From: Allain Legacy Date: Wed, 12 Feb 2025 13:09:36 +0000 (-0500) Subject: Remove assumptions about vendor values X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F67%2F14167%2F2;p=it%2Ftest.git Remove assumptions about vendor values This removes assumptions made about vendor-specific contents in description and extension attributes. The specification documents do not define the contents of extension or description fields; therefore, the tests should not look for any specific values beyond checking for their presence. It also removes tests steps related to specific types of resources that are not defined in the test specification document. Specifically, 7.3.2 steps s14 to s18 are not a part of the test specification document Issue-ID: INT-168 Change-Id: I7e1686c7487ce7b2fd75e303f88d41b3b6c48cc5 Signed-off-by: Allain Legacy --- 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..a1ed275 100644 --- 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 @@ -308,334 +308,7 @@ s13, query Resource detail # Clear Expectations log ${res} level=DEBUG Integer response status 200 - ${description} output $.description - should contain ${description} hostname: - should contain ${description} id: - should contain ${description} personality: - should contain ${description} subfunctions: - should contain ${description} max_cpu_mhz_allowed: - should contain ${description} install_state: - should contain ${description} operational: - should contain ${description} availability: - should contain ${description} administrative: - should contain ${description} boot_device: - should contain ${description} mgmt_mac: - should contain ${description} clock_synchronization: - should contain ${description} rootfs_device: Object $.extensions - String $.extensions['hostname'] - Integer $.extensions['id'] - String $.extensions['personality'] - # String $.extensions['max_cpu_mhz_allowed'] - # String $.extensions['install_state'] - String $.extensions['operational'] - String $.extensions['availability'] - String $.extensions['administrative'] - String $.extensions['boot_device'] - String $.extensions['rootfs_device'] - String $.extensions['subfunctions'] - String $.extensions['mgmt_mac'] - String $.extensions['clock_synchronization'] - - BREAK - END - - -s14, query Resource detail of an accelerator - [documentation] This test case verifies Query OCloud Resource Detail of an accelerator - [tags] ORAN_Compliance ORAN_O2 ORAN_O2IMS ORAN_O2IMS_Inventory - Clear Expectations - GET ${ORAN_O2IMS_ENDPOINT}/o2ims-infrastructureInventory/v1/resourceTypes?filter=(eq,name,pserver_acc) - ${resourceTypeId} output $[0].resourceTypeId - GET ${ORAN_O2IMS_ENDPOINT}/o2ims-infrastructureInventory/v1/resourcePools - @{resourcePools} output $ - FOR ${resourcePool} IN @{resourcePools} - # ${resourcePoolId} output $[0].resourcePoolId - ${resourcePoolId} input ${resourcePool}[resourcePoolId] - - Clear Expectations - GET ${ORAN_O2IMS_ENDPOINT}/o2ims-infrastructureInventory/v1/resourcePools/${resourcePoolId}/resources?filter=(eq,resourceTypeId,${resourceTypeId}) - @{resources} output $ - ${length1}= Get Length ${resources} - IF ${length1} == 0 - log "resourcePool with id: ${resourcePoolId} has no resource of accelerator" - CONTINUE - END - ${resourceId} output $[0].resourceId - - Expect Response Body ${CURDIR}/schemas/resource_allfields_properties.json - ${res} GET ${ORAN_O2IMS_ENDPOINT}/o2ims-infrastructureInventory/v1/resourcePools/${resourcePoolId}/resources/${resourceId}?all_fields - - # Output Schema response body ${CURDIR}/schemas/.output/resource_properties.json - # Clear Expectations - log ${res} level=DEBUG - Integer response status 200 - Object response body - ${description} output $.description - should contain ${description} name: - should contain ${description} pdevice: - should contain ${description} pciaddr: - should contain ${description} pvendor_id: - should contain ${description} pvendor: - should contain ${description} pclass_id: - should contain ${description} pclass: - should contain ${description} psvendor: - should contain ${description} psdevice: - should contain ${description} sriov_totalvfs: - should contain ${description} sriov_numvfs: - should contain ${description} numa_node: - # should contain ${description} name: - # should contain ${description} class: - # should contain ${description} vendor: - Object $.extensions - String $.extensions['name'] - String $.extensions['pdevice'] - String $.extensions['pciaddr'] - String $.extensions['pvendor_id'] - String $.extensions['pvendor'] - String $.extensions['pclass_id'] - String $.extensions['pclass'] - String $.extensions['psvendor'] - String $.extensions['psdevice'] - # Integer $.extensions['sriov_totalvfs'] - Integer $.extensions['sriov_numvfs'] - Integer $.extensions['numa_node'] - - BREAK - END - -s15, query Resource detail of an cpu - [documentation] This test case verifies Query OCloud Resource Detail of an cpu - [tags] ORAN_Compliance ORAN_O2 ORAN_O2IMS ORAN_O2IMS_Inventory - Clear Expectations - GET ${ORAN_O2IMS_ENDPOINT}/o2ims-infrastructureInventory/v1/resourceTypes?filter=(eq,name,pserver_cpu) - ${resourceTypeId} output $[0].resourceTypeId - GET ${ORAN_O2IMS_ENDPOINT}/o2ims-infrastructureInventory/v1/resourcePools - @{resourcePools} output $ - FOR ${resourcePool} IN @{resourcePools} - # ${resourcePoolId} output $[0].resourcePoolId - ${resourcePoolId} input ${resourcePool}[resourcePoolId] - - Clear Expectations - GET ${ORAN_O2IMS_ENDPOINT}/o2ims-infrastructureInventory/v1/resourcePools/${resourcePoolId}/resources?filter=(eq,resourceTypeId,${resourceTypeId}) - @{resources} output $ - ${length1}= Get Length ${resources} - IF ${length1} == 0 - log "resourcePool with id: ${resourcePoolId} has no resource of accelerator" - CONTINUE - END - ${resourceId} output $[0].resourceId - - Expect Response Body ${CURDIR}/schemas/resource_allfields_properties.json - ${res} GET ${ORAN_O2IMS_ENDPOINT}/o2ims-infrastructureInventory/v1/resourcePools/${resourcePoolId}/resources/${resourceId}?all_fields - - # Output Schema response body ${CURDIR}/schemas/.output/resource_properties.json - # Clear Expectations - log ${res} level=DEBUG - Integer response status 200 - Object response body - ${description} output $.description - should contain ${description} core: - should contain ${description} thread: - should contain ${description} allocated_function: - should contain ${description} numa_node: - should contain ${description} cpu_model: - should contain ${description} cpu_family: - should contain ${description} cpu: - Object $.extensions - Integer $.extensions['cpu'] - Integer $.extensions['core'] - Integer $.extensions['thread'] - String $.extensions['allocated_function'] - Integer $.extensions['numa_node'] - String $.extensions['cpu_model'] - String $.extensions['cpu_family'] - - BREAK - END - - -s16, query Resource detail of an interface - [documentation] This test case verifies Query OCloud Resource Detail of an interface - [tags] ORAN_Compliance ORAN_O2 ORAN_O2IMS ORAN_O2IMS_Inventory - Clear Expectations - GET ${ORAN_O2IMS_ENDPOINT}/o2ims-infrastructureInventory/v1/resourceTypes?filter=(eq,name,pserver_if) - ${resourceTypeId} output $[0].resourceTypeId - GET ${ORAN_O2IMS_ENDPOINT}/o2ims-infrastructureInventory/v1/resourcePools - @{resourcePools} output $ - FOR ${resourcePool} IN @{resourcePools} - # ${resourcePoolId} output $[0].resourcePoolId - ${resourcePoolId} input ${resourcePool}[resourcePoolId] - - Clear Expectations - GET ${ORAN_O2IMS_ENDPOINT}/o2ims-infrastructureInventory/v1/resourcePools/${resourcePoolId}/resources?filter=(eq,resourceTypeId,${resourceTypeId}) - @{resources} output $ - ${length1}= Get Length ${resources} - IF ${length1} == 0 - log "resourcePool with id: ${resourcePoolId} has no resource of accelerator" - CONTINUE - END - ${resourceId} output $[0].resourceId - - Expect Response Body ${CURDIR}/schemas/resource_allfields_properties.json - ${res} GET ${ORAN_O2IMS_ENDPOINT}/o2ims-infrastructureInventory/v1/resourcePools/${resourcePoolId}/resources/${resourceId}?all_fields - - # Output Schema response body ${CURDIR}/schemas/.output/resource_properties.json - # Clear Expectations - log ${res} level=DEBUG - Integer response status 200 - Object response body - ${description} output $.description - should contain ${description} ifname: - should contain ${description} iftype: - should contain ${description} imac: - should contain ${description} vlan_id: - should contain ${description} imtu: - should contain ${description} ifclass: - should contain ${description} uses: - should contain ${description} max_tx_rate: - should contain ${description} sriov_vf_driver: - should contain ${description} sriov_numvfs: - should contain ${description} ptp_role: - Object $.extensions - String $.extensions['ifname'] - String $.extensions['iftype'] - String $.extensions['imac'] - # Integer $.extensions['vlan_id'] - Integer $.extensions['imtu'] - # String $.extensions['ifclass'] - # String $.extensions['uses'] - # Integer $.extensions['max_tx_rate'] - # String $.extensions['sriov_vf_driver'] - # Integer $.extensions['sriov_numvfs'] - # String $.extensions['ptp_role'] - - BREAK - END - - -s17, query Resource detail of a memory - [documentation] This test case verifies Query OCloud Resource Detail of a memory - [tags] ORAN_Compliance ORAN_O2 ORAN_O2IMS ORAN_O2IMS_Inventory - Clear Expectations - GET ${ORAN_O2IMS_ENDPOINT}/o2ims-infrastructureInventory/v1/resourceTypes?filter=(eq,name,pserver_mem) - ${resourceTypeId} output $[0].resourceTypeId - GET ${ORAN_O2IMS_ENDPOINT}/o2ims-infrastructureInventory/v1/resourcePools - @{resourcePools} output $ - FOR ${resourcePool} IN @{resourcePools} - # ${resourcePoolId} output $[0].resourcePoolId - ${resourcePoolId} input ${resourcePool}[resourcePoolId] - - Clear Expectations - GET ${ORAN_O2IMS_ENDPOINT}/o2ims-infrastructureInventory/v1/resourcePools/${resourcePoolId}/resources?filter=(eq,resourceTypeId,${resourceTypeId}) - @{resources} output $ - ${length1}= Get Length ${resources} - IF ${length1} == 0 - log "resourcePool with id: ${resourcePoolId} has no resource of accelerator" - CONTINUE - END - ${resourceId} output $[0].resourceId - - Expect Response Body ${CURDIR}/schemas/resource_allfields_properties.json - ${res} GET ${ORAN_O2IMS_ENDPOINT}/o2ims-infrastructureInventory/v1/resourcePools/${resourcePoolId}/resources/${resourceId}?all_fields - - # Output Schema response body ${CURDIR}/schemas/.output/resource_properties.json - # Clear Expectations - log ${res} level=DEBUG - Integer response status 200 - Object response body - ${description} output $.description - should contain ${description} memtotal_mib: - should contain ${description} memavail_mib: - should contain ${description} vm_hugepages_use_1G: - should contain ${description} vm_hugepages_possible_1G: - should contain ${description} hugepages_configured: - should contain ${description} vm_hugepages_avail_1G: - should contain ${description} vm_hugepages_nr_1G: - should contain ${description} vm_hugepages_nr_4K: - should contain ${description} vm_hugepages_nr_2M: - should contain ${description} numa_node: - should contain ${description} vm_hugepages_possible_2M: - should contain ${description} vm_hugepages_avail_2M: - should contain ${description} platform_reserved_mib: - Object $.extensions - Integer $.extensions['memtotal_mib'] - Integer $.extensions['memavail_mib'] - # String $.extensions['vm_hugepages_use_1G'] - Integer $.extensions['vm_hugepages_possible_1G'] - # String $.extensions['hugepages_configured'] - Integer $.extensions['vm_hugepages_avail_1G'] - Integer $.extensions['vm_hugepages_nr_1G'] - Integer $.extensions['vm_hugepages_nr_4K'] - Integer $.extensions['vm_hugepages_nr_2M'] - Integer $.extensions['vm_hugepages_possible_2M'] - Integer $.extensions['vm_hugepages_avail_2M'] - Integer $.extensions['platform_reserved_mib'] - Integer $.extensions['numa_node'] - - BREAK - END - -s18, query Resource detail of an ethernet port - [documentation] This test case verifies Query OCloud Resource Detail of an ethernet port - [tags] ORAN_Compliance ORAN_O2 ORAN_O2IMS ORAN_O2IMS_Inventory - Clear Expectations - GET ${ORAN_O2IMS_ENDPOINT}/o2ims-infrastructureInventory/v1/resourceTypes?filter=(eq,name,pserver_ethernet) - ${resourceTypeId} output $[0].resourceTypeId - GET ${ORAN_O2IMS_ENDPOINT}/o2ims-infrastructureInventory/v1/resourcePools - @{resourcePools} output $ - FOR ${resourcePool} IN @{resourcePools} - # ${resourcePoolId} output $[0].resourcePoolId - ${resourcePoolId} input ${resourcePool}[resourcePoolId] - - Clear Expectations - GET ${ORAN_O2IMS_ENDPOINT}/o2ims-infrastructureInventory/v1/resourcePools/${resourcePoolId}/resources?filter=(eq,resourceTypeId,${resourceTypeId}) - @{resources} output $ - ${length1}= Get Length ${resources} - IF ${length1} == 0 - log "resourcePool with id: ${resourcePoolId} has no resource of accelerator" - CONTINUE - END - ${resourceId} output $[0].resourceId - - Expect Response Body ${CURDIR}/schemas/resource_allfields_properties.json - ${res} GET ${ORAN_O2IMS_ENDPOINT}/o2ims-infrastructureInventory/v1/resourcePools/${resourcePoolId}/resources/${resourceId}?all_fields - - # Output Schema response body ${CURDIR}/schemas/.output/resource_properties.json - # Clear Expectations - log ${res} level=DEBUG - Integer response status 200 - Object response body - ${description} output $.description - should contain ${description} name: - should contain ${description} pdevice: - should contain ${description} pciaddr: - should contain ${description} mac: - should contain ${description} dev_id: - should contain ${description} pclass: - should contain ${description} psvendor: - should contain ${description} psdevice: - should contain ${description} sriov_totalvfs: - should contain ${description} sriov_numvfs: - should contain ${description} numa_node: - should contain ${description} capabilities: - should contain ${description} type: - should contain ${description} driver: - Object $.extensions - String $.extensions['name'] - String $.extensions['pdevice'] - String $.extensions['pciaddr'] - String $.extensions['mac'] - Integer $.extensions['dev_id'] - String $.extensions['pclass'] - String $.extensions['psvendor'] - String $.extensions['psdevice'] - # Integer $.extensions['sriov_totalvfs'] - Integer $.extensions['sriov_numvfs'] - Integer $.extensions['numa_node'] - # Integer $.extensions['capabilities'] - String $.extensions['type'] - String $.extensions['driver'] BREAK END diff --git a/test_scripts/O2IMS_Compliance_Test/o2ims_compliance/7.3.4_SMO_succeeds_to_create_alarmSubscription_receive_alarm_notification_and_query_alarm_list.robot b/test_scripts/O2IMS_Compliance_Test/o2ims_compliance/7.3.4_SMO_succeeds_to_create_alarmSubscription_receive_alarm_notification_and_query_alarm_list.robot index 78ab701..8531608 100644 --- a/test_scripts/O2IMS_Compliance_Test/o2ims_compliance/7.3.4_SMO_succeeds_to_create_alarmSubscription_receive_alarm_notification_and_query_alarm_list.robot +++ b/test_scripts/O2IMS_Compliance_Test/o2ims_compliance/7.3.4_SMO_succeeds_to_create_alarmSubscription_receive_alarm_notification_and_query_alarm_list.robot @@ -217,18 +217,6 @@ s1, create alarmSubscription Integer response status 200 Object response body Object $.extensions - # Boolean $.extensions['mgmt_affecting'] - String $.extensions['alarm_state'] - # Boolean $.extensions['degrade_affecting'] - # Boolean $.extensions['service_affecting'] - String $.extensions['alarm_type'] - String $.extensions['entity_type_id'] - String $.extensions['probable_cause'] - String $.extensions['alarm_id'] - String $.extensions['entity_instance_id'] - String $.extensions['proposed_repair_action'] - # Boolean $.extensions['suppression'] - String $.extensions['suppression_status'] # s8, delete the alarmSubscription # [documentation] This test case verifies Query OCloud resourcePools with filter