Namespace migration to open_cli_schema_version

CLI-3
Change-Id: I87d739c9c9b9f8e7724f1aa736a51b0fd91c30df
Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>

89 files changed, 95 insertions, 95 deletions

diff --git a/framework/src/main/java/org/onap/cli/fw/OnapCommand.java b/framework/src/main/java/org/onap/cli/fw/OnapCommand.java
index c65ca9a8..dc90314a 100644
--- a/framework/src/main/java/org/onap/cli/fw/OnapCommand.java
+++ b/framework/src/main/java/org/onap/cli/fw/OnapCommand.java
@@ -71,7 +71,7 @@ public abstract class OnapCommand {
     protected boolean isInitialzied = false;
 
     public String getSchemaVersion() {
-        return Constants.ONAP_CMD_SCHEMA_VERSION_VALUE;
+        return Constants.OPEN_CLI_SCHEMA_VERSION_VALUE;
     }
 
     /**
diff --git a/framework/src/main/java/org/onap/cli/fw/cmd/OnapHttpCommand.java b/framework/src/main/java/org/onap/cli/fw/cmd/OnapHttpCommand.java
index 9438102f..e3ec17de 100644
--- a/framework/src/main/java/org/onap/cli/fw/cmd/OnapHttpCommand.java
+++ b/framework/src/main/java/org/onap/cli/fw/cmd/OnapHttpCommand.java
@@ -48,7 +48,7 @@ public class OnapHttpCommand extends OnapCommand {
 
     @Override
     public String getSchemaVersion() {
-        return Constants.ONAP_CMD_SCHEMA_VERSION_VALUE;
+        return Constants.OPEN_CLI_SCHEMA_VERSION_VALUE;
     }
 
     public void setSuccessStatusCodes(List<Integer> successStatusCodes) {
diff --git a/framework/src/main/java/org/onap/cli/fw/conf/Constants.java b/framework/src/main/java/org/onap/cli/fw/conf/Constants.java
index 00bdb855..17b771c0 100644
--- a/framework/src/main/java/org/onap/cli/fw/conf/Constants.java
+++ b/framework/src/main/java/org/onap/cli/fw/conf/Constants.java
@@ -80,7 +80,7 @@ public class Constants {
 
     public static final String SCOPE = "scope";
 
-    public static final String ONAP_CMD_SCHEMA_VERSION_VALUE = "1.0";
+    public static final String OPEN_CLI_SCHEMA_VERSION_VALUE = "1.0";
     public static final String DESCRIPTION = "description";
     public static final String SERVICE = "service";
     public static final String PARAMETERS = "parameters";
@@ -90,7 +90,7 @@ public class Constants {
 
     public static final String RESULTS = "results";
 
-    public static final String ONAP_CMD_SCHEMA_VERSION = "onap_cmd_schema_version";
+    public static final String OPEN_CLI_SCHEMA_VERSION = "open_cli_schema_version";
     public static final String NAME = "name";
     public static final String VERSION = "version";
     public static final String BASE_PATH = "base_path";
diff --git a/framework/src/main/java/org/onap/cli/fw/error/OnapCommandInvalidSchemaVersion.java b/framework/src/main/java/org/onap/cli/fw/error/OnapCommandInvalidSchemaVersion.java
index 75530ab4..e330283f 100644
--- a/framework/src/main/java/org/onap/cli/fw/error/OnapCommandInvalidSchemaVersion.java
+++ b/framework/src/main/java/org/onap/cli/fw/error/OnapCommandInvalidSchemaVersion.java
@@ -25,7 +25,7 @@ public class OnapCommandInvalidSchemaVersion extends OnapCommandException {
     private static final long serialVersionUID = 4459731110721370387L;
 
     public OnapCommandInvalidSchemaVersion(String schemaVersion) {
-        super("0x0008", "Command schema onap_cmd_schema_version " + schemaVersion + " is invalid or missing");
+        super("0x0008", "Command schema open_cli_schema_version " + schemaVersion + " is invalid or missing");
     }
 
 }
diff --git a/framework/src/main/java/org/onap/cli/fw/utils/OnapCommandUtils.java b/framework/src/main/java/org/onap/cli/fw/utils/OnapCommandUtils.java
index f4fb7515..9b824d32 100644
--- a/framework/src/main/java/org/onap/cli/fw/utils/OnapCommandUtils.java
+++ b/framework/src/main/java/org/onap/cli/fw/utils/OnapCommandUtils.java
@@ -62,7 +62,7 @@ import static org.onap.cli.fw.conf.Constants.MODE;
 import static org.onap.cli.fw.conf.Constants.MODE_VALUES;
 import static org.onap.cli.fw.conf.Constants.MULTIPART_ENTITY_NAME;
 import static org.onap.cli.fw.conf.Constants.NAME;
-import static org.onap.cli.fw.conf.Constants.ONAP_CMD_SCHEMA_VERSION;
+import static org.onap.cli.fw.conf.Constants.OPEN_CLI_SCHEMA_VERSION;
 import static org.onap.cli.fw.conf.Constants.PARAMETERS;
 import static org.onap.cli.fw.conf.Constants.QUERIES;
 import static org.onap.cli.fw.conf.Constants.REQUEST;
@@ -200,8 +200,8 @@ public class OnapCommandUtils {
             throw new OnapCommandInvalidSchema(schemaName, e);
         }
         String schemaVersion = "";
-        if (values.keySet().contains(ONAP_CMD_SCHEMA_VERSION)) {
-            Object obj = values.get(ONAP_CMD_SCHEMA_VERSION);
+        if (values.keySet().contains(OPEN_CLI_SCHEMA_VERSION)) {
+            Object obj = values.get(OPEN_CLI_SCHEMA_VERSION);
             schemaVersion = obj.toString();
         }
 
@@ -1528,7 +1528,7 @@ public class OnapCommandUtils {
                         schema.setSchemaName(resource.getFilename());
                         schema.setSchemaURI(resource.getURI().toString());
                         schema.setCmdName((String) resourceMap.get(NAME));
-                        Object obj = resourceMap.get(ONAP_CMD_SCHEMA_VERSION);
+                        Object obj = resourceMap.get(OPEN_CLI_SCHEMA_VERSION);
                         schema.setVersion(obj.toString());
                         schema.setCmdVersion(resourceMap.get(Constants.VERSION).toString());
                         if (resourceMap.get(Constants.HTTP) != null) {
diff --git a/framework/src/main/resources/default_input_parameters.yaml b/framework/src/main/resources/default_input_parameters.yaml
index 3b7e198a..0503ff90 100644
--- a/framework/src/main/resources/default_input_parameters.yaml
+++ b/framework/src/main/resources/default_input_parameters.yaml
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 parameters:
   - name: onap-username
     type: string
diff --git a/framework/src/main/resources/onap-cli-schema/schema-refresh.yaml b/framework/src/main/resources/onap-cli-schema/schema-refresh.yaml
index 2cd90bcd..280dec36 100644
--- a/framework/src/main/resources/onap-cli-schema/schema-refresh.yaml
+++ b/framework/src/main/resources/onap-cli-schema/schema-refresh.yaml
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 name: schema-refresh
 description: Onap command to refresh schemas stored in onap_cli_schema folders.
 version: cli-1.0
diff --git a/framework/src/main/resources/onap-cli-schema/schema-validate.yaml b/framework/src/main/resources/onap-cli-schema/schema-validate.yaml
index 74abfdc4..5eb29f0b 100644
--- a/framework/src/main/resources/onap-cli-schema/schema-validate.yaml
+++ b/framework/src/main/resources/onap-cli-schema/schema-validate.yaml
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 name: schema-validate
 description: Onap command to validate schema
 version: cli-1.0
diff --git a/framework/src/main/resources/onap.properties b/framework/src/main/resources/onap.properties
index fc4dcb7d..285e5c8a 100644
--- a/framework/src/main/resources/onap.properties
+++ b/framework/src/main/resources/onap.properties
@@ -28,8 +28,8 @@ cli.http.basic.common_headers.sdc.user-id.value=${onap-username}
 #cli.service.auth=aaf
 
 #schema validation
-cli.schema.top_level_params_list=onap_cmd_schema_version,name,version,description,service,parameters,results,http
-cli.schema.top_level_mandatory_list=onap_cmd_schema_version
+cli.schema.top_level_params_list=open_cli_schema_version,name,version,description,service,parameters,results,http
+cli.schema.top_level_mandatory_list=open_cli_schema_version
 
 cli.schema.service_params_list=name,version,auth,mode
 cli.schema.service_params_mandatory_list=name,version
diff --git a/framework/src/test/java/org/onap/cli/fw/error/OnapCommandErrorTest.java b/framework/src/test/java/org/onap/cli/fw/error/OnapCommandErrorTest.java
index 0a388e5f..20402b0d 100644
--- a/framework/src/test/java/org/onap/cli/fw/error/OnapCommandErrorTest.java
+++ b/framework/src/test/java/org/onap/cli/fw/error/OnapCommandErrorTest.java
@@ -162,7 +162,7 @@ public class OnapCommandErrorTest {
     public void onapCommandInvalidSchemaVersionTest() {
         OnapCommandInvalidSchemaVersion failed = new OnapCommandInvalidSchemaVersion("1.0");
 
-        assertEquals("0x0008::Command schema onap_cmd_schema_version 1.0 is invalid or missing", failed.getMessage());
+        assertEquals("0x0008::Command schema open_cli_schema_version 1.0 is invalid or missing", failed.getMessage());
     }
 
     @Test
diff --git a/framework/src/test/java/org/onap/cli/fw/utils/OnapCommandUtilsTest.java b/framework/src/test/java/org/onap/cli/fw/utils/OnapCommandUtilsTest.java
index 5a992c6f..47ee2c7a 100644
--- a/framework/src/test/java/org/onap/cli/fw/utils/OnapCommandUtilsTest.java
+++ b/framework/src/test/java/org/onap/cli/fw/utils/OnapCommandUtilsTest.java
@@ -133,7 +133,7 @@ public class OnapCommandUtilsTest {
         try {
             map = OnapCommandUtils.validateSchemaVersion("sample-test-schema.yaml", "1.1");
         } catch (OnapCommandInvalidSchemaVersion e) {
-            assertEquals("0x0008::Command schema onap_cmd_schema_version 1.0 is invalid or missing", e.getMessage());
+            assertEquals("0x0008::Command schema open_cli_schema_version 1.0 is invalid or missing", e.getMessage());
         } catch (OnapCommandInvalidSchema e) {
             fail("Test should not have thrown this exception : " + e.getMessage());
         } catch (OnapCommandSchemaNotFound e) {
diff --git a/framework/src/test/resources/onap-cli-schema/sample-test1-schema-http.yaml b/framework/src/test/resources/onap-cli-schema/sample-test1-schema-http.yaml
index 0da1d22e..55e9326c 100644
--- a/framework/src/test/resources/onap-cli-schema/sample-test1-schema-http.yaml
+++ b/framework/src/test/resources/onap-cli-schema/sample-test1-schema-http.yaml
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 name: sample-test1
 description: Onap sample command to test the command features
 version: cli-1.0
diff --git a/framework/src/test/resources/onap-test-schema.yaml b/framework/src/test/resources/onap-test-schema.yaml
index 0a2f5c47..ef86348e 100644
--- a/framework/src/test/resources/onap-test-schema.yaml
+++ b/framework/src/test/resources/onap-test-schema.yaml
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 name: sample-test
 description: Onap sample command to test the command features
 verion: cli-1.0
diff --git a/framework/src/test/resources/onap.properties b/framework/src/test/resources/onap.properties
index 9e6b34bd..14639504 100644
--- a/framework/src/test/resources/onap.properties
+++ b/framework/src/test/resources/onap.properties
@@ -28,8 +28,8 @@ cli.http.basic.common_headers.sdc.user-id.value=${onap-username}
 #cli.service.auth=aaf
 
 #schema validation
-cli.schema.top_level_params_list=onap_cmd_schema_version,name,version,description,service,parameters,results,http
-cli.schema.top_level_mandatory_list=onap_cmd_schema_version
+cli.schema.top_level_params_list=open_cli_schema_version,name,version,description,service,parameters,results,http
+cli.schema.top_level_mandatory_list=open_cli_schema_version
 
 cli.schema.service_params_list=name,version,auth,mode
 cli.schema.service_params_mandatory_list=name,version
diff --git a/framework/src/test/resources/sample-test-exclude-param.yaml b/framework/src/test/resources/sample-test-exclude-param.yaml
index 970a185d..7aed55cf 100644
--- a/framework/src/test/resources/sample-test-exclude-param.yaml
+++ b/framework/src/test/resources/sample-test-exclude-param.yaml
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 default_parameters:
   exclude:
     - long
diff --git a/framework/src/test/resources/sample-test-import-def-param-false.yaml b/framework/src/test/resources/sample-test-import-def-param-false.yaml
index 438ad64d..2eb92ef3 100644
--- a/framework/src/test/resources/sample-test-import-def-param-false.yaml
+++ b/framework/src/test/resources/sample-test-import-def-param-false.yaml
@@ -1,2 +1,2 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 default_parameters:
diff --git a/framework/src/test/resources/sample-test-include-exclude.yaml b/framework/src/test/resources/sample-test-include-exclude.yaml
index 7a14f262..77d3211c 100644
--- a/framework/src/test/resources/sample-test-include-exclude.yaml
+++ b/framework/src/test/resources/sample-test-include-exclude.yaml
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 default_parameters:
   include:
     - onap-username
diff --git a/framework/src/test/resources/sample-test-include-param.yaml b/framework/src/test/resources/sample-test-include-param.yaml
index ecc737c7..18097129 100644
--- a/framework/src/test/resources/sample-test-include-param.yaml
+++ b/framework/src/test/resources/sample-test-include-param.yaml
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 default_parameters:
   include:
     - onap-username
diff --git a/framework/src/test/resources/sample-test-invalid-default-parameter.yaml b/framework/src/test/resources/sample-test-invalid-default-parameter.yaml
index ae20145a..242bdbfb 100644
--- a/framework/src/test/resources/sample-test-invalid-default-parameter.yaml
+++ b/framework/src/test/resources/sample-test-invalid-default-parameter.yaml
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 default_parameters:
   exclude:
     - invalid-param
diff --git a/framework/src/test/resources/sample-test-invalid-default-params-not-exist.yaml b/framework/src/test/resources/sample-test-invalid-default-params-not-exist.yaml
index 7e1f39e9..d8bea682 100644
--- a/framework/src/test/resources/sample-test-invalid-default-params-not-exist.yaml
+++ b/framework/src/test/resources/sample-test-invalid-default-params-not-exist.yaml
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 default_parameters:
   exclude:
     - invalid-param-1
\ No newline at end of file
diff --git a/framework/src/test/resources/sample-test-invalid-exclude-noauth.yaml b/framework/src/test/resources/sample-test-invalid-exclude-noauth.yaml
index 1de471c8..1a42b8d4 100644
--- a/framework/src/test/resources/sample-test-invalid-exclude-noauth.yaml
+++ b/framework/src/test/resources/sample-test-invalid-exclude-noauth.yaml
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 default_parameters:
   exclude:
     - onap-username
\ No newline at end of file
diff --git a/framework/src/test/resources/sample-test-invalid-include-noauth.yaml b/framework/src/test/resources/sample-test-invalid-include-noauth.yaml
index b80ac57f..2d53ab11 100644
--- a/framework/src/test/resources/sample-test-invalid-include-noauth.yaml
+++ b/framework/src/test/resources/sample-test-invalid-include-noauth.yaml
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 service:
   auth: none
 default_parameters:
diff --git a/framework/src/test/resources/sample-test-invalid-schema-duplicate-longoption.yaml b/framework/src/test/resources/sample-test-invalid-schema-duplicate-longoption.yaml
index a18aacc0..c7b018d3 100644
--- a/framework/src/test/resources/sample-test-invalid-schema-duplicate-longoption.yaml
+++ b/framework/src/test/resources/sample-test-invalid-schema-duplicate-longoption.yaml
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 name: sample-test
 description: Onap sample command to test the command features
 version: cli-1.0
diff --git a/framework/src/test/resources/sample-test-invalid-schema-duplicate-name.yaml b/framework/src/test/resources/sample-test-invalid-schema-duplicate-name.yaml
index 375f4548..f46a9759 100644
--- a/framework/src/test/resources/sample-test-invalid-schema-duplicate-name.yaml
+++ b/framework/src/test/resources/sample-test-invalid-schema-duplicate-name.yaml
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 name: sample-test
 description: Onap sample command to test the command features
 version: cli-1.0
diff --git a/framework/src/test/resources/sample-test-invalid-schema-duplicate-shortoption.yaml b/framework/src/test/resources/sample-test-invalid-schema-duplicate-shortoption.yaml
index 9c501452..4eb07be4 100644
--- a/framework/src/test/resources/sample-test-invalid-schema-duplicate-shortoption.yaml
+++ b/framework/src/test/resources/sample-test-invalid-schema-duplicate-shortoption.yaml
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 name: sample-test
 description: Onap sample command to test the command features
 version: cli-1.0
diff --git a/framework/src/test/resources/sample-test-invalid-schema.yaml b/framework/src/test/resources/sample-test-invalid-schema.yaml
index fc301bbd..036a2071 100644
--- a/framework/src/test/resources/sample-test-invalid-schema.yaml
+++ b/framework/src/test/resources/sample-test-invalid-schema.yaml
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 name: sample-test
 description: Onap sample command to test the command features
 version: cli-1.0
diff --git a/framework/src/test/resources/sample-test-schema-auth-required.yaml b/framework/src/test/resources/sample-test-schema-auth-required.yaml
index 408c74c7..6250e1f8 100644
--- a/framework/src/test/resources/sample-test-schema-auth-required.yaml
+++ b/framework/src/test/resources/sample-test-schema-auth-required.yaml
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 name: sample-test
 description: Onap sample command to test the command features
 version: cli-1.0
diff --git a/framework/src/test/resources/sample-test-schema-http.yaml b/framework/src/test/resources/sample-test-schema-http.yaml
index 56a0a536..c6e0450c 100644
--- a/framework/src/test/resources/sample-test-schema-http.yaml
+++ b/framework/src/test/resources/sample-test-schema-http.yaml
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 name: sample-create-http
 description: Register microservice into Onap
 version: onap-1.0
diff --git a/framework/src/test/resources/sample-test-schema-swagger.yaml b/framework/src/test/resources/sample-test-schema-swagger.yaml
index b9944363..7f486c2f 100644
--- a/framework/src/test/resources/sample-test-schema-swagger.yaml
+++ b/framework/src/test/resources/sample-test-schema-swagger.yaml
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 name: sample-test-swagger
 description: Sample swagger command test.
 version: cli-1.0
diff --git a/framework/src/test/resources/sample-test-schema.yaml b/framework/src/test/resources/sample-test-schema.yaml
index 2f021779..48ef2d61 100644
--- a/framework/src/test/resources/sample-test-schema.yaml
+++ b/framework/src/test/resources/sample-test-schema.yaml
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 name: sample-test
 description: Onap sample command to test the command features
 version: onap-1.0
diff --git a/framework/src/test/resources/schema-invalid-file.yaml b/framework/src/test/resources/schema-invalid-file.yaml
index 7b5937d5..3b841e7c 100644
--- a/framework/src/test/resources/schema-invalid-file.yaml
+++ b/framework/src/test/resources/schema-invalid-file.yaml
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 description: Register microservice into Onap
 name: schema-validate
 service:dasd
diff --git a/framework/src/test/resources/schema-validate-basic.yaml b/framework/src/test/resources/schema-validate-basic.yaml
index 80a9e1c6..f7880316 100644
--- a/framework/src/test/resources/schema-validate-basic.yaml
+++ b/framework/src/test/resources/schema-validate-basic.yaml
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 description: Register microservice into Onap
 name: schema-validate
 service:
diff --git a/framework/src/test/resources/schema-validate-http.yaml b/framework/src/test/resources/schema-validate-http.yaml
index 82f44aed..c813b764 100644
--- a/framework/src/test/resources/schema-validate-http.yaml
+++ b/framework/src/test/resources/schema-validate-http.yaml
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 description: Register microservice into Onap
 name: schema-validate
 service:
diff --git a/framework/src/test/resources/schema-validate-invalid.yaml b/framework/src/test/resources/schema-validate-invalid.yaml
index 61f3eeba..6a1a2a71 100644
--- a/framework/src/test/resources/schema-validate-invalid.yaml
+++ b/framework/src/test/resources/schema-validate-invalid.yaml
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 name: sdnc-create
 description: Register SDNC into Onap
 service:
diff --git a/framework/src/test/resources/schema-validate-invalidschematype.yaml b/framework/src/test/resources/schema-validate-invalidschematype.yaml
index cacf9c06..469f28ee 100644
--- a/framework/src/test/resources/schema-validate-invalidschematype.yaml
+++ b/framework/src/test/resources/schema-validate-invalidschematype.yaml
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 description: Register microservice into Onap
 name: schema-validate
 parameters:
diff --git a/framework/src/test/resources/schema-validate-pass.yaml b/framework/src/test/resources/schema-validate-pass.yaml
index 91fb3141..f5a258c9 100644
--- a/framework/src/test/resources/schema-validate-pass.yaml
+++ b/framework/src/test/resources/schema-validate-pass.yaml
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 name: sdnc-create
 description: Register SDNC into Onap
 service:
diff --git a/main/src/test/resources/onap-cli-schema/sample-create-schema.yaml b/main/src/test/resources/onap-cli-schema/sample-create-schema.yaml
index 478f58f6..561fa22b 100644
--- a/main/src/test/resources/onap-cli-schema/sample-create-schema.yaml
+++ b/main/src/test/resources/onap-cli-schema/sample-create-schema.yaml
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 name: sample-create
 description: Sample create into Onap
 version: cli-1.0
diff --git a/main/src/test/resources/sample-test-schema.yaml b/main/src/test/resources/sample-test-schema.yaml
index b1988240..286135c3 100644
--- a/main/src/test/resources/sample-test-schema.yaml
+++ b/main/src/test/resources/sample-test-schema.yaml
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 name: sample-test
 description: Onap sample command to test the command features
 version: cli-1.0
diff --git a/plugins/aai/src/main/resources/onap-cli-schema/cloud-region/cloud-create-schema-1.1.yaml b/plugins/aai/src/main/resources/onap-cli-schema/cloud-region/cloud-create-schema-1.1.yaml
index dad8d68c..8657ae14 100644
--- a/plugins/aai/src/main/resources/onap-cli-schema/cloud-region/cloud-create-schema-1.1.yaml
+++ b/plugins/aai/src/main/resources/onap-cli-schema/cloud-region/cloud-create-schema-1.1.yaml
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 name: cloud-create
 description: Create a cloud region in Onap
 version: onap-1.1
diff --git a/plugins/aai/src/main/resources/onap-cli-schema/cloud-region/cloud-delete-schema-1.1.yaml b/plugins/aai/src/main/resources/onap-cli-schema/cloud-region/cloud-delete-schema-1.1.yaml
index 85a8f76a..5575f7f7 100644
--- a/plugins/aai/src/main/resources/onap-cli-schema/cloud-region/cloud-delete-schema-1.1.yaml
+++ b/plugins/aai/src/main/resources/onap-cli-schema/cloud-region/cloud-delete-schema-1.1.yaml
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 name: cloud-delete
 description: Delete a cloud region from Onap
 version: onap-1.1
diff --git a/plugins/aai/src/main/resources/onap-cli-schema/cloud-region/cloud-list-schema-1.1.yaml b/plugins/aai/src/main/resources/onap-cli-schema/cloud-region/cloud-list-schema-1.1.yaml
index 63a90de7..c9fd5368 100644
--- a/plugins/aai/src/main/resources/onap-cli-schema/cloud-region/cloud-list-schema-1.1.yaml
+++ b/plugins/aai/src/main/resources/onap-cli-schema/cloud-region/cloud-list-schema-1.1.yaml
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 name: cloud-list
 description: List the configured clouds and Onap service subscriptions
 version: onap-1.1
diff --git a/plugins/aai/src/main/resources/onap-cli-schema/cloud-region/cloud-list-schema.yaml b/plugins/aai/src/main/resources/onap-cli-schema/cloud-region/cloud-list-schema.yaml
index 1f231256..10a7e954 100644
--- a/plugins/aai/src/main/resources/onap-cli-schema/cloud-region/cloud-list-schema.yaml
+++ b/plugins/aai/src/main/resources/onap-cli-schema/cloud-region/cloud-list-schema.yaml
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 name: cloud-list
 description: List the configured clouds and Onap service subscriptions
 version: onap-1.0
diff --git a/plugins/aai/src/main/resources/onap-cli-schema/customer/customer-create-schema-1.1.yaml b/plugins/aai/src/main/resources/onap-cli-schema/customer/customer-create-schema-1.1.yaml
index 8ff4b579..41c1515c 100644
--- a/plugins/aai/src/main/resources/onap-cli-schema/customer/customer-create-schema-1.1.yaml
+++ b/plugins/aai/src/main/resources/onap-cli-schema/customer/customer-create-schema-1.1.yaml
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 name: customer-create
 description: Create a customer in Onap
 version: onap-1.1
diff --git a/plugins/aai/src/main/resources/onap-cli-schema/customer/customer-create-schema.yaml b/plugins/aai/src/main/resources/onap-cli-schema/customer/customer-create-schema.yaml
index 533cd71e..e79cd5e6 100644
--- a/plugins/aai/src/main/resources/onap-cli-schema/customer/customer-create-schema.yaml
+++ b/plugins/aai/src/main/resources/onap-cli-schema/customer/customer-create-schema.yaml
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 name: customer-create
 description: Create a customer in Onap
 version: onap-1.0
diff --git a/plugins/aai/src/main/resources/onap-cli-schema/customer/customer-delete-schema-1.1.yaml b/plugins/aai/src/main/resources/onap-cli-schema/customer/customer-delete-schema-1.1.yaml
index c048870a..673cb94a 100644
--- a/plugins/aai/src/main/resources/onap-cli-schema/customer/customer-delete-schema-1.1.yaml
+++ b/plugins/aai/src/main/resources/onap-cli-schema/customer/customer-delete-schema-1.1.yaml
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 name: customer-delete
 description: Delete a customer from Onap
 version: onap-1.1
diff --git a/plugins/aai/src/main/resources/onap-cli-schema/customer/customer-delete-schema.yaml b/plugins/aai/src/main/resources/onap-cli-schema/customer/customer-delete-schema.yaml
index 3baca5eb..48455cdc 100644
--- a/plugins/aai/src/main/resources/onap-cli-schema/customer/customer-delete-schema.yaml
+++ b/plugins/aai/src/main/resources/onap-cli-schema/customer/customer-delete-schema.yaml
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 name: customer-delete
 description: Delete a customer from Onap
 version: onap-1.0
diff --git a/plugins/aai/src/main/resources/onap-cli-schema/customer/customer-list-schema-1.1.yaml b/plugins/aai/src/main/resources/onap-cli-schema/customer/customer-list-schema-1.1.yaml
index c5953c86..1e408f78 100644
--- a/plugins/aai/src/main/resources/onap-cli-schema/customer/customer-list-schema-1.1.yaml
+++ b/plugins/aai/src/main/resources/onap-cli-schema/customer/customer-list-schema-1.1.yaml
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 name: customer-list
 description: Lists the registetred customers in Onap
 version: onap-1.1
diff --git a/plugins/aai/src/main/resources/onap-cli-schema/customer/customer-list-schema.yaml b/plugins/aai/src/main/resources/onap-cli-schema/customer/customer-list-schema.yaml
index 79c4e20a..0866cfb4 100644
--- a/plugins/aai/src/main/resources/onap-cli-schema/customer/customer-list-schema.yaml
+++ b/plugins/aai/src/main/resources/onap-cli-schema/customer/customer-list-schema.yaml
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 name: customer-list
 description: Lists the registetred customers in Onap
 version: onap-1.0
diff --git a/plugins/aai/src/main/resources/onap-cli-schema/customer/customer-show-schema-1.1.yaml b/plugins/aai/src/main/resources/onap-cli-schema/customer/customer-show-schema-1.1.yaml
index ba37eed6..f12e235a 100644
--- a/plugins/aai/src/main/resources/onap-cli-schema/customer/customer-show-schema-1.1.yaml
+++ b/plugins/aai/src/main/resources/onap-cli-schema/customer/customer-show-schema-1.1.yaml
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 name: customer-show
 description: Lists the registetred customers in Onap
 version: onap-1.1
diff --git a/plugins/aai/src/main/resources/onap-cli-schema/customer/customer-show-schema.yaml b/plugins/aai/src/main/resources/onap-cli-schema/customer/customer-show-schema.yaml
index ff5a5c71..bb37aa27 100644
--- a/plugins/aai/src/main/resources/onap-cli-schema/customer/customer-show-schema.yaml
+++ b/plugins/aai/src/main/resources/onap-cli-schema/customer/customer-show-schema.yaml
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 name: customer-show
 description: Lists the registetred customers in Onap
 version: onap-1.0
diff --git a/plugins/aai/src/main/resources/onap-cli-schema/esr/ems/ems-create-schema-1.1.yaml b/plugins/aai/src/main/resources/onap-cli-schema/esr/ems/ems-create-schema-1.1.yaml
index e0acf3b1..efe28eec 100644
--- a/plugins/aai/src/main/resources/onap-cli-schema/esr/ems/ems-create-schema-1.1.yaml
+++ b/plugins/aai/src/main/resources/onap-cli-schema/esr/ems/ems-create-schema-1.1.yaml
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 
 name: ems-register
 
diff --git a/plugins/aai/src/main/resources/onap-cli-schema/esr/ems/ems-delete-schema-1.1.yaml b/plugins/aai/src/main/resources/onap-cli-schema/esr/ems/ems-delete-schema-1.1.yaml
index bb8521a8..dbbe7ecd 100644
--- a/plugins/aai/src/main/resources/onap-cli-schema/esr/ems/ems-delete-schema-1.1.yaml
+++ b/plugins/aai/src/main/resources/onap-cli-schema/esr/ems/ems-delete-schema-1.1.yaml
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 
 name: ems-unregister
 
diff --git a/plugins/aai/src/main/resources/onap-cli-schema/esr/ems/ems-list-schema-1.1.yaml b/plugins/aai/src/main/resources/onap-cli-schema/esr/ems/ems-list-schema-1.1.yaml
index 4756c1d5..91ba7ebb 100644
--- a/plugins/aai/src/main/resources/onap-cli-schema/esr/ems/ems-list-schema-1.1.yaml
+++ b/plugins/aai/src/main/resources/onap-cli-schema/esr/ems/ems-list-schema-1.1.yaml
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 
 name: ems-list
 
diff --git a/plugins/aai/src/main/resources/onap-cli-schema/esr/sdnc/sdnc-create-schema-1.1.yaml b/plugins/aai/src/main/resources/onap-cli-schema/esr/sdnc/sdnc-create-schema-1.1.yaml
index 9aea8416..83afd018 100644
--- a/plugins/aai/src/main/resources/onap-cli-schema/esr/sdnc/sdnc-create-schema-1.1.yaml
+++ b/plugins/aai/src/main/resources/onap-cli-schema/esr/sdnc/sdnc-create-schema-1.1.yaml
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 
 name: sdnc-register
 
diff --git a/plugins/aai/src/main/resources/onap-cli-schema/esr/sdnc/sdnc-delete-schema-1.1.yaml b/plugins/aai/src/main/resources/onap-cli-schema/esr/sdnc/sdnc-delete-schema-1.1.yaml
index 7a0e7fde..3cee4726 100644
--- a/plugins/aai/src/main/resources/onap-cli-schema/esr/sdnc/sdnc-delete-schema-1.1.yaml
+++ b/plugins/aai/src/main/resources/onap-cli-schema/esr/sdnc/sdnc-delete-schema-1.1.yaml
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 
 name: sdnc-unregister
 
diff --git a/plugins/aai/src/main/resources/onap-cli-schema/esr/sdnc/sdnc-list-schema-1.1.yaml b/plugins/aai/src/main/resources/onap-cli-schema/esr/sdnc/sdnc-list-schema-1.1.yaml
index 50850fbc..aa56b711 100644
--- a/plugins/aai/src/main/resources/onap-cli-schema/esr/sdnc/sdnc-list-schema-1.1.yaml
+++ b/plugins/aai/src/main/resources/onap-cli-schema/esr/sdnc/sdnc-list-schema-1.1.yaml
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 
 name: sdnc-list
 
diff --git a/plugins/aai/src/main/resources/onap-cli-schema/esr/vim/vim-create-schema-1.1.yaml b/plugins/aai/src/main/resources/onap-cli-schema/esr/vim/vim-create-schema-1.1.yaml
index 3961a345..d50acfb9 100644
--- a/plugins/aai/src/main/resources/onap-cli-schema/esr/vim/vim-create-schema-1.1.yaml
+++ b/plugins/aai/src/main/resources/onap-cli-schema/esr/vim/vim-create-schema-1.1.yaml
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 name: vim-register
 description: Register a VIM under a given cloud region in Onap
 version: onap-1.1
diff --git a/plugins/aai/src/main/resources/onap-cli-schema/esr/vim/vim-delete-schema-1.1.yaml b/plugins/aai/src/main/resources/onap-cli-schema/esr/vim/vim-delete-schema-1.1.yaml
index 7035bf92..7fd2d983 100644
--- a/plugins/aai/src/main/resources/onap-cli-schema/esr/vim/vim-delete-schema-1.1.yaml
+++ b/plugins/aai/src/main/resources/onap-cli-schema/esr/vim/vim-delete-schema-1.1.yaml
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 
 name: vim-unregister
 
diff --git a/plugins/aai/src/main/resources/onap-cli-schema/esr/vim/vim-list-schema-1.1.yaml b/plugins/aai/src/main/resources/onap-cli-schema/esr/vim/vim-list-schema-1.1.yaml
index 0f8d76c0..de133db8 100644
--- a/plugins/aai/src/main/resources/onap-cli-schema/esr/vim/vim-list-schema-1.1.yaml
+++ b/plugins/aai/src/main/resources/onap-cli-schema/esr/vim/vim-list-schema-1.1.yaml
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 
 name: vim-list
 
diff --git a/plugins/aai/src/main/resources/onap-cli-schema/esr/vnfm/vnfm-create-schema-1.1.yaml b/plugins/aai/src/main/resources/onap-cli-schema/esr/vnfm/vnfm-create-schema-1.1.yaml
index c1a58bd8..e2710986 100644
--- a/plugins/aai/src/main/resources/onap-cli-schema/esr/vnfm/vnfm-create-schema-1.1.yaml
+++ b/plugins/aai/src/main/resources/onap-cli-schema/esr/vnfm/vnfm-create-schema-1.1.yaml
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 
 name: vnfm-register
 
diff --git a/plugins/aai/src/main/resources/onap-cli-schema/esr/vnfm/vnfm-delete-schema-1.1.yaml b/plugins/aai/src/main/resources/onap-cli-schema/esr/vnfm/vnfm-delete-schema-1.1.yaml
index 7e45b177..f9cfda11 100644
--- a/plugins/aai/src/main/resources/onap-cli-schema/esr/vnfm/vnfm-delete-schema-1.1.yaml
+++ b/plugins/aai/src/main/resources/onap-cli-schema/esr/vnfm/vnfm-delete-schema-1.1.yaml
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 
 name: vnfm-unregister
 
diff --git a/plugins/aai/src/main/resources/onap-cli-schema/esr/vnfm/vnfm-list-schema-1.1.yaml b/plugins/aai/src/main/resources/onap-cli-schema/esr/vnfm/vnfm-list-schema-1.1.yaml
index 53d12876..c9d7304d 100644
--- a/plugins/aai/src/main/resources/onap-cli-schema/esr/vnfm/vnfm-list-schema-1.1.yaml
+++ b/plugins/aai/src/main/resources/onap-cli-schema/esr/vnfm/vnfm-list-schema-1.1.yaml
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 
 name: vnfm-list
 
diff --git a/plugins/aai/src/main/resources/onap-cli-schema/service-type/service-type-create-schema-1.1.yaml b/plugins/aai/src/main/resources/onap-cli-schema/service-type/service-type-create-schema-1.1.yaml
index ea1ecad1..ffd3a964 100644
--- a/plugins/aai/src/main/resources/onap-cli-schema/service-type/service-type-create-schema-1.1.yaml
+++ b/plugins/aai/src/main/resources/onap-cli-schema/service-type/service-type-create-schema-1.1.yaml
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 name: service-type-create
 description: Add a service type in Onap
 version: onap-1.1
diff --git a/plugins/aai/src/main/resources/onap-cli-schema/service-type/service-type-create-schema.yaml b/plugins/aai/src/main/resources/onap-cli-schema/service-type/service-type-create-schema.yaml
index 0f5eea1f..f8a73841 100644
--- a/plugins/aai/src/main/resources/onap-cli-schema/service-type/service-type-create-schema.yaml
+++ b/plugins/aai/src/main/resources/onap-cli-schema/service-type/service-type-create-schema.yaml
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 name: service-type-create
 description: Add a service type in Onap
 version: onap-1.0
diff --git a/plugins/aai/src/main/resources/onap-cli-schema/service-type/service-type-delete-schema-1.1.yaml b/plugins/aai/src/main/resources/onap-cli-schema/service-type/service-type-delete-schema-1.1.yaml
index 729a2cca..c1745b13 100644
--- a/plugins/aai/src/main/resources/onap-cli-schema/service-type/service-type-delete-schema-1.1.yaml
+++ b/plugins/aai/src/main/resources/onap-cli-schema/service-type/service-type-delete-schema-1.1.yaml
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 name: service-type-delete
 description: Delete a service type from Onap
 version: onap-1.1
diff --git a/plugins/aai/src/main/resources/onap-cli-schema/service-type/service-type-delete-schema.yaml b/plugins/aai/src/main/resources/onap-cli-schema/service-type/service-type-delete-schema.yaml
index d007a05c..a2b438b6 100644
--- a/plugins/aai/src/main/resources/onap-cli-schema/service-type/service-type-delete-schema.yaml
+++ b/plugins/aai/src/main/resources/onap-cli-schema/service-type/service-type-delete-schema.yaml
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 name: service-type-delete
 description: Delete a service type from Onap
 version: onap-1.0
diff --git a/plugins/aai/src/main/resources/onap-cli-schema/service-type/service-type-list-schema-1.1.yaml b/plugins/aai/src/main/resources/onap-cli-schema/service-type/service-type-list-schema-1.1.yaml
index e4797a9a..dd769c2c 100644
--- a/plugins/aai/src/main/resources/onap-cli-schema/service-type/service-type-list-schema-1.1.yaml
+++ b/plugins/aai/src/main/resources/onap-cli-schema/service-type/service-type-list-schema-1.1.yaml
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 name: service-type-list
 description: List the service types configured in Onap
 version: onap-1.1
diff --git a/plugins/aai/src/main/resources/onap-cli-schema/service-type/service-type-list-schema.yaml b/plugins/aai/src/main/resources/onap-cli-schema/service-type/service-type-list-schema.yaml
index a81b6d95..bdff43c3 100644
--- a/plugins/aai/src/main/resources/onap-cli-schema/service-type/service-type-list-schema.yaml
+++ b/plugins/aai/src/main/resources/onap-cli-schema/service-type/service-type-list-schema.yaml
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 name: service-type-list
 description: List the service types configured in Onap
 version: onap-1.0
diff --git a/plugins/aai/src/main/resources/onap-cli-schema/subscription/subscription-create-schema-1.1.yaml b/plugins/aai/src/main/resources/onap-cli-schema/subscription/subscription-create-schema-1.1.yaml
index 95f11308..1ed61eca 100644
--- a/plugins/aai/src/main/resources/onap-cli-schema/subscription/subscription-create-schema-1.1.yaml
+++ b/plugins/aai/src/main/resources/onap-cli-schema/subscription/subscription-create-schema-1.1.yaml
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 name: subscription-create
 description: Create a subscription of a customer for given service in specific cloud region in Onap
 version: onap-1.1
diff --git a/plugins/aai/src/main/resources/onap-cli-schema/subscription/subscription-create-schema.yaml b/plugins/aai/src/main/resources/onap-cli-schema/subscription/subscription-create-schema.yaml
index 9bd67350..a45f8cfd 100644
--- a/plugins/aai/src/main/resources/onap-cli-schema/subscription/subscription-create-schema.yaml
+++ b/plugins/aai/src/main/resources/onap-cli-schema/subscription/subscription-create-schema.yaml
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 name: subscription-create
 description: Create a subscription for a customer in Onap
 version: onap-1.0
diff --git a/plugins/aai/src/main/resources/onap-cli-schema/subscription/subscription-delete-schema-1.1.yaml b/plugins/aai/src/main/resources/onap-cli-schema/subscription/subscription-delete-schema-1.1.yaml
index 069a27e8..18e83fdd 100644
--- a/plugins/aai/src/main/resources/onap-cli-schema/subscription/subscription-delete-schema-1.1.yaml
+++ b/plugins/aai/src/main/resources/onap-cli-schema/subscription/subscription-delete-schema-1.1.yaml
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 name: subscription-delete
 description: Delete the subscription for a given customer in Onap
 version: onap-1.1
diff --git a/plugins/aai/src/main/resources/onap-cli-schema/subscription/subscription-list-schema-1.1.yaml b/plugins/aai/src/main/resources/onap-cli-schema/subscription/subscription-list-schema-1.1.yaml
index adfd1026..a14d2da2 100644
--- a/plugins/aai/src/main/resources/onap-cli-schema/subscription/subscription-list-schema-1.1.yaml
+++ b/plugins/aai/src/main/resources/onap-cli-schema/subscription/subscription-list-schema-1.1.yaml
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 name: subscription-list
 description: Lists the subscription for a given customer in Onap
 version: onap-1.1
diff --git a/plugins/aai/src/main/resources/onap-cli-schema/subscription/subscription-list-schema.yaml b/plugins/aai/src/main/resources/onap-cli-schema/subscription/subscription-list-schema.yaml
index f3bb9f7f..634c5cb2 100644
--- a/plugins/aai/src/main/resources/onap-cli-schema/subscription/subscription-list-schema.yaml
+++ b/plugins/aai/src/main/resources/onap-cli-schema/subscription/subscription-list-schema.yaml
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 name: subscription-list
 description: Lists the subscription for a given customer in Onap
 version: onap-1.0
diff --git a/plugins/aai/src/main/resources/onap-cli-schema/tenant/tenant-create-schema-1.1.yaml b/plugins/aai/src/main/resources/onap-cli-schema/tenant/tenant-create-schema-1.1.yaml
index 6f17ba98..9bc22853 100644
--- a/plugins/aai/src/main/resources/onap-cli-schema/tenant/tenant-create-schema-1.1.yaml
+++ b/plugins/aai/src/main/resources/onap-cli-schema/tenant/tenant-create-schema-1.1.yaml
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 name: tenant-create
 description: Create a tenant under given cloud region in Onap
 version: onap-1.1
diff --git a/plugins/aai/src/main/resources/onap-cli-schema/tenant/tenant-delete-schema-1.1.yaml b/plugins/aai/src/main/resources/onap-cli-schema/tenant/tenant-delete-schema-1.1.yaml
index 70778254..ece1bd5c 100644
--- a/plugins/aai/src/main/resources/onap-cli-schema/tenant/tenant-delete-schema-1.1.yaml
+++ b/plugins/aai/src/main/resources/onap-cli-schema/tenant/tenant-delete-schema-1.1.yaml
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 name: tenant-delete
 description: Delete tenant under given cloud region in Onap
 version: onap-1.1
diff --git a/plugins/aai/src/main/resources/onap-cli-schema/tenant/tenant-list-schema-1.1.yaml b/plugins/aai/src/main/resources/onap-cli-schema/tenant/tenant-list-schema-1.1.yaml
index d248e6af..46f470da 100644
--- a/plugins/aai/src/main/resources/onap-cli-schema/tenant/tenant-list-schema-1.1.yaml
+++ b/plugins/aai/src/main/resources/onap-cli-schema/tenant/tenant-list-schema-1.1.yaml
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 name: tenant-list
 description: Lists the tenants under given cloud region in Onap
 version: onap-1.1
diff --git a/plugins/msb/src/main/resources/onap-cli-schema/microservice-create-schema.yaml b/plugins/msb/src/main/resources/onap-cli-schema/microservice-create-schema.yaml
index a568f350..1d0053fc 100644
--- a/plugins/msb/src/main/resources/onap-cli-schema/microservice-create-schema.yaml
+++ b/plugins/msb/src/main/resources/onap-cli-schema/microservice-create-schema.yaml
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 name: microservice-create
 description: Register microservice into Onap
 version: onap-1.1
diff --git a/plugins/msb/src/main/resources/onap-cli-schema/microservice-delete-schema.yaml b/plugins/msb/src/main/resources/onap-cli-schema/microservice-delete-schema.yaml
index e53b617c..81d9d486 100644
--- a/plugins/msb/src/main/resources/onap-cli-schema/microservice-delete-schema.yaml
+++ b/plugins/msb/src/main/resources/onap-cli-schema/microservice-delete-schema.yaml
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 name: microservice-delete
 description: Deletes the micro service from Onap
 version: onap-1.1
diff --git a/plugins/msb/src/main/resources/onap-cli-schema/microservice-list-schema.yaml b/plugins/msb/src/main/resources/onap-cli-schema/microservice-list-schema.yaml
index f36a74d6..981d6190 100644
--- a/plugins/msb/src/main/resources/onap-cli-schema/microservice-list-schema.yaml
+++ b/plugins/msb/src/main/resources/onap-cli-schema/microservice-list-schema.yaml
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 name: microservice-list
 description: Lists the registetred micro services in Onap
 version: onap-1.1
diff --git a/plugins/msb/src/main/resources/onap-cli-schema/microservice-show-schema.yaml b/plugins/msb/src/main/resources/onap-cli-schema/microservice-show-schema.yaml
index 956ef4a9..919af2d7 100644
--- a/plugins/msb/src/main/resources/onap-cli-schema/microservice-show-schema.yaml
+++ b/plugins/msb/src/main/resources/onap-cli-schema/microservice-show-schema.yaml
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 name: microservice-show
 description: Details the registered microservice in Onap
 version: onap-1.1
diff --git a/plugins/msb/src/test/resources/service-list-schema.yaml b/plugins/msb/src/test/resources/service-list-schema.yaml
index f7a45a3c..3c97d30b 100644
--- a/plugins/msb/src/test/resources/service-list-schema.yaml
+++ b/plugins/msb/src/test/resources/service-list-schema.yaml
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 name: service-list
 description: Onap Service list
 version: onap-1.0
diff --git a/plugins/msb/src/test/resources/user-create-schema.yaml b/plugins/msb/src/test/resources/user-create-schema.yaml
index 08bbd5b6..eff8458f 100644
--- a/plugins/msb/src/test/resources/user-create-schema.yaml
+++ b/plugins/msb/src/test/resources/user-create-schema.yaml
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 name: user-create
 description: Onap user create command.
 version: onap-1.0
diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-checkin-schema.yaml b/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-checkin-schema.yaml
index 4bd8b1f4..4522b41d 100644
--- a/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-checkin-schema.yaml
+++ b/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-checkin-schema.yaml
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 name: vsp-checkin
 description: Checkin Vendor Software Product
 version: onap-1.0
diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-checkout-schema.yaml b/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-checkout-schema.yaml
index f06bded7..d790ce55 100644
--- a/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-checkout-schema.yaml
+++ b/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-checkout-schema.yaml
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 name: vsp-checkout
 description: Checkout Vendor Software Product
 version: onap-1.1
diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-create-schema.yaml b/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-create-schema.yaml
index f090b035..58da2a43 100644
--- a/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-create-schema.yaml
+++ b/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-create-schema.yaml
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 name: vsp-create
 description: Create Vendor Software Product
 version: onap-1.0
diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-list-schema.yaml b/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-list-schema.yaml
index 1055f297..f171b442 100644
--- a/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-list-schema.yaml
+++ b/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-list-schema.yaml
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 name: vsp-list
 description: List of the Vendor Software Products
 version: onap-1.0
diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-show-schema.yaml b/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-show-schema.yaml
index 83e11139..47cc462e 100644
--- a/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-show-schema.yaml
+++ b/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-show-schema.yaml
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 name: vsp-show
 description: Details of the Vendor Software Product
 version: onap-1.0
diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-submit-schema.yaml b/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-submit-schema.yaml
index 631e204d..d5f1733f 100644
--- a/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-submit-schema.yaml
+++ b/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-submit-schema.yaml
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 name: vsp-submit
 description: Submit Vendor Software Product
 version: onap-1.0
diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-upload-schema.yaml b/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-upload-schema.yaml
index 5786531c..28d8c0a5 100644
--- a/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-upload-schema.yaml
+++ b/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-upload-schema.yaml
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 name: vsp-upload
 description: Upload the CSAR file to VSP
 version: onap-1.0