Merges from 1.1.0

Issue-Id: CLI-66

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

31 files changed, 30 insertions, 114 deletions

diff --git a/framework/pom.xml b/framework/pom.xml
index ce49164b..231d804b 100644
--- a/framework/pom.xml
+++ b/framework/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.cli</groupId>
         <artifactId>cli</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
     </parent>
 
     <artifactId>cli-framework</artifactId>
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
index dab9652e..36473df7 100644
--- a/framework/src/main/resources/open-cli-schema/http/basic-login.yaml
+++ b/framework/src/main/resources/open-cli-schema/http/basic-login.yaml
@@ -8,7 +8,7 @@ info:
   product: open-cli
   service: basic-auth
   type: auth
-  author: Kanagaraj Manickam mkr1481@gmail.com
+  author: Kanagaraj Manickam kanagaraj.manickam@huawei.com
 
 results:
   direction: portrait
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
index ef60006c..f4acc0ae 100644
--- a/framework/src/main/resources/open-cli-schema/http/basic-logout.yaml
+++ b/framework/src/main/resources/open-cli-schema/http/basic-logout.yaml
@@ -8,7 +8,7 @@ info:
   product: open-cli
   service: basic-auth
   type: auth
-  author: Kanagaraj Manickam mkr1481@gmail.com
+  author: Kanagaraj Manickam kanagaraj.manickam@huawei.com
 
 parameters:
   - name: host-username
diff --git a/framework/src/main/resources/open-cli-schema/http/catalog.yaml b/framework/src/main/resources/open-cli-schema/http/catalog.yaml
index d3ee9992..508955f5 100644
--- a/framework/src/main/resources/open-cli-schema/http/catalog.yaml
+++ b/framework/src/main/resources/open-cli-schema/http/catalog.yaml
@@ -8,7 +8,7 @@ info:
   product: open-cli
   service: catalog
   type: catalog
-  author: Kanagaraj Manickam mkr1481@gmail.com
+  author: Kanagaraj Manickam kanagaraj.manickam@huawei.com
 
 parameters:
   - name: catalog-service-name
diff --git a/framework/src/main/resources/open-cli-schema/schema-refresh.yaml b/framework/src/main/resources/open-cli-schema/schema-refresh.yaml
index e5c9b56f..2a80cf7c 100644
--- a/framework/src/main/resources/open-cli-schema/schema-refresh.yaml
+++ b/framework/src/main/resources/open-cli-schema/schema-refresh.yaml
@@ -6,7 +6,7 @@ info:
   product: open-cli
   service: schema
   type: auth
-  author: Kanagaraj Manickam mkr1481@gmail.com
+  author: Kanagaraj Manickam kanagaraj.manickam@huawei.com
 
 results:
   direction: landscape
diff --git a/framework/src/main/resources/open-cli-schema/schema-validate.yaml b/framework/src/main/resources/open-cli-schema/schema-validate.yaml
index c17b3a08..98ac8c25 100644
--- a/framework/src/main/resources/open-cli-schema/schema-validate.yaml
+++ b/framework/src/main/resources/open-cli-schema/schema-validate.yaml
@@ -6,7 +6,7 @@ info:
   product: open-cli
   service: schema
   type: auth
-  author: Kanagaraj Manickam mkr1481@gmail.com
+  author: Kanagaraj Manickam kanagaraj.manickam@huawei.com
 
 parameters:
   - name: schema-location
diff --git a/framework/src/test/resources/onap-test-schema.yaml b/framework/src/test/resources/onap-test-schema.yaml
deleted file mode 100644
index 496cb023..00000000
--- a/framework/src/test/resources/onap-test-schema.yaml
+++ /dev/null
@@ -1,84 +0,0 @@
-open_cli_schema_version: 1.0
-name: sample-test
-description: Oclip sample command to test the command features
-
-info:
-  product: open-cli
-  service: test
-  type: cmd
-  author: Kanagaraj Manickam mkr1481@gmail.com
-
-parameters:
-  - name: bool-param
-    type: bool
-    description: Oclip boolean param, by default its always false.
-    short_option: b
-    long_option: bool
-    is_optional: true
-    default_value: false
-  - name: secure-param
-    type: string
-    description: Oclip secure param such as password
-    short_option: x
-    long_option: secure
-    is_secured: true
-    is_optional: false
-    default_Value: pass123#
-  - name: string-param
-    type: string
-    description: Oclip string param
-    long_option: string-param
-    short_option: c
-    is_optional: false
-    default_Value: test
-  - name: yaml-param
-    type: json
-    description: Oclip yaml file location param
-    long_option: yaml-param
-    short_option: y
-    is_optional: false
-  - name: json-param
-    type: json
-    description: Oclip json file location param
-    long_option: json-param
-    short_option: j
-    is_optional: false
-  - name: long-param
-    type: digit
-    description: Oclip long param
-    short_option: l
-    long_option: long-opt
-    is_optional: false
-    default_value: 10
-  - name: url-param
-    type: url
-    description: Oclip url param
-    short_option: r
-    long_option: url
-    is_optional: false
-    default_value: http://localhost:8082/file.txt
-  - name: env-param
-    type: string
-    description: Oclip env param.
-    short_option: z
-    long_option: env
-    is_optional: false
-    default_value: ${ENV_VAR}
-  - name: positional-args
-    type: string
-    description: Oclip positional args, if no short option and no long option given for it
-    is_optional: false
-    default_value: http://localhost:8082/file.txt
-results:
-  direction: portrait
-  attributes:
-    - name: output-1
-      description: Oclip output attribute marked in short
-      scope: short
-      type: string
-      is_secured: true
-    - name: output-2
-      description: Oclip output attribute marked in long
-      scope: short
-      is_secured: false
-      type: string
\ No newline at end of file
diff --git a/framework/src/test/resources/onap-cli-sample/schema-refresh-sample.yaml b/framework/src/test/resources/open-cli-sample/schema-refresh-sample.yaml
index 80e34844..c24ea4d2 100644
--- a/framework/src/test/resources/onap-cli-sample/schema-refresh-sample.yaml
+++ b/framework/src/test/resources/open-cli-sample/schema-refresh-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
 name: schema-refresh
 version: cli-1.0
 samples:
diff --git a/framework/src/test/resources/onap-cli-sample/schema-validate-sample.yaml b/framework/src/test/resources/open-cli-sample/schema-validate-sample.yaml
index fd7c1611..21cc4012 100644
--- a/framework/src/test/resources/onap-cli-sample/schema-validate-sample.yaml
+++ b/framework/src/test/resources/open-cli-sample/schema-validate-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
 name: schema-validate
 version: cli-1.0
 samples:
diff --git a/framework/src/test/resources/open-cli-schema/sample-test-schema.yaml b/framework/src/test/resources/open-cli-schema/sample-test-schema.yaml
index 347e9123..3c4ace83 100644
--- a/framework/src/test/resources/open-cli-schema/sample-test-schema.yaml
+++ b/framework/src/test/resources/open-cli-schema/sample-test-schema.yaml
@@ -5,7 +5,7 @@ info:
   product: open-cli
   service: test
   type: cmd
-  author: Kanagaraj Manickam mkr1481@gmail.com
+  author: Kanagaraj Manickam kanagaraj.manickam@huawei.com
 parameters:
   - name: bool-param
     type: bool
diff --git a/framework/src/test/resources/open-cli-schema/sample-test1-schema-http.yaml b/framework/src/test/resources/open-cli-schema/sample-test1-schema-http.yaml
index 72c7dc55..f162231f 100644
--- a/framework/src/test/resources/open-cli-schema/sample-test1-schema-http.yaml
+++ b/framework/src/test/resources/open-cli-schema/sample-test1-schema-http.yaml
@@ -6,7 +6,7 @@ info:
   product: open-cli
   service: test
   type: cmd
-  author: Kanagaraj Manickam mkr1481@gmail.com
+  author: Kanagaraj Manickam kanagaraj.manickam@huawei.com
 
 parameters:
   - name: bool-param
diff --git a/framework/src/test/resources/open-cli-schema/testauth-login.yaml b/framework/src/test/resources/open-cli-schema/testauth-login.yaml
index 8f3a8339..3e9211ef 100644
--- a/framework/src/test/resources/open-cli-schema/testauth-login.yaml
+++ b/framework/src/test/resources/open-cli-schema/testauth-login.yaml
@@ -8,7 +8,7 @@ info:
   product: open-cli
   service: test
   type: auth
-  author: Kanagaraj Manickam mkr1481@gmail.com
+  author: Kanagaraj Manickam kanagaraj.manickam@huawei.com
 
 parameters:
   - name: string-param
diff --git a/framework/src/test/resources/open-cli-schema/testauth-logout.yaml b/framework/src/test/resources/open-cli-schema/testauth-logout.yaml
index d8de7c6f..dfe33638 100644
--- a/framework/src/test/resources/open-cli-schema/testauth-logout.yaml
+++ b/framework/src/test/resources/open-cli-schema/testauth-logout.yaml
@@ -8,7 +8,7 @@ info:
   product: open-cli
   service: test
   type: auth
-  author: Kanagaraj Manickam mkr1481@gmail.com
+  author: Kanagaraj Manickam kanagaraj.manickam@huawei.com
 
 # followings are dummy simulator for http command
 http:
diff --git a/framework/src/test/resources/sample-test-info.yaml b/framework/src/test/resources/sample-test-info.yaml
index b80bfad7..f85d43c0 100644
--- a/framework/src/test/resources/sample-test-info.yaml
+++ b/framework/src/test/resources/sample-test-info.yaml
@@ -6,4 +6,4 @@ info:
   product: open-cli
   service: test
   type: cmd
-  author: Kanagaraj Manickam mkr1481@gmail.com
+  author: Kanagaraj Manickam kanagaraj.manickam@huawei.com
diff --git a/framework/src/test/resources/sample-test-invalid-schema-duplicate-longoption.yaml b/framework/src/test/resources/sample-test-invalid-schema-duplicate-longoption.yaml
index a0fb0d56..f3a0a1da 100644
--- a/framework/src/test/resources/sample-test-invalid-schema-duplicate-longoption.yaml
+++ b/framework/src/test/resources/sample-test-invalid-schema-duplicate-longoption.yaml
@@ -6,7 +6,7 @@ info:
   product: open-cli
   service: test
   type: cmd
-  author: Kanagaraj Manickam mkr1481@gmail.com
+  author: Kanagaraj Manickam kanagaraj.manickam@huawei.com
 
 parameters:
   - name: bool-param
diff --git a/framework/src/test/resources/sample-test-invalid-schema-duplicate-name.yaml b/framework/src/test/resources/sample-test-invalid-schema-duplicate-name.yaml
index 0718f315..9986ff6b 100644
--- a/framework/src/test/resources/sample-test-invalid-schema-duplicate-name.yaml
+++ b/framework/src/test/resources/sample-test-invalid-schema-duplicate-name.yaml
@@ -5,7 +5,7 @@ info:
   product: open-cli
   service: test
   type: cmd
-  author: Kanagaraj Manickam mkr1481@gmail.com
+  author: Kanagaraj Manickam kanagaraj.manickam@huawei.com
 
 parameters:
   - name: bool-param
diff --git a/framework/src/test/resources/sample-test-invalid-schema-duplicate-shortoption.yaml b/framework/src/test/resources/sample-test-invalid-schema-duplicate-shortoption.yaml
index d61bf6e9..0843faf2 100644
--- a/framework/src/test/resources/sample-test-invalid-schema-duplicate-shortoption.yaml
+++ b/framework/src/test/resources/sample-test-invalid-schema-duplicate-shortoption.yaml
@@ -5,7 +5,7 @@ info:
   product: open-cli
   service: test
   type: cmd
-  author: Kanagaraj Manickam mkr1481@gmail.com
+  author: Kanagaraj Manickam kanagaraj.manickam@huawei.com
 parameters:
   - name: bool-param
     type: bool
diff --git a/framework/src/test/resources/sample-test-invalid-schema.yaml b/framework/src/test/resources/sample-test-invalid-schema.yaml
index 06c45daa..06332505 100644
--- a/framework/src/test/resources/sample-test-invalid-schema.yaml
+++ b/framework/src/test/resources/sample-test-invalid-schema.yaml
@@ -5,7 +5,7 @@ info:
   product: open-cli
   service: test
   type: cmd
-  author: Kanagaraj Manickam mkr1481@gmail.com
+  author: Kanagaraj Manickam kanagaraj.manickam@huawei.com
 parameters:
   - name: bool-param
     type: bool
diff --git a/framework/src/test/resources/sample-test-schema-auth-required.yaml b/framework/src/test/resources/sample-test-schema-auth-required.yaml
index 062388f1..bb919d9a 100644
--- a/framework/src/test/resources/sample-test-schema-auth-required.yaml
+++ b/framework/src/test/resources/sample-test-schema-auth-required.yaml
@@ -5,7 +5,7 @@ info:
   product: open-cli
   service: test
   type: cmd
-  author: Kanagaraj Manickam mkr1481@gmail.com
+  author: Kanagaraj Manickam kanagaraj.manickam@huawei.com
 parameters:
   - name: bool-param
     type: bool
diff --git a/framework/src/test/resources/sample-test-schema-http.yaml b/framework/src/test/resources/sample-test-schema-http.yaml
index b5d91604..4ae6e9e0 100644
--- a/framework/src/test/resources/sample-test-schema-http.yaml
+++ b/framework/src/test/resources/sample-test-schema-http.yaml
@@ -5,7 +5,7 @@ info:
   product: open-cli
   service: test
   type: cmd
-  author: Kanagaraj Manickam mkr1481@gmail.com
+  author: Kanagaraj Manickam kanagaraj.manickam@huawei.com
 parameters:
   - name: service-name
     description: Oclip service name
diff --git a/framework/src/test/resources/sample-test-schema-no-auth-no-catalog.yaml b/framework/src/test/resources/sample-test-schema-no-auth-no-catalog.yaml
index e3e48c59..2629a2f9 100644
--- a/framework/src/test/resources/sample-test-schema-no-auth-no-catalog.yaml
+++ b/framework/src/test/resources/sample-test-schema-no-auth-no-catalog.yaml
@@ -8,7 +8,7 @@ info:
   product: open-cli
   service: test
   type: cmd
-  author: Kanagaraj Manickam mkr1481@gmail.com
+  author: Kanagaraj Manickam kanagaraj.manickam@huawei.com
 
 http:
 
diff --git a/framework/src/test/resources/sample-test-schema-no-auth-yes-catalog.yaml b/framework/src/test/resources/sample-test-schema-no-auth-yes-catalog.yaml
index 0cdee7fe..15b5bf0c 100644
--- a/framework/src/test/resources/sample-test-schema-no-auth-yes-catalog.yaml
+++ b/framework/src/test/resources/sample-test-schema-no-auth-yes-catalog.yaml
@@ -9,7 +9,7 @@ info:
   product: open-cli
   service: test
   type: cmd
-  author: Kanagaraj Manickam mkr1481@gmail.com
+  author: Kanagaraj Manickam kanagaraj.manickam@huawei.com
 
 http:
 
diff --git a/framework/src/test/resources/sample-test-schema-swagger.yaml b/framework/src/test/resources/sample-test-schema-swagger.yaml
index 2d8086e5..4108d4e6 100644
--- a/framework/src/test/resources/sample-test-schema-swagger.yaml
+++ b/framework/src/test/resources/sample-test-schema-swagger.yaml
@@ -5,7 +5,7 @@ info:
   product: open-cli
   service: test
   type: cmd
-  author: Kanagaraj Manickam mkr1481@gmail.com
+  author: Kanagaraj Manickam kanagaraj.manickam@huawei.com
 parameters:
   - name: user
     type: string
diff --git a/framework/src/test/resources/sample-test-schema-yes-auth-no-catalog.yaml b/framework/src/test/resources/sample-test-schema-yes-auth-no-catalog.yaml
index 0b418462..bb0ae46b 100644
--- a/framework/src/test/resources/sample-test-schema-yes-auth-no-catalog.yaml
+++ b/framework/src/test/resources/sample-test-schema-yes-auth-no-catalog.yaml
@@ -8,7 +8,7 @@ info:
   product: open-cli
   service: test
   type: cmd
-  author: Kanagaraj Manickam mkr1481@gmail.com
+  author: Kanagaraj Manickam kanagaraj.manickam@huawei.com
 
 http:
 
diff --git a/framework/src/test/resources/sample-test-schema-yes-auth-with-additional-params-no-catalog.yaml b/framework/src/test/resources/sample-test-schema-yes-auth-with-additional-params-no-catalog.yaml
index 4470e634..a5a39f92 100644
--- a/framework/src/test/resources/sample-test-schema-yes-auth-with-additional-params-no-catalog.yaml
+++ b/framework/src/test/resources/sample-test-schema-yes-auth-with-additional-params-no-catalog.yaml
@@ -9,7 +9,7 @@ info:
   product: open-cli
   service: test
   type: cmd
-  author: Kanagaraj Manickam mkr1481@gmail.com
+  author: Kanagaraj Manickam kanagaraj.manickam@huawei.com
 
 http:
 
diff --git a/framework/src/test/resources/sample-test-schema-yes-auth-yes-catalog.yaml b/framework/src/test/resources/sample-test-schema-yes-auth-yes-catalog.yaml
index ca22e1d1..4efd4c51 100644
--- a/framework/src/test/resources/sample-test-schema-yes-auth-yes-catalog.yaml
+++ b/framework/src/test/resources/sample-test-schema-yes-auth-yes-catalog.yaml
@@ -9,7 +9,7 @@ info:
   product: open-cli
   service: test
   type: cmd
-  author: Kanagaraj Manickam mkr1481@gmail.com
+  author: Kanagaraj Manickam kanagaraj.manickam@huawei.com
 
 http:
 
diff --git a/framework/src/test/resources/schema-validate-basic.yaml b/framework/src/test/resources/schema-validate-basic.yaml
index 14104879..982d6ceb 100644
--- a/framework/src/test/resources/schema-validate-basic.yaml
+++ b/framework/src/test/resources/schema-validate-basic.yaml
@@ -5,7 +5,7 @@ info:
   product: open-cli
   service: test
   type: cmd
-  author: Kanagaraj Manickam mkr1481@gmail.com
+  author: Kanagaraj Manickam kanagaraj.manickam@huawei.com
 parameters:
   - name: service-name1
     description: Oclip service name
diff --git a/framework/src/test/resources/schema-validate-http.yaml b/framework/src/test/resources/schema-validate-http.yaml
index 8228b179..7bdafc56 100644
--- a/framework/src/test/resources/schema-validate-http.yaml
+++ b/framework/src/test/resources/schema-validate-http.yaml
@@ -5,7 +5,7 @@ info:
   product: open-cli
   service: test
   type: cmd
-  author: Kanagaraj Manickam mkr1481@gmail.com
+  author: Kanagaraj Manickam kanagaraj.manickam@huawei.com
 
 parameters:
   - name: service-name1
diff --git a/framework/src/test/resources/schema-validate-invalid.yaml b/framework/src/test/resources/schema-validate-invalid.yaml
index 166e146b..06fa8c9e 100644
--- a/framework/src/test/resources/schema-validate-invalid.yaml
+++ b/framework/src/test/resources/schema-validate-invalid.yaml
@@ -5,7 +5,7 @@ info:
   product: open-cli
   service: test
   type: cmd
-  author: Kanagaraj Manickam mkr1481@gmail.com
+  author: Kanagaraj Manickam kanagaraj.manickam@huawei.com
 parameters:
   - name: name
     description: Oclip SDNC name
diff --git a/framework/src/test/resources/schema-validate-invalidschematype.yaml b/framework/src/test/resources/schema-validate-invalidschematype.yaml
index 0d5e34ce..0c5ade5d 100644
--- a/framework/src/test/resources/schema-validate-invalidschematype.yaml
+++ b/framework/src/test/resources/schema-validate-invalidschematype.yaml
@@ -4,7 +4,7 @@ info:
   product: open-cli
   service: test
   type: cmd
-  author: Kanagaraj Manickam mkr1481@gmail.com
+  author: Kanagaraj Manickam kanagaraj.manickam@huawei.com
 
 name: schema-validate
 parameters:
diff --git a/framework/src/test/resources/schema-validate-pass.yaml b/framework/src/test/resources/schema-validate-pass.yaml
index 28da9547..79cf7794 100644
--- a/framework/src/test/resources/schema-validate-pass.yaml
+++ b/framework/src/test/resources/schema-validate-pass.yaml
@@ -5,7 +5,7 @@ info:
   product: open-cli
   service: test
   type: cmd
-  author: Kanagaraj Manickam mkr1481@gmail.com
+  author: Kanagaraj Manickam kanagaraj.manickam@huawei.com
 
 parameters:
   - name: name