Namespace migration to open_cli_schema_version 93/12093/2
authorKanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
Wed, 13 Sep 2017 05:22:49 +0000 (10:52 +0530)
committerKanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
Wed, 13 Sep 2017 05:42:31 +0000 (11:12 +0530)
CLI-3
Change-Id: I87d739c9c9b9f8e7724f1aa736a51b0fd91c30df
Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
89 files changed:
framework/src/main/java/org/onap/cli/fw/OnapCommand.java
framework/src/main/java/org/onap/cli/fw/cmd/OnapHttpCommand.java
framework/src/main/java/org/onap/cli/fw/conf/Constants.java
framework/src/main/java/org/onap/cli/fw/error/OnapCommandInvalidSchemaVersion.java
framework/src/main/java/org/onap/cli/fw/utils/OnapCommandUtils.java
framework/src/main/resources/default_input_parameters.yaml
framework/src/main/resources/onap-cli-schema/schema-refresh.yaml
framework/src/main/resources/onap-cli-schema/schema-validate.yaml
framework/src/main/resources/onap.properties
framework/src/test/java/org/onap/cli/fw/error/OnapCommandErrorTest.java
framework/src/test/java/org/onap/cli/fw/utils/OnapCommandUtilsTest.java
framework/src/test/resources/onap-cli-schema/sample-test1-schema-http.yaml
framework/src/test/resources/onap-test-schema.yaml
framework/src/test/resources/onap.properties
framework/src/test/resources/sample-test-exclude-param.yaml
framework/src/test/resources/sample-test-import-def-param-false.yaml
framework/src/test/resources/sample-test-include-exclude.yaml
framework/src/test/resources/sample-test-include-param.yaml
framework/src/test/resources/sample-test-invalid-default-parameter.yaml
framework/src/test/resources/sample-test-invalid-default-params-not-exist.yaml
framework/src/test/resources/sample-test-invalid-exclude-noauth.yaml
framework/src/test/resources/sample-test-invalid-include-noauth.yaml
framework/src/test/resources/sample-test-invalid-schema-duplicate-longoption.yaml
framework/src/test/resources/sample-test-invalid-schema-duplicate-name.yaml
framework/src/test/resources/sample-test-invalid-schema-duplicate-shortoption.yaml
framework/src/test/resources/sample-test-invalid-schema.yaml
framework/src/test/resources/sample-test-schema-auth-required.yaml
framework/src/test/resources/sample-test-schema-http.yaml
framework/src/test/resources/sample-test-schema-swagger.yaml
framework/src/test/resources/sample-test-schema.yaml
framework/src/test/resources/schema-invalid-file.yaml
framework/src/test/resources/schema-validate-basic.yaml
framework/src/test/resources/schema-validate-http.yaml
framework/src/test/resources/schema-validate-invalid.yaml
framework/src/test/resources/schema-validate-invalidschematype.yaml
framework/src/test/resources/schema-validate-pass.yaml
main/src/test/resources/onap-cli-schema/sample-create-schema.yaml
main/src/test/resources/sample-test-schema.yaml
plugins/aai/src/main/resources/onap-cli-schema/cloud-region/cloud-create-schema-1.1.yaml
plugins/aai/src/main/resources/onap-cli-schema/cloud-region/cloud-delete-schema-1.1.yaml
plugins/aai/src/main/resources/onap-cli-schema/cloud-region/cloud-list-schema-1.1.yaml
plugins/aai/src/main/resources/onap-cli-schema/cloud-region/cloud-list-schema.yaml
plugins/aai/src/main/resources/onap-cli-schema/customer/customer-create-schema-1.1.yaml
plugins/aai/src/main/resources/onap-cli-schema/customer/customer-create-schema.yaml
plugins/aai/src/main/resources/onap-cli-schema/customer/customer-delete-schema-1.1.yaml
plugins/aai/src/main/resources/onap-cli-schema/customer/customer-delete-schema.yaml
plugins/aai/src/main/resources/onap-cli-schema/customer/customer-list-schema-1.1.yaml
plugins/aai/src/main/resources/onap-cli-schema/customer/customer-list-schema.yaml
plugins/aai/src/main/resources/onap-cli-schema/customer/customer-show-schema-1.1.yaml
plugins/aai/src/main/resources/onap-cli-schema/customer/customer-show-schema.yaml
plugins/aai/src/main/resources/onap-cli-schema/esr/ems/ems-create-schema-1.1.yaml
plugins/aai/src/main/resources/onap-cli-schema/esr/ems/ems-delete-schema-1.1.yaml
plugins/aai/src/main/resources/onap-cli-schema/esr/ems/ems-list-schema-1.1.yaml
plugins/aai/src/main/resources/onap-cli-schema/esr/sdnc/sdnc-create-schema-1.1.yaml
plugins/aai/src/main/resources/onap-cli-schema/esr/sdnc/sdnc-delete-schema-1.1.yaml
plugins/aai/src/main/resources/onap-cli-schema/esr/sdnc/sdnc-list-schema-1.1.yaml
plugins/aai/src/main/resources/onap-cli-schema/esr/vim/vim-create-schema-1.1.yaml
plugins/aai/src/main/resources/onap-cli-schema/esr/vim/vim-delete-schema-1.1.yaml
plugins/aai/src/main/resources/onap-cli-schema/esr/vim/vim-list-schema-1.1.yaml
plugins/aai/src/main/resources/onap-cli-schema/esr/vnfm/vnfm-create-schema-1.1.yaml
plugins/aai/src/main/resources/onap-cli-schema/esr/vnfm/vnfm-delete-schema-1.1.yaml
plugins/aai/src/main/resources/onap-cli-schema/esr/vnfm/vnfm-list-schema-1.1.yaml
plugins/aai/src/main/resources/onap-cli-schema/service-type/service-type-create-schema-1.1.yaml
plugins/aai/src/main/resources/onap-cli-schema/service-type/service-type-create-schema.yaml
plugins/aai/src/main/resources/onap-cli-schema/service-type/service-type-delete-schema-1.1.yaml
plugins/aai/src/main/resources/onap-cli-schema/service-type/service-type-delete-schema.yaml
plugins/aai/src/main/resources/onap-cli-schema/service-type/service-type-list-schema-1.1.yaml
plugins/aai/src/main/resources/onap-cli-schema/service-type/service-type-list-schema.yaml
plugins/aai/src/main/resources/onap-cli-schema/subscription/subscription-create-schema-1.1.yaml
plugins/aai/src/main/resources/onap-cli-schema/subscription/subscription-create-schema.yaml
plugins/aai/src/main/resources/onap-cli-schema/subscription/subscription-delete-schema-1.1.yaml
plugins/aai/src/main/resources/onap-cli-schema/subscription/subscription-list-schema-1.1.yaml
plugins/aai/src/main/resources/onap-cli-schema/subscription/subscription-list-schema.yaml
plugins/aai/src/main/resources/onap-cli-schema/tenant/tenant-create-schema-1.1.yaml
plugins/aai/src/main/resources/onap-cli-schema/tenant/tenant-delete-schema-1.1.yaml
plugins/aai/src/main/resources/onap-cli-schema/tenant/tenant-list-schema-1.1.yaml
plugins/msb/src/main/resources/onap-cli-schema/microservice-create-schema.yaml
plugins/msb/src/main/resources/onap-cli-schema/microservice-delete-schema.yaml
plugins/msb/src/main/resources/onap-cli-schema/microservice-list-schema.yaml
plugins/msb/src/main/resources/onap-cli-schema/microservice-show-schema.yaml
plugins/msb/src/test/resources/service-list-schema.yaml
plugins/msb/src/test/resources/user-create-schema.yaml
plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-checkin-schema.yaml
plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-checkout-schema.yaml
plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-create-schema.yaml
plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-list-schema.yaml
plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-show-schema.yaml
plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-submit-schema.yaml
plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-upload-schema.yaml

index c65ca9a..dc90314 100644 (file)
@@ -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;
     }
 
     /**
index 9438102..e3ec17d 100644 (file)
@@ -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) {
index 00bdb85..17b771c 100644 (file)
@@ -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";
index 75530ab..e330283 100644 (file)
@@ -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");
     }
 
 }
index f4fb751..9b824d3 100644 (file)
@@ -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) {
index 3b7e198..0503ff9 100644 (file)
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 parameters:
   - name: onap-username
     type: string
index 2cd90bc..280dec3 100644 (file)
@@ -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
index 74abfdc..5eb29f0 100644 (file)
@@ -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
index fc4dcb7..285e5c8 100644 (file)
@@ -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
index 0a388e5..20402b0 100644 (file)
@@ -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
index 5a992c6..47ee2c7 100644 (file)
@@ -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) {
index 0da1d22..55e9326 100644 (file)
@@ -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
index 0a2f5c4..ef86348 100644 (file)
@@ -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
index 9e6b34b..1463950 100644 (file)
@@ -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
index 970a185..7aed55c 100644 (file)
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 default_parameters:
   exclude:
     - long
index 7a14f26..77d3211 100644 (file)
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 default_parameters:
   include:
     - onap-username
index ecc737c..1809712 100644 (file)
@@ -1,4 +1,4 @@
-onap_cmd_schema_version: 1.0
+open_cli_schema_version: 1.0
 default_parameters:
   include:
     - onap-username
index 1de471c..1a42b8d 100644 (file)
@@ -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
index a18aacc..c7b018d 100644 (file)
@@ -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
index 375f454..f46a975 100644 (file)
@@ -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
index fc301bb..036a207 100644 (file)
@@ -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
index 408c74c..6250e1f 100644 (file)
@@ -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
index 56a0a53..c6e0450 100644 (file)
@@ -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
index b994436..7f486c2 100644 (file)
@@ -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
index 2f02177..48ef2d6 100644 (file)
@@ -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
index 7b5937d..3b841e7 100644 (file)
@@ -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
index 80a9e1c..f788031 100644 (file)
@@ -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:
index 82f44ae..c813b76 100644 (file)
@@ -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:
index 61f3eeb..6a1a2a7 100644 (file)
@@ -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:
index cacf9c0..469f28e 100644 (file)
@@ -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:
index 91fb314..f5a258c 100644 (file)
@@ -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:
index 478f58f..561fa22 100644 (file)
@@ -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
index b198824..286135c 100644 (file)
@@ -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
index 1f23125..10a7e95 100644 (file)
@@ -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
index 3961a34..d50acfb 100644 (file)
@@ -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
index 95f1130..1ed61ec 100644 (file)
@@ -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
index d248e6a..46f470d 100644 (file)
@@ -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
index e53b617..81d9d48 100644 (file)
@@ -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
index f36a74d..981d619 100644 (file)
@@ -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
index 956ef4a..919af2d 100644 (file)
@@ -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
index f7a45a3..3c97d30 100644 (file)
@@ -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
index 08bbd5b..eff8458 100644 (file)
@@ -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
index f090b03..58da2a4 100644 (file)
@@ -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
index 1055f29..f171b44 100644 (file)
@@ -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
index 83e1113..47cc462 100644 (file)
@@ -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
index 631e204..d5f1733 100644 (file)
@@ -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