From 2da3077f60b2f0173a5c2fa0cf6b09834f63482e Mon Sep 17 00:00:00 2001 From: krzysztof kuzmicki Date: Fri, 28 Sep 2018 11:34:40 +0200 Subject: Adaptation of PnP PNF simulator heat template Issue-ID: INT-644 Change-Id: I040874a1d0ae4ceb58d22be883070d7f5171b1b3 Signed-off-by: krzysztof kuzmicki --- .../deployment/PnP_PNF_sim_heat_template.yml | 37 ++++++++-------------- 1 file changed, 13 insertions(+), 24 deletions(-) (limited to 'test') diff --git a/test/mocks/pnfsimulator/deployment/PnP_PNF_sim_heat_template.yml b/test/mocks/pnfsimulator/deployment/PnP_PNF_sim_heat_template.yml index d9acc9e37..4bf6758d9 100644 --- a/test/mocks/pnfsimulator/deployment/PnP_PNF_sim_heat_template.yml +++ b/test/mocks/pnfsimulator/deployment/PnP_PNF_sim_heat_template.yml @@ -42,7 +42,7 @@ resources: dnf -y install fedora-upgrade } - docker_install_configure () { + docker_remove () { dnf -y remove docker \ docker-client \ docker-client-latest \ @@ -53,6 +53,9 @@ resources: docker-selinux \ docker-engine-selinux \ docker-engine + } + + docker_install_and_configure () { dnf -y install dnf-plugins-core dnf config-manager \ --add-repo \ @@ -67,41 +70,27 @@ resources: EOF systemctl daemon-reload systemctl restart docker - docker login -u docker -p docker nexus3.onap.org:10003 } docker_compose_install () { curl -L https://github.com/docker/compose/releases/download/$DOCKER_COMPOSE_VERSION/docker-compose-$(uname -s)-$(uname -m) -o /usr/local/bin/docker-compose chmod +x /usr/local/bin/docker-compose } pnf_sim_file_checkout () { - mkdir ~/sim/ - mkdir ~/sim/ssh - cd ~/sim/ssh/;wget "https://gerrit.onap.org/r/gitweb?p=integration.git;a=blob_plain;f=test/mocks/pnfsimulator/ssh/ssh_host_rsa_key;hb=HEAD" -O ssh_host_rsa_key - cd ~/sim/ssh/;wget "https://gerrit.onap.org/r/gitweb?p=integration.git;a=blob_plain;f=test/mocks/pnfsimulator/ssh/ssh_host_rsa_key.pub;hb=HEAD" -O ssh_host_rsa_key.pub - mkdir ~/sim/sftp - cd ~/sim/sftp/;wget "https://gerrit.onap.org/r/gitweb?p=integration.git;a=blob_plain;f=test/mocks/pnfsimulator/sftp/sftp-file.txt;hb=HEAD" -O sftp-file.txt - mkdir ~/sim/config - cd ~/sim/config/;wget "https://gerrit.onap.org/r/gitweb?p=integration.git;a=blob_plain;f=test/mocks/pnfsimulator/config/config.json;hb=HEAD" -O config.json - cd ~/sim/config/;wget "https://gerrit.onap.org/r/gitweb?p=integration.git;a=blob_plain;f=test/mocks/pnfsimulator/config/netconf.env;hb=HEAD" -O netconf.env - mkdir ~/sim/json_schema - cd ~/sim/config/;wget "https://gerrit.onap.org/r/gitweb?p=integration.git;a=blob_plain;f=test/mocks/pnfsimulator/json_schema/input_validator.json;hb=HEAD" -O input_validator.json - cd ~/sim/config/;wget "https://gerrit.onap.org/r/gitweb?p=integration.git;a=blob_plain;f=test/mocks/pnfsimulator/json_schema/output_validator_ves_schema_30.0.1.json;hb=HEAD" -O output_validator_ves_schema_30.0.1.json - mkdir ~/sim/netconf - cd ~/sim/netconf/;wget "https://gerrit.onap.org/r/gitweb?p=integration.git;a=blob_plain;f=test/mocks/pnfsimulator/netconf/pnf-simulator.data.xml;hb=HEAD" -O pnf-simulator.data.xml - cd ~/sim/netconf/;wget "https://gerrit.onap.org/r/gitweb?p=integration.git;a=blob_plain;f=test/mocks/pnfsimulator/netconf/pnf-simulator.yang;hb=HEAD" -O pnf-simulator.yang - cd ~/sim/;wget "https://gerrit.onap.org/r/gitweb?p=integration.git;a=blob_plain;f=test/mocks/pnfsimulator/docker-compose.yml;hb=HEAD" -O docker-compose.yml - cd ~/sim/;wget "https://gerrit.onap.org/r/gitweb?p=integration.git;a=blob_plain;f=test/mocks/pnfsimulator/simulator.sh;hb=HEAD" -O simulator.sh - chmod 654 ~/sim/simulator.sh + cd /root; git clone https://gerrit.onap.org/r/integration + printf "{\n "simulatorParams": {\n "vesServerUrl": "http://VES-HOST:VES-PORT/eventListener/v7",\n "testDuration": "10",\n "messageInterval": "1"\n },\n "commonEventHeaderParams": {\n "eventName": "pnfRegistration_Nokia_5gDu",\n "nfNamingCode": "gNB",\n "nfcNamingCode": "oam",\n "sourceName": "NOK6061ZW3",\n "sourceId": "val13",\n "reportingEntityName": "NOK6061ZW3"\n },\n "pnfRegistrationParams": {\n "serialNumber": "6061ZW3",\n "vendorName": "Nokia",\n "oamV4IpAddress": "val3",\n "oamV6IpAddress": "val4",\n "unitFamily": "BBU",\n "modelNumber": "val6",\n "softwareVersion": "val7",\n "unitType": "val8"\n }\n}" > integration/test/mocks/pnfsimulator/config/config.json } - start_simulator (){ - ~/sim/simulator.sh start + start_simulator () { + docker login -u docker -p docker nexus3.onap.org:10003 + cd ~/integration/test/mocks/pnfsimulator + ./simulator.sh start } set_versions enable_root_ssh update_os - docker_install_configure + docker_remove + docker_install_and_configure docker_compose_install pnf_sim_file_checkout start_simulator @@ -126,4 +115,4 @@ outputs: value: { get_attr: [ PNF_PnP_simualtor, first_address ] } PNF_PnP_simualtor_public_ip: description: Floating IP address of PNF_PnP_simualtor in public network - value: { get_attr: [ PNF_PnP_simualtor_public, floating_ip_address ] } + value: { get_attr: [ PNF_PnP_simualtor_public, floating_ip_address ] } \ No newline at end of file -- cgit 1.2.3-korg