Update naming of Robot Healthcheck

Update the naming of the Basic Health Check so we can
easily associate their name to an ONAP project.

Change-Id: Icfb9756edbacf3371d110f2f104944f1ebe502b1
Issue-ID: INT-462
Signed-off-by: Gildas Lanilis <gildas.lanilis@huawei.com>
diff --git a/robot/testsuites/health-check.robot b/robot/testsuites/health-check.robot
index 9d049ef..e2b647c 100644
--- a/robot/testsuites/health-check.robot
+++ b/robot/testsuites/health-check.robot
@@ -34,6 +34,10 @@
     [Tags]    health    core
     Run APPC Health Check
 
+Basic CLI Health Check
+    [Tags]    health    core
+    Run CLI Health Check
+
 Basic CLAMP Health Check
     [Tags]    health    core
     Run CLAMP Health Check
@@ -46,6 +50,22 @@
     [Tags]    health    core
     Run MR Health Check
 
+Basic External API NBI Health Check
+    [Tags]    health    externalapi    api
+    Run NBI Health Check
+
+Basic Log Elasticsearch Health Check
+    [Tags]    health    core
+    Run Log Elasticsearch Health Check
+
+Basic Log Kibana Health Check
+    [Tags]    health    core
+    Run Log Kibana Health Check
+
+Basic Log Logstash Health Check
+    [Tags]    health    core
+    Run Log Logstash Health Check
+    
 Basic Microservice Bus Health Check
     [Tags]    health    core
     Run MSB Health Check
@@ -102,6 +122,10 @@
     [Tags]    health    3rdparty
     Run MSB Get Request  /api/gvnfmdriver/v1/swagger.json
 
+Basic VFC huaweivnfmdriver API Health Check
+    [Tags]    health    3rdparty
+    Run MSB Get Request  /api/huaweivnfmdriver/v1/swagger.json
+
 Basic VFC jujuvnfmdriver API Health Check
     [Tags]    health    3rdparty
     Run MSB Get Request  /api/jujuvnfmdriver/v1/swagger.json
@@ -110,10 +134,6 @@
     [Tags]    health    3rdparty
     Run MSB Get Request  /api/multivimproxy/v1/swagger.json
 
-Basic VFC huaweivnfmdriver API Health Check
-    [Tags]    health    3rdparty
-    Run MSB Get Request  /api/huaweivnfmdriver/v1/swagger.json
-
 Basic VFC nokiavnfmdriver API Health Check
      [Tags]    health    3rdparty
      Run MSB Get Request  /api/nokiavnfmdriver/v1/swagger.json
@@ -158,6 +178,10 @@
     [Tags]    health    core
     Run VID Health Check
 
+Basic VNFSDK Health Check
+    [Tags]    health    core
+    Run VNFSDK Health Check
+
 Health Distribution Test
     [Tags]    healthdist
     [Timeout]   240
@@ -170,29 +194,4 @@
 Portal Application Access Tests
     [Tags]    healthportalapp
     [Timeout]   180
-    Run Portal Application Access Tests
-
-Basic NBI Health Check
-    [Tags]    health    externalapi    api
-    Run NBI Health Check
-
-Basic CLI Health Check
-    [Tags]    health    core
-    Run CLI Health Check
-
-Basic VNFSDK Health Check
-    [Tags]    health    core
-    Run VNFSDK Health Check
-
-Basic Log Elasticsearch Health Check
-    [Tags]    health    core
-    Run Log Elasticsearch Health Check
-
-Basic Log Logstash Health Check
-    [Tags]    health    core
-    Run Log Logstash Health Check
-
-Basic Log Kibana Health Check
-    [Tags]    health    core
-    Run Log Kibana Health Check
-
+    Run Portal Application Access Tests
\ No newline at end of file