Normalize the config params

Issue-ID: CLI-66

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

2 files changed, 24 insertions, 24 deletions

diff --git a/framework/src/main/java/org/onap/cli/fw/conf/OnapCommandConstants.java b/framework/src/main/java/org/onap/cli/fw/conf/OnapCommandConstants.java
index a8fb9d37..408f4f69 100644
--- a/framework/src/main/java/org/onap/cli/fw/conf/OnapCommandConstants.java
+++ b/framework/src/main/java/org/onap/cli/fw/conf/OnapCommandConstants.java
@@ -25,22 +25,22 @@ public class OnapCommandConstants {
     //config
     public static final String CONF = "open-cli.properties";
     public static final String OPEN_CLI_VERSION = "cli.version";
-    public static final String TOP_LEVEL_PARAMS_LIST = "cli.schema.top_level_params_list";
-    public static final String TOP_LEVEL_MANDATORY_LIST = "cli.schema.top_level_mandatory_list";
-    public static final String SERVICE_PARAMS_LIST = "cli.schema.service_params_list";
-    public static final String SERVICE_PARAMS_MANDATORY_LIST = "cli.schema.service_params_mandatory_list";
-    public static final String INFO_PARAMS_LIST = "cli.schema.info_params_list";
-    public static final String INFO_PARAMS_MANDATORY_LIST = "cli.schema.info_params_mandatory_list";
-    public static final String INPUT_PARAMS_LIST = "cli.schema.input_params_list";
-    public static final String INPUT_PARAMS_MANDATORY_LIST = "cli.schema.input_params_mandatory_list";
-    public static final String RESULT_PARAMS_LIST = "cli.schema.result_params_list";
-    public static final String RESULT_PARAMS_MANDATORY_LIST = "cli.schema.result_params_mandatory_list";
+    public static final String TOP_LEVEL_PARAMS_LIST = "cli.schema.base.sections";
+    public static final String TOP_LEVEL_MANDATORY_LIST = "cli.schema.base.sections.mandatory";
+    public static final String SERVICE_PARAMS_LIST = "cli.schema.http.service.sections";
+    public static final String SERVICE_PARAMS_MANDATORY_LIST = "cli.schema.http.service.sections.mandatory";
+    public static final String INFO_PARAMS_LIST = "cli.schema.base.info.sections";
+    public static final String INFO_PARAMS_MANDATORY_LIST = "cli.schema.base.info.sections.mandatory";
+    public static final String INPUT_PARAMS_LIST = "cli.schema.base.parameters.sections";
+    public static final String INPUT_PARAMS_MANDATORY_LIST = "cli.schema.base.parameters.sections.mandatory";
+    public static final String RESULT_PARAMS_LIST = "cli.schema.base.results.sections";
+    public static final String RESULT_PARAMS_MANDATORY_LIST = "cli.schema.base.results.sections.mandatory";
     public static final String BOOLEAN_VALUE = "cli.schema.boolean_values";
 
-    public static final String COMMAND_TYPE_VALUES = "cli.command.type";
-    public static final String SCHEMA_TYPES_SUPPORTED = "cli.schema.type.supported";
+    public static final String COMMAND_TYPE_VALUES = "cli.schema.command.type";
+    public static final String SCHEMA_TYPES_SUPPORTED = "cli.schema.profile.available";
     public static final String OPEN_CLI_PRODUCT_NAME = "cli.product_name";
-    public static final String OPEN_CLI_PLUGIN_PRPS = "cli.plugins-prps";
+    public static final String OPEN_CLI_PLUGIN_PRPS = "cli.schema.profile.confs";
 
     //schema
     public static final String OPEN_CLI_SCHEMA_VERSION = "open_cli_schema_version";
diff --git a/framework/src/main/resources/open-cli.properties b/framework/src/main/resources/open-cli.properties
index 2ae1b146..79800fbc 100644
--- a/framework/src/main/resources/open-cli.properties
+++ b/framework/src/main/resources/open-cli.properties
@@ -3,28 +3,28 @@ cli.version=1.0
 cli.discover_always=false
 
 #schema validation
-cli.schema.top_level_params_list=open_cli_schema_version,name,description,parameters,results,info
-cli.schema.top_level_mandatory_list=open_cli_schema_version
+cli.schema.base.sections=open_cli_schema_version,name,description,parameters,results,info
+cli.schema.base.sections.mandatory=open_cli_schema_version
 
-cli.schema.info_params_list=product,service,type,author,ignore
-cli.schema.info_params_mandatory_list=product,service
+cli.schema.base.info.sections=product,service,type,author,ignore
+cli.schema.base.info.sections.mandatory=product,service
 
-cli.schema.input_params_list=name,description,type,short_option,long_option, is_optional,default_value,is_secured,is_include,is_default_param
-cli.schema.input_params_mandatory_list=name,description,type
+cli.schema.base.parameters.sections=name,description,type,short_option,long_option, is_optional,default_value,is_secured,is_include,is_default_param
+cli.schema.base.parameters.sections.mandatory=name,description,type
 
-cli.schema.result_params_list=name,description,scope,type,is_secured, default_value
-cli.schema.result_params_mandatory_list=name, description, type, scope
+cli.schema.base.results.sections=name,description,scope,type,is_secured, default_value
+cli.schema.base.results.sections.mandatory=name, description, type, scope
 
 cli.schema.boolean_values=true,false
-cli.command.type=cmd,auth,catalog
+cli.schema.command.type=cmd,auth,catalog
 
 # moco properties
 cli.sample.gen.enable=false
 cli.sample.gen.target=.
 
 # mrkanag Move this to db, once exteranl command registration is supported in place of discovery
-cli.schema.type.supported=
+cli.schema.profile.available=
 
 #other properties to load (it should be hanled when plugins are made as externally register-able
 #when command plugin management support is enabled in oclip
-cli.plugins-prps=
\ No newline at end of file
+cli.schema.profile.confs=
\ No newline at end of file