From: Eli Halych Date: Tue, 24 Nov 2020 09:59:07 +0000 (+0000) Subject: Change mass-pnf-sim folder name to masspnfsim X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F94%2F115294%2F1;p=integration.git 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 --- diff --git a/test/mocks/mass-pnf-sim/.gitignore b/test/mocks/masspnfsim/.gitignore similarity index 100% rename from test/mocks/mass-pnf-sim/.gitignore rename to test/mocks/masspnfsim/.gitignore diff --git a/test/mocks/mass-pnf-sim/MassPnfSim.py b/test/mocks/masspnfsim/MassPnfSim.py similarity index 100% rename from test/mocks/mass-pnf-sim/MassPnfSim.py rename to test/mocks/masspnfsim/MassPnfSim.py diff --git a/test/mocks/mass-pnf-sim/README.md b/test/mocks/masspnfsim/README.md similarity index 100% rename from test/mocks/mass-pnf-sim/README.md rename to test/mocks/masspnfsim/README.md diff --git a/test/mocks/mass-pnf-sim/clean.sh b/test/mocks/masspnfsim/clean.sh similarity index 100% rename from test/mocks/mass-pnf-sim/clean.sh rename to test/mocks/masspnfsim/clean.sh diff --git a/test/mocks/mass-pnf-sim/conftest.py b/test/mocks/masspnfsim/conftest.py similarity index 100% rename from test/mocks/mass-pnf-sim/conftest.py rename to test/mocks/masspnfsim/conftest.py diff --git a/test/mocks/mass-pnf-sim/deployment/heat/README.rst b/test/mocks/masspnfsim/deployment/heat/README.rst similarity index 93% rename from test/mocks/mass-pnf-sim/deployment/heat/README.rst rename to test/mocks/masspnfsim/deployment/heat/README.rst index 0c688aecd..60473fa74 100644 --- a/test/mocks/mass-pnf-sim/deployment/heat/README.rst +++ b/test/mocks/masspnfsim/deployment/heat/README.rst @@ -55,4 +55,4 @@ To instantiate the Heat template run from *openstack* CLI: :: - stack create -t integration/test/mocks/mass-pnf-sim/deployment/heat/heat.yaml -e integration/test/mocks/mass-pnf-sim/deployment/heat/heat.env + stack create -t integration/test/mocks/masspnfsim/deployment/heat/heat.yaml -e integration/test/mocks/masspnfsim/deployment/heat/heat.env diff --git a/test/mocks/mass-pnf-sim/deployment/heat/cloud-config.yaml b/test/mocks/masspnfsim/deployment/heat/cloud-config.yaml similarity index 100% rename from test/mocks/mass-pnf-sim/deployment/heat/cloud-config.yaml rename to test/mocks/masspnfsim/deployment/heat/cloud-config.yaml diff --git a/test/mocks/mass-pnf-sim/deployment/heat/heat.env b/test/mocks/masspnfsim/deployment/heat/heat.env similarity index 100% rename from test/mocks/mass-pnf-sim/deployment/heat/heat.env rename to test/mocks/masspnfsim/deployment/heat/heat.env diff --git a/test/mocks/mass-pnf-sim/deployment/heat/heat.yaml b/test/mocks/masspnfsim/deployment/heat/heat.yaml similarity index 100% rename from test/mocks/mass-pnf-sim/deployment/heat/heat.yaml rename to test/mocks/masspnfsim/deployment/heat/heat.yaml diff --git a/test/mocks/mass-pnf-sim/deployment/heat/mass-pnf-sim_run.sh b/test/mocks/masspnfsim/deployment/heat/mass-pnf-sim_run.sh similarity index 90% rename from test/mocks/mass-pnf-sim/deployment/heat/mass-pnf-sim_run.sh rename to test/mocks/masspnfsim/deployment/heat/mass-pnf-sim_run.sh index 20880003a..184684bbe 100644 --- a/test/mocks/mass-pnf-sim/deployment/heat/mass-pnf-sim_run.sh +++ b/test/mocks/masspnfsim/deployment/heat/mass-pnf-sim_run.sh @@ -1,7 +1,7 @@ #!/bin/bash pushd /root git clone https://git.onap.org/integration -pushd integration/test/mocks/mass-pnf-sim +pushd integration/test/mocks/masspnfsim ./setup.sh source .tox/MassPnfSim-runtime/bin/activate ./mass-pnf-sim.py build diff --git a/test/mocks/mass-pnf-sim/diagnostic.sh b/test/mocks/masspnfsim/diagnostic.sh similarity index 100% rename from test/mocks/mass-pnf-sim/diagnostic.sh rename to test/mocks/masspnfsim/diagnostic.sh diff --git a/test/mocks/mass-pnf-sim/mass-pnf-sim.py b/test/mocks/masspnfsim/mass-pnf-sim.py similarity index 100% rename from test/mocks/mass-pnf-sim/mass-pnf-sim.py rename to test/mocks/masspnfsim/mass-pnf-sim.py diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/README.md b/test/mocks/masspnfsim/pnf-sim-lightweight/README.md similarity index 87% rename from test/mocks/mass-pnf-sim/pnf-sim-lightweight/README.md rename to test/mocks/masspnfsim/pnf-sim-lightweight/README.md index 927140571..2b902d0f8 100644 --- a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/README.md +++ b/test/mocks/masspnfsim/pnf-sim-lightweight/README.md @@ -6,7 +6,7 @@ To start listening on port 10000 for test purposes: nc -l -k -p 10000 ``` -Test the command above: +Test the command above: ``` echo "Hello World" | nc localhost 10000 @@ -15,7 +15,7 @@ echo "Hello World" | nc localhost 10000 Trigger the pnf simulator locally: ``` -~/dev/git/integration/test/mocks/mass-pnf-sim/pnf-sim-lightweight$ curl -s -X POST -H "Content-Type: application/json" -H "X-ONAP-RequestID: 123" -H "X-InvocationID: 456" -d @config/config.json +~/dev/git/integration/test/mocks/masspnfsim/pnf-sim-lightweight$ curl -s -X POST -H "Content-Type: application/json" -H "X-ONAP-RequestID: 123" -H "X-InvocationID: 456" -d @config/config.json http://localhost:5000/simulator/start ``` diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/ROP_file_creator.sh b/test/mocks/masspnfsim/pnf-sim-lightweight/ROP_file_creator.sh similarity index 100% rename from test/mocks/mass-pnf-sim/pnf-sim-lightweight/ROP_file_creator.sh rename to test/mocks/masspnfsim/pnf-sim-lightweight/ROP_file_creator.sh diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/config/config.json b/test/mocks/masspnfsim/pnf-sim-lightweight/config/config.json similarity index 100% rename from test/mocks/mass-pnf-sim/pnf-sim-lightweight/config/config.json rename to test/mocks/masspnfsim/pnf-sim-lightweight/config/config.json diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/config/config.yml b/test/mocks/masspnfsim/pnf-sim-lightweight/config/config.yml similarity index 100% rename from test/mocks/mass-pnf-sim/pnf-sim-lightweight/config/config.yml rename to test/mocks/masspnfsim/pnf-sim-lightweight/config/config.yml diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/config/netconf.env b/test/mocks/masspnfsim/pnf-sim-lightweight/config/netconf.env similarity index 100% rename from test/mocks/mass-pnf-sim/pnf-sim-lightweight/config/netconf.env rename to test/mocks/masspnfsim/pnf-sim-lightweight/config/netconf.env diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/config/vsftpd_ssl-TEMPLATE.conf b/test/mocks/masspnfsim/pnf-sim-lightweight/config/vsftpd_ssl-TEMPLATE.conf similarity index 100% rename from test/mocks/mass-pnf-sim/pnf-sim-lightweight/config/vsftpd_ssl-TEMPLATE.conf rename to test/mocks/masspnfsim/pnf-sim-lightweight/config/vsftpd_ssl-TEMPLATE.conf diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/deployment/PnP_PNF_sim_heat_template.yml b/test/mocks/masspnfsim/pnf-sim-lightweight/deployment/PnP_PNF_sim_heat_template.yml similarity index 100% rename from test/mocks/mass-pnf-sim/pnf-sim-lightweight/deployment/PnP_PNF_sim_heat_template.yml rename to test/mocks/masspnfsim/pnf-sim-lightweight/deployment/PnP_PNF_sim_heat_template.yml diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/deployment/PnP_PNF_sim_heat_template_Ubuntu_16_04.yml b/test/mocks/masspnfsim/pnf-sim-lightweight/deployment/PnP_PNF_sim_heat_template_Ubuntu_16_04.yml similarity index 100% rename from test/mocks/mass-pnf-sim/pnf-sim-lightweight/deployment/PnP_PNF_sim_heat_template_Ubuntu_16_04.yml rename to test/mocks/masspnfsim/pnf-sim-lightweight/deployment/PnP_PNF_sim_heat_template_Ubuntu_16_04.yml diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/docker-compose-template.yml b/test/mocks/masspnfsim/pnf-sim-lightweight/docker-compose-template.yml similarity index 100% rename from test/mocks/mass-pnf-sim/pnf-sim-lightweight/docker-compose-template.yml rename to test/mocks/masspnfsim/pnf-sim-lightweight/docker-compose-template.yml diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/fix-sftp-perms-template.sh b/test/mocks/masspnfsim/pnf-sim-lightweight/fix-sftp-perms-template.sh similarity index 100% rename from test/mocks/mass-pnf-sim/pnf-sim-lightweight/fix-sftp-perms-template.sh rename to test/mocks/masspnfsim/pnf-sim-lightweight/fix-sftp-perms-template.sh diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/json_schema/input_validator.json b/test/mocks/masspnfsim/pnf-sim-lightweight/json_schema/input_validator.json similarity index 100% rename from test/mocks/mass-pnf-sim/pnf-sim-lightweight/json_schema/input_validator.json rename to test/mocks/masspnfsim/pnf-sim-lightweight/json_schema/input_validator.json diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/json_schema/output_validator_ves_schema_30.0.1.json b/test/mocks/masspnfsim/pnf-sim-lightweight/json_schema/output_validator_ves_schema_30.0.1.json similarity index 100% rename from test/mocks/mass-pnf-sim/pnf-sim-lightweight/json_schema/output_validator_ves_schema_30.0.1.json rename to test/mocks/masspnfsim/pnf-sim-lightweight/json_schema/output_validator_ves_schema_30.0.1.json diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/netconf/pnf-simulator.data.xml b/test/mocks/masspnfsim/pnf-sim-lightweight/netconf/pnf-simulator.data.xml similarity index 100% rename from test/mocks/mass-pnf-sim/pnf-sim-lightweight/netconf/pnf-simulator.data.xml rename to test/mocks/masspnfsim/pnf-sim-lightweight/netconf/pnf-simulator.data.xml diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/netconf/pnf-simulator.yang b/test/mocks/masspnfsim/pnf-sim-lightweight/netconf/pnf-simulator.yang similarity index 100% rename from test/mocks/mass-pnf-sim/pnf-sim-lightweight/netconf/pnf-simulator.yang rename to test/mocks/masspnfsim/pnf-sim-lightweight/netconf/pnf-simulator.yang diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/pom.xml b/test/mocks/masspnfsim/pnf-sim-lightweight/pom.xml similarity index 100% rename from test/mocks/mass-pnf-sim/pnf-sim-lightweight/pom.xml rename to test/mocks/masspnfsim/pnf-sim-lightweight/pom.xml diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/simulator.sh b/test/mocks/masspnfsim/pnf-sim-lightweight/simulator.sh similarity index 100% rename from test/mocks/mass-pnf-sim/pnf-sim-lightweight/simulator.sh rename to test/mocks/masspnfsim/pnf-sim-lightweight/simulator.sh diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/assembly/resources.xml b/test/mocks/masspnfsim/pnf-sim-lightweight/src/assembly/resources.xml similarity index 100% rename from test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/assembly/resources.xml rename to test/mocks/masspnfsim/pnf-sim-lightweight/src/assembly/resources.xml diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/ConfigurationProvider.java b/test/mocks/masspnfsim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/ConfigurationProvider.java similarity index 100% rename from test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/ConfigurationProvider.java rename to test/mocks/masspnfsim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/ConfigurationProvider.java diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/FileProvider.java b/test/mocks/masspnfsim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/FileProvider.java similarity index 100% rename from test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/FileProvider.java rename to test/mocks/masspnfsim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/FileProvider.java diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/Main.java b/test/mocks/masspnfsim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/Main.java similarity index 100% rename from test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/Main.java rename to test/mocks/masspnfsim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/Main.java diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/PnfSimConfig.java b/test/mocks/masspnfsim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/PnfSimConfig.java similarity index 100% rename from test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/PnfSimConfig.java rename to test/mocks/masspnfsim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/PnfSimConfig.java diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/logback.xml b/test/mocks/masspnfsim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/logback.xml similarity index 100% rename from test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/logback.xml rename to test/mocks/masspnfsim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/logback.xml diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/logging/MDCVariables.java b/test/mocks/masspnfsim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/logging/MDCVariables.java similarity index 100% rename from test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/logging/MDCVariables.java rename to test/mocks/masspnfsim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/logging/MDCVariables.java diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/message/JSONObjectFactory.java b/test/mocks/masspnfsim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/message/JSONObjectFactory.java similarity index 100% rename from test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/message/JSONObjectFactory.java rename to test/mocks/masspnfsim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/message/JSONObjectFactory.java diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/message/MessageConstants.java b/test/mocks/masspnfsim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/message/MessageConstants.java similarity index 100% rename from test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/message/MessageConstants.java rename to test/mocks/masspnfsim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/message/MessageConstants.java diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/message/MessageProvider.java b/test/mocks/masspnfsim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/message/MessageProvider.java similarity index 100% rename from test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/message/MessageProvider.java rename to test/mocks/masspnfsim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/message/MessageProvider.java diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/netconfmonitor/NetconfConfigurationCheckingTask.java b/test/mocks/masspnfsim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/netconfmonitor/NetconfConfigurationCheckingTask.java similarity index 100% rename from test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/netconfmonitor/NetconfConfigurationCheckingTask.java rename to test/mocks/masspnfsim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/netconfmonitor/NetconfConfigurationCheckingTask.java diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/netconfmonitor/NetconfMonitorService.java b/test/mocks/masspnfsim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/netconfmonitor/NetconfMonitorService.java similarity index 100% rename from test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/netconfmonitor/NetconfMonitorService.java rename to test/mocks/masspnfsim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/netconfmonitor/NetconfMonitorService.java diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/netconfmonitor/NetconfMonitorServiceConfiguration.java b/test/mocks/masspnfsim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/netconfmonitor/NetconfMonitorServiceConfiguration.java similarity index 100% rename from test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/netconfmonitor/NetconfMonitorServiceConfiguration.java rename to test/mocks/masspnfsim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/netconfmonitor/NetconfMonitorServiceConfiguration.java diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/netconfmonitor/netconf/NetconfConfigurationCache.java b/test/mocks/masspnfsim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/netconfmonitor/netconf/NetconfConfigurationCache.java similarity index 100% rename from test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/netconfmonitor/netconf/NetconfConfigurationCache.java rename to test/mocks/masspnfsim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/netconfmonitor/netconf/NetconfConfigurationCache.java diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/netconfmonitor/netconf/NetconfConfigurationReader.java b/test/mocks/masspnfsim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/netconfmonitor/netconf/NetconfConfigurationReader.java similarity index 100% rename from test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/netconfmonitor/netconf/NetconfConfigurationReader.java rename to test/mocks/masspnfsim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/netconfmonitor/netconf/NetconfConfigurationReader.java diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/netconfmonitor/netconf/NetconfConfigurationWriter.java b/test/mocks/masspnfsim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/netconfmonitor/netconf/NetconfConfigurationWriter.java similarity index 100% rename from test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/netconfmonitor/netconf/NetconfConfigurationWriter.java rename to test/mocks/masspnfsim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/netconfmonitor/netconf/NetconfConfigurationWriter.java diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/netconfmonitor/netconf/NetconfConnectionParams.java b/test/mocks/masspnfsim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/netconfmonitor/netconf/NetconfConnectionParams.java similarity index 100% rename from test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/netconfmonitor/netconf/NetconfConnectionParams.java rename to test/mocks/masspnfsim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/netconfmonitor/netconf/NetconfConnectionParams.java diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/rest/SimulatorController.java b/test/mocks/masspnfsim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/rest/SimulatorController.java similarity index 100% rename from test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/rest/SimulatorController.java rename to test/mocks/masspnfsim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/rest/SimulatorController.java diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/rest/util/DateUtil.java b/test/mocks/masspnfsim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/rest/util/DateUtil.java similarity index 100% rename from test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/rest/util/DateUtil.java rename to test/mocks/masspnfsim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/rest/util/DateUtil.java diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/rest/util/ResponseBuilder.java b/test/mocks/masspnfsim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/rest/util/ResponseBuilder.java similarity index 100% rename from test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/rest/util/ResponseBuilder.java rename to test/mocks/masspnfsim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/rest/util/ResponseBuilder.java diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/simulator/Simulator.java b/test/mocks/masspnfsim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/simulator/Simulator.java similarity index 100% rename from test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/simulator/Simulator.java rename to test/mocks/masspnfsim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/simulator/Simulator.java diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/simulator/SimulatorFactory.java b/test/mocks/masspnfsim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/simulator/SimulatorFactory.java similarity index 100% rename from test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/simulator/SimulatorFactory.java rename to test/mocks/masspnfsim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/simulator/SimulatorFactory.java diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/simulator/client/HttpClientAdapter.java b/test/mocks/masspnfsim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/simulator/client/HttpClientAdapter.java similarity index 100% rename from test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/simulator/client/HttpClientAdapter.java rename to test/mocks/masspnfsim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/simulator/client/HttpClientAdapter.java diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/simulator/client/HttpClientAdapterImpl.java b/test/mocks/masspnfsim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/simulator/client/HttpClientAdapterImpl.java similarity index 100% rename from test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/simulator/client/HttpClientAdapterImpl.java rename to test/mocks/masspnfsim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/simulator/client/HttpClientAdapterImpl.java diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/simulator/validation/JSONValidator.java b/test/mocks/masspnfsim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/simulator/validation/JSONValidator.java similarity index 100% rename from test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/simulator/validation/JSONValidator.java rename to test/mocks/masspnfsim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/simulator/validation/JSONValidator.java diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/simulator/validation/NoRopFilesException.java b/test/mocks/masspnfsim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/simulator/validation/NoRopFilesException.java similarity index 100% rename from test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/simulator/validation/NoRopFilesException.java rename to test/mocks/masspnfsim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/simulator/validation/NoRopFilesException.java diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/simulator/validation/ValidationException.java b/test/mocks/masspnfsim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/simulator/validation/ValidationException.java similarity index 100% rename from test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/simulator/validation/ValidationException.java rename to test/mocks/masspnfsim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/simulator/validation/ValidationException.java diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/main/resources/application.properties b/test/mocks/masspnfsim/pnf-sim-lightweight/src/main/resources/application.properties similarity index 100% rename from test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/main/resources/application.properties rename to test/mocks/masspnfsim/pnf-sim-lightweight/src/main/resources/application.properties diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/test/java/org/onap/pnfsimulator/message/JSONObjectFactoryTest.java b/test/mocks/masspnfsim/pnf-sim-lightweight/src/test/java/org/onap/pnfsimulator/message/JSONObjectFactoryTest.java similarity index 100% rename from test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/test/java/org/onap/pnfsimulator/message/JSONObjectFactoryTest.java rename to test/mocks/masspnfsim/pnf-sim-lightweight/src/test/java/org/onap/pnfsimulator/message/JSONObjectFactoryTest.java diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/test/java/org/onap/pnfsimulator/message/MessageProviderTest.java b/test/mocks/masspnfsim/pnf-sim-lightweight/src/test/java/org/onap/pnfsimulator/message/MessageProviderTest.java similarity index 100% rename from test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/test/java/org/onap/pnfsimulator/message/MessageProviderTest.java rename to test/mocks/masspnfsim/pnf-sim-lightweight/src/test/java/org/onap/pnfsimulator/message/MessageProviderTest.java diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/test/java/org/onap/pnfsimulator/netconfmonitor/NetconfConfigurationCheckingTaskTest.java b/test/mocks/masspnfsim/pnf-sim-lightweight/src/test/java/org/onap/pnfsimulator/netconfmonitor/NetconfConfigurationCheckingTaskTest.java similarity index 100% rename from test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/test/java/org/onap/pnfsimulator/netconfmonitor/NetconfConfigurationCheckingTaskTest.java rename to test/mocks/masspnfsim/pnf-sim-lightweight/src/test/java/org/onap/pnfsimulator/netconfmonitor/NetconfConfigurationCheckingTaskTest.java diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/test/java/org/onap/pnfsimulator/netconfmonitor/NetconfMonitorServiceConfigurationTest.java b/test/mocks/masspnfsim/pnf-sim-lightweight/src/test/java/org/onap/pnfsimulator/netconfmonitor/NetconfMonitorServiceConfigurationTest.java similarity index 100% rename from test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/test/java/org/onap/pnfsimulator/netconfmonitor/NetconfMonitorServiceConfigurationTest.java rename to test/mocks/masspnfsim/pnf-sim-lightweight/src/test/java/org/onap/pnfsimulator/netconfmonitor/NetconfMonitorServiceConfigurationTest.java diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/test/java/org/onap/pnfsimulator/netconfmonitor/NetconfMonitorServiceTest.java b/test/mocks/masspnfsim/pnf-sim-lightweight/src/test/java/org/onap/pnfsimulator/netconfmonitor/NetconfMonitorServiceTest.java similarity index 100% rename from test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/test/java/org/onap/pnfsimulator/netconfmonitor/NetconfMonitorServiceTest.java rename to test/mocks/masspnfsim/pnf-sim-lightweight/src/test/java/org/onap/pnfsimulator/netconfmonitor/NetconfMonitorServiceTest.java diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/test/java/org/onap/pnfsimulator/netconfmonitor/netconf/NetconfConfigurationCacheTest.java b/test/mocks/masspnfsim/pnf-sim-lightweight/src/test/java/org/onap/pnfsimulator/netconfmonitor/netconf/NetconfConfigurationCacheTest.java similarity index 100% rename from test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/test/java/org/onap/pnfsimulator/netconfmonitor/netconf/NetconfConfigurationCacheTest.java rename to test/mocks/masspnfsim/pnf-sim-lightweight/src/test/java/org/onap/pnfsimulator/netconfmonitor/netconf/NetconfConfigurationCacheTest.java diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/test/java/org/onap/pnfsimulator/netconfmonitor/netconf/NetconfConfigurationReaderTest.java b/test/mocks/masspnfsim/pnf-sim-lightweight/src/test/java/org/onap/pnfsimulator/netconfmonitor/netconf/NetconfConfigurationReaderTest.java similarity index 100% rename from test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/test/java/org/onap/pnfsimulator/netconfmonitor/netconf/NetconfConfigurationReaderTest.java rename to test/mocks/masspnfsim/pnf-sim-lightweight/src/test/java/org/onap/pnfsimulator/netconfmonitor/netconf/NetconfConfigurationReaderTest.java diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/test/java/org/onap/pnfsimulator/netconfmonitor/netconf/NetconfConfigurationWriterTest.java b/test/mocks/masspnfsim/pnf-sim-lightweight/src/test/java/org/onap/pnfsimulator/netconfmonitor/netconf/NetconfConfigurationWriterTest.java similarity index 100% rename from test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/test/java/org/onap/pnfsimulator/netconfmonitor/netconf/NetconfConfigurationWriterTest.java rename to test/mocks/masspnfsim/pnf-sim-lightweight/src/test/java/org/onap/pnfsimulator/netconfmonitor/netconf/NetconfConfigurationWriterTest.java diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/test/java/org/onap/pnfsimulator/rest/SimulatorControllerTest.java b/test/mocks/masspnfsim/pnf-sim-lightweight/src/test/java/org/onap/pnfsimulator/rest/SimulatorControllerTest.java similarity index 100% rename from test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/test/java/org/onap/pnfsimulator/rest/SimulatorControllerTest.java rename to test/mocks/masspnfsim/pnf-sim-lightweight/src/test/java/org/onap/pnfsimulator/rest/SimulatorControllerTest.java diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/test/java/org/onap/pnfsimulator/rest/util/DateUtilTest.java b/test/mocks/masspnfsim/pnf-sim-lightweight/src/test/java/org/onap/pnfsimulator/rest/util/DateUtilTest.java similarity index 100% rename from test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/test/java/org/onap/pnfsimulator/rest/util/DateUtilTest.java rename to test/mocks/masspnfsim/pnf-sim-lightweight/src/test/java/org/onap/pnfsimulator/rest/util/DateUtilTest.java diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/test/java/org/onap/pnfsimulator/rest/util/ResponseBuilderTest.java b/test/mocks/masspnfsim/pnf-sim-lightweight/src/test/java/org/onap/pnfsimulator/rest/util/ResponseBuilderTest.java similarity index 100% rename from test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/test/java/org/onap/pnfsimulator/rest/util/ResponseBuilderTest.java rename to test/mocks/masspnfsim/pnf-sim-lightweight/src/test/java/org/onap/pnfsimulator/rest/util/ResponseBuilderTest.java diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/test/java/org/onap/pnfsimulator/simulator/SimulatorFactoryTest.java b/test/mocks/masspnfsim/pnf-sim-lightweight/src/test/java/org/onap/pnfsimulator/simulator/SimulatorFactoryTest.java similarity index 100% rename from test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/test/java/org/onap/pnfsimulator/simulator/SimulatorFactoryTest.java rename to test/mocks/masspnfsim/pnf-sim-lightweight/src/test/java/org/onap/pnfsimulator/simulator/SimulatorFactoryTest.java diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/test/java/org/onap/pnfsimulator/simulator/SimulatorTest.java b/test/mocks/masspnfsim/pnf-sim-lightweight/src/test/java/org/onap/pnfsimulator/simulator/SimulatorTest.java similarity index 100% rename from test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/test/java/org/onap/pnfsimulator/simulator/SimulatorTest.java rename to test/mocks/masspnfsim/pnf-sim-lightweight/src/test/java/org/onap/pnfsimulator/simulator/SimulatorTest.java diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/test/java/org/onap/pnfsimulator/simulator/TestMessages.java b/test/mocks/masspnfsim/pnf-sim-lightweight/src/test/java/org/onap/pnfsimulator/simulator/TestMessages.java similarity index 100% rename from test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/test/java/org/onap/pnfsimulator/simulator/TestMessages.java rename to test/mocks/masspnfsim/pnf-sim-lightweight/src/test/java/org/onap/pnfsimulator/simulator/TestMessages.java diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/test/java/org/onap/pnfsimulator/simulator/client/HttpClientAdapterImplTest.java b/test/mocks/masspnfsim/pnf-sim-lightweight/src/test/java/org/onap/pnfsimulator/simulator/client/HttpClientAdapterImplTest.java similarity index 100% rename from test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/test/java/org/onap/pnfsimulator/simulator/client/HttpClientAdapterImplTest.java rename to test/mocks/masspnfsim/pnf-sim-lightweight/src/test/java/org/onap/pnfsimulator/simulator/client/HttpClientAdapterImplTest.java diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/test/java/org/onap/pnfsimulator/simulator/validation/JSONValidatorTest.java b/test/mocks/masspnfsim/pnf-sim-lightweight/src/test/java/org/onap/pnfsimulator/simulator/validation/JSONValidatorTest.java similarity index 100% rename from test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/test/java/org/onap/pnfsimulator/simulator/validation/JSONValidatorTest.java rename to test/mocks/masspnfsim/pnf-sim-lightweight/src/test/java/org/onap/pnfsimulator/simulator/validation/JSONValidatorTest.java diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/test/resources/invalid-test-schema.json b/test/mocks/masspnfsim/pnf-sim-lightweight/src/test/resources/invalid-test-schema.json similarity index 100% rename from test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/test/resources/invalid-test-schema.json rename to test/mocks/masspnfsim/pnf-sim-lightweight/src/test/resources/invalid-test-schema.json diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/test/resources/logback-test.xml b/test/mocks/masspnfsim/pnf-sim-lightweight/src/test/resources/logback-test.xml similarity index 100% rename from test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/test/resources/logback-test.xml rename to test/mocks/masspnfsim/pnf-sim-lightweight/src/test/resources/logback-test.xml diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/test/resources/org/onap/pnfsimulator/simulator/validCommonEventHeaderParams.json b/test/mocks/masspnfsim/pnf-sim-lightweight/src/test/resources/org/onap/pnfsimulator/simulator/validCommonEventHeaderParams.json similarity index 100% rename from test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/test/resources/org/onap/pnfsimulator/simulator/validCommonEventHeaderParams.json rename to test/mocks/masspnfsim/pnf-sim-lightweight/src/test/resources/org/onap/pnfsimulator/simulator/validCommonEventHeaderParams.json diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/test/resources/org/onap/pnfsimulator/simulator/validNotificationParams.json b/test/mocks/masspnfsim/pnf-sim-lightweight/src/test/resources/org/onap/pnfsimulator/simulator/validNotificationParams.json similarity index 100% rename from test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/test/resources/org/onap/pnfsimulator/simulator/validNotificationParams.json rename to test/mocks/masspnfsim/pnf-sim-lightweight/src/test/resources/org/onap/pnfsimulator/simulator/validNotificationParams.json diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/test/resources/org/onap/pnfsimulator/simulator/validPnfRegistrationParams.json b/test/mocks/masspnfsim/pnf-sim-lightweight/src/test/resources/org/onap/pnfsimulator/simulator/validPnfRegistrationParams.json similarity index 100% rename from test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/test/resources/org/onap/pnfsimulator/simulator/validPnfRegistrationParams.json rename to test/mocks/masspnfsim/pnf-sim-lightweight/src/test/resources/org/onap/pnfsimulator/simulator/validPnfRegistrationParams.json diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/test/resources/org/onap/pnfsimulator/simulator/validSimulatorParams.json b/test/mocks/masspnfsim/pnf-sim-lightweight/src/test/resources/org/onap/pnfsimulator/simulator/validSimulatorParams.json similarity index 100% rename from test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/test/resources/org/onap/pnfsimulator/simulator/validSimulatorParams.json rename to test/mocks/masspnfsim/pnf-sim-lightweight/src/test/resources/org/onap/pnfsimulator/simulator/validSimulatorParams.json diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/test/resources/valid-test-schema.json b/test/mocks/masspnfsim/pnf-sim-lightweight/src/test/resources/valid-test-schema.json similarity index 100% rename from test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/test/resources/valid-test-schema.json rename to test/mocks/masspnfsim/pnf-sim-lightweight/src/test/resources/valid-test-schema.json diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/templates/.gitattributes b/test/mocks/masspnfsim/pnf-sim-lightweight/templates/.gitattributes similarity index 100% rename from test/mocks/mass-pnf-sim/pnf-sim-lightweight/templates/.gitattributes rename to test/mocks/masspnfsim/pnf-sim-lightweight/templates/.gitattributes diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/templates/file_template_new.xml.gz b/test/mocks/masspnfsim/pnf-sim-lightweight/templates/file_template_new.xml.gz similarity index 100% rename from test/mocks/mass-pnf-sim/pnf-sim-lightweight/templates/file_template_new.xml.gz rename to test/mocks/masspnfsim/pnf-sim-lightweight/templates/file_template_new.xml.gz diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/tls/README.md b/test/mocks/masspnfsim/pnf-sim-lightweight/tls/README.md similarity index 100% rename from test/mocks/mass-pnf-sim/pnf-sim-lightweight/tls/README.md rename to test/mocks/masspnfsim/pnf-sim-lightweight/tls/README.md diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/tls/dfc.crt b/test/mocks/masspnfsim/pnf-sim-lightweight/tls/dfc.crt similarity index 100% rename from test/mocks/mass-pnf-sim/pnf-sim-lightweight/tls/dfc.crt rename to test/mocks/masspnfsim/pnf-sim-lightweight/tls/dfc.crt diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/tls/ftp.crt b/test/mocks/masspnfsim/pnf-sim-lightweight/tls/ftp.crt similarity index 100% rename from test/mocks/mass-pnf-sim/pnf-sim-lightweight/tls/ftp.crt rename to test/mocks/masspnfsim/pnf-sim-lightweight/tls/ftp.crt diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/tls/ftp.key b/test/mocks/masspnfsim/pnf-sim-lightweight/tls/ftp.key similarity index 100% rename from test/mocks/mass-pnf-sim/pnf-sim-lightweight/tls/ftp.key rename to test/mocks/masspnfsim/pnf-sim-lightweight/tls/ftp.key diff --git a/test/mocks/mass-pnf-sim/setup.py b/test/mocks/masspnfsim/setup.py similarity index 100% rename from test/mocks/mass-pnf-sim/setup.py rename to test/mocks/masspnfsim/setup.py diff --git a/test/mocks/mass-pnf-sim/setup.sh b/test/mocks/masspnfsim/setup.sh similarity index 100% rename from test/mocks/mass-pnf-sim/setup.sh rename to test/mocks/masspnfsim/setup.sh diff --git a/test/mocks/mass-pnf-sim/test_cli.py b/test/mocks/masspnfsim/test_cli.py similarity index 100% rename from test/mocks/mass-pnf-sim/test_cli.py rename to test/mocks/masspnfsim/test_cli.py diff --git a/test/mocks/mass-pnf-sim/test_lifecycle.py b/test/mocks/masspnfsim/test_lifecycle.py similarity index 100% rename from test/mocks/mass-pnf-sim/test_lifecycle.py rename to test/mocks/masspnfsim/test_lifecycle.py diff --git a/test/mocks/mass-pnf-sim/test_settings.py b/test/mocks/masspnfsim/test_settings.py similarity index 100% rename from test/mocks/mass-pnf-sim/test_settings.py rename to test/mocks/masspnfsim/test_settings.py diff --git a/test/mocks/mass-pnf-sim/tox.ini b/test/mocks/masspnfsim/tox.ini similarity index 100% rename from test/mocks/mass-pnf-sim/tox.ini rename to test/mocks/masspnfsim/tox.ini