Make Http as separate plugin

Issue-ID: CLI-66

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

8 files changed, 10 insertions, 147 deletions

diff --git a/framework/src/main/resources/META-INF/services/org.onap.cli.fw.OnapCommand b/framework/src/main/resources/META-INF/services/org.onap.cli.fw.OnapCommand
deleted file mode 100644
index 1993bcb6..00000000
--- a/framework/src/main/resources/META-INF/services/org.onap.cli.fw.OnapCommand
+++ /dev/null
@@ -1,6 +0,0 @@
-org.onap.cli.fw.cmd.OnapSchemaValidateCommand
-org.onap.cli.fw.cmd.OnapSchemaRefreshCommand
-org.onap.cli.fw.cmd.BasicAuthLoginCommand
-org.onap.cli.fw.cmd.BasicAuthLogoutCommand
-org.onap.cli.fw.cmd.CatalogCommand
-org.onap.cli.fw.cmd.OnapHttpCommand
\ No newline at end of file
diff --git a/framework/src/main/resources/META-INF/services/org.onap.cli.fw.cmd.OnapCommand b/framework/src/main/resources/META-INF/services/org.onap.cli.fw.cmd.OnapCommand
new file mode 100644
index 00000000..89648bf5
--- /dev/null
+++ b/framework/src/main/resources/META-INF/services/org.onap.cli.fw.cmd.OnapCommand
@@ -0,0 +1,2 @@
+org.onap.cli.fw.cmd.OnapSchemaValidateCommand
+org.onap.cli.fw.cmd.OnapSchemaRefreshCommand
\ No newline at end of file
diff --git a/framework/src/main/resources/log4j.properties b/framework/src/main/resources/log4j.properties
index f117ef6e..419faf30 100644
--- a/framework/src/main/resources/log4j.properties
+++ b/framework/src/main/resources/log4j.properties
@@ -1,4 +1,4 @@
-log4j.rootLogger=ERROR, file
+log4j.rootLogger=ALL, file
 
 # Redirect log messages to a log file, support file rolling.
 log4j.appender.file=org.apache.log4j.RollingFileAppender
diff --git a/framework/src/main/resources/open-cli-schema/http/basic-login.yaml b/framework/src/main/resources/open-cli-schema/http/basic-login.yaml
deleted file mode 100644
index 36473df7..00000000
--- a/framework/src/main/resources/open-cli-schema/http/basic-login.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-open_cli_schema_version: 1.0
-
-name: basic-login
-
-description: basic login auth command
-
-info:
-  product: open-cli
-  service: basic-auth
-  type: auth
-  author: Kanagaraj Manickam kanagaraj.manickam@huawei.com
-
-results:
-  direction: portrait
-  attributes:
-    - name: Authorization
-      description: Authorization
-      scope: short
-      type: string
diff --git a/framework/src/main/resources/open-cli-schema/http/basic-logout.yaml b/framework/src/main/resources/open-cli-schema/http/basic-logout.yaml
deleted file mode 100644
index f4acc0ae..00000000
--- a/framework/src/main/resources/open-cli-schema/http/basic-logout.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-open_cli_schema_version: 1.0
-
-name: basic-logout
-
-description: basic logout auth command
-
-info:
-  product: open-cli
-  service: basic-auth
-  type: auth
-  author: Kanagaraj Manickam kanagaraj.manickam@huawei.com
-
-parameters:
-  - name: host-username
-    is_include: false
-  - name: host-password
-    is_include: false
-  - name: no-auth
-    is_include: false
\ No newline at end of file
diff --git a/framework/src/main/resources/open-cli-schema/http/catalog.yaml b/framework/src/main/resources/open-cli-schema/http/catalog.yaml
deleted file mode 100644
index 508955f5..00000000
--- a/framework/src/main/resources/open-cli-schema/http/catalog.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
-open_cli_schema_version: 1.0
-
-name: catalog
-
-description: cli catalog command to find the base path for service.
-
-info:
-  product: open-cli
-  service: catalog
-  type: catalog
-  author: Kanagaraj Manickam kanagaraj.manickam@huawei.com
-
-parameters:
-  - name: catalog-service-name
-    type: string
-    description: service name registered in catalog service
-    short_option: l
-    long_option: catalog-service-name
-    is_optional: false
-  - name: catalog-service-version
-    type: string
-    description: service version registered in catalog service
-    short_option: i
-    long_option: catalog-service-version
-    is_optional: false
-  - name: host-username
-    is_include: false
-  - name: host-password
-    is_include: false
-  - name: no-auth
-    is_include: false
-results:
-  direction: portrait
-  attributes:
-    - name: catalog-service-host-url
-      description: Service connection url
-      scope: short
-      type: string
-      default_value: ${host-url}
-    - name: catalog-service-base-path
-      description: service base path, to append with host-url for connecting the service.
-      scope: short
-      type: string
-      default_value: /
\ No newline at end of file
diff --git a/framework/src/main/resources/open-cli-schema/http/default_input_parameters_http.yaml b/framework/src/main/resources/open-cli-schema/http/default_input_parameters_http.yaml
deleted file mode 100644
index d7fbe03c..00000000
--- a/framework/src/main/resources/open-cli-schema/http/default_input_parameters_http.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-open_cli_schema_version: 1.0
-
-info:
-  product: open-cli
-  service: default-param
-  ignore: true
-
-parameters:
-  - name: host-username
-    type: string
-    description: Host user name
-    short_option: u
-    long_option: host-username
-    default_value: $s{env:OPEN_CLI_HOST_USERNAME}
-    is_optional: false
-  - name: host-password
-    type: string
-    description: Host user password
-    short_option: p
-    long_option: host-password
-    default_value: $s{env:OPEN_CLI_HOST_PASSWORD}
-    is_secured: true
-    is_optional: false
-  - name: host-url
-    type: url
-    description: host url in http(s)
-    short_option: m
-    long_option: host-url
-    is_optional: false
-    default_value: $s{env:OPEN_CLI_HOST_URL}
-  - name: no-auth
-    type: bool
-    description: whether to authenticate user or not
-    short_option: a
-    long_option: no-auth
-    default_value: false
\ No newline at end of file
diff --git a/framework/src/main/resources/open-cli.properties b/framework/src/main/resources/open-cli.properties
index b009472b..c8792835 100644
--- a/framework/src/main/resources/open-cli.properties
+++ b/framework/src/main/resources/open-cli.properties
@@ -1,8 +1,6 @@
-cli.ignore_auth=false
-cli.http.api_key_use_cookies=true
-cli.discover_always=false
 cli.product_name=open-cli
 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
@@ -17,29 +15,16 @@ cli.schema.input_params_mandatory_list=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
 
-#http
-cli.schema.http_sections=request,service,success_codes,result_map,sample_response
-cli.schema.http_mandatory_sections=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.service_params_list=name,version,auth,mode
-cli.schema.service_params_mandatory_list=auth,mode
-
-cli.schema.http_methods=post,get,delete,put,head
-
 cli.schema.boolean_values=true,false
-cli.schema.auth_values=none,basic
-cli.schema.mode_values=direct,catalog
 cli.command.type=cmd,auth,catalog
 
-#product version
-cli.product.version=open-cli
-
 # moco properties
-cli.sample.gen.enable=false
+cli.sample.gen.enable=true
 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.type.supported=
+
+#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