diff options
| -rwxr-xr-x | kubernetes/config/docker/init/src/config/robot/eteshare/config/vm_properties.py | 78 | ||||
| -rwxr-xr-x[-rw-r--r--] | kubernetes/robot/resources/config/authorization (renamed from kubernetes/config/docker/init/src/config/robot/authorization) | 0 | ||||
| -rwxr-xr-x | kubernetes/robot/resources/config/eteshare/config/integration_preload_parameters.py (renamed from kubernetes/config/docker/init/src/config/robot/eteshare/config/integration_preload_parameters.py) | 109 | ||||
| -rwxr-xr-x | kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py (renamed from kubernetes/config/docker/init/src/config/robot/eteshare/config/integration_robot_properties.py) | 4 | ||||
| -rwxr-xr-x | kubernetes/robot/resources/config/eteshare/config/vm_config2robot.sh (renamed from kubernetes/config/docker/init/src/config/robot/eteshare/config/vm_config2robot.sh) | 0 | ||||
| -rwxr-xr-x | kubernetes/robot/resources/config/eteshare/config/vm_properties.py | 77 | ||||
| -rw-r--r-- | kubernetes/robot/resources/config/robot/resources/asdc_interface.robot (renamed from kubernetes/config/docker/init/src/config/robot/robot/resources/asdc_interface.robot) | 0 | ||||
| -rw-r--r-- | kubernetes/robot/resources/config/robot/resources/policy_interface.robot (renamed from kubernetes/config/docker/init/src/config/robot/robot/resources/policy_interface.robot) | 9 | ||||
| -rw-r--r-- | kubernetes/robot/resources/config/robot/resources/sdngc_interface.robot (renamed from kubernetes/config/docker/init/src/config/robot/robot/resources/sdngc_interface.robot) | 2 | ||||
| -rw-r--r-- | kubernetes/robot/templates/robot-dep-configmap.yaml | 25 | ||||
| -rw-r--r-- | kubernetes/robot/templates/robot-deployment.yaml | 33 | ||||
| -rw-r--r-- | kubernetes/robot/values.yaml | 14 |
12 files changed, 191 insertions, 160 deletions
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 1b96b3a001..0000000000 --- a/kubernetes/config/docker/init/src/config/robot/eteshare/config/vm_properties.py +++ /dev/null @@ -1,78 +0,0 @@ -# File generated from /opt/config -# -GLOBAL_INJECTED_AAI1_IP_ADDR = "aai-service.namespace-placeholder" -GLOBAL_INJECTED_AAI2_IP_ADDR = "N/A" -GLOBAL_INJECTED_APPC_IP_ADDR = "appc-sdnhost.namespace-placeholder" -GLOBAL_INJECTED_ARTIFACTS_VERSION = "1.1.0-SNAPSHOT" -GLOBAL_INJECTED_CLAMP_IP_ADDR = "clamp.namespace-placeholder" -GLOBAL_INJECTED_CLOUD_ENV = "openstack" -GLOBAL_INJECTED_DCAE_IP_ADDR = "dcae-controller.namespace-placeholder" -GLOBAL_INJECTED_DNS_IP_ADDR = "10.0.100.1" -GLOBAL_INJECTED_DOCKER_VERSION = "1.1-STAGING-latest" -#GLOBAL_INJECTED_EXTERNAL_DNS = "N/A" -GLOBAL_INJECTED_GERRIT_BRANCH = "master" -GLOBAL_INJECTED_KEYSTONE = "OPENSTACK_KEYSTONE_IP_HERE" -GLOBAL_INJECTED_MR_IP_ADDR = "dmaap.namespace-placeholder" -GLOBAL_INJECTED_MSO_IP_ADDR = "mso.namespace-placeholder" -GLOBAL_INJECTED_NETWORK = "OPENSTACK_NETWORK_ID_WITH_ONAP_ROUTE_HERE" -GLOBAL_INJECTED_NEXUS_DOCKER_REPO = "nexus3.onap.org:10001" -GLOBAL_INJECTED_NEXUS_PASSWORD = "docker" -GLOBAL_INJECTED_NEXUS_REPO = "https://nexus.onap.org/content/sites/raw" -GLOBAL_INJECTED_NEXUS_USERNAME = "docker" -GLOBAL_INJECTED_OPENO_IP_ADDR = "msb-iag.namespace-placeholder" -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.namespace-placeholder" -GLOBAL_INJECTED_POLICY_HEALTHCHECK_IP_ADDR = "drools.namespace-placeholder" -GLOBAL_INJECTED_PORTAL_IP_ADDR = "portalapps.namespace-placeholder" -GLOBAL_INJECTED_REGION = "OPENSTACK_REGION_HERE" -GLOBAL_INJECTED_REMOTE_REPO = "http://gerrit.onap.org/r/testsuite/properties.git" -GLOBAL_INJECTED_SDC_IP_ADDR = "sdc-be.namespace-placeholder" -GLOBAL_INJECTED_SDC_FE_IP_ADDR = "sdc-fe.namespace-placeholder" -GLOBAL_INJECTED_SDC_BE_IP_ADDR = "sdc-be.namespace-placeholder" -GLOBAL_INJECTED_SDNC_IP_ADDR = "sdnhost.namespace-placeholder" -GLOBAL_INJECTED_SDNC_PORTAL_IP_ADDR = "sdnc-portal.namespace-placeholder" -GLOBAL_INJECTED_SO_IP_ADDR = "mso.namespace-placeholder" -GLOBAL_INJECTED_VID_IP_ADDR = "vid-server.namespace-placeholder" -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_PROPERTIES = { - "GLOBAL_INJECTED_AAI1_IP_ADDR" : "aai-service.namespace-placeholder", - "GLOBAL_INJECTED_APPC_IP_ADDR" : "appc-sdnhost.namespace-placeholder", - "GLOBAL_INJECTED_ARTIFACTS_VERSION" : "1.1.0-SNAPSHOT", - "GLOBAL_INJECTED_CLAMP_IP_ADDR" : "clamp.namespace-placeholder", - "GLOBAL_INJECTED_CLOUD_ENV" : "openstack", - "GLOBAL_INJECTED_DCAE_IP_ADDR" : "dcae-controller.namespace-placeholder", - "GLOBAL_INJECTED_DNS_IP_ADDR" : "10.0.100.1", - "GLOBAL_INJECTED_DOCKER_VERSION" : "1.1-STAGING-latest", - "GLOBAL_INJECTED_GERRIT_BRANCH" : "master", - "GLOBAL_INJECTED_KEYSTONE" : "OPENSTACK_KEYSTONE_IP_HERE", - "GLOBAL_INJECTED_MR_IP_ADDR" : "dmaap.namespace-placeholder", - "GLOBAL_INJECTED_MSO_IP_ADDR" : "mso.namespace-placeholder", - "GLOBAL_INJECTED_NETWORK" : "OPENSTACK_NETWORK_ID_WITH_ONAP_ROUTE_HERE", - "GLOBAL_INJECTED_NEXUS_DOCKER_REPO" : "nexus3.onap.org:10001", - "GLOBAL_INJECTED_NEXUS_PASSWORD" : "docker", - "GLOBAL_INJECTED_NEXUS_REPO" : "https://nexus.onap.org/content/sites/raw", - "GLOBAL_INJECTED_NEXUS_USERNAME" : "docker", - "GLOBAL_INJECTED_OPENO_IP_ADDR" : "msb-iag.namespace-placeholder", - "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.namespace-placeholder", - "GLOBAL_INJECTED_POLICY_HEALTHCHECK_IP_ADDR" : "drools.namespace-placeholder", - "GLOBAL_INJECTED_PORTAL_IP_ADDR" : "portalapps.namespace-placeholder", - "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.namespace-placeholder", - "GLOBAL_INJECTED_SDC_BE_IP_ADDR" : "sdc-be.namespace-placeholder", - "GLOBAL_INJECTED_SDNC_IP_ADDR" : "sdnhost.namespace-placeholder", - "GLOBAL_INJECTED_SDNC_PORTAL_IP_ADDR" : "sdnc-portal.namespace-placeholder", - "GLOBAL_INJECTED_SO_IP_ADDR" : "mso.namespace-placeholder", - "GLOBAL_INJECTED_VID_IP_ADDR" : "vid-server.namespace-placeholder", - "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" -} diff --git a/kubernetes/config/docker/init/src/config/robot/authorization b/kubernetes/robot/resources/config/authorization index 988730f7a8..988730f7a8 100644..100755 --- a/kubernetes/config/docker/init/src/config/robot/authorization +++ b/kubernetes/robot/resources/config/authorization diff --git a/kubernetes/config/docker/init/src/config/robot/eteshare/config/integration_preload_parameters.py b/kubernetes/robot/resources/config/eteshare/config/integration_preload_parameters.py index 3826659fcd..b125f792b9 100755 --- a/kubernetes/config/docker/init/src/config/robot/eteshare/config/integration_preload_parameters.py +++ b/kubernetes/robot/resources/config/eteshare/config/integration_preload_parameters.py @@ -5,15 +5,15 @@ GLOBAL_PRELOAD_PARAMETERS = { "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", + "demo_artifacts_version" : "{{ .Values.demoArtifactsVersion }}", + "onap_private_net_id" : "{{ .Values.openStackPrivateNetId }}", + "onap_private_subnet_id" : "{{ .Values.openStackPrivateSubnetId }}", + "onap_private_net_cidr" : "{{ .Values.openStackPrivateNetCidr }}", "dcae_collector_ip" : "10.0.4.102", "dcae_collector_port" : "8080", - "public_net_id" : "OPENSTACK_PUBLIC_NET_ID_HERE", + "public_net_id" : "{{ .Values.openStackPublicNetId }}", "cloud_env" : "${cloud_env}", - "install_script_version" : "${install_script_version}", + "install_script_version" : "${install_script_version}", ### # vims_preload same for every instantiation ### @@ -24,28 +24,28 @@ GLOBAL_PRELOAD_PARAMETERS = { "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==", + "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_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}", + "vfw_image_name" : "${vm_image_name}", + "vfw_flavor_name" : "${vm_flavor_name}", ### }, @@ -60,11 +60,11 @@ GLOBAL_PRELOAD_PARAMETERS = { "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", + "vfw_private_ip_2" : "{{ .Values.openStackOamNetworkCidrPrefix }}.1", "vpg_private_ip_0" : "192.168.10.200", - "vpg_private_ip_1" : "OPENSTACK_OAM_NETWORK_CIDR_PREFIX_HERE.2", + "vpg_private_ip_1" : "{{ .Values.openStackOamNetworkCidrPrefix }}.2", "vsn_private_ip_0" : "192.168.20.250", - "vsn_private_ip_1" : "OPENSTACK_OAM_NETWORK_CIDR_PREFIX_HERE.3", + "vsn_private_ip_1" : "{{ .Values.openStackOamNetworkCidrPrefix }}.3", 'vfw_name_0':'vofwl01fwl${hostid}', 'vpg_name_0':'vofwl01pgn${hostid}', 'vsn_name_0':'vofwl01snk${hostid}' @@ -73,41 +73,41 @@ GLOBAL_PRELOAD_PARAMETERS = { "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", + "vlb_private_ip_1" : "{{ .Values.openStackOamNetworkCidrPrefix }}.4", "vdns_private_ip_0" : "192.168.30.110", - "vdns_private_ip_1" : "OPENSTACK_OAM_NETWORK_CIDR_PREFIX_HERE.5", + "vdns_private_ip_1" : "{{ .Values.openStackOamNetworkCidrPrefix }}.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" - + "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", + "vlb_private_ip_1" : "{{ .Values.openStackOamNetworkCidrPrefix }}.4", "vdns_private_ip_0" : "192.168.30.222", - "vdns_private_ip_1" : "OPENSTACK_OAM_NETWORK_CIDR_PREFIX_HERE.6", + "vdns_private_ip_1" : "{{ .Values.openStackOamNetworkCidrPrefix }}.6", 'scaling_vdns_name_0':'vovlbscaling${hostid}', - "vlb_private_net_cidr" : "192.168.10.0/24" + "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": { + "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", + "vfw_private_ip_2" : "{{ .Values.openStackOamNetworkCidrPrefix }}.11", "vpg_private_ip_0" : "192.168.110.200", - "vpg_private_ip_1" : "OPENSTACK_OAM_NETWORK_CIDR_PREFIX_HERE.12", + "vpg_private_ip_1" : "{{ .Values.openStackOamNetworkCidrPrefix }}.12", "vsn_private_ip_0" : "192.168.120.250", - "vsn_private_ip_1" : "OPENSTACK_OAM_NETWORK_CIDR_PREFIX_HERE.13", + "vsn_private_ip_1" : "{{ .Values.openStackOamNetworkCidrPrefix }}.13", 'vfw_name_0':'clfwl01fwl${hostid}', 'vpg_name_0':'clfwl01pgn${hostid}', 'vsn_name_0':'clfwl01snk${hostid}' @@ -116,22 +116,22 @@ GLOBAL_PRELOAD_PARAMETERS = { "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", + "vlb_private_ip_1" : "{{ .Values.openStackOamNetworkCidrPrefix }}.14", "vdns_private_ip_0" : "192.168.130.110", - "vdns_private_ip_1" : "OPENSTACK_OAM_NETWORK_CIDR_PREFIX_HERE.15", + "vdns_private_ip_1" : "{{ .Values.openStackOamNetworkCidrPrefix }}.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" + "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", + "vlb_private_ip_1" : "{{ .Values.openStackOamNetworkCidrPrefix }}.14", "vdns_private_ip_0" : "192.168.130.222", - "vdns_private_ip_1" : "OPENSTACK_OAM_NETWORK_CIDR_PREFIX_HERE.16", + "vdns_private_ip_1" : "{{ .Values.openStackOamNetworkCidrPrefix }}.16", 'scaling_vdns_name_0':'clvlbscaling${hostid}', - "vlb_private_net_cidr" : "192.168.10.0/24" + "vlb_private_net_cidr" : "192.168.10.0/24" }, "vvg_preload.template" : { } @@ -145,11 +145,11 @@ GLOBAL_PRELOAD_PARAMETERS = { "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", + "vfw_private_ip_2" : "{{ .Values.openStackOamNetworkCidrPrefix }}.11", "vpg_private_ip_0" : "192.168.110.200", - "vpg_private_ip_1" : "OPENSTACK_OAM_NETWORK_CIDR_PREFIX_HERE.12", + "vpg_private_ip_1" : "{{ .Values.openStackOamNetworkCidrPrefix }}.12", "vsn_private_ip_0" : "192.168.120.250", - "vsn_private_ip_1" : "OPENSTACK_OAM_NETWORK_CIDR_PREFIX_HERE.13", + "vsn_private_ip_1" : "{{ .Values.openStackOamNetworkCidrPrefix }}.13", 'vfw_name_0':'demofwl01fwl', 'vpg_name_0':'demofwl01pgn', 'vsn_name_0':'demofwl01snk' @@ -158,25 +158,24 @@ GLOBAL_PRELOAD_PARAMETERS = { "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", + "vlb_private_ip_1" : "{{ .Values.openStackOamNetworkCidrPrefix }}.14", "vdns_private_ip_0" : "192.168.130.110", - "vdns_private_ip_1" : "OPENSTACK_OAM_NETWORK_CIDR_PREFIX_HERE.15", + "vdns_private_ip_1" : "{{ .Values.openStackOamNetworkCidrPrefix }}.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" + "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", + "vlb_private_ip_1" : "{{ .Values.openStackOamNetworkCidrPrefix }}.14", "vdns_private_ip_0" : "192.168.130.222", - "vdns_private_ip_1" : "OPENSTACK_OAM_NETWORK_CIDR_PREFIX_HERE.16", + "vdns_private_ip_1" : "{{ .Values.openStackOamNetworkCidrPrefix }}.16", 'scaling_vdns_name_0':'demovlbscaling', - "vlb_private_net_cidr" : "192.168.10.0/24" + "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/robot/resources/config/eteshare/config/integration_robot_properties.py index 0bf67912d2..305ba3e8a0 100755 --- a/kubernetes/config/docker/init/src/config/robot/eteshare/config/integration_robot_properties.py +++ b/kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py @@ -74,8 +74,8 @@ GLOBAL_VID_HEALTH_PASSWORD = "AppPassword!1" 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" +GLOBAL_VVGSERVER_IMAGE = "{{ .Values.ubuntuImage }}" +GLOBAL_VVGSERVER_FLAVOR = "{{ .Values.openStackFlavourMedium }}" # 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/robot/resources/config/eteshare/config/vm_config2robot.sh index c50fa5f491..c50fa5f491 100755 --- a/kubernetes/config/docker/init/src/config/robot/eteshare/config/vm_config2robot.sh +++ b/kubernetes/robot/resources/config/eteshare/config/vm_config2robot.sh diff --git a/kubernetes/robot/resources/config/eteshare/config/vm_properties.py b/kubernetes/robot/resources/config/eteshare/config/vm_properties.py new file mode 100755 index 0000000000..b4a724697d --- /dev/null +++ b/kubernetes/robot/resources/config/eteshare/config/vm_properties.py @@ -0,0 +1,77 @@ +# File generated from /opt/config +# +GLOBAL_INJECTED_AAI1_IP_ADDR = "aai-service.{{ .Values.nsPrefix }}" +GLOBAL_INJECTED_AAI2_IP_ADDR = "N/A" +GLOBAL_INJECTED_APPC_IP_ADDR = "appc-sdnhost.{{ .Values.nsPrefix }}" +GLOBAL_INJECTED_ARTIFACTS_VERSION = "1.1.0-SNAPSHOT" +GLOBAL_INJECTED_CLAMP_IP_ADDR = "clamp.{{ .Values.nsPrefix }}" +GLOBAL_INJECTED_CLOUD_ENV = "openstack" +GLOBAL_INJECTED_DCAE_IP_ADDR = "dcae-controller.{{ .Values.nsPrefix }}" +GLOBAL_INJECTED_DNS_IP_ADDR = "10.0.100.1" +GLOBAL_INJECTED_DOCKER_VERSION = "1.1-STAGING-latest" +#GLOBAL_INJECTED_EXTERNAL_DNS = "N/A" +GLOBAL_INJECTED_GERRIT_BRANCH = "master" +GLOBAL_INJECTED_KEYSTONE = "{{ .Values.openStackKeyStoneUrl }}" +GLOBAL_INJECTED_MR_IP_ADDR = "dmaap.{{ .Values.nsPrefix }}" +GLOBAL_INJECTED_MSO_IP_ADDR = "mso.{{ .Values.nsPrefix }}" +GLOBAL_INJECTED_NETWORK = "{{ .Values.openStackPrivateNetId }}" +GLOBAL_INJECTED_NEXUS_DOCKER_REPO = "nexus3.onap.org:10001" +GLOBAL_INJECTED_NEXUS_PASSWORD = "docker" +GLOBAL_INJECTED_NEXUS_REPO = "https://nexus.onap.org/content/sites/raw" +GLOBAL_INJECTED_NEXUS_USERNAME = "docker" +GLOBAL_INJECTED_OPENO_IP_ADDR = "msb-iag.{{ .Values.nsPrefix }}" +GLOBAL_INJECTED_OPENSTACK_PASSWORD = "{{ .Values.openStackEncryptedPassword }}" +GLOBAL_INJECTED_OPENSTACK_TENANT_ID = "{{ .Values.openStackTenantId }}" +GLOBAL_INJECTED_OPENSTACK_USERNAME = "{{ .Values.openStackUserName }}" +GLOBAL_INJECTED_POLICY_IP_ADDR = "pypdp.{{ .Values.nsPrefix }}" +GLOBAL_INJECTED_POLICY_HEALTHCHECK_IP_ADDR = "drools.{{ .Values.nsPrefix }}" +GLOBAL_INJECTED_PORTAL_IP_ADDR = "portalapps.{{ .Values.nsPrefix }}" +GLOBAL_INJECTED_REGION = "{{ .Values.openStackRegion }}" +GLOBAL_INJECTED_REMOTE_REPO = "http://gerrit.onap.org/r/testsuite/properties.git" +GLOBAL_INJECTED_SDC_IP_ADDR = "sdc-be.{{ .Values.nsPrefix }}" +GLOBAL_INJECTED_SDC_FE_IP_ADDR = "sdc-fe.{{ .Values.nsPrefix }}" +GLOBAL_INJECTED_SDC_BE_IP_ADDR = "sdc-be.{{ .Values.nsPrefix }}" +GLOBAL_INJECTED_SDNC_IP_ADDR = "sdnhost.{{ .Values.nsPrefix }}" +GLOBAL_INJECTED_SDNC_PORTAL_IP_ADDR = "sdnc-portal.{{ .Values.nsPrefix }}" +GLOBAL_INJECTED_SO_IP_ADDR = "mso.{{ .Values.nsPrefix }}" +GLOBAL_INJECTED_VID_IP_ADDR = "vid-server.{{ .Values.nsPrefix }}" +GLOBAL_INJECTED_VM_FLAVOR = "{{ .Values.openStackFlavourMedium }}" +GLOBAL_INJECTED_VM_IMAGE_NAME = "{{ .Values.ubuntuImage }}" +GLOBAL_INJECTED_PUBLIC_NET_ID = "{{ .Values.openStackPublicNetId }}" +GLOBAL_INJECTED_PROPERTIES = { + "GLOBAL_INJECTED_AAI1_IP_ADDR" : "aai-service.{{ .Values.nsPrefix }}", + "GLOBAL_INJECTED_APPC_IP_ADDR" : "appc-sdnhost.{{ .Values.nsPrefix }}", + "GLOBAL_INJECTED_ARTIFACTS_VERSION" : "1.1.0-SNAPSHOT", + "GLOBAL_INJECTED_CLAMP_IP_ADDR" : "clamp.{{ .Values.nsPrefix }}", + "GLOBAL_INJECTED_CLOUD_ENV" : "openstack", + "GLOBAL_INJECTED_DCAE_IP_ADDR" : "dcae-controller.{{ .Values.nsPrefix }}", + "GLOBAL_INJECTED_DNS_IP_ADDR" : "10.0.100.1", + "GLOBAL_INJECTED_DOCKER_VERSION" : "1.1-STAGING-latest", + "GLOBAL_INJECTED_GERRIT_BRANCH" : "master", + "GLOBAL_INJECTED_KEYSTONE" : "{{ .Values.openStackKeyStoneUrl }}", + "GLOBAL_INJECTED_MR_IP_ADDR" : "dmaap.{{ .Values.nsPrefix }}", + "GLOBAL_INJECTED_MSO_IP_ADDR" : "mso.{{ .Values.nsPrefix }}", + "GLOBAL_INJECTED_NETWORK" : "{{ .Values.openStackPrivateNetId }}", + "GLOBAL_INJECTED_NEXUS_DOCKER_REPO" : "nexus3.onap.org:10001", + "GLOBAL_INJECTED_NEXUS_PASSWORD" : "docker", + "GLOBAL_INJECTED_NEXUS_REPO" : "https://nexus.onap.org/content/sites/raw", + "GLOBAL_INJECTED_NEXUS_USERNAME" : "docker", + "GLOBAL_INJECTED_OPENO_IP_ADDR" : "msb-iag.{{ .Values.nsPrefix }}", + "GLOBAL_INJECTED_OPENSTACK_PASSWORD" : "{{ .Values.openStackEncryptedPassword }}", + "GLOBAL_INJECTED_OPENSTACK_TENANT_ID" : "{{ .Values.openStackTenantId }}", + "GLOBAL_INJECTED_OPENSTACK_USERNAME" : "{{ .Values.openStackUserName }}", + "GLOBAL_INJECTED_POLICY_IP_ADDR" : "pypdp.{{ .Values.nsPrefix }}", + "GLOBAL_INJECTED_POLICY_HEALTHCHECK_IP_ADDR" : "drools.{{ .Values.nsPrefix }}", + "GLOBAL_INJECTED_PORTAL_IP_ADDR" : "portalapps.{{ .Values.nsPrefix }}", + "GLOBAL_INJECTED_REGION" : "{{ .Values.openStackRegion }}", + "GLOBAL_INJECTED_REMOTE_REPO" : "http://gerrit.onap.org/r/testsuite/properties.git", + "GLOBAL_INJECTED_SDC_FE_IP_ADDR" : "sdc-fe.{{ .Values.nsPrefix }}", + "GLOBAL_INJECTED_SDC_BE_IP_ADDR" : "sdc-be.{{ .Values.nsPrefix }}", + "GLOBAL_INJECTED_SDNC_IP_ADDR" : "sdnhost.{{ .Values.nsPrefix }}", + "GLOBAL_INJECTED_SDNC_PORTAL_IP_ADDR" : "sdnc-portal.{{ .Values.nsPrefix }}", + "GLOBAL_INJECTED_SO_IP_ADDR" : "mso.{{ .Values.nsPrefix }}", + "GLOBAL_INJECTED_VID_IP_ADDR" : "vid-server.{{ .Values.nsPrefix }}", + "GLOBAL_INJECTED_VM_FLAVOR" : "{{ .Values.openStackFlavourMedium }}", + "GLOBAL_INJECTED_VM_IMAGE_NAME" : "{{ .Values.ubuntuImage }}", + "GLOBAL_INJECTED_PUBLIC_NET_ID" : "{{ .Values.openStackPublicNetId }}" +} diff --git a/kubernetes/config/docker/init/src/config/robot/robot/resources/asdc_interface.robot b/kubernetes/robot/resources/config/robot/resources/asdc_interface.robot index 5b69a66c7c..5b69a66c7c 100644 --- a/kubernetes/config/docker/init/src/config/robot/robot/resources/asdc_interface.robot +++ b/kubernetes/robot/resources/config/robot/resources/asdc_interface.robot diff --git a/kubernetes/config/docker/init/src/config/robot/robot/resources/policy_interface.robot b/kubernetes/robot/resources/config/robot/resources/policy_interface.robot index 6887ce6b56..9193fe438a 100644 --- a/kubernetes/config/docker/init/src/config/robot/robot/resources/policy_interface.robot +++ b/kubernetes/robot/resources/config/robot/resources/policy_interface.robot @@ -4,7 +4,7 @@ Library RequestsClientCert Library RequestsLibrary Library String Library JSONUtils -Library Collections +Library Collections Resource global_properties.robot *** Variables *** @@ -16,7 +16,7 @@ ${POLICY_HEALTHCHECK_ENDPOINT} ${GLOBAL_POLICY_SERVER_PROTOCOL}://${GLOBAL_I Run Policy Health Check [Documentation] Runs Policy Health check - ${auth}= Create List ${GLOBAL_POLICY_USERNAME} ${GLOBAL_POLICY_PASSWORD} + ${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 @@ -28,7 +28,6 @@ Run Policy Health Check :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} @@ -38,7 +37,6 @@ Run Policy Put Request ${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} @@ -48,7 +46,6 @@ Run Policy Delete Request ${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} @@ -57,4 +54,4 @@ Run Policy Get Configs Request ${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 + [Return] ${resp} diff --git a/kubernetes/config/docker/init/src/config/robot/robot/resources/sdngc_interface.robot b/kubernetes/robot/resources/config/robot/resources/sdngc_interface.robot index 4e9d5c2bb9..5b79f9a305 100644 --- a/kubernetes/config/docker/init/src/config/robot/robot/resources/sdngc_interface.robot +++ b/kubernetes/robot/resources/config/robot/resources/sdngc_interface.robot @@ -1,7 +1,7 @@ *** 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 UUID Library OperatingSystem Library ExtendedSelenium2Library Library Collections diff --git a/kubernetes/robot/templates/robot-dep-configmap.yaml b/kubernetes/robot/templates/robot-dep-configmap.yaml new file mode 100644 index 0000000000..94e359dce7 --- /dev/null +++ b/kubernetes/robot/templates/robot-dep-configmap.yaml @@ -0,0 +1,25 @@ +#{{ if not .Values.disableRobot }} +apiVersion: v1 +kind: ConfigMap +metadata: + name: robot-eteshare-configmap + namespace: {{ .Values.nsPrefix }} +data: +{{ tpl (.Files.Glob "resources/config/eteshare/config/*").AsConfig . | indent 2 }} +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: robot-resources-configmap + namespace: {{ .Values.nsPrefix }} +data: +{{ tpl (.Files.Glob "resources/config/robot/resources/*").AsConfig . | indent 2 }} +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: lighttpd-authorization-configmap + namespace: {{ .Values.nsPrefix }} +data: +{{ tpl (.Files.Glob "resources/config/authorization").AsConfig . | indent 2 }} +#{{ end }} diff --git a/kubernetes/robot/templates/robot-deployment.yaml b/kubernetes/robot/templates/robot-deployment.yaml index a978ff4f41..9f936e8275 100644 --- a/kubernetes/robot/templates/robot-deployment.yaml +++ b/kubernetes/robot/templates/robot-deployment.yaml @@ -24,15 +24,19 @@ spec: mountPath: /etc/localtime readOnly: true - name: robot-eteshare - mountPath: /share - - name: robot-resources-asdc-interface + mountPath: /share/config + - name: robot-resources mountPath: /var/opt/OpenECOMP_ETE/robot/resources/asdc_interface.robot - - name: robot-resources-policy-interface + subPath: asdc_interface.robot + - name: robot-resources mountPath: /var/opt/OpenECOMP_ETE/robot/resources/policy_interface.robot - - name: robot-resources-sdngc-interface + subPath: policy_interface.robot + - name: robot-resources mountPath: /var/opt/OpenECOMP_ETE/robot/resources/sdngc_interface.robot + subPath: sdngc_interface.robot - name: lighttpd-authorization mountPath: /etc/lighttpd/authorization + subPath: authorization ports: - containerPort: 88 readinessProbe: @@ -45,20 +49,15 @@ spec: 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 - hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/robot/robot/resources/sdngc_interface.robot + configMap: + name: robot-eteshare-configmap + defaultMode: 0755 + - name: robot-resources + configMap: + name: robot-resources-configmap - name: lighttpd-authorization - hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/robot/authorization + configMap: + name: lighttpd-authorization-configmap imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" #{{ end }} diff --git a/kubernetes/robot/values.yaml b/kubernetes/robot/values.yaml index 6aadd93647..ea5d2ae856 100644 --- a/kubernetes/robot/values.yaml +++ b/kubernetes/robot/values.yaml @@ -2,6 +2,18 @@ nsPrefix: onap pullPolicy: Always nodePortPrefix: 302 robotReplicas: 1 +demoArtifactsVersion: "1.1.0-SNAPSHOT" +openStackPrivateNetCidr: "192.168.30.0" +openStackFlavourMedium: "m1.medium" +openStackKeyStoneUrl: "http://1.2.3.4:5000" +openStackPublicNetId: "e8f51958045716781ffc" +openStackPrivateNetId: "e8f51956-00dd-4425-af36-045716781ffc" +openStackOamNetworkCidrPrefix: "192.168.120" +openStackEncryptedPassword: "c124921a3a0efbe579782cde8227681e" +openStackRegion: "RegionOne" +openStackPrivateSubnetId: "e8f51956-00dd-4425-af36-045716781ffc" +openStackTenantId: "47899782ed714295b1151681fdfd51f5" +openStackUserName: "vnf_user" +ubuntuImage: "Ubuntu_14.04.5_LTS" image: testsuite: nexus3.onap.org:10001/openecomp/testsuite:1.1-STAGING-latest - |