6 files changed, 12 insertions, 25 deletions
diff --git a/framework/src/main/resources/onap-cli-schema/basic-login.yaml b/framework/src/main/resources/open-cli-schema/basic-login.yaml
index 10bc8a80..78294fc5 100644
--- a/framework/src/main/resources/onap-cli-schema/basic-login.yaml
+++ b/framework/src/main/resources/open-cli-schema/basic-login.yaml
@@ -5,7 +5,7 @@ version: cli-1.0
 type: auth
 
 service:
-  name: onap-cli
+  name: open-cli
   version: 1.0.0
     
 results:
diff --git a/framework/src/main/resources/onap-cli-schema/basic-logout.yaml b/framework/src/main/resources/open-cli-schema/basic-logout.yaml
index ccb05160..2c0e3dbd 100644
--- a/framework/src/main/resources/onap-cli-schema/basic-logout.yaml
+++ b/framework/src/main/resources/open-cli-schema/basic-logout.yaml
@@ -9,5 +9,5 @@ version: cli-1.0
 type: auth
 
 service:
-  name: onap-cli
+  name: open-cli
   version: 1.0.0
diff --git a/framework/src/main/resources/onap-cli-schema/catalog.yaml b/framework/src/main/resources/open-cli-schema/catalog.yaml
index 6cfdb0a0..160ff1d4 100644
--- a/framework/src/main/resources/onap-cli-schema/catalog.yaml
+++ b/framework/src/main/resources/open-cli-schema/catalog.yaml
@@ -10,7 +10,7 @@ type: catalog
 
 service:
   auth: none
-  name: onap-cli
+  name: open-cli
   version: 1.0.0
   mode: direct
  
diff --git a/framework/src/main/resources/onap-cli-schema/schema-refresh.yaml b/framework/src/main/resources/open-cli-schema/schema-refresh.yaml
index 280dec36..5f1cb50e 100644
--- a/framework/src/main/resources/onap-cli-schema/schema-refresh.yaml
+++ b/framework/src/main/resources/open-cli-schema/schema-refresh.yaml
@@ -1,10 +1,10 @@
 open_cli_schema_version: 1.0
 name: schema-refresh
-description: Onap command to refresh schemas stored in onap_cli_schema folders.
+description: Onap command to refresh schemas stored in OPEN_cli_schema folders.
 version: cli-1.0
 service:
   auth: none
-  name: onap-cli
+  name: open-cli
   version: 1.0.0
 results:
   direction: landscape
diff --git a/framework/src/main/resources/onap-cli-schema/schema-validate.yaml b/framework/src/main/resources/open-cli-schema/schema-validate.yaml
index 55e61e58..8c777666 100644
--- a/framework/src/main/resources/onap-cli-schema/schema-validate.yaml
+++ b/framework/src/main/resources/open-cli-schema/schema-validate.yaml
@@ -4,7 +4,7 @@ description: Onap command to validate schema
 version: cli-1.0
 service:
   auth: none
-  name: onap-cli
+  name: open-cli
   version: 1.0.0
 default_parameters:
   exclude:
diff --git a/framework/src/main/resources/onap.properties b/framework/src/main/resources/open-cli.properties
index d73f1454..2531ce22 100644
--- a/framework/src/main/resources/onap.properties
+++ b/framework/src/main/resources/open-cli.properties
@@ -1,11 +1,10 @@
 cli.ignore_auth=false
-cli.version=1.0
 cli.http.api_key_use_cookies=true
 cli.discover_always=false
 
-cli.service_name=onap-cli
-cli.api_gateway=msb
-cli.auth_service=auth
+cli.service_name=open-cli
+cli.product.version=cli-1.0
+cli.version=1.0
 
 # service section
 cli.exclude_params_internal_cmd=host-username,host-password,host-url,no-auth
@@ -13,21 +12,6 @@ cli.no_auth_disable_include_params_external_cmd=host-username,host-password,host
 cli.no_auth_enable_exclude_params_external_cmd=host-username,host-password,no-auth
 cli.no_auth_enable_include_params_external_cmd=host-url
 
-cli.http.basic.common_headers=x-auth-token,x-transaction-id,x-app-id
-cli.http.basic.common_headers.x-auth-token=Authorization
-cli.http.basic.common_headers.x-transaction-id=X-TransactionId
-cli.http.basic.common_headers.x-transaction-id.value=req-uuid
-cli.http.basic.common_headers.x-app-id=X-FromAppId
-cli.http.basic.common_headers.x-app-id.value=onap-cli
-
-# Service specific headers
-cli.http.basic.common_headers.sdc=user-id
-cli.http.basic.common_headers.sdc.user-id=USER_ID
-cli.http.basic.common_headers.sdc.user-id.value=${host-username}
-
-#TODO mrkanag add support for aaf like defined above for basic
-#cli.service.auth=aaf
-
 #schema validation
 cli.schema.top_level_params_list=open_cli_schema_version,name,version,description,service,parameters,results,http,type
 cli.schema.top_level_mandatory_list=open_cli_schema_version
@@ -53,6 +37,7 @@ cli.schema.boolean_values=true,false
 cli.schema.auth_values=none,basic
 cli.schema.mode_values=direct,catalog
 
+<<<<<<< 5301969fc26714a8494882027116282898278f32:framework/src/main/resources/onap.properties
 #product version
 cli.product.version=cli-1.0
 
@@ -60,3 +45,5 @@ cli.product.version=cli-1.0
 cli.sample.gen.enable=false
 cli.sample.gen.target=.
 
+=======
+>>>>>>> Migrate onap-cli-schema into open-cli-schema:framework/src/main/resources/open-cli.properties