Normalize the config params

Issue-ID: CLI-66

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

diff --git a/deployment/zip/src/main/release/conf/open-cli.properties b/deployment/zip/src/main/release/conf/open-cli.properties
index 026b1f1..d64069a 100644 (file)
--- a/deployment/zip/src/main/release/conf/open-cli.properties
+++ b/deployment/zip/src/main/release/conf/open-cli.properties
@@ -4,28 +4,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,http,info
-cli.schema.top_level_mandatory_list=open_cli_schema_version
+cli.schema.base.sections=open_cli_schema_version,name,description,parameters,results,http,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
-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
+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=http
+cli.schema.profile.available=http
 
 #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=open-cli-http.properties
\ No newline at end of file
+cli.schema.profile.confs=open-cli-http.properties
\ No newline at end of file

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 a8fb9d3..408f4f6 100644 (file)
--- 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 2ae1b14..79800fb 100644 (file)
--- 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

diff --git a/profiles/http/src/main/java/org/onap/cli/fw/http/conf/OnapCommandHttpConstants.java b/profiles/http/src/main/java/org/onap/cli/fw/http/conf/OnapCommandHttpConstants.java
index 38688ab..cd10849 100644 (file)
--- a/profiles/http/src/main/java/org/onap/cli/fw/http/conf/OnapCommandHttpConstants.java
+++ b/profiles/http/src/main/java/org/onap/cli/fw/http/conf/OnapCommandHttpConstants.java
@@ -24,11 +24,11 @@ public class OnapCommandHttpConstants {
     public static final String CONF = "open-cli-http.properties";
     public static final String OPEN_IGNORE_AUTH = "cli.ignore_auth";
     public static final String HTTP_API_KEY_USE_COOKIES = "cli.http.api_key_use_cookies";
-    public static final String HTTP_SECTIONS = "cli.schema.http_sections";
-    public static final String HTTP_MANDATORY_SECTIONS = "cli.schema.http_mandatory_sections";
-    public static final String HTTP_REQUEST_PARAMS = "cli.schema.http_request_params";
-    public static final String HTTP_REQUEST_MANDATORY_PARAMS = "cli.schema.http_request_mandatory_params";
-    public static final String HTTP_METHODS = "cli.schema.http_methods";
+    public static final String HTTP_SECTIONS = "cli.schema.http.sections";
+    public static final String HTTP_MANDATORY_SECTIONS = "cli.schema.http.sections.mandatory";
+    public static final String HTTP_REQUEST_PARAMS = "cli.schema.http.request.sections";
+    public static final String HTTP_REQUEST_MANDATORY_PARAMS = "cli.schema.http.request.sections.mandatory";
+    public static final String HTTP_METHODS = "cli.schema.http.request.method.values";
     //http connection
     public static final String SSLCONTEST_TLS = "TLSV1.2";
     public static final String APPLICATION_JSON = "application/json";

diff --git a/profiles/http/src/main/resources/open-cli-http.properties b/profiles/http/src/main/resources/open-cli-http.properties
index caeb4a9..db19d08 100644 (file)
--- a/profiles/http/src/main/resources/open-cli-http.properties
+++ b/profiles/http/src/main/resources/open-cli-http.properties
@@ -3,16 +3,16 @@ cli.http.api_key_use_cookies=true
 
 #schema validation
 #http
-cli.schema.http_sections=request,service,success_codes,result_map,sample_response
-cli.schema.http_mandatory_sections=request, success_codes
+cli.schema.http.sections=request,service,success_codes,result_map,sample_response
+cli.schema.http.sections.mandatory=request, success_codes
 
-cli.schema.http_request_params=uri,method,body,headers,queries,multipart_entity_name
-cli.schema.http_request_mandatory_params=uri,method
+cli.schema.http.request.sections=uri,method,body,headers,queries,multipart_entity_name
+cli.schema.http.request.sections.mandatory=uri,method
 
-cli.schema.service_params_list=name,version,auth,mode
-cli.schema.service_params_mandatory_list=auth,mode
+cli.schema.http.service.sections=name,version,auth,mode
+cli.schema.http.service.sections.mandatory=auth,mode
 
-cli.schema.http_methods=post,get,delete,put,head
+cli.schema.http.request.method.values=post,get,delete,put,head
 
-cli.schema.auth_values=none,basic
-cli.schema.mode_values=direct,catalog
+cli.schema.http.service.auth.values=none,basic
+cli.schema.http.service.mode.values=direct,catalog

diff --git a/profiles/http/src/test/resources/open-cli.properties b/profiles/http/src/test/resources/open-cli.properties
index 026b1f1..d64069a 100644 (file)
--- a/profiles/http/src/test/resources/open-cli.properties
+++ b/profiles/http/src/test/resources/open-cli.properties
@@ -4,28 +4,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,http,info
-cli.schema.top_level_mandatory_list=open_cli_schema_version
+cli.schema.base.sections=open_cli_schema_version,name,description,parameters,results,http,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
-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
+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=http
+cli.schema.profile.available=http
 
 #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=open-cli-http.properties
\ No newline at end of file
+cli.schema.profile.confs=open-cli-http.properties
\ No newline at end of file

diff --git a/validate/validation/src/test/resources/open-cli.properties b/validate/validation/src/test/resources/open-cli.properties
index 026b1f1..d64069a 100644 (file)
--- a/validate/validation/src/test/resources/open-cli.properties
+++ b/validate/validation/src/test/resources/open-cli.properties
@@ -4,28 +4,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,http,info
-cli.schema.top_level_mandatory_list=open_cli_schema_version
+cli.schema.base.sections=open_cli_schema_version,name,description,parameters,results,http,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
-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
+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=http
+cli.schema.profile.available=http
 
 #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=open-cli-http.properties
\ No newline at end of file
+cli.schema.profile.confs=open-cli-http.properties
\ No newline at end of file