From ddb95b946a86361fb966fadc9736fea2cc7d550b Mon Sep 17 00:00:00 2001 From: Kanagaraj Manickam k00365106 Date: Fri, 5 Jan 2018 11:46:51 +0530 Subject: Normalize the config params Issue-ID: CLI-66 Change-Id: Ibab64e9764ecaf2dd64490e87612f225f724b9ff Signed-off-by: Kanagaraj Manickam k00365106 --- .../cli/fw/http/conf/OnapCommandHttpConstants.java | 10 +++++----- .../http/src/main/resources/open-cli-http.properties | 18 +++++++++--------- 2 files changed, 14 insertions(+), 14 deletions(-) (limited to 'profiles/http/src/main') 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 38688abb..cd10849b 100644 --- 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 caeb4a95..db19d088 100644 --- 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 -- cgit 1.2.3-korg