1 files changed, 61 insertions, 101 deletions
diff --git a/robot/testsuites/health-check.robot b/robot/testsuites/health-check.robot
index dda2fbc4..a5f2ee1f 100644
--- a/robot/testsuites/health-check.robot
+++ b/robot/testsuites/health-check.robot
@@ -32,43 +32,43 @@ Resource          ../resources/holmes_interface.robot
 
 *** Test Cases ***
 Basic A&AI Health Check
-    [Tags]    health    core
+    [Tags]    health    core  dev-aai
     Run A&AI Health Check
 
 Basic AAF Health Check
-    [Tags]    health    small
+    [Tags]    health    small  dev-aaf
     Run AAF Health Check
 
-Basic AAF SMS Health Check
+Basic AAF SMS Health Check    dev-aaf
     [Tags]    health    small
     Run SMS Health Check
 
 Basic APPC Health Check
-    [Tags]    health    small
+    [Tags]    health    small   dev-appc
     Run APPC Health Check
 
 Basic CLI Health Check
-    [Tags]    health    small
+    [Tags]    health    small  dev-cli
     Run CLI Health Check
 
 Basic CLAMP Health Check
-    [Tags]    health    medium
+    [Tags]    health    medium  dev-clamp
     Run CLAMP Health Check
 
 Basic DCAE Health Check
-    [Tags]    health    medium
+    [Tags]    health    medium   dev-dcae
     Run DCAE Health Check
 
 Basic DMAAP Data Router Health Check
-    [Tags]    health    datarouter
+    [Tags]    health    datarouter   dev-dmaap
     Run DR Health Check
 
 Basic DMAAP Message Router Health Check
-    [Tags]    health    core
+    [Tags]    health    core  dev-dmaap
     Run MR Health Check
 
 Basic DMAAP Message Router PubSub Health Check
-    [Tags]    healthmr
+    [Tags]    healthmr    dev-dmaap
     [Timeout]   30
     Run MR PubSub Health Check
 
@@ -77,200 +77,200 @@ Basic External API NBI Health Check
     Run NBI Health Check
 
 Basic Log Elasticsearch Health Check
-    [Tags]    health    small    oom
+    [Tags]    health    small    oom   dev-log
     Run Log Elasticsearch Health Check
 
 Basic Log Kibana Health Check
-    [Tags]    health    small    oom
+    [Tags]    health    small    oom   dev-log
     Run Log Kibana Health Check
 
 Basic Log Logstash Health Check
-    [Tags]    health    small    oom
+    [Tags]    health    small    oom   dev-log
     Run Log Logstash Health Check
 
 Basic Microservice Bus Health Check
-    [Tags]    health    small
+    [Tags]    health    small  dev-msb
     Run MSB Health Check
 
 Basic Multicloud API Health Check
-    [Tags]    health    multicloud    small
+    [Tags]    health    multicloud    small  dev-multicloud
     Run MSB Get Request    /api/multicloud/v0/swagger.json
 
 Basic Multicloud-ocata API Health Check
-    [Tags]    health    multicloud    small
+    [Tags]    health    multicloud    small   dev-multicloud
     Run MSB Get Request    /api/multicloud-ocata/v0/swagger.json
 
 Basic Multicloud-pike API Health Check
-    [Tags]    health    multicloud    small
+    [Tags]    health    multicloud    small   dev-multicloud
     Run MSB Get Request    /api/multicloud-pike/v0/swagger.json
 
 Basic Multicloud-starlingx API Health Check
-    [Tags]    health    multicloud
+    [Tags]    health    multicloud   dev-multicloud
     Run MSB Get Request    /api/multicloud-starlingx/v0/swagger.json
 
 Basic Multicloud-titanium_cloud API Health Check
-    [Tags]    health    multicloud
+    [Tags]    health    multicloud   dev-multicloud
     Run MSB Get Request    /api/multicloud-titaniumcloud/v1/swagger.json
 
 Basic Multicloud-vio API Health Check
-    [Tags]    health    multicloud
+    [Tags]    health    multicloud   dev-multicloud
     Run MSB Get Request    /api/multicloud-vio/v0/swagger.json
 
 Basic MUSIC Health Check
-    [Tags]    health    music
+    [Tags]    health    music   dev-common
     Run MUSIC Health Check
 
 Basic MUSIC Cassa Check
-    [Tags]    health    music
+    [Tags]    health    music   dev-common
     Run MUSIC Cassandra Connection Check
 
 Basic OOF-Homing Health Check
-    [Tags]    health    medium
+    [Tags]    health    medium   dev-oof
     Run OOF-Homing Health Check
 
 Basic OOF-SNIRO Health Check
-    [Tags]    health    medium
+    [Tags]    health    medium  dev-oof
     Run OOF-SNIRO Health Check
 
 Basic OOF-CMSO Health Check
-    [Tags]    health    medium
+    [Tags]    health    medium  dev-oof
     Run OOF-CMSO Health Check
 
 Basic Policy Health Check
-    [Tags]    health    medium
+    [Tags]    health    medium   dev-policy
     Run Policy Health Check
 
 Basic Pomba AAI-context-builder Health Check
-    [Tags]    health    oom
+    [Tags]    health    oom   dev-pomba
     Run Pomba Aai Context Builder Health Check
 
 Basic Pomba SDC-context-builder Health Check
-    [Tags]    health    oom
+    [Tags]    health    oom   dev-pomba
     Run Pomba Sdc Context Builder Health Check
 
 Basic Pomba Network-discovery-context-builder Health Check
-    [Tags]    health    oom
+    [Tags]    health    oom   dev-pomba
     Run Pomba Network Discovery Context Builder Health Check
 
 Basic Pomba Service-Decomposition Health Check
-    [Tags]    health    oom
+    [Tags]    health    oom   dev-pomba
     Run Pomba Service Decomposition Health Check
 
 Basic Pomba Network-Discovery-MicroService Health Check
-    [Tags]    health    oom
+    [Tags]    health    oom  dev-pomba
     Run Pomba Network Discovery MicroService Health Check
 
 Basic Pomba Pomba-Kibana Health Check
-    [Tags]    health    oom
+    [Tags]    health    oom   dev-pomba
     Run Pomba Kibana Health Check
 
 Basic Pomba Elastic-Search Health Check
-    [Tags]    health    oom
+    [Tags]    health    oom   dev-pomba
     Run Pomba Elastic Search Health Check
 
 Basic Pomba Sdnc-Context-Builder Health Check
-    [Tags]    health    oom
+    [Tags]    health    oom   dev-pomba
     Run Pomba Sdnc Context Builder Health Check
 
 Basic Pomba Context-Aggregator Health Check
-    [Tags]    health    oom
+    [Tags]    health    oom   dev-pomba
     Run Pomba Context Aggregator Health Check
 
 Basic Portal Health Check
-    [Tags]    health    core
+    [Tags]    health    core   dev-portal
     Run Portal Health Check
 
 Basic SDC Health Check
-    [Tags]    health    core
+    [Tags]    health    core   dev-sdc
     Run ASDC Health Check
 
 Basic SDNC Health Check
-    [Tags]    health    core
+    [Tags]    health    core   dev-sdnc
     Run SDNGC Health Check
 
 Basic SO Health Check
-    [Tags]    health    core
+    [Tags]    health    core   dev-so
     Run SO Global Health Check
 
 Basic UseCaseUI API Health Check
-    [Tags]    health    api    medium
+    [Tags]    health    api    medium   dev-uui
     Run MSB Get Request    /iui/usecaseui/
 
 Basic VFC catalog API Health Check
-    [Tags]    health    api
+    [Tags]    health    api   dev-vfc
     Run MSB Get Request    /api/catalog/v1/swagger.json
 
 Basic VFC emsdriver API Health Check
-    [Tags]    health    3rdparty
+    [Tags]    health    3rdparty  dev-vfc
     Run MSB Get Request    /api/emsdriver/v1/swagger.json
 
 Basic VFC gvnfmdriver API Health Check
-    [Tags]    health    3rdparty
+    [Tags]    health    3rdparty   dev-vfc
     Run MSB Get Request    /api/gvnfmdriver/v1/swagger.json
 
 Basic VFC huaweivnfmdriver API Health Check
-    [Tags]    health    3rdparty
+    [Tags]    health    3rdparty   dev-vfc
     Run MSB Get Request    /api/huaweivnfmdriver/v1/swagger.json
 
 Basic VFC jujuvnfmdriver API Health Check
-    [Tags]    health    3rdparty
+    [Tags]    health    3rdparty   dev-vfc
     Run MSB Get Request    /api/jujuvnfmdriver/v1/swagger.json
 
 Basic VFC multivimproxy API Health Check
-    [Tags]    health    3rdparty
+    [Tags]    health    3rdparty   dev-vfc
     Run MSB Get Request    /api/multivimproxy/v1/swagger.json
 
 Basic VFC nokiavnfmdriver API Health Check
-    [Tags]    health    3rdparty
+    [Tags]    health    3rdparty   dev-vfc
     Run MSB Get Request    /api/nokiavnfmdriver/v1/swagger.json
 
 Basic VFC nokiav2driver API Health Check
-    [Tags]    health    3rdparty
+    [Tags]    health    3rdparty   dev-vfc
     Run MSB Get Request    /api/NokiaSVNFM/v1/swagger.json
 
 Basic VFC nslcm API Health Check
-    [Tags]    health    api
+    [Tags]    health    api   dev-vfc
     Run MSB Get Request    /api/nslcm/v1/swagger.json
 
 Basic VFC resmgr API Health Check
-    [Tags]    health    api
+    [Tags]    health    api  dev-vfc
     Run MSB Get Request    /api/resmgr/v1/swagger.json
 
 Basic VFC vnflcm API Health Check
-    [Tags]    health    api
+    [Tags]    health    api  dev-vfc
     Run MSB Get Request    /api/vnflcm/v1/swagger.json
 
 Basic VFC vnfmgr API Health Check
-    [Tags]    health    api
+    [Tags]    health    api  dev-vfc
     Run MSB Get Request    /api/vnfmgr/v1/swagger.json
 
 Basic VFC vnfres API Health Check
-    [Tags]    health    api
+    [Tags]    health    api   dev-vfc
     Run MSB Get Request    /api/vnfres/v1/swagger.json
 
 Basic VFC workflow API Health Check
-    [Tags]    health    api
+    [Tags]    health    api   dev-vfc
     Run MSB Get Request    /api/workflow/v1/swagger.json
 
 Basic VFC ztesdncdriver API Health Check
-    [Tags]    health    3rdparty
+    [Tags]    health    3rdparty   dev-vfc
     Run MSB Get Request    /api/ztesdncdriver/v1/swagger.json
 
 Basic VFC ztevnfmdriver API Health Check
-    [Tags]    health    3rdparty
+    [Tags]    health    3rdparty   dev-vfc
     Run MSB Get Request    /api/ztevnfmdriver/v1/swagger.json
 
 Basic VID Health Check
-    [Tags]    health    small
+    [Tags]    health    small  dev-vid
     Run VID Health Check
 
 Basic VNFSDK Health Check
-    [Tags]    health
+    [Tags]    health    dev-vnfsdk
     Run VNFSDK Health Check
 
 Health Distribution Test
     [Tags]    healthdist
-    [Timeout]    600
+    [Timeout]    1200
     Model Distribution For Directory    vFW
 
 Portal Login Tests
@@ -283,49 +283,9 @@ Portal Application Access Tests
     Run Portal Application Access Tests
 
 Basic Holmes Rule Management API Health Check
-    [Tags]    health    medium
+    [Tags]    health    medium   dev-dcae
     Run Holmes Rule Mgmt Health Check
 
 Basic Holmes Engine Management API Health Check
-    [Tags]    health    medium
+    [Tags]    health    medium   dev-dcae
     Run Holmes Engine Mgmt Health Check
-
-#Basic VVP ICE CI Container (Automat Testing) Health Check
-#    [Tags]    oom
-#    Run VVP ICE CI Container (Automat Testing) Health Check
-
-#Basic VVP CMS Health Check
-#    [Tags]    oom
-#    Run VVP CMS Health Check
-
-#Basic VVP Engagement Manager Health Check
-#    [Tags]    oom
-#    Run VVP Engagement Manager Health Check
-
-#Basic VVP Ext HA Proxy Health Check
-#    [Tags]    oom
-#    Run VVP Ext HA Proxy Health Check
-
-#Basic VVP Gitlab Health Check
-#    [Tags]    oom
-#    Run VVP Gitlab Health Check
-
-#Basic VVP Image Scanner Health Check
-#    [Tags]    oom
-#    Run VVP Image Scanner Health Check
-
-#Basic VVP Int HA Proxy Health Check
-#    [Tags]    oom
-#    Run VVP Int HA Proxy Health Check
-
-#Basic VVP Jenkins Health Check
-#    [Tags]    oom
-#    Run VVP Jenkins Health Check
-
-#Basic VVP Postgresql Health Check
-#    [Tags]    oom
-#    Run VVP Postgresql Health Check
-
-#Basic VVP Redis Health Check
-#    [Tags]    oom
-#    Run VVP Redis Health Check