From dcccf6e2c90ef7b079ac6a4f6258b7d550fa79c5 Mon Sep 17 00:00:00 2001 From: Eli Halych Date: Tue, 24 Nov 2020 09:59:07 +0000 Subject: Change mass-pnf-sim folder name to masspnfsim Details: - Allows for importing python files/classes/methods via normal import. - Dashes in mass-pnf-sim prevented from a normal Python import. - mass-pnf-sim path referenced in the project files changed to masspnfsim. - Possibility of using masspnfsim as a git submodule that requires noraml import. Issue-ID: INT-1789 Signed-off-by: Eli Halych Change-Id: I00cd753181c9b240b99881057cf777cf7977387a --- .../pnf-sim-lightweight/config/config.json | 15 ------ .../pnf-sim-lightweight/config/config.yml | 8 --- .../pnf-sim-lightweight/config/netconf.env | 10 ---- .../config/vsftpd_ssl-TEMPLATE.conf | 59 ---------------------- 4 files changed, 92 deletions(-) delete mode 100644 test/mocks/mass-pnf-sim/pnf-sim-lightweight/config/config.json delete mode 100644 test/mocks/mass-pnf-sim/pnf-sim-lightweight/config/config.yml delete mode 100644 test/mocks/mass-pnf-sim/pnf-sim-lightweight/config/netconf.env delete mode 100644 test/mocks/mass-pnf-sim/pnf-sim-lightweight/config/vsftpd_ssl-TEMPLATE.conf (limited to 'test/mocks/mass-pnf-sim/pnf-sim-lightweight/config') diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/config/config.json b/test/mocks/mass-pnf-sim/pnf-sim-lightweight/config/config.json deleted file mode 100644 index 9d2ba7e08..000000000 --- a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/config/config.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "simulatorParams": { - "testDuration": "86400", - "messageInterval": "900" - }, - "commonEventHeaderParams": { - "eventName": "Noti_RnNode-Ericsson_FileReady", - "nfNamingCode": "gNB", - "nfcNamingCode": "oam" - }, - "notificationParams": { - "changeIdentifier": "PM_MEAS_FILES", - "changeType": "FileReady" - } -} diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/config/config.yml b/test/mocks/mass-pnf-sim/pnf-sim-lightweight/config/config.yml deleted file mode 100644 index f21329eff..000000000 --- a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/config/config.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -urlves: http://localhost:10000/eventListener/v7 -urlftps: ftps://onap:pano@10.11.0.67 -urlsftp: sftp://onap:pano@10.11.0.68 -#when run in simulator, it does not have own IP -ippnfsim: localhost -typefileserver: sftp -... diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/config/netconf.env b/test/mocks/mass-pnf-sim/pnf-sim-lightweight/config/netconf.env deleted file mode 100644 index ef79365ec..000000000 --- a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/config/netconf.env +++ /dev/null @@ -1,10 +0,0 @@ - -//to run in simulator -//NETCONF_ADDRESS=netopeer - -//to run in docker -NETCONF_ADDRESS=localhost - -NETCONF_PORT=830 -NETCONF_MODEL=pnf-simulator -NETCONF_MAIN_CONTAINER=config diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/config/vsftpd_ssl-TEMPLATE.conf b/test/mocks/mass-pnf-sim/pnf-sim-lightweight/config/vsftpd_ssl-TEMPLATE.conf deleted file mode 100644 index 75bb974a3..000000000 --- a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/config/vsftpd_ssl-TEMPLATE.conf +++ /dev/null @@ -1,59 +0,0 @@ -# Server Config -anonymous_enable=NO -local_enable=YES -write_enable=YES -local_umask=022 -dirmessage_enable=YES - -# Security and User auth -chroot_local_user=YES -pam_service_name=vsftpd_virtual -virtual_use_local_privs=YES -chmod_enable=NO -user_config_dir=/etc/vsftpd/user_conf -user_sub_token=$USER -#local_root=/srv/$USER -local_root=/srv/ -userlist_enable=NO -allow_writeable_chroot=YES - -# Logging -log_ftp_protocol=YES -xferlog_enable=YES -xferlog_std_format=YES -#xferlog_file=/dev/stdout -syslog_enable=NO -dual_log_enable=YES - -# Remap all login users to this username -guest_enable=YES -guest_username=ftp -hide_ids=YES - -# Networking -connect_from_port_20=NO -listen=YES -tcp_wrappers=YES -pasv_min_port=${FTPS_PASV_MIN} -pasv_max_port=${FTPS_PASV_MAX} - -# SSL -ssl_enable=Yes -require_ssl_reuse=NO -force_local_data_ssl=YES -force_local_logins_ssl=YES -ssl_ciphers=HIGH -allow_anon_ssl=NO - -ssl_tlsv1=YES -ssl_sslv2=YES -ssl_sslv3=YES -rsa_cert_file=/etc/ssl/private/ftp.crt -rsa_private_key_file=/etc/ssl/private/ftp.key - -require_cert=YES -ssl_request_cert=YES -ca_certs_file=/etc/ssl/private/dfc.crt - -write_enable=YES -pasv_address=${IPFILESERVER} -- cgit 1.2.3-korg