CORD-1676: Realign XOS tests
Change-Id: I3439134427476a2be66eea482f9232b17f6fbb6b
diff --git a/src/test/cord-api/Tests/Ch_MultiInstanceTest.txt b/src/test/cord-api/Tests/Ch_MultiInstanceTest.txt
index 29be1cc..b0df06a 100644
--- a/src/test/cord-api/Tests/Ch_MultiInstanceTest.txt
+++ b/src/test/cord-api/Tests/Ch_MultiInstanceTest.txt
@@ -87,34 +87,37 @@
${voltDict}= Get From Dictionary ${voltTenantDict} voltTenant
${c_tag}= Get From Dictionary ${voltDict} c_tag
${postResult}= restApi.ApiPost VOLT_TENANT ${voltDict}
- Sleep 10
+ Sleep 30
# Verifying GET operation after POST
${get_result}= restApi.ApiGet VOLT_TENANT
${get_result_list}= Get From Dictionary ${get_result} items
${getJsonDict}= utils.getDictFromListofDict ${get_result_list} c_tag ${c_tag}
+ Log ${getJsonDict}
${test_result}= utils.compare_dict ${voltDict} ${getJsonDict}
Should Be True ${test_result}
${Volt_Id}= Get From Dictionary ${getJsonDict} id
+ ${provided_links_ids_list}= utils.getFieldValueFromDict ${getJsonDict} provided_links_ids
+ Log ${provided_links_ids_list}
+ ${provided_links_ids}= Get From List ${provided_links_ids_list} 0
+ Log ${provided_links_ids}
+ # Get subscribed_links_ids from volttenant
${subscribed_links_ids_list}= utils.getFieldValueFromDict ${getJsonDict} subscribed_links_ids
- Log ${subscribed_links_ids_list}
${subscribed_links_ids}= Get From List ${subscribed_links_ids_list} 0
- Log ${subscribed_links_ids}
- # Retrieve service links using provide links ID
- ${getServiceLink}= restApi.ApiChameleonGet CH_CORE_SERVICELINK ${subscribed_links_ids}
+ # Retrieve service links using provided links ID
+ ${getServiceLink}= restApi.ApiChameleonGet CH_CORE_SERVICELINK ${provided_links_ids}
${provider_service_instance_id}= Get From Dictionary ${getServiceLink} provider_service_instance_id
# Update the subscriber_service_instance_id to the required subscriber_id to establish desired link
${serviceDict}= Create Dictionary subscriber_service_instance_id=${Subscriber_Id}
- ${result}= restApi.ApiChameleonPut CH_CORE_SERVICELINK ${serviceDict} ${subscribed_links_ids}
- Sleep 10
+ ${result}= restApi.ApiChameleonPut CH_CORE_SERVICELINK ${serviceDict} ${provided_links_ids}
+ Sleep 30
Should Be True ${result}
# Validation of Instances
Log ${instanceList}
- #Log ${getJsonDict}
- #${VSGTenantList}= Get From Dictionary ${getJsonDict} subscribed_tenants_ids
- #Log ${VSGTenantList}
- #${VSGTenant}= Get From List ${VSGTenantList} 0
- #${getVSG_result}= restApi.ApiChameleonGet VSG_TENANT ${VSGTenant}
- ${getVSG_result}= restApi.ApiChameleonGet VSG_TENANT ${provider_service_instance_id}
+ ${serviceLinkDict}= restApi.ApiChameleonGet CH_CORE_SERVICELINK ${subscribed_links_ids}
+ Log ${serviceLinkDict}
+ ${VSGTenant}= Get From Dictionary ${serviceLinkDict} provider_service_instance_id
+ # Retrieve VSGTenant to retrieve instance_id
+ ${getVSG_result}= restApi.ApiChameleonGet VSG_TENANT ${VSGTenant}
${instance_id}= Get From Dictionary ${getVSG_result} instance_id
Append To List ${instanceList} ${instance_id}
Log ${instanceList}
diff --git a/src/test/cord-api/Tests/Ch_SingleInstanceTest.txt b/src/test/cord-api/Tests/Ch_SingleInstanceTest.txt
index 90f80b4..781f4e8 100644
--- a/src/test/cord-api/Tests/Ch_SingleInstanceTest.txt
+++ b/src/test/cord-api/Tests/Ch_SingleInstanceTest.txt
@@ -58,37 +58,61 @@
${subscriberList} = Get Variable Value ${slist}
${subscriberDict}= utils.listToDict ${subscriberList} ${listIndex}
${api_result}= restApi.ApiPost VOLT_SUBSCRIBER ${subscriberDict}
+ ${service_specific_id}= utils.getFieldValueFromDict ${subscriberDict} service_specific_id
+ ${json_result}= restApi.ApiGet VOLT_SUBSCRIBER
+ Log ${json_result}
+ ${json_result_list}= Get From Dictionary ${json_result} items
+ ${getJsonDict}= utils.getDictFromListOfDict ${json_result_list} service_specific_id ${service_specific_id}
+ ${result}= utils.compare_dict ${subscriberDict} ${getJsonDict}
+ Should Be True ${result}
${instanceList} Create List
Test Post volt Tenant Create
[Arguments] ${listIndex}
+ ${subscriberList} = Get Variable Value ${slist}
+ ${subscriberDict}= utils.listToDict ${subscriberList} ${listIndex}
+ ${service_specific_id}= utils.getFieldValueFromDict ${subscriberDict} service_specific_id
+ ${json_result}= restApi.ApiGet VOLT_SUBSCRIBER
+ Log ${json_result}
+ ${json_result_list}= Get From Dictionary ${json_result} items
+ ${getJsonDict}= utils.getDictFromListOfDict ${json_result_list} service_specific_id ${service_specific_id}
+ ${Subscriber_Id}= utils.getFieldValueFromDict ${getJsonDict} id
+ Log ${Subscriber_Id}
${voltTenantList} = Get Variable Value ${vlist}
${voltTenantDict}= utils.listToDict ${voltTenantList} ${listIndex}
${voltDict}= Get From Dictionary ${voltTenantDict} voltTenant
- ${service_specific_id}= Get From Dictionary ${voltTenantDict} service_specific_id
- ${get_result}= restApi.ApiGet VOLT_SUBSCRIBER
+ ${c_tag}= Get From Dictionary ${voltDict} c_tag
+ ${postResult}= restApi.ApiPost VOLT_TENANT ${voltDict}
+ Sleep 30
+ # Verifying GET operation after POST
+ ${get_result}= restApi.ApiGet VOLT_TENANT
${get_result_list}= Get From Dictionary ${get_result} items
- ${subscriberDict}= utils.getDictFromListofDict ${get_result_list} service_specific_id ${service_specific_id}
- ${subscriberID}= utils.getFieldValueFromDict ${subscriberDict} id
- ${updatedVoltDict}= utils.setFieldValueInDict ${voltDict} subscriber_root_id ${subscriberID}
- ${api_result}= restApi.ApiPost VOLT_TENANT ${updatedVoltDict}
- Should Be True ${api_result}
- # Verifying Get operation after POST
- Sleep 20
- ${getVolt_result}= restApi.ApiGet VOLT_TENANT
- Log ${getVolt_result}
- ${getVolt_result_list}= utils.getFieldValueFromDict ${getVolt_result} items
- Log ${getVolt_result_list}
- ${getJsonDict}= utils.getDictFromListOfDict ${getVolt_result_list} subscriber_root_id ${subscriberID}
+ ${getJsonDict}= utils.getDictFromListofDict ${get_result_list} c_tag ${c_tag}
Log ${getJsonDict}
${test_result}= utils.compare_dict ${voltDict} ${getJsonDict}
Should Be True ${test_result}
+ ${Volt_Id}= Get From Dictionary ${getJsonDict} id
+ ${provided_links_ids_list}= utils.getFieldValueFromDict ${getJsonDict} provided_links_ids
+ Log ${provided_links_ids_list}
+ ${provided_links_ids}= Get From List ${provided_links_ids_list} 0
+ Log ${provided_links_ids}
+ # Get subscribed_links_ids from volttenant
+ ${subscribed_links_ids_list}= utils.getFieldValueFromDict ${getJsonDict} subscribed_links_ids
+ ${subscribed_links_ids}= Get From List ${subscribed_links_ids_list} 0
+ # Retrieve service links using provided links ID
+ ${getServiceLink}= restApi.ApiChameleonGet CH_CORE_SERVICELINK ${provided_links_ids}
+ ${provider_service_instance_id}= Get From Dictionary ${getServiceLink} provider_service_instance_id
+ # Update the subscriber_service_instance_id to the required subscriber_id to establish desired link
+ ${serviceDict}= Create Dictionary subscriber_service_instance_id=${Subscriber_Id}
+ ${result}= restApi.ApiChameleonPut CH_CORE_SERVICELINK ${serviceDict} ${provided_links_ids}
+ Sleep 30
+ Should Be True ${result}
# Validation of Instances
Log ${instanceList}
- Log ${getJsonDict}
- ${VSGTenantList}= Get From Dictionary ${getJsonDict} subscribed_tenants_ids
- Log ${VSGTenantList}
- ${VSGTenant}= Get From List ${VSGTenantList} 0
+ ${serviceLinkDict}= restApi.ApiChameleonGet CH_CORE_SERVICELINK ${subscribed_links_ids}
+ Log ${serviceLinkDict}
+ ${VSGTenant}= Get From Dictionary ${serviceLinkDict} provider_service_instance_id
+ # Retrieve VSGTenant to retrieve instance_id
${getVSG_result}= restApi.ApiChameleonGet VSG_TENANT ${VSGTenant}
${instance_id}= Get From Dictionary ${getVSG_result} instance_id
Append To List ${instanceList} ${instance_id}
diff --git a/src/test/cord-api/Tests/Ch_SubscriberVolt_Delete.txt b/src/test/cord-api/Tests/Ch_SubscriberVolt_Delete.txt
index 3676c39..92f45cc 100644
--- a/src/test/cord-api/Tests/Ch_SubscriberVolt_Delete.txt
+++ b/src/test/cord-api/Tests/Ch_SubscriberVolt_Delete.txt
@@ -48,10 +48,13 @@
Log ${subscriberDict}
${subscriberId}= utils.getFieldValueFromDict ${subscriberDict} id
Log ${subscriberId}
+ ${subscribed_links_ids_list}= utils.getFieldValueFromDict ${subscriberDict} subscribed_links_ids
+ ${subscribed_links_ids}= Get From List ${subscribed_links_ids_list} 0
+ # Retrieve service links using service links ID
+ ${getServiceLink}= restApi.ApiChameleonGet CH_CORE_SERVICELINK ${subscribed_links_ids}
+ ${provider_service_instance_id}= Get From Dictionary ${getServiceLink} provider_service_instance_id
# Deletion of volt Tenants
- ${getVoltDict}= utils.getDictFromListOfDict ${getVoltTenant_result_list} subscriber_root_id ${subscriberId}
- ${voltID}= utils.getFieldValueFromDict ${getVoltDict} id
- ${volt_delete_result}= restApi.ApiChameleonDelete VOLT_TENANT ${voltID}
+ ${volt_delete_result}= restApi.ApiChameleonDelete VOLT_TENANT ${provider_service_instance_id}
Should Be True ${volt_delete_result}
#Deletion of Subscribers
${subscriber_delete_result}= restApi.ApiChameleonDelete VOLT_SUBSCRIBER ${subscriberId}
diff --git a/src/test/cord-api/Tests/data/Ch_MultiInstance_VoltTenant.json b/src/test/cord-api/Tests/data/Ch_MultiInstance_VoltTenant.json
index 7f92d41..f5f19de 100644
--- a/src/test/cord-api/Tests/data/Ch_MultiInstance_VoltTenant.json
+++ b/src/test/cord-api/Tests/data/Ch_MultiInstance_VoltTenant.json
@@ -3,24 +3,24 @@
{
"voltTenant" :
{
- "s_tag" : 115,
- "c_tag" : 222
+ "s_tag" : 404,
+ "c_tag" : 101
},
"service_specific_id" : "304"
},
{
"voltTenant" :
{
- "s_tag" : 116,
- "c_tag" : 333
+ "s_tag" : 505,
+ "c_tag" : 202
},
"service_specific_id" : "305"
},
{
"voltTenant" :
{
- "s_tag" : 117,
- "c_tag" : 444
+ "s_tag" : 606,
+ "c_tag" : 303
},
"service_specific_id" : "306"
}
diff --git a/src/test/cord-api/Tests/data/Ch_SingleInstance_VoltTenant.json b/src/test/cord-api/Tests/data/Ch_SingleInstance_VoltTenant.json
index 43c0500..622d9bd 100644
--- a/src/test/cord-api/Tests/data/Ch_SingleInstance_VoltTenant.json
+++ b/src/test/cord-api/Tests/data/Ch_SingleInstance_VoltTenant.json
@@ -3,27 +3,24 @@
{
"voltTenant" :
{
- "s_tag" : 115,
- "c_tag" : 222,
- "subscriber_root_id" : ""
+ "s_tag" : 415,
+ "c_tag" : 422
},
"service_specific_id" : "304"
},
{
"voltTenant" :
{
- "s_tag" : 115,
- "c_tag" : 333,
- "subscriber_root_id" : ""
+ "s_tag" : 415,
+ "c_tag" : 533
},
"service_specific_id" : "305"
},
{
"voltTenant" :
{
- "s_tag" : 115,
- "c_tag" : 444,
- "subscriber_root_id" : ""
+ "s_tag" : 415,
+ "c_tag" : 644
},
"service_specific_id" : "306"
}
diff --git a/src/test/cord-api/Tests/data/Ch_Subscriber.json b/src/test/cord-api/Tests/data/Ch_Subscriber.json
index d5e81a1..30661f6 100644
--- a/src/test/cord-api/Tests/data/Ch_Subscriber.json
+++ b/src/test/cord-api/Tests/data/Ch_Subscriber.json
@@ -7,7 +7,7 @@
"enable_uverse": true,
"status": "enabled",
"service_specific_id": "304",
- "name": "My House"
+ "name": "My House-304"
},
{
"cdn_enable": false,
diff --git a/src/test/cord-api/Tests/data/Ch_VoltTenant.json b/src/test/cord-api/Tests/data/Ch_VoltTenant.json
index c99f453..63f06e4 100644
--- a/src/test/cord-api/Tests/data/Ch_VoltTenant.json
+++ b/src/test/cord-api/Tests/data/Ch_VoltTenant.json
@@ -3,24 +3,24 @@
{
"voltTenant" :
{
- "s_tag" : 114,
- "c_tag" : 224
+ "s_tag" : 333,
+ "c_tag" : 888
},
"service_specific_id" : "304"
},
{
"voltTenant" :
{
- "s_tag" : 121,
- "c_tag" : 333
+ "s_tag" : 555,
+ "c_tag" : 999
},
"service_specific_id" : "305"
},
{
"voltTenant" :
{
- "s_tag" : 131,
- "c_tag" : 444
+ "s_tag" : 666,
+ "c_tag" : 661
},
"service_specific_id" : "306"
}