Merge changes I7388da38,Idcccea23,Ie8a98a2a,I1f83cc9d,Idf2aa6f8

* changes:
  Verfiy Invalid samples
  Add UT for validating using moco
  Enhance validation with moco server
  Model onap-cli-sample in java class
  Fix registrar test command registration UT

4 files changed, 55 insertions, 5 deletions

diff --git a/framework/src/main/java/org/onap/cli/fw/error/OnapCommandException.java b/framework/src/main/java/org/onap/cli/fw/error/OnapCommandException.java
index 8e99b9a1..3fecad02 100644
--- a/framework/src/main/java/org/onap/cli/fw/error/OnapCommandException.java
+++ b/framework/src/main/java/org/onap/cli/fw/error/OnapCommandException.java
@@ -35,6 +35,7 @@ schema 0xb00
 profile 0xc00
 product/service 0xd00
 catalog 0xe00
+sample 0xf00
  */
 public class OnapCommandException extends Exception {
 
diff --git a/framework/src/main/java/org/onap/cli/fw/error/OnapCommandInvalidSample.java b/framework/src/main/java/org/onap/cli/fw/error/OnapCommandInvalidSample.java
new file mode 100644
index 00000000..32e5cf65
--- /dev/null
+++ b/framework/src/main/java/org/onap/cli/fw/error/OnapCommandInvalidSample.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2017 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.error;
+
+/**
+ * Command sample is invalid.
+ *
+ */
+public class OnapCommandInvalidSample extends OnapCommandException {
+
+    private static final long serialVersionUID = -3387652326582792835L;
+
+    private static final String ERROR_CODE = "0xf001";
+
+    private static final String ERROR_MSG = "Invalid command sample ";
+
+    public OnapCommandInvalidSample(String schema, String error) {
+        super(ERROR_CODE, ERROR_MSG + schema + ", " + error);
+    }
+
+    public OnapCommandInvalidSample(String schema, Throwable throwable) {
+        super(ERROR_CODE, ERROR_MSG + schema , throwable);
+    }
+
+}
diff --git a/framework/src/test/java/org/onap/cli/fw/OnapCommandRegistrarTest.java b/framework/src/test/java/org/onap/cli/fw/OnapCommandRegistrarTest.java
index 16c3f2f3..4f5c95e2 100644
--- a/framework/src/test/java/org/onap/cli/fw/OnapCommandRegistrarTest.java
+++ b/framework/src/test/java/org/onap/cli/fw/OnapCommandRegistrarTest.java
@@ -60,19 +60,18 @@ public class OnapCommandRegistrarTest {
     public void registerTest() throws OnapCommandException {
         OnapCommand test = new OnapCommandTest();
         Class<OnapCommand> cmd = (Class<OnapCommand>) test.getClass();
-        registerar.register("Test", "cli-1.0", cmd);
-        OnapCommand cc = registerar.get("Test");
+        registerar.register("test", "cli-1.0", cmd);
+        OnapCommand cc = registerar.get("test");
         assertTrue(cmd == cc.getClass());
 
     }
 
     @Test
-    // For Coverage
     public void cmdTestSchema() throws OnapCommandException {
         OnapCommand test = new OnapCommandTest();
         Class<OnapCommand> cmd = (Class<OnapCommand>) test.getClass();
-        registerar.register("Test", "cli-1.0", cmd);
-        OnapCommand cc = registerar.get("Test");
+        registerar.register("test", "cli-1.0", cmd);
+        OnapCommand cc = registerar.get("test");
     }
 
     @Test
diff --git a/framework/src/test/java/org/onap/cli/fw/error/OnapCommandErrorTest.java b/framework/src/test/java/org/onap/cli/fw/error/OnapCommandErrorTest.java
index e56eac03..cc12cfc0 100644
--- a/framework/src/test/java/org/onap/cli/fw/error/OnapCommandErrorTest.java
+++ b/framework/src/test/java/org/onap/cli/fw/error/OnapCommandErrorTest.java
@@ -256,6 +256,17 @@ public class OnapCommandErrorTest {
     }
 
     @Test
+    public void onapCommandSampleInvalidTest() {
+        OnapCommandInvalidSample failed = new OnapCommandInvalidSample("Test", "error");
+
+        assertEquals("0xf001::Invalid command sample Test, error", failed.getMessage());
+
+        failed = new OnapCommandInvalidSample("Test", new Exception("error"));
+
+        assertEquals("0xf001::Invalid command sample Test, error", failed.getMessage());
+    }
+
+    @Test
     public void onapCommandServiceNotFoundTest() {
         OnapCommandServiceNotFound failed = new OnapCommandServiceNotFound("Service");