diff options
Diffstat (limited to 'robot/testsuites')
| -rw-r--r-- | robot/testsuites/create-cloud-config.robot | 13 | ||||
| -rw-r--r-- | robot/testsuites/demo.robot | 3 | ||||
| -rw-r--r-- | robot/testsuites/health-check.robot | 6 | ||||
| -rw-r--r-- | robot/testsuites/model-distribution-vcpe.robot | 2 | ||||
| -rw-r--r-- | robot/testsuites/model-distribution.robot | 2 | ||||
| -rw-r--r-- | robot/testsuites/update_onap_page.robot | 2 |
6 files changed, 13 insertions, 15 deletions
diff --git a/robot/testsuites/create-cloud-config.robot b/robot/testsuites/create-cloud-config.robot index 636609c4..cda8a5e6 100644 --- a/robot/testsuites/create-cloud-config.robot +++ b/robot/testsuites/create-cloud-config.robot @@ -8,14 +8,14 @@ Resource ../resources/aai/create_tenant.robot *** Test Cases *** Create Cloud Config Test - [TAGS] mso cloudconfig + [TAGS] so cloudconfig # Run Create Cloud Configuration RegionOne RegionOne RegionOne DEFAULT_KEYSTONE identify_url:http://10.12.25.2:5000/v2.0 mso_id:demo mso_pass:encrypted_password admin_tenant:1e097c6713e74fd7ac8e4295e605ee1e member_role:admin identity_server_type:KEYSTONE identity_authentication_type:USERNAME_PASSWORD ${arguments}= Create Dictionary site_name=${GLOBAL_INJECTED_REGION} region_id=${GLOBAL_INJECTED_REGION} clli=${GLOBAL_INJECTED_REGION} identity_id=DEFAULT_KEYSTONE identity_url=${GLOBAL_INJECTED_KEYSTONE}/${GLOBAL_INJECTED_OPENSTACK_KEYSTONE_API_VERSION} mso_id=${GLOBAL_INJECTED_OPENSTACK_USERNAME} mso_pass=${GLOBAL_INJECTED_OPENSTACK_API_KEY} admin_tenant=${GLOBAL_INJECTED_OPENSTACK_TENANT_ID} member_role=admin identity_server_type=KEYSTONE_V3 authentication_type=USERNAME_PASSWORD - ${auth}= Create List ${GLOBAL_MSO_CATDB_USERNAME} ${GLOBAL_MSO_PASSWORD} + ${auth}= Create List ${GLOBAL_SO_CATDB_USERNAME} ${GLOBAL_SO_PASSWORD} SO.Upsert Cloud Configuration ${GLOBAL_SO_CATDB_ENDPOINT} ${GLOBAL_SO_CLOUD_CONFIG_PATH} ${GLOBAL_TEMPLATE_FOLDER} ${GLOBAL_SO_CLOUD_CONFIG_TEMPLATE} ${arguments} auth=${auth} Create Cloud Config RegionThree V3 Test - [TAGS] mso cloudconfig cloudconfigv3 + [TAGS] so cloudconfig cloudconfigv3 [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} @@ -23,14 +23,13 @@ Create Cloud Config RegionThree V3 Test ... 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 - ${arguments}= Create Dictionary site_name=${GLOBAL_INJECTED_REGION_THREE} region_id=${GLOBAL_INJECTED_REGION} clli=${GLOBAL_INJECTED_REGION_THREE} identity_id=REGION_THREE_KEYSTONE identity_url=${GLOBAL_INJECTED_KEYSTONE_REGION_THREE}/${GLOBAL_INJECTED_OPENSTACK_KEYSTONE_API_VERSION_REGION_THREE} mso_id=${GLOBAL_INJECTED_OPENSTACK_USERNAME_REGION_THREE} mso_pass=${GLOBAL_INJECTED_OPENSTACK_MSO_ENCRYPTED_PASSWORD_REGION_THREE} admin_tenant=${GLOBAL_INJECTED_OPENSTACK_TENANT_ID_REGION_THREE} member_role=admin identity_server_type=KEYSTONE_V3 authentication_type=USERNAME_PASSWORD project_domain_name=${GLOBAL_INJECTED_OPENSTACK_PROJECT_DOMAIN_REGION_THREE} user_domain_name=${GLOBAL_INJECTED_OPENSTACK_USER_DOMAIN_REGION_THREE} - ${auth}= Create List ${GLOBAL_MSO_CATDB_USERNAME} ${GLOBAL_MSO_PASSWORD} + ${arguments}= Create Dictionary site_name=${GLOBAL_INJECTED_REGION_THREE} region_id=${GLOBAL_INJECTED_REGION} clli=${GLOBAL_INJECTED_REGION_THREE} identity_id=REGION_THREE_KEYSTONE identity_url=${GLOBAL_INJECTED_KEYSTONE_REGION_THREE}/${GLOBAL_INJECTED_OPENSTACK_KEYSTONE_API_VERSION_REGION_THREE} mso_id=${GLOBAL_INJECTED_OPENSTACK_USERNAME_REGION_THREE} mso_pass=${GLOBAL_INJECTED_OPENSTACK_SO_ENCRYPTED_PASSWORD_REGION_THREE} admin_tenant=${GLOBAL_INJECTED_OPENSTACK_TENANT_ID_REGION_THREE} member_role=admin identity_server_type=KEYSTONE_V3 authentication_type=USERNAME_PASSWORD project_domain_name=${GLOBAL_INJECTED_OPENSTACK_PROJECT_DOMAIN_REGION_THREE} user_domain_name=${GLOBAL_INJECTED_OPENSTACK_USER_DOMAIN_REGION_THREE} + ${auth}= Create List ${GLOBAL_SO_CATDB_USERNAME} ${GLOBAL_SO_PASSWORD} SO.Upsert Cloud Configuration ${GLOBAL_SO_CATDB_ENDPOINT} ${GLOBAL_SO_CLOUD_CONFIG_PATH} ${GLOBAL_TEMPLATE_FOLDER} ${GLOBAL_SO_CLOUD_CONFIG_TEMPLATE} ${arguments} auth=${auth} 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 - ${auth}= Create List ${GLOBAL_MSO_CATDB_USERNAME} ${GLOBAL_MSO_PASSWORD} + ${auth}= Create List ${GLOBAL_SO_CATDB_USERNAME} ${GLOBAL_SO_PASSWORD} ${get_resp}= SO.Get Cloud Configuration ${GLOBAL_SO_CATDB_ENDPOINT} ${GLOBAL_SO_CLOUD_CONFIG_PATH} ${GLOBAL_INJECTED_REGION} auth=${auth} Should Be Equal As Strings ${get_resp.status_code} 200
\ No newline at end of file diff --git a/robot/testsuites/demo.robot b/robot/testsuites/demo.robot index 75a9f161..b60921d3 100644 --- a/robot/testsuites/demo.robot +++ b/robot/testsuites/demo.robot @@ -4,7 +4,6 @@ Documentation Executes the VNF Orchestration Test cases including setup and te Library ONAPLibrary.SO WITH NAME SO Library Collections Resource ../resources/demo_preload.robot -Resource ../resources/asdc_interface.robot *** Variables *** @@ -32,7 +31,7 @@ Initialize Customer And Models Initialize SO Openstack Identity For V3 [Tags] InitDemo ${arguments}= Create Dictionary site_name=${GLOBAL_INJECTED_REGION} region_id=${GLOBAL_INJECTED_REGION} clli=${GLOBAL_INJECTED_REGION} identity_id=DEFAULT_KEYSTONE identity_url=${GLOBAL_INJECTED_KEYSTONE}/${GLOBAL_INJECTED_OPENSTACK_KEYSTONE_API_VERSION} mso_id=${GLOBAL_INJECTED_OPENSTACK_USERNAME} mso_pass=${GLOBAL_INJECTED_OPENSTACK_SO_ENCRYPTED_PASSWORD} admin_tenant=${GLOBAL_INJECTED_OPENSTACK_TENANT_ID} member_role=admin identity_server_type=KEYSTONE_V3 authentication_type=USERNAME_PASSWORD project_domain_name=${GLOBAL_INJECTED_OPENSTACK_DOMAIN_ID} user_domain_name=${GLOBAL_INJECTED_OPENSTACK_USER_DOMAIN} - ${auth}= Create List ${GLOBAL_MSO_CATDB_USERNAME} ${GLOBAL_MSO_PASSWORD} + ${auth}= Create List ${GLOBAL_SO_CATDB_USERNAME} ${GLOBAL_SO_PASSWORD} Run Keyword If '${GLOBAL_INJECTED_OPENSTACK_KEYSTONE_API_VERSION}'=='v3' SO.Upsert Cloud Configuration ${GLOBAL_SO_CATDB_ENDPOINT} ${GLOBAL_SO_CLOUD_CONFIG_PATH} ${GLOBAL_TEMPLATE_FOLDER} ${GLOBAL_SO_CLOUD_CONFIG_TEMPLATE} ${arguments} auth=${auth} Initialize Customer diff --git a/robot/testsuites/health-check.robot b/robot/testsuites/health-check.robot index 13b049cf..b1a48892 100644 --- a/robot/testsuites/health-check.robot +++ b/robot/testsuites/health-check.robot @@ -9,7 +9,7 @@ Resource ../resources/aai/aai_interface.robot Resource ../resources/vid/vid_interface.robot Resource ../resources/policy_interface.robot Library ONAPLibrary.SO WITH NAME SO -Resource ../resources/asdc_interface.robot +Resource ../resources/sdc_interface.robot Resource ../resources/appc_interface.robot Resource ../resources/portal_interface.robot Resource ../resources/mr_interface.robot @@ -186,7 +186,7 @@ Basic Portal Health Check Basic SDC Health Check [Tags] health core health-sdc - Run ASDC Health Check + Run SDC Health Check Basic SDNC Health Check [Tags] health core health-sdnc @@ -195,7 +195,7 @@ Basic SDNC Health Check Basic SO Health Check [Tags] health core health-so SO.Run Get Request ${GLOBAL_SO_APIHAND_ENDPOINT} ${GLOBAL_SO_HEALTH_CHECK_PATH} - SO.Run Get Request ${GLOBAL_SO_ASDCHAND_ENDPOINT} ${GLOBAL_SO_HEALTH_CHECK_PATH} + SO.Run Get Request ${GLOBAL_SO_SDCHAND_ENDPOINT} ${GLOBAL_SO_HEALTH_CHECK_PATH} SO.Run Get Request ${GLOBAL_SO_BPMN_ENDPOINT} ${GLOBAL_SO_HEALTH_CHECK_PATH} SO.Run Get Request ${GLOBAL_SO_CATDB_ENDPOINT} ${GLOBAL_SO_HEALTH_CHECK_PATH} SO.Run Get Request ${GLOBAL_SO_OPENSTACK_ENDPOINT} ${GLOBAL_SO_HEALTH_CHECK_PATH} diff --git a/robot/testsuites/model-distribution-vcpe.robot b/robot/testsuites/model-distribution-vcpe.robot index eee3af91..6bbde68c 100644 --- a/robot/testsuites/model-distribution-vcpe.robot +++ b/robot/testsuites/model-distribution-vcpe.robot @@ -1,5 +1,5 @@ *** Settings *** -Documentation Testing asdc. +Documentation Testing sdc. Library OperatingSystem Library RequestsLibrary Library Collections diff --git a/robot/testsuites/model-distribution.robot b/robot/testsuites/model-distribution.robot index 0bdb997c..b2f0ff3f 100644 --- a/robot/testsuites/model-distribution.robot +++ b/robot/testsuites/model-distribution.robot @@ -1,5 +1,5 @@ *** Settings *** -Documentation Testing asdc. +Documentation Testing sdc. Library OperatingSystem Library RequestsLibrary Library Collections diff --git a/robot/testsuites/update_onap_page.robot b/robot/testsuites/update_onap_page.robot index 08c958fb..b197d16c 100644 --- a/robot/testsuites/update_onap_page.robot +++ b/robot/testsuites/update_onap_page.robot @@ -33,7 +33,7 @@ Update ONAP Page Set To Dictionary ${oam_ip_map} ${GLOBAL_INJECTED_AAI2_IP_ADDR}=aai2 Set To Dictionary ${oam_ip_map} ${GLOBAL_INJECTED_APPC_IP_ADDR}=appc Set To Dictionary ${oam_ip_map} ${GLOBAL_INJECTED_DCAE_IP_ADDR}=dcae_controller - Set To Dictionary ${oam_ip_map} ${GLOBAL_INJECTED_SO_IP_ADDR}=mso + Set To Dictionary ${oam_ip_map} ${GLOBAL_INJECTED_SO_IP_ADDR}=so Set To Dictionary ${oam_ip_map} ${GLOBAL_INJECTED_MR_IP_ADDR}=message_router Set To Dictionary ${oam_ip_map} ${GLOBAL_INJECTED_BC_IP_ADDR}=bus_controller Set To Dictionary ${oam_ip_map} ${GLOBAL_INJECTED_POLICY_IP_ADDR}=policy |