Fixes [INT-154] Multiple tests configured with static name for a resourceType called...

    Issue-ID: INT-154

Change-Id: Ic893dfba83f240ccf8318a63f132dc8020d49180
Signed-off-by: Alberto Losada <alosadag@redhat.com>

diff --git a/test_scripts/O2IMS_Compliance_Test/o2ims_compliance/7.3.2_SMO_succeeds_to_query_inventory_with_O2ims_APIs_and_correct_token.robot b/test_scripts/O2IMS_Compliance_Test/o2ims_compliance/7.3.2_SMO_succeeds_to_query_inventory_with_O2ims_APIs_and_correct_token.robot
index b585b16..8d9d10d 100644 (file)
--- a/test_scripts/O2IMS_Compliance_Test/o2ims_compliance/7.3.2_SMO_succeeds_to_query_inventory_with_O2ims_APIs_and_correct_token.robot
+++ b/test_scripts/O2IMS_Compliance_Test/o2ims_compliance/7.3.2_SMO_succeeds_to_query_inventory_with_O2ims_APIs_and_correct_token.robot
@@ -15,6 +15,7 @@ ${globalLocationId}         ${ocloud.oran_o2_app.g_location_id}
 
 ${ORAN_O2IMS_ENDPOINT}  ${ocloud.oran_o2_app.api.protocol}://${ORAN_HOST_EXTERNAL_IP}:${ORAN_SERVICE_NODE_PORT}
 ${ORAN_O2IMS_ENDPOINT_DEFAULT_PORT}  ${ocloud.oran_o2_app.api.protocol}://${ORAN_HOST_EXTERNAL_IP}
+${RESOURCETYPE_NAME}        ${ocloud.oran_o2_app.resourcetype_name}
 
 *** Test Cases ***
 s1, query o-cloud detail
@@ -76,7 +77,7 @@ s3, query resource type list with filters
     [tags]  ORAN_Compliance     ORAN_O2     ORAN_O2IMS    ORAN_O2IMS_Inventory
     # Clear Expectations
     Expect Response Body        ${CURDIR}/schemas/resourceTypes_properties.json
-    ${res}     GET   ${ORAN_O2IMS_ENDPOINT}/o2ims-infrastructureInventory/v1/resourceTypes?filter=(eq,name,pserver)
+    ${res}     GET   ${ORAN_O2IMS_ENDPOINT}/o2ims-infrastructureInventory/v1/resourceTypes?filter=(eq,name,${RESOURCETYPE_NAME})
     Clear Expectations
     log      ${res}   level=DEBUG
     Integer     response status    200
@@ -104,7 +105,7 @@ s5, query Resource Type detail
     [documentation]  This test case verifies Query OCloud resourceTypes detail
     [tags]  ORAN_Compliance     ORAN_O2     ORAN_O2IMS    ORAN_O2IMS_Inventory
     Clear Expectations
-    GET   ${ORAN_O2IMS_ENDPOINT}/o2ims-infrastructureInventory/v1/resourceTypes?filter=(eq,name,pserver)
+    GET   ${ORAN_O2IMS_ENDPOINT}/o2ims-infrastructureInventory/v1/resourceTypes?filter=(eq,name,${RESOURCETYPE_NAME})
     ${resourceTypeId}      output   $[0].resourceTypeId
     # Clear Expectations
     Expect Response Body        ${CURDIR}/schemas/resourceType_properties.json
@@ -226,7 +227,7 @@ s11, query Resource list of a Resource Pool with filter
     [documentation]  This test case verifies Query OCloud Resource list with filter
     [tags]  ORAN_Compliance     ORAN_O2     ORAN_O2IMS    ORAN_O2IMS_Inventory
     Clear Expectations
-    GET   ${ORAN_O2IMS_ENDPOINT}/o2ims-infrastructureInventory/v1/resourceTypes?filter=(eq,name,pserver)
+    GET   ${ORAN_O2IMS_ENDPOINT}/o2ims-infrastructureInventory/v1/resourceTypes?filter=(eq,name,${RESOURCETYPE_NAME})
     ${resourceTypeId}      output   $[0].resourceTypeId
     Clear Expectations
     GET   ${ORAN_O2IMS_ENDPOINT}/o2ims-infrastructureInventory/v1/resourcePools
@@ -250,7 +251,7 @@ s12, query Resource list of a Resource Pool with selector
     [documentation]  This test case verifies query Resource list of a Resource Pool with selector
     [tags]  ORAN_Compliance     ORAN_O2     ORAN_O2IMS    ORAN_O2IMS_Inventory
     Clear Expectations
-    GET   ${ORAN_O2IMS_ENDPOINT}/o2ims-infrastructureInventory/v1/resourceTypes?filter=(eq,name,pserver)
+    GET   ${ORAN_O2IMS_ENDPOINT}/o2ims-infrastructureInventory/v1/resourceTypes?filter=(eq,name,${RESOURCETYPE_NAME})
     ${resourceTypeId}      output   $[0].resourceTypeId
     Clear Expectations
     GET   ${ORAN_O2IMS_ENDPOINT}/o2ims-infrastructureInventory/v1/resourcePools
@@ -270,10 +271,10 @@ s12, query Resource list of a Resource Pool with selector
     END
 
 s13, query Resource detail
-    [documentation]  This test case verifies Query OCloud Resource Detail of pserver
+    [documentation]  This test case verifies Query OCloud Resource Detail of ${RESOURCETYPE_NAME}
     [tags]  ORAN_Compliance     ORAN_O2     ORAN_O2IMS    ORAN_O2IMS_Inventory
     Clear Expectations
-    GET   ${ORAN_O2IMS_ENDPOINT}/o2ims-infrastructureInventory/v1/resourceTypes?filter=(eq,name,pserver)
+    GET   ${ORAN_O2IMS_ENDPOINT}/o2ims-infrastructureInventory/v1/resourceTypes?filter=(eq,name,${RESOURCETYPE_NAME})
     ${resourceTypeId}      output   $[0].resourceTypeId
     GET   ${ORAN_O2IMS_ENDPOINT}/o2ims-infrastructureInventory/v1/resourcePools
     @{resourcePools}     output  $

diff --git a/test_scripts/O2IMS_Compliance_Test/o2ims_compliance/7.3.6_SMO_gets_405_while_sending_O2ims_APIs_with_unsupported_method.robot b/test_scripts/O2IMS_Compliance_Test/o2ims_compliance/7.3.6_SMO_gets_405_while_sending_O2ims_APIs_with_unsupported_method.robot
index 202c086..5dbc978 100644 (file)
--- a/test_scripts/O2IMS_Compliance_Test/o2ims_compliance/7.3.6_SMO_gets_405_while_sending_O2ims_APIs_with_unsupported_method.robot
+++ b/test_scripts/O2IMS_Compliance_Test/o2ims_compliance/7.3.6_SMO_gets_405_while_sending_O2ims_APIs_with_unsupported_method.robot
@@ -14,6 +14,7 @@ ${SMO_TOKEN_DATA}           ${ocloud.oran_o2_app.smo_token_data}
 ${globalLocationId}         ${ocloud.oran_o2_app.g_location_id}
 
 ${ORAN_O2IMS_ENDPOINT}  ${ocloud.oran_o2_app.api.protocol}://${ORAN_HOST_EXTERNAL_IP}:${ORAN_SERVICE_NODE_PORT}
+${RESOURCETYPE_NAME}        ${ocloud.oran_o2_app.resourcetype_name}
 
 
 *** Test Cases ***
@@ -64,7 +65,7 @@ s1, Operate resourceTypes with unsupported method
     Integer  response status    405
     Object   response body
 
-    GET   ${ORAN_O2IMS_ENDPOINT}/o2ims-infrastructureInventory/v1/resourceTypes?filter=(eq,name,pserver)
+    GET   ${ORAN_O2IMS_ENDPOINT}/o2ims-infrastructureInventory/v1/resourceTypes?filter=(eq,name,${RESOURCETYPE_NAME})
     ${resourceTypeId}      output   $[0].resourceTypeId
     ${res}     PUT   ${ORAN_O2IMS_ENDPOINT}/o2ims-infrastructureInventory/v1/resourceTypes/${resourceTypeId}
     # Clear Expectations

diff --git a/test_scripts/O2IMS_Compliance_Test/test_configs.yaml b/test_scripts/O2IMS_Compliance_Test/test_configs.yaml
index 99f2a78..41237b7 100644 (file)
--- a/test_scripts/O2IMS_Compliance_Test/test_configs.yaml
+++ b/test_scripts/O2IMS_Compliance_Test/test_configs.yaml
@@ -12,6 +12,7 @@ ocloud:
     g_ocloud_id: 18f2dc90-b375-47dd-b8dc-ae80072e6cdb\r
     smo_token_data: put_smo_token_data_here\r
     deploymentmanager_name: put_deploymentmanager_name_here\r
+    resourcetype_name: put_resourcetype_name_here\r
     api:\r
       host: 192.168.112.15\r
       node_port: 30205\r