Merge changes Ic75c7eca,Ic0b547f7,I932b1ceb,I26c99032,Ifaeeb8f4, ...

* changes:
  OCLIP: Change the order of classpath
  OCLIP: Fix the correct type of OCS command
  VTP: Add schema-list command
  OCLIP: Fix OCLIP registrar to log register events
  OCLIP: Fix json print format
  VTP: Enable grpc part of deployment
  VTP: grpc client impl
  VTP: grpc server impl
  VTP: grpc stub model
  VTP: grpc client
  VTP: grpc server
  VTP: grpc stub
  VTP: Add grpc

7 files changed, 120 insertions, 4 deletions

diff --git a/framework/src/main/java/org/onap/cli/fw/cmd/OnapSchemaListCommand.java b/framework/src/main/java/org/onap/cli/fw/cmd/OnapSchemaListCommand.java
new file mode 100644
index 00000000..bbd350b7
--- /dev/null
+++ b/framework/src/main/java/org/onap/cli/fw/cmd/OnapSchemaListCommand.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2018 Huawei Technologies Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.onap.cli.fw.cmd;
+
+import java.util.List;
+
+import org.onap.cli.fw.error.OnapCommandException;
+import org.onap.cli.fw.schema.OnapCommandSchema;
+import org.onap.cli.fw.schema.OnapCommandSchemaInfo;
+import org.onap.cli.fw.utils.OnapCommandDiscoveryUtils;
+
+/**
+ * Refresh external schema.
+ *
+ */
+@OnapCommandSchema(schema = "schema-list.yaml")
+public class OnapSchemaListCommand extends OnapCommand {
+
+    @Override
+    protected void run() throws OnapCommandException {
+
+        String product = getParametersMap().get("product").getValue().toString();
+
+        List<OnapCommandSchemaInfo> schemas = OnapCommandDiscoveryUtils.discoverOrLoadSchemas(true);
+        int i = 0;
+        for (OnapCommandSchemaInfo schema :  schemas) {
+            if (schema.isIgnore()) {
+                continue;
+            }
+
+            if (schema.getProduct().equalsIgnoreCase(product)) {
+                i++;
+
+                this.getResult().getRecordsMap().get("sr.no").getValues().add(String.valueOf(i));
+                this.getResult().getRecordsMap().get("command").getValues().add(schema.getCmdName());
+                this.getResult().getRecordsMap().get("schema").getValues().add(schema.getSchemaName());
+                this.getResult().getRecordsMap().get("ocs-version").getValues().add(schema.getVersion());
+
+                this.getResult().getRecordsMap().get("type").getValues().add(schema.getSchemaProfile());
+            }
+        }
+    }
+
+}
diff --git a/framework/src/main/java/org/onap/cli/fw/output/print/OnapCommandPrint.java b/framework/src/main/java/org/onap/cli/fw/output/print/OnapCommandPrint.java
index fd1ddbaf..614ef5d1 100644
--- a/framework/src/main/java/org/onap/cli/fw/output/print/OnapCommandPrint.java
+++ b/framework/src/main/java/org/onap/cli/fw/output/print/OnapCommandPrint.java
@@ -248,7 +248,8 @@ public class OnapCommandPrint {
             JSONObject rowO = new JSONObject();
 
             for (int j=0; j<titleRow.size(); j++) {
-                rowO.put(titleRow.get(j).toString(), rows.get(i).get(j).toString());
+                if (rows.get(i).get(j) != null)
+                    rowO.put(titleRow.get(j).toString(), rows.get(i).get(j).toString());
             }
 
             array.add(rowO);
diff --git a/framework/src/main/java/org/onap/cli/fw/registrar/OnapCommandRegistrar.java b/framework/src/main/java/org/onap/cli/fw/registrar/OnapCommandRegistrar.java
index 6ea1931a..07c2dbe1 100644
--- a/framework/src/main/java/org/onap/cli/fw/registrar/OnapCommandRegistrar.java
+++ b/framework/src/main/java/org/onap/cli/fw/registrar/OnapCommandRegistrar.java
@@ -121,6 +121,7 @@ public class OnapCommandRegistrar {
         }
 
         this.registry.put(name + ":" + version, cmd);
+        log.info("REGISITER : " + name + ":" + version + " = " + cmd.getCanonicalName());
         this.availableProductVersions.add(version);
 
     }
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
index 285f8f38..85294cbb 100644
--- 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
@@ -13,4 +13,5 @@
 # limitations under the License.
 
 org.onap.cli.fw.cmd.OnapSchemaValidateCommand
-org.onap.cli.fw.cmd.OnapSchemaRefreshCommand
\ No newline at end of file
+org.onap.cli.fw.cmd.OnapSchemaRefreshCommand
+org.onap.cli.fw.cmd.OnapSchemaListCommand
\ No newline at end of file
diff --git a/framework/src/main/resources/open-cli-schema/schema-list.yaml b/framework/src/main/resources/open-cli-schema/schema-list.yaml
new file mode 100644
index 00000000..44172d75
--- /dev/null
+++ b/framework/src/main/resources/open-cli-schema/schema-list.yaml
@@ -0,0 +1,55 @@
+# Copyright 2018 Huawei Technologies Co., Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+open_cli_schema_version: 1.0
+name: schema-list
+description: OCLIP command to list available schema
+
+info:
+  product: open-cli
+  service: schema
+  type: cmd
+  author: Kanagaraj Manickam kanagaraj.manickam@huawei.com
+
+parameters:
+  - name: product
+    type: string
+    description: For a given product version
+    short_option: l
+    long_option: product
+    is_optional: false
+
+results:
+  direction: landscape
+  attributes:
+    - name: sr.no
+      description: Serial Number
+      scope: short
+      type: string
+    - name: command
+      description: Command name
+      scope: short
+      type: string
+    - name: schema
+      description: Schema name
+      scope: short
+      type: string
+    - name: ocs-version
+      description: Schema version
+      scope: short
+      type: string
+    - name: type
+      description: Command type
+      scope: short
+      type: string
\ No newline at end of file
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 cc3f2300..1e448c9f 100644
--- a/framework/src/main/resources/open-cli-schema/schema-refresh.yaml
+++ b/framework/src/main/resources/open-cli-schema/schema-refresh.yaml
@@ -19,7 +19,7 @@ description: OCLIP command to refresh schemas stored in open-cli-schema folders.
 info:
   product: open-cli
   service: schema
-  type: auth
+  type: cmd
   author: Kanagaraj Manickam kanagaraj.manickam@huawei.com
 
 results:
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 a8a04941..97999dde 100644
--- a/framework/src/main/resources/open-cli-schema/schema-validate.yaml
+++ b/framework/src/main/resources/open-cli-schema/schema-validate.yaml
@@ -19,7 +19,7 @@ description: OCLIP command to validate schema
 info:
   product: open-cli
   service: schema
-  type: auth
+  type: cmd
   author: Kanagaraj Manickam kanagaraj.manickam@huawei.com
 
 parameters: