From cfa48db5d059b891aa53cb52e512504860863bed Mon Sep 17 00:00:00 2001 From: Bartosz Gardziejewski Date: Wed, 8 Apr 2020 09:47:06 +0200 Subject: Remove old PNF simulator Issue-ID: INT-1517 Signed-off-by: Bartosz Gardziejewski Change-Id: I235b0fdf12b265a256c371126e218826e74a9133 --- test/mocks/pnfsimulator/deployment/assembly.xml | 35 ----- test/mocks/pnfsimulator/deployment/pom.xml | 52 -------- .../pnfsimulator/deployment/src/MANIFEST.json | 17 --- .../deployment/src/simulators_heat_template.env | 10 -- .../deployment/src/simulators_heat_template.yaml | 147 --------------------- 5 files changed, 261 deletions(-) delete mode 100644 test/mocks/pnfsimulator/deployment/assembly.xml delete mode 100644 test/mocks/pnfsimulator/deployment/pom.xml delete mode 100644 test/mocks/pnfsimulator/deployment/src/MANIFEST.json delete mode 100644 test/mocks/pnfsimulator/deployment/src/simulators_heat_template.env delete mode 100644 test/mocks/pnfsimulator/deployment/src/simulators_heat_template.yaml (limited to 'test/mocks/pnfsimulator/deployment') diff --git a/test/mocks/pnfsimulator/deployment/assembly.xml b/test/mocks/pnfsimulator/deployment/assembly.xml deleted file mode 100644 index a0609efd3..000000000 --- a/test/mocks/pnfsimulator/deployment/assembly.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - resources - false - - zip - - - - - src - . - - - \ No newline at end of file diff --git a/test/mocks/pnfsimulator/deployment/pom.xml b/test/mocks/pnfsimulator/deployment/pom.xml deleted file mode 100644 index 25fe08b49..000000000 --- a/test/mocks/pnfsimulator/deployment/pom.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - 4.0.0 - - - org.onap.simulator - simulator-parent - 5.0.0-SNAPSHOT - - onboarding-package - - - - org.apache.maven.plugins - maven-assembly-plugin - - assembly.xml - pnf-pnp-simulators - . - - - - package - - single - - - - - - - diff --git a/test/mocks/pnfsimulator/deployment/src/MANIFEST.json b/test/mocks/pnfsimulator/deployment/src/MANIFEST.json deleted file mode 100644 index 1065b6eb0..000000000 --- a/test/mocks/pnfsimulator/deployment/src/MANIFEST.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "name": "", - "description": "", - "data": [ - { - "file": "simulators_heat_template.yaml", - "type": "HEAT", - "isBase": "true", - "data": [ - { - "file": "simulators_heat_template.env", - "type": "HEAT_ENV" - } - ] - } - ] -} diff --git a/test/mocks/pnfsimulator/deployment/src/simulators_heat_template.env b/test/mocks/pnfsimulator/deployment/src/simulators_heat_template.env deleted file mode 100644 index cf2db52bf..000000000 --- a/test/mocks/pnfsimulator/deployment/src/simulators_heat_template.env +++ /dev/null @@ -1,10 +0,0 @@ -parameters: - image_name: ubuntu-14-04-cloud-amd64 - flavor_name: m1.medium - public_net_id: 41eae12a-27f7-4ace-9fda-3cd55c7c0651 - private_net_id: 41eae12a-27f7-4ace-9fda-3cd55c7c0651 - private_subnet_id: 41eae12a-27f7-4ace-9fda-3cd55c7c0651 - proxy: http://10.10.10.10:8080 - vnf_id: simulators_vnf - vf_module_id: simulators_vsp - key_name: onap-dev \ No newline at end of file diff --git a/test/mocks/pnfsimulator/deployment/src/simulators_heat_template.yaml b/test/mocks/pnfsimulator/deployment/src/simulators_heat_template.yaml deleted file mode 100644 index 253fcc735..000000000 --- a/test/mocks/pnfsimulator/deployment/src/simulators_heat_template.yaml +++ /dev/null @@ -1,147 +0,0 @@ -description: Heat template that deploys PnP PNF simulators -heat_template_version: '2013-05-23' -parameters: - flavor_name: {description: Type of instance (flavor) to be used, label: Flavor, - type: string} - image_name: {description: Image to be used for compute instance, label: Image name - or ID, type: string} - key_name: {description: Public/Private key pair name, label: Key pair name, type: string} - public_net_id: {description: Public network that enables remote connection to VNF, - label: Public network name or ID, type: string} - private_net_id: {type: string, description: Private network id, label: Private network name or ID} - private_subnet_id: {type: string, description: Private subnet id, label: Private subnetwork name or ID} - proxy: {type: string, description: Proxy, label: Proxy, default: ""} - vnf_id: {type: string, label: VNF ID, description: The VNF ID is provided by ONAP} - vf_module_id: {type: string, label: vBase module ID, description: The vBase Module ID is provided by ONAP} -resources: - PNF_PnP_simulator: - type: OS::Nova::Server - properties: - key_name: { get_param: key_name } - image: { get_param: image_name } - flavor: { get_param: flavor_name } - networks: - - port: { get_resource: PNF_PnP_simulator_port0 } - user_data_format: RAW - user_data: - str_replace: - template: | - #!/bin/bash - - set_versions () { - DOCKER_VERSION=17.03 - DOCKER_COMPOSE_VERSION=1.22.0 - } - - set_proxy () { - HTTP_PROXY=$proxy - HTTPS_PROXY=$proxy - http_proxy=$proxy - https_proxy=$proxy - export HTTP_PROXY=$proxy - export HTTPS_PROXY=$proxy - export http_proxy=$proxy - export https_proxy=$proxy - } - - enable_root_ssh () { - sed -i 's/PermitRootLogin.*/PermitRootLogin yes/' /etc/ssh/sshd_config - sed -i 's/PasswordAuthentication.*/PasswordAuthentication yes/' /etc/ssh/sshd_config - service sshd restart - echo -e "arthur\narthur" | passwd root - } - - update_os () { - rm -rf /var/lib/apt/lists/* - apt-get clean - apt-get update - } - - set_apt_get_proxy () { - cat > /etc/apt/apt.conf.d/proxy.conf << EOF - Acquire { - HTTP::proxy "$proxy"; - HTTPS::proxy "$proxy"; - } - EOF - } - - docker_remove () { - dnf -y remove docker \ - docker-client \ - docker-client-latest \ - docker-common \ - docker-latest \ - docker-latest-logrotate \ - docker-logrotate \ - docker-selinux \ - docker-engine-selinux \ - docker-engine - } - - docker_install_and_configure () { - curl "https://releases.rancher.com/install-docker/$DOCKER_VERSION.sh" | sh - mkdir -p /etc/systemd/system/docker.service.d/ - cat > /etc/systemd/system/docker.service.d/docker.conf << EOF - [Service] - ExecStart= - ExecStart=/usr/bin/dockerd -H fd:// --insecure-registry=nexus3.onap.org:10003 - Environment="HTTP_PROXY=$proxy" - Environment="HTTPS_PROXY=$proxy" - EOF - systemctl daemon-reload - systemctl restart docker - apt-mark hold docker-ce - 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 () { - cd /root; git clone https://gerrit.onap.org/r/integration - } - - start_pnf_simulator () { - docker login -u docker -p docker nexus3.onap.org:10003 - cd ~/integration/test/mocks/pnfsimulator/pnfsimulator - docker-compose up -d - } - - start_netconf_simulator () { - docker login -u docker -p docker nexus3.onap.org:10003 - cd ~/integration/test/mocks/pnfsimulator/netconfsimulator - docker-compose up -d - } - - set_versions - set_proxy - enable_root_ssh - set_apt_get_proxy - docker_install_and_configure - docker_compose_install - pnf_sim_file_checkout - start_pnf_simulator - start_netconf_simulator - params: - $proxy: { get_param: proxy } - PNF_PnP_simulator_port0: - type: OS::Neutron::Port - properties: - network_id: { get_param: private_net_id } - security_groups: - - default - fixed_ips: - - subnet_id: { get_param: private_subnet_id } - PNF_PnP_simulator_public: - type: OS::Neutron::FloatingIP - properties: - floating_network_id: { get_param: public_net_id } - port_id: { get_resource: PNF_PnP_simulator_port0 } -outputs: - PNF_PnP_simulator_private_ip: - description: IP address of PNF_PnP_simulator in private network - value: { get_attr: [ PNF_PnP_simulator, first_address ] } - PNF_PnP_simulator_public_ip: - description: Floating IP address of PNF_PnP_simulator in public network - value: { get_attr: [ PNF_PnP_simulator_public, floating_ip_address ] } -- cgit 1.2.3-korg