summaryrefslogtreecommitdiffstats
path: root/robot
diff options
context:
space:
mode:
authorBrian Freeman <bf1936@att.com>2019-04-17 13:46:53 -0500
committerBrian Freeman <bf1936@att.com>2019-04-17 16:21:05 -0500
commit9d85d0b33ade6b633e6654593b5d5da9e5a75536 (patch)
tree2fd85a79cc22bfa847a80f447f634fdf5d9d813c /robot
parente12b626ab2141e59d74314dc24713b295dac9d53 (diff)
Fixes for RegionThree and Instantiate Direct
Issue-ID: INT-1028 Change-Id: I2ffb571da6af9d16077b5d085fa9ae5611209865 Signed-off-by: Brian Freeman <bf1936@att.com>
Diffstat (limited to 'robot')
-rw-r--r--robot/resources/so/direct_instantiate.robot10
-rw-r--r--robot/testsuites/create-cloud-config.robot15
-rw-r--r--robot/testsuites/vnf-orchestration-direct-so.robot5
3 files changed, 21 insertions, 9 deletions
diff --git a/robot/resources/so/direct_instantiate.robot b/robot/resources/so/direct_instantiate.robot
index afd99ad6..6e8ba136 100644
--- a/robot/resources/so/direct_instantiate.robot
+++ b/robot/resources/so/direct_instantiate.robot
@@ -40,10 +40,14 @@ Instantiate Service Direct To SO
${tmp_key2}= Catenate \$ { GLOBAL_INJECTED_UBUNTU_1404_IMAGE }
${tmp_key2}= Evaluate '${tmp_key2}'.replace(' ','')
# ecompnet 13 , 14, 15
- Set To Dictionary ${template} ${tmp_key1} 14 ${tmp_key2} ${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}
+ # use same method as sdnc preload robot script
+ ${ecompnet}= Evaluate str((${GLOBAL_BUILD_NUMBER}%128)+128)
+
+ Set To Dictionary ${template} ${tmp_key1} ${ecompnet} ${tmp_key2} ${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}
Log ${preload_dict}
Log ${template}
- Create Entire Service ${csar_file} ${vnf_template_file} ${template} ${name_suffix} ${GLOBAL_INJECTED_REGION} ${GLOBAL_INJECTED_OPENSTACK_TENANT_ID} ${heatbridge}
-
+ ${service_instance_id}= Create Entire Service ${csar_file} ${vnf_template_file} ${template} ${name_suffix} ${GLOBAL_INJECTED_REGION} ${GLOBAL_INJECTED_OPENSTACK_TENANT_ID} ${heatbridge}
+ Log To Console ServiceInstanceId:${service_instance_id}
+ Should Not Be Equal As Strings ${service_instance_id} None
diff --git a/robot/testsuites/create-cloud-config.robot b/robot/testsuites/create-cloud-config.robot
index 7a798a4b..d78f446d 100644
--- a/robot/testsuites/create-cloud-config.robot
+++ b/robot/testsuites/create-cloud-config.robot
@@ -4,6 +4,7 @@ Test Timeout 1 minute
Resource ../resources/so/create_cloud_config.robot
+Resource ../resources/aai/create_tenant.robot
*** Test Cases ***
@@ -14,12 +15,16 @@ Create Cloud Config Test
Create Cloud Config RegionThree V3 Test
[TAGS] mso cloudconfig cloudconfigv3
- # [Arguments] ${site_name} ${region_id} ${clli} ${identity_id} ${identity_url} ${mso_id} ${mso_pass} ${admin_tenant} ${member_role} ${identity_server_type} ${authentication_type} ${project_domain_name} ${user_domain_Name}
- # ${region_id} in openstack is set up by cloud administration and does not have to be same as ONAP ${site_name}
- # In Windriver/Intel test labs the os_region_id's are all set to "RegionOne"
- # clli by testing team convention is same as onap site_name
- # KEYSTONE URL should end in /v3 SO will put /auth when KEYSTONE_V3 is the identity_server_type
+ [Documentation] Create Keystone V3 in Region 3
+ ... [Arguments] ${site_name} ${region_id} ${clli} ${identity_id} ${identity_url} ${mso_id} ${mso_pass}
+ ... ${admin_tenant} ${member_role} ${identity_server_type} ${authentication_type} ${project_domain_name} ${user_domain_Name}
+ ... ${region_id} in openstack is set up by cloud administration and does not have to be same as ONAP ${site_name}
+ ... In Windriver/Intel test labs the os_region_id's are all set to "RegionOne"
+ ... clli by testing team convention is same as onap site_name
+ ... KEYSTONE URL should end in /v3 SO will put /auth when KEYSTONE_V3 is the identity_server_type
Create Cloud Configuration v3 ${GLOBAL_INJECTED_REGION_THREE} ${GLOBAL_INJECTED_REGION} ${GLOBAL_INJECTED_REGION_THREE} REGION_THREE_KEYSTONE ${GLOBAL_INJECTED_KEYSTONE_REGION_THREE}/${GLOBAL_INJECTED_OPENSTACK_KEYSTONE_API_VERSION_REGION_THREE} ${GLOBAL_INJECTED_OPENSTACK_USERNAME_REGION_THREE} ${GLOBAL_INJECTED_OPENSTACK_MSO_ENCRYPTED_PASSWORD_REGION_THREE} ${GLOBAL_INJECTED_OPENSTACK_TENANT_ID_REGION_THREE} admin KEYSTONE_V3 USERNAME_PASSWORD ${GLOBAL_INJECTED_OPENSTACK_PROJECT_DOMAIN__REGION_THREE} ${GLOBAL_INJECTED_OPENSTACK_USER_DOMAIN__REGION_THREE}
+ Inventory Tenant If Not Exists CloudOwner ${GLOBAL_INJECTED_REGION_THREE} SharedNode OwnerType v1 CloudZone ${GLOBAL_INJECTED_OPENSTACK_TENANT_ID_REGION_THREE} ${GLOBAL_INJECTED_OPENSTACK_PROJECT_DOMAIN__REGION_THREE}
+
Get Cloud Config Test
[TAGS] mso cloudconfig
diff --git a/robot/testsuites/vnf-orchestration-direct-so.robot b/robot/testsuites/vnf-orchestration-direct-so.robot
index 4a9fd1a3..ee2759cb 100644
--- a/robot/testsuites/vnf-orchestration-direct-so.robot
+++ b/robot/testsuites/vnf-orchestration-direct-so.robot
@@ -6,11 +6,14 @@ Resource ../resources/so/direct_instantiate.robot
*** Variables ***
${CSAR_FILE}
-${VFW_TEMPLATE} ../assets/templates/vcpeutils/template.vfw_vfmodule.json
+${VFW_TEMPLATE} robot/assets/templates/vcpeutils/template.vfw_vfmodule.json
*** Test Cases ***
SO Direct Instantiate vFW VNF
[Tags] instantiateVFWdirectso
+ [Documentation] Direct REST API into SO
+ ... ./ete-k8s.sh onap healtdist (cpy csar file name)
+ ... ./ete-k8s.sh onap instantiateVFWdirectso CSAR_FILE:/tmp/csar/service-Vfw20190413133734-csar.csar
Run Keyword If '${CSAR_FILE}' == '' Fail "CSAR_FILE must not be empty (/tmp/csar/service-Vfw20190413133734-csar.csar)"
Instantiate Service Direct To SO vFW ${CSAR_FILE} ${VFW_TEMPLATE}