From 5ed638e4125473b6a48f30bbe5a7d55f6bbfaba0 Mon Sep 17 00:00:00 2001 From: Alexis de Talhouët Date: Tue, 23 Jan 2018 11:05:38 -0500 Subject: Fix Robot distribute test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I22b2983f7ca1ac3ef9690d4cd53cd1a27b675700 Signed-off-by: Alexis de Talhouët Issue-ID: OOM-575 --- .../init/src/config/robot/config/vm_properties.py | 64 ++++++ .../config/integration_preload_parameters.py | 182 ----------------- .../config/integration_robot_properties.py | 81 -------- .../robot/eteshare/config/vm_config2robot.sh | 24 --- .../config/robot/eteshare/config/vm_properties.py | 81 -------- .../robot/robot/resources/asdc_interface.robot | 4 +- .../robot/robot/resources/policy_interface.robot | 60 ------ .../robot/robot/resources/sdngc_interface.robot | 222 --------------------- kubernetes/robot/templates/robot-deployment.yaml | 29 ++- kubernetes/robot/values.yaml | 2 +- 10 files changed, 82 insertions(+), 667 deletions(-) create mode 100644 kubernetes/config/docker/init/src/config/robot/config/vm_properties.py delete mode 100755 kubernetes/config/docker/init/src/config/robot/eteshare/config/integration_preload_parameters.py delete mode 100755 kubernetes/config/docker/init/src/config/robot/eteshare/config/integration_robot_properties.py delete mode 100755 kubernetes/config/docker/init/src/config/robot/eteshare/config/vm_config2robot.sh delete mode 100755 kubernetes/config/docker/init/src/config/robot/eteshare/config/vm_properties.py delete mode 100644 kubernetes/config/docker/init/src/config/robot/robot/resources/policy_interface.robot delete mode 100644 kubernetes/config/docker/init/src/config/robot/robot/resources/sdngc_interface.robot diff --git a/kubernetes/config/docker/init/src/config/robot/config/vm_properties.py b/kubernetes/config/docker/init/src/config/robot/config/vm_properties.py new file mode 100644 index 0000000000..7fd5b2fbf2 --- /dev/null +++ b/kubernetes/config/docker/init/src/config/robot/config/vm_properties.py @@ -0,0 +1,64 @@ +# File generated from /opt/config +# +GLOBAL_INJECTED_AAI1_IP_ADDR = "aai-service.onap-aai" +GLOBAL_INJECTED_AAI2_IP_ADDR = "N/A" +GLOBAL_INJECTED_APPC_IP_ADDR = "sdnhost.onap-appc" +GLOBAL_INJECTED_ARTIFACTS_VERSION = "DEMO_ARTIFACTS_VERSION_HERE" +GLOBAL_INJECTED_CLAMP_IP_ADDR = "clamp.onap-clamp" +GLOBAL_INJECTED_CLOUD_ENV = "openstack" +GLOBAL_INJECTED_DCAE_IP_ADDR = "DCAE_CONTROLLER_IP_HERE" +GLOBAL_INJECTED_KEYSTONE = "OPENSTACK_KEYSTONE_IP_HERE" +GLOBAL_INJECTED_MR_IP_ADDR = "dmaap.onap-message-router" +GLOBAL_INJECTED_NEXUS_DOCKER_REPO = "NEXUS_DOCKER_REPO_HERE" +GLOBAL_INJECTED_NEXUS_PASSWORD = "NEXUS_PASSWORD_HERE" +GLOBAL_INJECTED_NEXUS_REPO = "NEXUS_HTTP_REPO_HERE" +GLOBAL_INJECTED_NEXUS_USERNAME = "NEXUS_USERNAME_HERE" +GLOBAL_INJECTED_OPENO_IP_ADDR = "msb-iag.onap-msb" +GLOBAL_INJECTED_OPENSTACK_PASSWORD = "OPENSTACK_PASSWORD_HERE" +GLOBAL_INJECTED_OPENSTACK_TENANT_ID = "OPENSTACK_TENANT_ID_HERE" +GLOBAL_INJECTED_OPENSTACK_USERNAME = "OPENSTACK_USERNAME_HERE" +GLOBAL_INJECTED_POLICY_IP_ADDR = "drools.onap-policy" +GLOBAL_INJECTED_PORTAL_IP_ADDR = "portalapps.onap-portal" +GLOBAL_INJECTED_REGION = "OPENSTACK_REGION_HERE" +GLOBAL_INJECTED_SDC_IP_ADDR = "sdc-be.onap-sdc" +GLOBAL_INJECTED_SDC_BE_IP_ADDR = "sdc-be.onap-sdc" +GLOBAL_INJECTED_SDC_FE_IP_ADDR = "sdc-fe.onap-sdc" +GLOBAL_INJECTED_SDNC_IP_ADDR = "sdnhost.onap-sdnc" +GLOBAL_INJECTED_SO_IP_ADDR = "mso.onap-mso" +GLOBAL_INJECTED_VID_IP_ADDR = "vid-server.onap-vid" +GLOBAL_INJECTED_NETWORK = "VNF_OPENSTACK_OAM_NETWORK_ID_HERE" +GLOBAL_INJECTED_PUBLIC_NET_ID = "VNF_OPENSTACK_PUBLIC_ID_HERE" +GLOBAL_INJECTED_VM_FLAVOR = "VNF_OPENSTACK_FLAVOR_HERE" +GLOBAL_INJECTED_VM_IMAGE_NAME = "VNF_OPENSTACK_IMAGE_HERE" + +GLOBAL_INJECTED_PROPERTIES={ +"GLOBAL_INJECTED_VM_IMAGE_NAME" : "VNF_OPENSTACK_IMAGE_HERE", +"GLOBAL_INJECTED_VM_FLAVOR" : "VNF_OPENSTACK_FLAVOR_HERE", +"GLOBAL_INJECTED_NETWORK" : "VNF_OPENSTACK_OAM_NETWORK_ID_HERE", +"GLOBAL_INJECTED_PUBLIC_NET_ID" : "VNF_OPENSTACK_PUBLIC_ID_HERE", +"GLOBAL_INJECTED_AAI1_IP_ADDR" : "aai-service.onap-aai", +"GLOBAL_INJECTED_AAI2_IP_ADDR" : "N/A", +"GLOBAL_INJECTED_APPC_IP_ADDR" : "sdnhost.onap-appc", +"GLOBAL_INJECTED_ARTIFACTS_VERSION" : "DEMO_ARTIFACTS_VERSION_HERE", +"GLOBAL_INJECTED_CLAMP_IP_ADDR" : "clamp.onap-clamp", +"GLOBAL_INJECTED_CLOUD_ENV" : "openstack", +"GLOBAL_INJECTED_DCAE_IP_ADDR" : "DCAE_CONTROLLER_IP_HERE", +"GLOBAL_INJECTED_KEYSTONE" : "OPENSTACK_KEYSTONE_IP_HERE", +"GLOBAL_INJECTED_MR_IP_ADDR" : "dmaap.onap-message-router", +"GLOBAL_INJECTED_NEXUS_DOCKER_REPO" : "NEXUS_DOCKER_REPO_HERE", +"GLOBAL_INJECTED_NEXUS_PASSWORD" : "NEXUS_PASSWORD_HERE", +"GLOBAL_INJECTED_NEXUS_REPO" : "NEXUS_HTTP_REPO_HERE", +"GLOBAL_INJECTED_NEXUS_USERNAME" : "NEXUS_USERNAME_HERE", +"GLOBAL_INJECTED_OPENO_IP_ADDR" : "msb-iag.onap-msb", +"GLOBAL_INJECTED_OPENSTACK_PASSWORD" : "OPENSTACK_PASSWORD_HERE", +"GLOBAL_INJECTED_OPENSTACK_TENANT_ID" : "OPENSTACK_TENANT_ID_HERE", +"GLOBAL_INJECTED_OPENSTACK_USERNAME" : "OPENSTACK_USERNAME_HERE", +"GLOBAL_INJECTED_POLICY_IP_ADDR" : "drools.onap-policy", +"GLOBAL_INJECTED_PORTAL_IP_ADDR" : "portalapps.onap-portal", +"GLOBAL_INJECTED_REGION" : "OPENSTACK_REGION_HERE", +"GLOBAL_INJECTED_SDC_IP_ADDR" : "sdc-be.onap-sdc", +"GLOBAL_INJECTED_SDC_BE_IP_ADDR" : "sdc-be.onap-sdc", +"GLOBAL_INJECTED_SDC_FE_IP_ADDR" : "sdc-fe.onap-sdc", +"GLOBAL_INJECTED_SDNC_IP_ADDR" : "sdnhost.onap-sdnc", +"GLOBAL_INJECTED_SO_IP_ADDR" : "mso.onap-mso", +"GLOBAL_INJECTED_VID_IP_ADDR" : "vid-server.onap-vid"} \ No newline at end of file diff --git a/kubernetes/config/docker/init/src/config/robot/eteshare/config/integration_preload_parameters.py b/kubernetes/config/docker/init/src/config/robot/eteshare/config/integration_preload_parameters.py deleted file mode 100755 index 3826659fcd..0000000000 --- a/kubernetes/config/docker/init/src/config/robot/eteshare/config/integration_preload_parameters.py +++ /dev/null @@ -1,182 +0,0 @@ -GLOBAL_PRELOAD_PARAMETERS = { -# heat template parameter values common to all heat template continaing these parameters - "defaults" : { - 'key_name' : 'vfw_key${uuid}', - "pub_key" : "ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAqqnA9BAiMLtjOPSYBfhzLu4CiBolWoskDg4KVwhTJVTTeB6CqrQNcadlGXxOHhCYuNCKkUmIVF4WTOisVOJ75Z1c4OMoZLL85xVPKSIeH63kgVugwgPYQu55NbbWX+rsbUha3LnElDhNviMM3iTPbD5nnhKixNERAJMTLKXvZZZGqxW94bREknYPQTT2qrk3YRqwldncopp6Nkgv3AnSJz2gc9tjxnWF0poTQnQm/3D6hiJICrzKfAV0EaPN0KdtYjPhKrYoy6Qb/tKOVaaqsvwfKBJGrT9LfcA7D7M/yj292RT1XN63hI84WC383LsaPJ6eWdDTE6zUP1eGTWCoOw== rsa-key-20161026", - "repo_url_blob" : "https://nexus.onap.org/content/repositories/raw", - "repo_url_artifacts" : "https://nexus.onap.org/content/groups/staging", - "demo_artifacts_version" : "DEMO_ARTIFACTS_VERSION_HERE", - "onap_private_net_id" : "OPENSTACK_NETWORK_ID_WITH_ONAP_ROUTE_HERE", - "onap_private_subnet_id" : "OPENSTACK_SUBNET_ID_WITH_ONAP_ROUTE_HERE", - "onap_private_net_cidr" : "NETWORK_CIDR_WITH_ONAP_ROUTE_HERE", - "dcae_collector_ip" : "10.0.4.102", - "dcae_collector_port" : "8080", - "public_net_id" : "OPENSTACK_PUBLIC_NET_ID_HERE", - "cloud_env" : "${cloud_env}", - "install_script_version" : "${install_script_version}", -### -# vims_preload same for every instantiation -### - "bono_image_name" : "${vm_image_name}", - "sprout_image_name" : "${vm_image_name}", - "homer_image_name" : "${vm_image_name}", - "homestead_image_name" : "${vm_image_name}", - "ralf_image_name" : "${vm_image_name}", - "ellis_image_name" : "${vm_image_name}", - "dns_image_name" : "${vm_image_name}", - "bono_flavor_name" : "${vm_flavor_name}", - "sprout_flavor_name" : "${vm_flavor_name}", - "homer_flavor_name" : "${vm_flavor_name}", - "homestead_flavor_name" : "${vm_flavor_name}", - "ralf_flavor_name" : "${vm_flavor_name}", - "ellis_flavor_name" : "${vm_flavor_name}", - "dns_flavor_name" : "${vm_flavor_name}", - "repo_url" : "http://repo.cw-ngv.com/stable", - "zone" : "me.cw-ngv.com", - "dn_range_start" : "2425550000", - "dn_range_length" : "10000", - "dnssec_key" : "9FPdYTWhk5+LbhrqtTPQKw==", -### -# vlb_preload same for every instantiation -### - "vlb_image_name" : "${vm_image_name}", - "vlb_flavor_name" : "${vm_flavor_name}", -### -# vlb_preload same for every instantiation -### - "vfw_image_name" : "${vm_image_name}", - "vfw_flavor_name" : "${vm_flavor_name}", -### - }, - -### -# heat template parameter values for heat template instances created during Vnf-Orchestration test cases -### - "Vnf-Orchestration" : { - "vfw_preload.template": { - "unprotected_private_net_id" : "vofwl01_unprotected${hostid}", - "unprotected_private_net_cidr" : "192.168.10.0/24", - "protected_private_net_id" : "vofwl01_protected${hostid}", - "protected_private_net_cidr" : "192.168.20.0/24", - "vfw_private_ip_0" : "192.168.10.100", - "vfw_private_ip_1" : "192.168.20.100", - "vfw_private_ip_2" : "OPENSTACK_OAM_NETWORK_CIDR_PREFIX_HERE.1", - "vpg_private_ip_0" : "192.168.10.200", - "vpg_private_ip_1" : "OPENSTACK_OAM_NETWORK_CIDR_PREFIX_HERE.2", - "vsn_private_ip_0" : "192.168.20.250", - "vsn_private_ip_1" : "OPENSTACK_OAM_NETWORK_CIDR_PREFIX_HERE.3", - 'vfw_name_0':'vofwl01fwl${hostid}', - 'vpg_name_0':'vofwl01pgn${hostid}', - 'vsn_name_0':'vofwl01snk${hostid}' - }, - "vlb_preload.template" : { - "vlb_private_net_id" : "volb01_private${hostid}", - "vlb_private_net_cidr" : "192.168.30.0/24", - "vlb_private_ip_0" : "192.168.30.100", - "vlb_private_ip_1" : "OPENSTACK_OAM_NETWORK_CIDR_PREFIX_HERE.4", - "vdns_private_ip_0" : "192.168.30.110", - "vdns_private_ip_1" : "OPENSTACK_OAM_NETWORK_CIDR_PREFIX_HERE.5", - 'vlb_name_0':'vovlblb${hostid}', - 'vdns_name_0':'vovlbdns${hostid}', - "vlb_private_net_cidr" : "192.168.10.0/24", - "pktgen_private_net_cidr" : "192.168.9.0/24" - - }, - "dnsscaling_preload.template" : { - "vlb_private_net_id" : "volb01_private${hostid}", - "vlb_private_ip_0" : "192.168.30.100", - "vlb_private_ip_1" : "OPENSTACK_OAM_NETWORK_CIDR_PREFIX_HERE.4", - "vdns_private_ip_0" : "192.168.30.222", - "vdns_private_ip_1" : "OPENSTACK_OAM_NETWORK_CIDR_PREFIX_HERE.6", - 'scaling_vdns_name_0':'vovlbscaling${hostid}', - "vlb_private_net_cidr" : "192.168.10.0/24" - }, - "vvg_preload.template" : { - } - }, -# heat template parameter values for heat template instances created during Closed-Loop test cases - "Closed-Loop" : { - "vfw_preload.template": { - "unprotected_private_net_id" : "clfwl01_unprotected${hostid}", - "unprotected_private_net_cidr" : "192.168.110.0/24", - "protected_private_net_id" : "clfwl01_protected${hostid}", - "protected_private_net_cidr" : "192.168.120.0/24", - "vfw_private_ip_0" : "192.168.110.100", - "vfw_private_ip_1" : "192.168.120.100", - "vfw_private_ip_2" : "OPENSTACK_OAM_NETWORK_CIDR_PREFIX_HERE.11", - "vpg_private_ip_0" : "192.168.110.200", - "vpg_private_ip_1" : "OPENSTACK_OAM_NETWORK_CIDR_PREFIX_HERE.12", - "vsn_private_ip_0" : "192.168.120.250", - "vsn_private_ip_1" : "OPENSTACK_OAM_NETWORK_CIDR_PREFIX_HERE.13", - 'vfw_name_0':'clfwl01fwl${hostid}', - 'vpg_name_0':'clfwl01pgn${hostid}', - 'vsn_name_0':'clfwl01snk${hostid}' - }, - "vlb_preload.template" : { - "vlb_private_net_id" : "cllb01_private${hostid}", - "vlb_private_net_cidr" : "192.168.130.0/24", - "vlb_private_ip_0" : "192.168.130.100", - "vlb_private_ip_1" : "OPENSTACK_OAM_NETWORK_CIDR_PREFIX_HERE.14", - "vdns_private_ip_0" : "192.168.130.110", - "vdns_private_ip_1" : "OPENSTACK_OAM_NETWORK_CIDR_PREFIX_HERE.15", - 'vlb_name_0':'clvlblb${hostid}', - 'vdns_name_0':'clvlbdns${hostid}', - "vlb_private_net_cidr" : "192.168.10.0/24", - "pktgen_private_net_cidr" : "192.168.9.0/24" - }, - "dnsscaling_preload.template" : { - "vlb_private_net_id" : "cllb01_private${hostid}", - "vlb_private_ip_0" : "192.168.130.100", - "vlb_private_ip_1" : "OPENSTACK_OAM_NETWORK_CIDR_PREFIX_HERE.14", - "vdns_private_ip_0" : "192.168.130.222", - "vdns_private_ip_1" : "OPENSTACK_OAM_NETWORK_CIDR_PREFIX_HERE.16", - 'scaling_vdns_name_0':'clvlbscaling${hostid}', - "vlb_private_net_cidr" : "192.168.10.0/24" - }, - "vvg_preload.template" : { - } - }, - # heat template parameter values for heat template instances created for hands on demo test case - "Demo" : { - "vfw_preload.template": { - "unprotected_private_net_id" : "demofwl_unprotected", - "unprotected_private_net_cidr" : "192.168.110.0/24", - "protected_private_net_id" : "demofwl_protected", - "protected_private_net_cidr" : "192.168.120.0/24", - "vfw_private_ip_0" : "192.168.110.100", - "vfw_private_ip_1" : "192.168.120.100", - "vfw_private_ip_2" : "OPENSTACK_OAM_NETWORK_CIDR_PREFIX_HERE.11", - "vpg_private_ip_0" : "192.168.110.200", - "vpg_private_ip_1" : "OPENSTACK_OAM_NETWORK_CIDR_PREFIX_HERE.12", - "vsn_private_ip_0" : "192.168.120.250", - "vsn_private_ip_1" : "OPENSTACK_OAM_NETWORK_CIDR_PREFIX_HERE.13", - 'vfw_name_0':'demofwl01fwl', - 'vpg_name_0':'demofwl01pgn', - 'vsn_name_0':'demofwl01snk' - }, - "vlb_preload.template" : { - "vlb_private_net_id" : "demolb_private", - "vlb_private_net_cidr" : "192.168.130.0/24", - "vlb_private_ip_0" : "192.168.130.100", - "vlb_private_ip_1" : "OPENSTACK_OAM_NETWORK_CIDR_PREFIX_HERE.14", - "vdns_private_ip_0" : "192.168.130.110", - "vdns_private_ip_1" : "OPENSTACK_OAM_NETWORK_CIDR_PREFIX_HERE.15", - 'vlb_name_0':'demovlblb', - 'vdns_name_0':'demovlbdns', - "vlb_private_net_cidr" : "192.168.10.0/24", - "pktgen_private_net_cidr" : "192.168.9.0/24" - }, - "dnsscaling_preload.template" : { - "vlb_private_net_id" : "demolb_private", - "vlb_private_ip_0" : "192.168.130.100", - "vlb_private_ip_1" : "OPENSTACK_OAM_NETWORK_CIDR_PREFIX_HERE.14", - "vdns_private_ip_0" : "192.168.130.222", - "vdns_private_ip_1" : "OPENSTACK_OAM_NETWORK_CIDR_PREFIX_HERE.16", - 'scaling_vdns_name_0':'demovlbscaling', - "vlb_private_net_cidr" : "192.168.10.0/24" - }, - "vvg_preload.template" : { - } - } -} - diff --git a/kubernetes/config/docker/init/src/config/robot/eteshare/config/integration_robot_properties.py b/kubernetes/config/docker/init/src/config/robot/eteshare/config/integration_robot_properties.py deleted file mode 100755 index 0bf67912d2..0000000000 --- a/kubernetes/config/docker/init/src/config/robot/eteshare/config/integration_robot_properties.py +++ /dev/null @@ -1,81 +0,0 @@ -# aaf info - everything is from the private oam network (also called ecomp private network) -GLOBAL_AAF_SERVER = "http://10.0.12.1:8101" -GLOBAL_AAF_USERNAME = "dgl@openecomp.org" -GLOBAL_AAF_PASSWORD = "ecomp_admin" -# aai info - everything is from the private oam network (also called ecomp private network) -GLOBAL_AAI_SERVER_PROTOCOL = "https" -GLOBAL_AAI_SERVER_PORT = "8443" -GLOBAL_AAI_USERNAME = "AAI" -GLOBAL_AAI_PASSWORD = "AAI" -# appc info - everything is from the private oam network (also called ecomp private network) -GLOBAL_APPC_SERVER_PROTOCOL = "http" -GLOBAL_APPC_SERVER_PORT = "8282" -GLOBAL_APPC_SERVER = "http://10.0.2.1:" -GLOBAL_APPC_USERNAME = "admin" -GLOBAL_APPC_PASSWORD = "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U" -# sdc info - everything is from the private oam network (also called ecomp private network) -GLOBAL_ASDC_SERVER_PROTOCOL = "http" -GLOBAL_ASDC_FE_PORT = "8181" -GLOBAL_ASDC_BE_PORT = "8080" -GLOBAL_ASDC_BE_USERNAME = "beep" -GLOBAL_ASDC_BE_PASSWORD = "boop" -# clamp info - everything is from the private oam network (also called ecomp private network) -GLOBAL_CLAMP_SERVER_PROTOCOL = "http" -GLOBAL_CLAMP_SERVER_PORT = "8080" -# dcae info - everything is from the private oam network (also called ecomp private network) -GLOBAL_DCAE_SERVER_PROTOCOL = "http" -GLOBAL_DCAE_SERVER_PORT = "8080" -GLOBAL_DCAE_USERNAME = "console" -GLOBAL_DCAE_PASSWORD = "ZjJkYjllMjljMTI2M2Iz" -# microservice bus info - everything is from the private oam network (also called ecomp private network) -GLOBAL_MSB_SERVER_PROTOCOL = "http" -GLOBAL_MSB_SERVER_PORT = "80" -# message router info - everything is from the private oam network (also called ecomp private network) -GLOBAL_MR_SERVER_PROTOCOL = "http" -GLOBAL_MR_SERVER_PORT = "3904" -# mso info - everything is from the private oam network (also called ecomp private network) -GLOBAL_MSO_SERVER_PROTOCOL = "http" -GLOBAL_MSO_SERVER_PORT = "8080" -GLOBAL_MSO_USERNAME = "InfraPortalClient" -GLOBAL_MSO_PASSWORD = "password1$" -# openstack info - info to select right info in environment -# packet generate vnf info - everything is from the private oam network (also called ecomp private network) -GLOBAL_PACKET_GENERATOR_PORT = "8183" -GLOBAL_PACKET_GENERATOR_USERNAME = "admin" -GLOBAL_PACKET_GENERATOR_PASSWORD = "admin" -GLOBAL_PGN_PORT = "2831" -# policy info - everything is from the private oam network (also called ecomp private network) -GLOBAL_POLICY_SERVER_PROTOCOL = "http" -GLOBAL_POLICY_SERVER_PORT = "8081" -GLOBAL_POLICY_HEALTHCHECK_PORT = "6969" -GLOBAL_POLICY_AUTH = "dGVzdHBkcDphbHBoYTEyMw==" -GLOBAL_POLICY_CLIENTAUTH = "cHl0aG9uOnRlc3Q=" -GLOBAL_POLICY_USERNAME = "healthcheck" -GLOBAL_POLICY_PASSWORD = "zb!XztG34" -# portal info - everything is from the private oam network (also called ecomp private network) -GLOBAL_PORTAL_SERVER_PROTOCOL = "http" -GLOBAL_PORTAL_SERVER_PORT = "8989" -GLOBAL_PORTAL_USERNAME = "demo" -GLOBAL_PORTAL_PASSWORD = "Kp8bJ4SXszM0WXlhak3eHlcse" -# sdngc info - everything is from the private oam network (also called ecomp private network) -GLOBAL_SDNGC_SERVER_PROTOCOL = "http" -GLOBAL_SDNGC_REST_PORT = "8282" -GLOBAL_SDNGC_ADMIN_PORT = "8843" -GLOBAL_SDNGC_USERNAME = "admin" -GLOBAL_SDNGC_PASSWORD = "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U" -# vid info - everything is from the private oam network (also called ecomp private network) -GLOBAL_VID_SERVER_PROTOCOL = "http" -GLOBAL_VID_SERVER_PORT = "8080" -GLOBAL_VID_USERNAME = "demo" -GLOBAL_VID_PASSWORD = "Kp8bJ4SXszM0WX" -GLOBAL_VID_HEALTH_USERNAME = "Default" -GLOBAL_VID_HEALTH_PASSWORD = "AppPassword!1" -#global selenium info -GLOBAL_PROXY_WARNING_TITLE = "" -GLOBAL_PROXY_WARNING_CONTINUE_XPATH = "" -# settings for vm to attach vvg too -GLOBAL_VVGSERVER_IMAGE = "UBUNTU_14_IMAGE_NAME_HERE" -GLOBAL_VVGSERVER_FLAVOR = "OPENSTACK_FLAVOUR_MEDIUM_HERE" -# dns info -GLOBAL_DNS_TRAFFIC_DURATION = "600" -GLOBAL_HEAT_TEMPLATES_FOLDER = "/share/heat" diff --git a/kubernetes/config/docker/init/src/config/robot/eteshare/config/vm_config2robot.sh b/kubernetes/config/docker/init/src/config/robot/eteshare/config/vm_config2robot.sh deleted file mode 100755 index c50fa5f491..0000000000 --- a/kubernetes/config/docker/init/src/config/robot/eteshare/config/vm_config2robot.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash - -# -# Make vm1_robot config available to robot -# -CONFIG=/opt/config -PROPERTIES=/opt/eteshare/config/vm_properties.py -GLOBAL_VM_PROPERTIES="# File generated from /opt/config\n#\n" -HASH="GLOBAL_INJECTED_PROPERTIES={" -COMMA="" -for f in `ls $CONFIG/*.txt`; -do - VALUE=`cat $f` - NAME=${f%.*} - NAME=${NAME##*/} - NAME=${NAME^^} - GLOBAL_VM_PROPERTIES=$"${GLOBAL_VM_PROPERTIES}GLOBAL_INJECTED_$NAME = \"$VALUE\"\n" - HASH=$"${HASH}${COMMA}\n\"GLOBAL_INJECTED_$NAME\" : \"$VALUE\"" - COMMA="," -done -HASH="${HASH}}\n" -GLOBAL_VM_PROPERTIES="${GLOBAL_VM_PROPERTIES}\n${HASH}" -GLOBAL_VM_PROPERTIES=${GLOBAL_VM_PROPERTIES} -echo -e $GLOBAL_VM_PROPERTIES > $PROPERTIES diff --git a/kubernetes/config/docker/init/src/config/robot/eteshare/config/vm_properties.py b/kubernetes/config/docker/init/src/config/robot/eteshare/config/vm_properties.py deleted file mode 100755 index 02d02ccf27..0000000000 --- a/kubernetes/config/docker/init/src/config/robot/eteshare/config/vm_properties.py +++ /dev/null @@ -1,81 +0,0 @@ -GLOBAL_INJECTED_AAI1_IP_ADDR = "aai-service.onap-aai" -GLOBAL_INJECTED_AAI2_IP_ADDR = "N/A" -GLOBAL_INJECTED_APPC_IP_ADDR = "sdnhost.onap-appc" -GLOBAL_INJECTED_ARTIFACTS_VERSION = "DEMO_ARTIFACTS_VERSION_HERE" -GLOBAL_INJECTED_CLAMP_IP_ADDR = "clamp.onap-clamp" -GLOBAL_INJECTED_CLOUD_ENV = "openstack" -GLOBAL_INJECTED_DCAE_IP_ADDR = "DCAE_CONTROLLER_IP_HERE" -GLOBAL_INJECTED_DNS_IP_ADDR = "DNS_IP_ADDR_HERE" -GLOBAL_INJECTED_EXTERNAL_DNS = "EXTERNAL_DNS_HERE" -GLOBAL_INJECTED_DOCKER_VERSION = "DCAE_DOCKER_VERSION_HERE" -GLOBAL_INJECTED_GERRIT_BRANCH = "amsterdam" -GLOBAL_INJECTED_KEYSTONE = "OPENSTACK_KEYSTONE_IP_HERE" -GLOBAL_INJECTED_MR_IP_ADDR = "dmaap.onap-message-router" -GLOBAL_INJECTED_MSO_IP_ADDR = "mso.onap-mso" -GLOBAL_INJECTED_NETWORK = "OPENSTACK_NETWORK_ID_WITH_ONAP_ROUTE_HERE" -GLOBAL_INJECTED_NEXUS_DOCKER_REPO = "NEXUS_DOCKER_REPO_HERE" -GLOBAL_INJECTED_NEXUS_PASSWORD = "NEXUS_PASSWORD_HERE" -GLOBAL_INJECTED_NEXUS_REPO = "https://nexus.onap.org/content/sites/raw" -GLOBAL_INJECTED_NEXUS_USERNAME = "NEXUS_USERNAME_HERE" -GLOBAL_INJECTED_OPENO_IP_ADDR = "msb-iag.onap-msb" -GLOBAL_INJECTED_OPENSTACK_PASSWORD = "OPENSTACK_PASSWORD_HERE" -GLOBAL_INJECTED_OPENSTACK_TENANT_ID = "OPENSTACK_TENANT_ID_HERE" -GLOBAL_INJECTED_OPENSTACK_USERNAME = "OPENSTACK_USERNAME_HERE" -GLOBAL_INJECTED_POLICY_IP_ADDR = "pypdp.onap-policy" -GLOBAL_INJECTED_POLICY_HEALTHCHECK_IP_ADDR = "drools.onap-policy" -GLOBAL_INJECTED_PORTAL_IP_ADDR = "portalapps.onap-portal" -GLOBAL_INJECTED_REGION = "OPENSTACK_REGION_HERE" -GLOBAL_INJECTED_REMOTE_REPO = "http://gerrit.onap.org/r/testsuite/properties.git" -GLOBAL_INJECTED_SDC_FE_IP_ADDR = "sdc-fe.onap-sdc" -GLOBAL_INJECTED_SDC_BE_IP_ADDR = "sdc-be.onap-sdc" -GLOBAL_INJECTED_SDC_IP_ADDR = "sdc-be.onap-sdc" -GLOBAL_INJECTED_SDNC_IP_ADDR = "sdnhost.onap-sdnc" -GLOBAL_INJECTED_SDNC_PORTAL_IP_ADDR = "sdnc-portal.onap-sdnc" -GLOBAL_INJECTED_SO_IP_ADDR = "mso.onap-mso" -GLOBAL_INJECTED_VID_IP_ADDR = "vid-server.onap-vid" -GLOBAL_INJECTED_VM_FLAVOR = "OPENSTACK_FLAVOUR_MEDIUM_HERE" -GLOBAL_INJECTED_VM_IMAGE_NAME = "UBUNTU_14_IMAGE_NAME_HERE" -GLOBAL_INJECTED_PUBLIC_NET_ID = "OPENSTACK_PUBLIC_NET_ID_HERE" -GLOBAL_INJECTED_SCRIPT_VERSION = "1.1.1" - -GLOBAL_INJECTED_PROPERTIES = { - "GLOBAL_INJECTED_AAI1_IP_ADDR" : "aai-service.onap-aai", - "GLOBAL_INJECTED_AAI2_IP_ADDR" : "N/A", - "GLOBAL_INJECTED_APPC_IP_ADDR" : "sdnhost.onap-appc", - "GLOBAL_INJECTED_ARTIFACTS_VERSION" : "DEMO_ARTIFACTS_VERSION_HERE", - "GLOBAL_INJECTED_CLAMP_IP_ADDR" : "clamp.onap-clamp", - "GLOBAL_INJECTED_CLOUD_ENV" : "openstack", - "GLOBAL_INJECTED_DCAE_IP_ADDR" : "DCAE_CONTROLLER_IP_HERE", - "GLOBAL_INJECTED_DNS_IP_ADDR" : "DNS_IP_ADDR_HERE", - "GLOBAL_INJECTED_EXTERNAL_DNS" : "EXTERNAL_DNS_HERE", - "GLOBAL_INJECTED_DOCKER_VERSION" : "DCAE_DOCKER_VERSION_HERE", - "GLOBAL_INJECTED_GERRIT_BRANCH" : "amsterdam", - "GLOBAL_INJECTED_KEYSTONE" : "OPENSTACK_KEYSTONE_IP_HERE", - "GLOBAL_INJECTED_MR_IP_ADDR" : "dmaap.onap-message-router", - "GLOBAL_INJECTED_MSO_IP_ADDR" : "mso.onap-mso", - "GLOBAL_INJECTED_NETWORK" : "OPENSTACK_NETWORK_ID_WITH_ONAP_ROUTE_HERE", - "GLOBAL_INJECTED_NEXUS_DOCKER_REPO" : "NEXUS_DOCKER_REPO_HERE", - "GLOBAL_INJECTED_NEXUS_PASSWORD" : "NEXUS_PASSWORD_HERE", - "GLOBAL_INJECTED_NEXUS_REPO" : "https://nexus.onap.org/content/sites/raw", - "GLOBAL_INJECTED_NEXUS_USERNAME" : "NEXUS_USERNAME_HERE", - "GLOBAL_INJECTED_OPENO_IP_ADDR" : "msb-iag.onap-msb", - "GLOBAL_INJECTED_OPENSTACK_PASSWORD" : "OPENSTACK_PASSWORD_HERE", - "GLOBAL_INJECTED_OPENSTACK_TENANT_ID" : "OPENSTACK_TENANT_ID_HERE", - "GLOBAL_INJECTED_OPENSTACK_USERNAME" : "OPENSTACK_USERNAME_HERE", - "GLOBAL_INJECTED_POLICY_IP_ADDR" : "pypdp.onap-policy", - "GLOBAL_INJECTED_POLICY_HEALTHCHECK_IP_ADDR" : "drools.onap-policy", - "GLOBAL_INJECTED_PORTAL_IP_ADDR" : "portalapps.onap-portal", - "GLOBAL_INJECTED_REGION" : "OPENSTACK_REGION_HERE", - "GLOBAL_INJECTED_REMOTE_REPO" : "http://gerrit.onap.org/r/testsuite/properties.git", - "GLOBAL_INJECTED_SDC_FE_IP_ADDR" : "sdc-fe.onap-sdc", - "GLOBAL_INJECTED_SDC_BE_IP_ADDR" : "sdc-be.onap-sdc", - "GLOBAL_INJECTED_SDC_IP_ADDR" : "sdc-be.onap-sdc", - "GLOBAL_INJECTED_SCRIPT_VERSION" : "1.1.1", - "GLOBAL_INJECTED_SDNC_IP_ADDR" : "sdnhost.onap-sdnc", - "GLOBAL_INJECTED_SDNC_PORTAL_IP_ADDR" : "sdnc-portal.onap-sdnc", - "GLOBAL_INJECTED_SO_IP_ADDR" : "mso.onap-mso", - "GLOBAL_INJECTED_VID_IP_ADDR" : "vid-server.onap-vid", - "GLOBAL_INJECTED_VM_FLAVOR" : "OPENSTACK_FLAVOUR_MEDIUM_HERE", - "GLOBAL_INJECTED_VM_IMAGE_NAME" : "UBUNTU_14_IMAGE_NAME_HERE", - "GLOBAL_INJECTED_PUBLIC_NET_ID" : "OPENSTACK_PUBLIC_NET_ID_HERE" -} \ No newline at end of file diff --git a/kubernetes/config/docker/init/src/config/robot/robot/resources/asdc_interface.robot b/kubernetes/config/docker/init/src/config/robot/robot/resources/asdc_interface.robot index 3020603ef8..e23c785b8e 100644 --- a/kubernetes/config/docker/init/src/config/robot/robot/resources/asdc_interface.robot +++ b/kubernetes/config/docker/init/src/config/robot/robot/resources/asdc_interface.robot @@ -53,11 +53,13 @@ Distribute Model From ASDC [Arguments] ${model_zip_path} ${catalog_service_name}= ${catalog_service_id}= Add ASDC Catalog Service ${catalog_service_name} ${catalog_resource_ids}= Create List + ${catalog_resources}= Create Dictionary : FOR ${zip} IN @{model_zip_path} \ ${loop_catalog_resource_id}= Setup ASDC Catalog Resource ${zip} \ Append To List ${catalog_resource_ids} ${loop_catalog_resource_id} \ ${loop_catalog_resource_resp}= Get ASDC Catalog Resource ${loop_catalog_resource_id} \ Add ASDC Resource Instance ${catalog_service_id} ${loop_catalog_resource_id} ${loop_catalog_resource_resp['name']} + \ Set To Dictionary ${catalog_resources} ${loop_catalog_resource_id}=${loop_catalog_resource_resp} ${catalog_service_resp}= Get ASDC Catalog Service ${catalog_service_id} Checkin ASDC Catalog Service ${catalog_service_id} Request Certify ASDC Catalog Service ${catalog_service_id} @@ -69,7 +71,7 @@ Distribute Model From ASDC ${catalog_service_resp}= Get ASDC Catalog Service ${catalog_service_id} ${vf_module}= Find Element In Array ${loop_catalog_resource_resp['groups']} type org.openecomp.groups.VfModule Check Catalog Service Distributed ${catalog_service_resp['uuid']} - [Return] ${catalog_service_resp['name']} ${loop_catalog_resource_resp['name']} ${vf_module} ${catalog_resource_ids} ${catalog_service_id} + [Return] ${catalog_service_resp['name']} ${loop_catalog_resource_resp['name']} ${vf_module} ${catalog_resource_ids} ${catalog_service_id} ${catalog_resources} Setup ASDC Catalog Resource [Documentation] Creates all the steps a vf needs for an asdc catalog resource and returns the id diff --git a/kubernetes/config/docker/init/src/config/robot/robot/resources/policy_interface.robot b/kubernetes/config/docker/init/src/config/robot/robot/resources/policy_interface.robot deleted file mode 100644 index 6887ce6b56..0000000000 --- a/kubernetes/config/docker/init/src/config/robot/robot/resources/policy_interface.robot +++ /dev/null @@ -1,60 +0,0 @@ -*** Settings *** -Documentation The main interface for interacting with Policy. It handles low level stuff like managing the http request library and Policy required fields -Library RequestsClientCert -Library RequestsLibrary -Library String -Library JSONUtils -Library Collections -Resource global_properties.robot - -*** Variables *** -${POLICY_HEALTH_CHECK_PATH} /healthcheck -${POLICY_ENDPOINT} ${GLOBAL_POLICY_SERVER_PROTOCOL}://${GLOBAL_INJECTED_POLICY_IP_ADDR}:${GLOBAL_POLICY_SERVER_PORT} -${POLICY_HEALTHCHECK_ENDPOINT} ${GLOBAL_POLICY_SERVER_PROTOCOL}://${GLOBAL_INJECTED_POLICY_HEALTHCHECK_IP_ADDR}:${GLOBAL_POLICY_HEALTHCHECK_PORT} - -*** Keywords *** - -Run Policy Health Check - [Documentation] Runs Policy Health check - ${auth}= Create List ${GLOBAL_POLICY_USERNAME} ${GLOBAL_POLICY_PASSWORD} - Log Creating session ${POLICY_ENDPOINT} - ${session}= Create Session policy ${POLICY_HEALTHCHECK_ENDPOINT} auth=${auth} - ${headers}= Create Dictionary Accept=application/json Content-Type=application/json - ${resp}= Get Request policy ${POLICY_HEALTH_CHECK_PATH} headers=${headers} - Log Received response from policy ${resp.text} - Should Be Equal As Strings ${resp.status_code} 200 - Should Be True ${resp.json()['healthy']} - @{ITEMS}= Copy List ${resp.json()['details']} - :FOR ${ELEMENT} IN @{ITEMS} - \ Should Be Equal As Strings ${ELEMENT['code']} 200 - \ Should Be True ${ELEMENT['healthy']} - -Run Policy Put Request - [Documentation] Runs Policy Put request - [Arguments] ${data_path} ${data} - Log Creating session ${POLICY_ENDPOINT} - ${session}= Create Session policy ${POLICY_ENDPOINT} - ${headers}= Create Dictionary Accept=application/json Content-Type=application/json Authorization=Basic ${GLOBAL_POLICY_AUTH} ClientAuth=${GLOBAL_POLICY_CLIENTAUTH} Environment=TEST - ${resp}= Put Request policy ${data_path} data=${data} headers=${headers} - Log Received response from policy ${resp.text} - [Return] ${resp} - -Run Policy Delete Request - [Documentation] Runs Policy Delete request - [Arguments] ${data_path} ${data} - Log Creating session ${POLICY_ENDPOINT} - ${session}= Create Session policy ${POLICY_ENDPOINT} - ${headers}= Create Dictionary Accept=application/json Content-Type=application/json Authorization=Basic ${GLOBAL_POLICY_AUTH} ClientAuth=${GLOBAL_POLICY_CLIENTAUTH} Environment=TEST - ${resp}= Delete Request policy ${data_path} data=${data} headers=${headers} - Log Received response from policy ${resp.text} - [Return] ${resp} - -Run Policy Get Configs Request - [Documentation] Runs Policy Get Configs request - [Arguments] ${data_path} ${data} - Log Creating session ${POLICY_ENDPOINT} - ${session}= Create Session policy ${POLICY_ENDPOINT} - ${headers}= Create Dictionary Accept=application/json Content-Type=application/json Authorization=Basic ${GLOBAL_POLICY_AUTH} ClientAuth=${GLOBAL_POLICY_CLIENTAUTH} - ${resp}= Post Request policy ${data_path} data=${data} headers=${headers} - Log Received response from policy ${resp.text} - [Return] ${resp} \ No newline at end of file diff --git a/kubernetes/config/docker/init/src/config/robot/robot/resources/sdngc_interface.robot b/kubernetes/config/docker/init/src/config/robot/robot/resources/sdngc_interface.robot deleted file mode 100644 index 07a8445221..0000000000 --- a/kubernetes/config/docker/init/src/config/robot/robot/resources/sdngc_interface.robot +++ /dev/null @@ -1,222 +0,0 @@ -*** Settings *** -Documentation The main interface for interacting with SDN-GC. It handles low level stuff like managing the http request library and SDN-GC required fields -Library RequestsLibrary -Library UUID -Library OperatingSystem -Library ExtendedSelenium2Library -Library Collections -Library String -Library StringTemplater -Resource global_properties.robot -Resource ../resources/json_templater.robot -Resource browser_setup.robot - -Variables ../assets/service_mappings.py - -*** Variables *** -${PRELOAD_VNF_TOPOLOGY_OPERATION_PATH} /operations/VNF-API:preload-vnf-topology-operation -${PRELOAD_VNF_CONFIG_PATH} /config/VNF-API:preload-vnfs/vnf-preload-list -${PRELOAD_VNF_TOPOLOGY_OPERATION_BODY} robot/assets/templates/sdnc/ -${SDNGC_INDEX_PATH} /restconf -${SDNCGC_HEALTHCHECK_OPERATION_PATH} /operations/SLI-API:healthcheck -${SDNGC_REST_ENDPOINT} ${GLOBAL_SDNGC_SERVER_PROTOCOL}://${GLOBAL_INJECTED_SDNC_IP_ADDR}:${GLOBAL_SDNGC_REST_PORT} -${SDNGC_ADMIN_ENDPOINT} ${GLOBAL_SDNGC_SERVER_PROTOCOL}://${GLOBAL_INJECTED_SDNC_PORTAL_IP_ADDR}:${GLOBAL_SDNGC_ADMIN_PORT} -${SDNGC_ADMIN_SIGNUP_URL} ${SDNGC_ADMIN_ENDPOINT}/signup -${SDNGC_ADMIN_LOGIN_URL} ${SDNGC_ADMIN_ENDPOINT}/login -${SDNGC_ADMIN_VNF_PROFILE_URL} ${SDNGC_ADMIN_ENDPOINT}/mobility/getVnfProfile - -*** Keywords *** -Run SDNGC Health Check - [Documentation] Runs an SDNGC healthcheck - ${resp}= Run SDNGC Post Request ${SDNGC_INDEX PATH}${SDNCGC_HEALTHCHECK_OPERATION_PATH} ${None} - Should Be Equal As Strings ${resp.status_code} 200 - Should Be Equal As Strings ${resp.json()['output']['response-code']} 200 - -Run SDNGC Get Request - [Documentation] Runs an SDNGC get request - [Arguments] ${data_path} - ${auth}= Create List ${GLOBAL_SDNGC_USERNAME} ${GLOBAL_SDNGC_PASSWORD} - Log Creating session ${SDNGC_REST_ENDPOINT} - ${session}= Create Session sdngc ${SDNGC_REST_ENDPOINT} auth=${auth} - ${uuid}= Generate UUID - ${headers}= Create Dictionary Accept=application/json Content-Type=application/json X-TransactionId=${GLOBAL_APPLICATION_ID}-${uuid} X-FromAppId=${GLOBAL_APPLICATION_ID} - ${resp}= Get Request sdngc ${data_path} headers=${headers} - Log Received response from sdngc ${resp.text} - [Return] ${resp} - -Run SDNGC Put Request - [Documentation] Runs an SDNGC put request - [Arguments] ${data_path} ${data} - ${auth}= Create List ${GLOBAL_SDNGC_USERNAME} ${GLOBAL_SDNGC_PASSWORD} - Log Creating session ${SDNGC_REST_ENDPOINT} - ${session}= Create Session sdngc ${SDNGC_REST_ENDPOINT} auth=${auth} - ${uuid}= Generate UUID - ${headers}= Create Dictionary Accept=application/json Content-Type=application/json X-TransactionId=${GLOBAL_APPLICATION_ID}-${uuid} X-FromAppId=${GLOBAL_APPLICATION_ID} - ${resp}= Put Request sdngc ${data_path} data=${data} headers=${headers} - Log Received response from sdngc ${resp.text} - [Return] ${resp} - -Run SDNGC Post Request - [Documentation] Runs an SDNGC post request - [Arguments] ${data_path} ${data} - ${auth}= Create List ${GLOBAL_SDNGC_USERNAME} ${GLOBAL_SDNGC_PASSWORD} - Log Creating session ${SDNGC_REST_ENDPOINT} - ${session}= Create Session sdngc ${SDNGC_REST_ENDPOINT} auth=${auth} - ${uuid}= Generate UUID - ${headers}= Create Dictionary Accept=application/json Content-Type=application/json X-TransactionId=${GLOBAL_APPLICATION_ID}-${uuid} X-FromAppId=${GLOBAL_APPLICATION_ID} - ${resp}= Post Request sdngc ${data_path} data=${data} headers=${headers} - Log Received response from sdngc ${resp.text} - [Return] ${resp} - -Run SDNGC Delete Request - [Documentation] Runs an SDNGC delete request - [Arguments] ${data_path} - ${auth}= Create List ${GLOBAL_SDNGC_USERNAME} ${GLOBAL_SDNGC_PASSWORD} - Log Creating session ${SDNGC_REST_ENDPOINT} - ${session}= Create Session sdngc ${SDNGC_REST_ENDPOINT} auth=${auth} - ${uuid}= Generate UUID - ${headers}= Create Dictionary Accept=application/json Content-Type=application/json X-TransactionId=${GLOBAL_APPLICATION_ID}-${uuid} X-FromAppId=${GLOBAL_APPLICATION_ID} - ${resp}= Delete Request sdngc ${data_path} headers=${headers} - Log Received response from sdngc ${resp.text} - [Return] ${resp} - - -Preload Vnf - [Arguments] ${service_type_uuid} ${generic_vnf_name} ${generic_vnf_type} ${vf_module_name} ${vf_modules} ${service} ${uuid} - ${base_vf_module_type}= Catenate '' - ${closedloop_vf_module}= Create Dictionary - ${templates}= Get From Dictionary ${GLOBAL_SERVICE_TEMPLATE_MAPPING} ${service} - :for ${vf_module} in @{vf_modules} - \ ${vf_module_type}= Get From Dictionary ${vf_module} name - \ ${dict} Get From Mapping ${templates} ${vf_module} - \ ${filename}= Get From Dictionary ${dict} template - \ ${base_vf_module_type}= Set Variable If '${dict['isBase']}' == 'true' ${vf_module_type} ${base_vf_module_type} - \ ${closedloop_vf_module}= Set Variable If '${dict['isBase']}' == 'false' ${vf_module} ${closedloop_vf_module} - \ ${vf_name}= Update Module Name ${dict} ${vf_module_name} - \ Preload Vnf Profile ${vf_module_type} - \ Preload One Vnf Topology ${service_type_uuid} ${generic_vnf_name} ${generic_vnf_type} ${vf_name} ${vf_module_type} ${service} ${filename} ${uuid} - [Return] ${base_vf_module_type} ${closedloop_vf_module} - - -Update Module Name - [Arguments] ${dict} ${vf_module_name} - Return From Keyword If 'prefix' not in ${dict} ${vf_module_name} - Return From Keyword If '${dict['prefix']}' == '' ${vf_module_name} - ${name}= Replace String ${vf_module_name} Vfmodule_ ${dict['prefix']} - [Return] ${name} - -Get From Mapping - [Documentation] Retrieve the appropriate prelad template entry for the passed vf_module - [Arguments] ${templates} ${vf_module} - ${vf_module_name}= Get From DIctionary ${vf_module} name - :for ${template} in @{templates} - \ Return From Keyword If '${template['name_pattern']}' in '${vf_module_name}' ${template} - [Return] None - -Preload One Vnf Topology - [Arguments] ${service_type_uuid} ${generic_vnf_name} ${generic_vnf_type} ${vf_module_name} ${vf_module_type} ${service} ${filename} ${uuid} - Return From Keyword If '${filename}' == '' - ${data_template}= OperatingSystem.Get File ${PRELOAD_VNF_TOPOLOGY_OPERATION_BODY}/preload.template - ${parameters}= Get Template Parameters ${filename} ${uuid} - Set To Dictionary ${parameters} generic_vnf_name=${generic_vnf_name} generic_vnf_type=${generic_vnf_type} service_type=${service_type_uuid} vf_module_name=${vf_module_name} vf_module_type=${vf_module_type} uuid=${uuid} - ${data}= Fill JSON Template ${data_template} ${parameters} - ${put_resp}= Run SDNGC Post Request ${SDNGC_INDEX_PATH}${PRELOAD_VNF_TOPOLOGY_OPERATION_PATH} ${data} - Should Be Equal As Strings ${put_resp.json()['output']['response-code']} 200 - ${get_resp}= Run SDNGC Get Request ${SDNGC_INDEX_PATH}${PRELOAD_VNF_CONFIG_PATH}/${vf_module_name}/${vf_module_type} - Should Be Equal As Strings ${get_resp.status_code} 200 - -Get Template Parameters - [Arguments] ${template} ${uuid} - ${rest} ${suite}= Split String From Right ${SUITE NAME} . 1 - ${uuid}= Catenate ${uuid} - ${hostid}= Get Substring ${uuid} -4 - ${ecompnet}= Evaluate ${GLOBAL_BUILD_NUMBER}%255 - # Initialize the value map with the properties generated from the Robot VM /opt/config folder - ${valuemap}= Create Dictionary - Set To Dictionary ${valuemap} artifacts_version=${GLOBAL_INJECTED_ARTIFACTS_VERSION} - Set To Dictionary ${valuemap} network=${GLOBAL_INJECTED_NETWORK} - Set To Dictionary ${valuemap} public_net_id=${GLOBAL_INJECTED_PUBLIC_NET_ID} - Set To Dictionary ${valuemap} cloud_env=${GLOBAL_INJECTED_CLOUD_ENV} - Set To Dictionary ${valuemap} install_script_version=${GLOBAL_INJECTED_INSTALL_SCRIPT_VERSION} - Set To Dictionary ${valuemap} vm_image_name=${GLOBAL_INJECTED_VM_IMAGE_NAME} - Set To Dictionary ${valuemap} vm_flavor_name=${GLOBAL_INJECTED_VM_FLAVOR_NAME} - # update the value map with unique values. - Set To Dictionary ${valuemap} uuid=${uuid} hostid=${hostid} ecompnet=${ecompnet} - ${parameters}= Create Dictionary - ${defaults}= Get From Dictionary ${GLOBAL_PRELOAD_PARAMETERS} defaults - Resolve Values Into Dictionary ${valuemap} ${defaults} ${parameters} - ${suite_templates}= Get From Dictionary ${GLOBAL_PRELOAD_PARAMETERS} ${suite} - ${template}= Get From Dictionary ${suite_templates} ${template} - ${vnf_parameters}= Resolve VNF Parameters Into Array ${valuemap} ${template} ${parameters} - ${vnf_parameters_json}= Evaluate json.dumps(${vnf_parameters}) json - Set To Dictionary ${parameters} vnf_parameters=${vnf_parameters_json} - [Return] ${parameters} - -Resolve Values Into Dictionary - [Arguments] ${valuemap} ${from} ${to} - ${keys}= Get Dictionary Keys ${from} - :for ${key} in @{keys} - \ ${value}= Get From Dictionary ${from} ${key} - \ ${value}= Template String ${value} ${valuemap} - \ Set To Dictionary ${to} ${key} ${value} - -Resolve VNF Parameters Into Array - [Arguments] ${valuemap} ${from} ${to} - ${vnf_parameters}= Create List - ${keys}= Get Dictionary Keys ${from} - :for ${key} in @{keys} - \ ${value}= Get From Dictionary ${from} ${key} - \ ${value}= Template String ${value} ${valuemap} - \ ${parameter}= Create Dictionary vnf-parameter-name=${key} vnf-parameter-value=${value} - \ Append To List ${vnf_parameters} ${parameter} - [Return] ${vnf_parameters} - -Preload Vnf Profile - [Arguments] ${vnf_name} - Login To SDNGC Admin GUI - Go To ${SDNGC_ADMIN_VNF_PROFILE_URL} - Click Button xpath=//button[@data-target='#add_vnf_profile'] - Input Text xpath=//input[@id='nf_vnf_type'] ${vnf_name} - Input Text xpath=//input[@id='nf_availability_zone_count'] 999 - Input Text xpath=//input[@id='nf_equipment_role'] robot-ete-test - Click Button xpath=//button[contains(.,'Submit')] - Page Should Contain VNF Profile - Input Text xpath=//div[@id='vnf_profile_filter']//input ${vnf_name} - Page Should Contain ${vnf_name} - -Delete Vnf Profile - [Arguments] ${vnf_name} - Login To SDNGC Admin GUI - Go To ${SDNGC_ADMIN_VNF_PROFILE_URL} - Page Should Contain VNF Profile - Input Text xpath=//div[@id='vnf_profile_filter']//input ${vnf_name} - Page Should Contain ${vnf_name} - Click Button xpath=//button[contains(@onclick, '${vnf_name}')] - Page Should Contain Are you sure you want to delete VNF_PROFILE - Click Button xpath=//button[contains(text(), 'Yes')] - Page Should Not Contain ${vnf_name} - -Login To SDNGC Admin GUI - [Documentation] Login To SDNGC Admin GUI - ## Setup Browser is now being managed by the test case - ## Setup Browser - Go To ${SDNGC_ADMIN_SIGNUP_URL} - Maximize Browser Window - Set Selenium Speed ${GLOBAL_SELENIUM_DELAY} - Set Browser Implicit Wait ${GLOBAL_SELENIUM_BROWSER_IMPLICIT_WAIT} - Log Logging in to ${SDNGC_ADMIN_LOGIN_URL} - Handle Proxy Warning - Title Should Be AdminPortal - ${uuid}= Generate UUID - ${shortened_uuid}= Evaluate str("${uuid}")[:12] - ${email}= Catenate ${shortened_uuid}@robotete.com - Input Text xpath=//input[@id='nf_email'] ${email} - Input Password xpath=//input[@id='nf_password'] ${shortened_uuid} - Click Button xpath=//button[@type='submit'] - Wait Until Page Contains User created 20s - Go To ${SDNGC_ADMIN_LOGIN_URL} - Input Text xpath=//input[@id='email'] ${email} - Input Password xpath=//input[@id='password'] ${shortened_uuid} - Click Button xpath=//button[@type='submit'] - Title Should Be SDN-C AdminPortal - Log Logged in to ${SDNGC_ADMIN_LOGIN_URL} \ No newline at end of file diff --git a/kubernetes/robot/templates/robot-deployment.yaml b/kubernetes/robot/templates/robot-deployment.yaml index 5130955919..154abb48ed 100644 --- a/kubernetes/robot/templates/robot-deployment.yaml +++ b/kubernetes/robot/templates/robot-deployment.yaml @@ -15,21 +15,26 @@ spec: name: robot spec: containers: - - image: {{ .Values.image.testsuite }} + - command: + - bash + - "-c" + - | + git clone -b amsterdam --single-branch http://gerrit.onap.org/r/demo.git /tmp/demo + mkdir -p /share/heat && cp -rf /tmp/demo/heat /share + git clone -b amsterdam --single-branch http://gerrit.onap.org/r/testsuite/properties.git /tmp/testsuite/properties + mkdir -p /share/config && cp /tmp/testsuite/properties/integration_* /share/config + lighttpd -D -f /etc/lighttpd/lighttpd.conf + image: {{ .Values.image.testsuite }} imagePullPolicy: {{ .Values.pullPolicy }} name: robot volumeMounts: - name: localtime mountPath: /etc/localtime readOnly: true - - name: robot-eteshare - mountPath: /share - name: robot-resources-asdc-interface mountPath: /var/opt/OpenECOMP_ETE/robot/resources/asdc_interface.robot - - name: robot-resources-policy-interface - mountPath: /var/opt/OpenECOMP_ETE/robot/resources/policy_interface.robot - - name: robot-resources-sdngc-interface - mountPath: /var/opt/OpenECOMP_ETE/robot/resources/sdngc_interface.robot + - name: vm-properties + mountPath: /share/config/ - name: lighttpd-authorization mountPath: /etc/lighttpd/authorization ports: @@ -43,18 +48,12 @@ spec: - name: localtime hostPath: path: /etc/localtime - - name: robot-eteshare - hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/robot/eteshare - name: robot-resources-asdc-interface hostPath: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/robot/robot/resources/asdc_interface.robot - - name: robot-resources-policy-interface - hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/robot/robot/resources/policy_interface.robot - - name: robot-resources-sdngc-interface + - name: vm-properties hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/robot/robot/resources/sdngc_interface.robot + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/robot/config - name: lighttpd-authorization hostPath: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/robot/authorization diff --git a/kubernetes/robot/values.yaml b/kubernetes/robot/values.yaml index 221b572264..657228f061 100644 --- a/kubernetes/robot/values.yaml +++ b/kubernetes/robot/values.yaml @@ -2,5 +2,5 @@ nsPrefix: onap pullPolicy: Always nodePortPrefix: 302 image: - testsuite: nexus3.onap.org:10001/openecomp/testsuite:1.1-STAGING-latest + testsuite: nexus3.onap.org:10001/openecomp/testsuite:1.2-STAGING-latest -- cgit 1.2.3-korg