upgrade to python3 libraries

[testsuite.git] / robot / resources / so_interface.robot

diff --git a/robot/resources/so_interface.robot b/robot/resources/so_interface.robot
index 0378caf..0bb4f49 100644 (file)
--- a/robot/resources/so_interface.robot
+++ b/robot/resources/so_interface.robot
@@ -17,22 +17,24 @@ ${SO_OPENSTACK_ENDPOINT}     ${GLOBAL_MSO_SERVER_PROTOCOL}://${GLOBAL_INJECTED_S
 ${SO_REQDB_ENDPOINT}     ${GLOBAL_MSO_SERVER_PROTOCOL}://${GLOBAL_INJECTED_SO_REQDB_IP_ADDR}:${GLOBAL_MSO_REQDB_SERVER_PORT}
 ${SO_SDNC_ENDPOINT}     ${GLOBAL_MSO_SERVER_PROTOCOL}://${GLOBAL_INJECTED_SO_SDNC_IP_ADDR}:${GLOBAL_MSO_SDNC_SERVER_PORT}
 ${SO_VFC_ENDPOINT}     ${GLOBAL_MSO_SERVER_PROTOCOL}://${GLOBAL_INJECTED_SO_VFC_IP_ADDR}:${GLOBAL_MSO_VFC_SERVER_PORT}
+${SO_VNFM_ENDPOINT}     ${GLOBAL_MSO_SERVER_PROTOCOL}://${GLOBAL_INJECTED_SO_VNFM_IP_ADDR}:${GLOBAL_MSO_VNFM_SERVER_PORT}
 
 *** Keywords ***
 Run SO Global Health Check
-    Run SO Container Health Check    API_HANDLER  ${SO_APIHAND_ENDPOINT}     
-    Run SO Container Health Check    ASDC_HANDLER  ${SO_ASDCHAND_ENDPOINT}     
-    Run SO Container Health Check    BPMN_INFRA    ${SO_BPMN_ENDPOINT}     
-    Run SO Container Health Check    CATALOG_DB    ${SO_CATDB_ENDPOINT}     
-    Run SO Container Health Check    OPENSTACK_INFRA   ${SO_OPENSTACK_ENDPOINT}     
-    Run SO Container Health Check    REQUEST_DB    ${SO_REQDB_ENDPOINT}     
-    Run SO Container Health Check    SDNC_INFRA  ${SO_SDNC_ENDPOINT}     
-    Run SO Container Health Check    VFC_INFRA  ${SO_VFC_ENDPOINT}     
+    Run SO Container Health Check    API_HANDLER  ${SO_APIHAND_ENDPOINT}
+    Run SO Container Health Check    ASDC_HANDLER  ${SO_ASDCHAND_ENDPOINT}
+    Run SO Container Health Check    BPMN_INFRA    ${SO_BPMN_ENDPOINT}
+    Run SO Container Health Check    CATALOG_DB    ${SO_CATDB_ENDPOINT}
+    Run SO Container Health Check    OPENSTACK_INFRA   ${SO_OPENSTACK_ENDPOINT}
+    Run SO Container Health Check    REQUEST_DB    ${SO_REQDB_ENDPOINT}
+    Run SO Container Health Check    SDNC_INFRA  ${SO_SDNC_ENDPOINT}
+    Run SO Container Health Check    VFC_INFRA  ${SO_VFC_ENDPOINT}
+    Run SO Container Health Check    VNFM_INFRA  ${SO_VNFM_ENDPOINT}
 
 
 Run SO Container Health Check
     [Documentation]    Runs an MSO global health check
-    [Arguments]    ${so_endpoint_label}    ${so_endpoint}  
+    [Arguments]    ${so_endpoint_label}    ${so_endpoint}
     ${auth}=  Create List  ${GLOBAL_MSO_USERNAME}    ${GLOBAL_MSO_PASSWORD}
     ${session}=    Create Session      mso     ${so_endpoint}
     ${uuid}=    Generate UUID
@@ -41,7 +43,7 @@ Run SO Container Health Check
     Should Be Equal As Strings         ${resp.status_code}     200
 
 Run MSO Get ModelInvariantId
-    [Documentation]    Runs an MSO Get ModelInvariantID for ClosedLoop Polieis 
+    [Documentation]    Runs an MSO Get ModelInvariantID for ClosedLoop Policies
     [Arguments]    ${service_model_name}   ${vf_module_label}=NULL
     ${param_dict}=    Create Dictionary    serviceModelName    ${service_model_name}
     ${param}=   Evaluate   urllib.urlencode(${param_dict})    urllib
@@ -55,8 +57,9 @@ Run MSO Get ModelInvariantId
     \    Log    ${ELEMENT['vfModules']}
     \    ${model_invariant_id}  Set Variable If   ('${vf_module_label}' in '${ELEMENT['vfModules'][0]['vfModuleLabel']}')   ${ELEMENT['modelInfo']['modelInvariantUuid']}  NULL
     \    Exit For Loop If  '${model_invariant_id}' != 'NULL'
+    Should Not Be Equal As Strings    ${model_invariant_id}    NULL
     [Return]   ${model_invariant_id}
-    
+
 Run MSO Get Request
     [Documentation]    Runs an MSO get request
     [Arguments]    ${data_path}    ${accept}=application/json