1 files changed, 58 insertions, 58 deletions
diff --git a/robot/testsuites/health-check.robot b/robot/testsuites/health-check.robot
index 44b71e7b..d75bcd82 100644
--- a/robot/testsuites/health-check.robot
+++ b/robot/testsuites/health-check.robot
@@ -21,130 +21,130 @@ Resource          ../resources/test_templates/model_test_template.robot
 
 
 *** Test Cases ***
+Basic A&AI Health Check
+    [Tags]    health    core
+    Run A&AI Health Check
+
+Basic APPC Health Check
+    [Tags]    health    core
+    Run APPC Health Check
+
+Basic CLAMP Health Check
+    [Tags]    health    core
+    Run CLAMP Health Check
+
 Basic DCAE Health Check
     [Tags]    health    dcae
     Run DCAE Health Check
 
-Basic SDNGC Health Check
+Basic DMAAP Message Router Health Check
     [Tags]    health    core
-    Run SDNGC Health Check
+    Run MR Health Check
 
-Basic A&AI Health Check
+Basic Microservice Bus Health Check
     [Tags]    health    core
-    Run A&AI Health Check
+    Run MSB Health Check
 
-Basic Policy Health Check
-    [Tags]    health    core
-    Run Policy Health Check
+Basic Multicloud API Health Check
+    [Tags]    health    multicloud
+    Run MSB Get Request  /api/multicloud/v0/swagger.json
 
-Basic MSO Health Check
-    [Tags]    health    core
-    Run MSO Health Check
+Basic Multicloud-ocata API Health Check
+    [Tags]    health    multicloud
+    Run MSB Get Request  /api/multicloud-ocata/v0/swagger.json
 
-Basic ASDC Health Check
-    [Tags]    health    core
-    Run ASDC Health Check
+Basic Multicloud-titanium_cloud API Health Check
+    [Tags]    health    multicloud
+    Run MSB Get Request  /api/multicloud-titanium_cloud/v0/swagger.json
 
-Basic APPC Health Check
+Basic Multicloud-vio API Health Check
+     [Tags]    health    multicloud
+     Run MSB Get Request  /api/multicloud-vio/v0/swagger.json
+
+Basic Policy Health Check
     [Tags]    health    core
-    Run APPC Health Check
+    Run Policy Health Check
 
 Basic Portal Health Check
     [Tags]    health    core
     Run Portal Health Check
 
-Basic Message Router Health Check
+Basic SDC Health Check
     [Tags]    health    core
-    Run MR Health Check
+    Run ASDC Health Check
 
-Basic VID Health Check
+Basic SDNC Health Check
     [Tags]    health    core
-    Run VID Health Check
+    Run SDNGC Health Check
 
-Basic Microservice Bus Health Check
+Basic SO Health Check
     [Tags]    health    core
-    Run MSB Health Check
+    Run MSO Health Check
 
-Basic CLAMP Health Check
-    [Tags]    health    core
-    Run CLAMP Health Check
+Basic UseCaseUI API Health Check
+     [Tags]    health    api
+     Run MSB Get Request  /iui/usecaseui/
 
-catalog API Health Check
+Basic VFC catalog API Health Check
     [Tags]    health    api
     Run MSB Get Request  /api/catalog/v1/swagger.json
 
-emsdriver API Health Check
+Basic VFC emsdriver API Health Check
     [Tags]    health    3rdparty
     Run MSB Get Request  /api/emsdriver/v1/swagger.json
 
-gvnfmdriver API Health Check
+Basic VFC gvnfmdriver API Health Check
     [Tags]    health    3rdparty
     Run MSB Get Request  /api/gvnfmdriver/v1/swagger.json
 
-huaweivnfmdriver API Health Check
+Basic VFC huaweivnfmdriver API Health Check
     [Tags]    health    3rdparty
     Run MSB Get Request  /api/huaweivnfmdriver/v1/swagger.json
 
-multicloud API Health Check
-    [Tags]    health    multicloud
-    Run MSB Get Request  /api/multicloud/v0/swagger.json
-
-multicloud-ocata API Health Check
-    [Tags]    health    multicloud
-    Run MSB Get Request  /api/multicloud-ocata/v0/swagger.json
-
-multicloud-titanium_cloud API Health Check
-    [Tags]    health    multicloud
-    Run MSB Get Request  /api/multicloud-titanium_cloud/v0/swagger.json
-
-multicloud-vio API Health Check
-     [Tags]    health    multicloud
-     Run MSB Get Request  /api/multicloud-vio/v0/swagger.json
-
-nokiavnfmdriver API Health Check
+Basic VFC nokiavnfmdriver API Health Check
      [Tags]    health    3rdparty
      Run MSB Get Request  /api/nokiavnfmdriver/v1/swagger.json
 
-nokiav2driver API Health Check
+Basic VFC nokiav2driver API Health Check
      [Tags]    health    3rdparty
      Run MSB Get Request  /api/NokiaSVNFM/v1/swagger.json
 
-nslcm API Health Check
+Basic VFC nslcm API Health Check
      [Tags]    health    api
      Run MSB Get Request  /api/nslcm/v1/swagger.json
 
-resmgr API Health Check
+Basic VFC resmgr API Health Check
      [Tags]    health    api
      Run MSB Get Request  /api/resmgr/v1/swagger.json
 
-usecaseui-gui API Health Check
-     [Tags]    health    api
-     Run MSB Get Request  /iui/usecaseui/
-
-vnflcm API Health Check
+Basic VFC vnflcm API Health Check
      [Tags]    health    api
      Run MSB Get Request  /api/vnflcm/v1/swagger.json
 
-vnfmgr API Health Check
+Basic VFC vnfmgr API Health Check
      [Tags]    health    api
      Run MSB Get Request  /api/vnfmgr/v1/swagger.json
 
-vnfres API Health Check
+Basic VFC vnfres API Health Check
      [Tags]    health    api
      Run MSB Get Request  /api/vnfres/v1/swagger.json
 
-workflow API Health Check
+Basic VFC workflow API Health Check
      [Tags]    health    api
      Run MSB Get Request  /api/workflow/v1/swagger.json
 
-ztesdncdriver API Health Check
+Basic VFC ztesdncdriver API Health Check
      [Tags]    health    3rdparty
      Run MSB Get Request  /api/ztesdncdriver/v1/swagger.json
 
-ztevnfmdriver API Health Check
+Basic VFC ztevnfmdriver API Health Check
      [Tags]    health    3rdparty
      Run MSB Get Request  /api/ztevnfmdriver/v1/swagger.json
 
+Basic VID Health Check
+    [Tags]    health    core
+    Run VID Health Check
+
 Health Distribution Test
     [Tags]    healthdist
     [Timeout]   240