Fix ovp lcm validation

Issue-ID: CLI-166

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

15 files changed, 100 insertions, 40 deletions

diff --git a/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/catalog/vfc-catalog-onboard-ns-schema-moco.json b/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/catalog/vfc-catalog-onboard-ns-schema-moco.json
index 5218f7fd..41accfa7 100644
--- a/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/catalog/vfc-catalog-onboard-ns-schema-moco.json
+++ b/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/catalog/vfc-catalog-onboard-ns-schema-moco.json
@@ -1,14 +1,7 @@
 [ {
   "request" : {
     "method" : "post",
-    "uri" : "/api/catalog/v1/nspackages",
-    "headers" : {
-      "Accept" : "application/json",
-      "Content-Type" : "application/json"
-    },
-    "json" : {
-      "csarId" : "a3394090-c5b4-49b4-974c-00a6eac755ab"
-    }
+    "uri" : "/api/catalog/v1/nspackages"
   },
   "response" : {
     "status" : 202,
diff --git a/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/catalog/vfc-catalog-onboard-vnf-schema-moco.json b/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/catalog/vfc-catalog-onboard-vnf-schema-moco.json
index 5e0591de..5327af7a 100644
--- a/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/catalog/vfc-catalog-onboard-vnf-schema-moco.json
+++ b/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/catalog/vfc-catalog-onboard-vnf-schema-moco.json
@@ -1,14 +1,7 @@
 [ {
   "request" : {
     "method" : "post",
-    "uri" : "/api/catalog/v1/vnfpackages",
-    "headers" : {
-      "Accept" : "application/json",
-      "Content-Type" : "application/json"
-    },
-    "json" : {
-      "csarId" : "c1cec675-1069-487d-b1a9-c256b17c3291"
-    }
+    "uri" : "/api/catalog/v1/vnfpackages"
   },
   "response" : {
     "status" : 202,
@@ -16,4 +9,4 @@
       "jobId" : "1d871fc4-380c-4699-8f7f-77e508f9734d"
     }
   }
-} ]
\ No newline at end of file
+} ]
diff --git a/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/moco-global.json b/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/moco-global.json
new file mode 100644
index 00000000..1ae10db0
--- /dev/null
+++ b/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/moco-global.json
@@ -0,0 +1,20 @@
+[
+    {
+        "include" : "catalog/vfc-catalog-onboard-vnf-schema-moco.json"
+    },
+    {
+        "include" : "catalog/vfc-catalog-onboard-ns-schema-moco.json"
+    },
+    {
+        "include" : "nslcm/vfc-nslcm-create-schema-moco.json"
+    },
+    {
+        "include" : "nslcm/vfc-nslcm-instantiate-schema-moco.json"
+    },
+    {
+        "include" : "nslcm/vfc-nslcm-delete-schema-moco.json"
+    },
+    {
+        "include" : "nslcm/vfc-nslcm-terminate-schema-moco.json"
+    }
+]
\ No newline at end of file
diff --git a/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/nslcm/vfc-nslcm-create-schema-moco.json b/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/nslcm/vfc-nslcm-create-schema-moco.json
index 07392582..9a7fd103 100644
--- a/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/nslcm/vfc-nslcm-create-schema-moco.json
+++ b/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/nslcm/vfc-nslcm-create-schema-moco.json
@@ -1,15 +1,7 @@
 [ {
   "request" : {
     "method" : "post",
-    "uri" : "/api/nslcm/v1/ns",
-    "headers" : {
-      "Accept" : "application/json",
-      "Content-Type" : "application/json"
-    },
-    "json" : {
-      "csarId" : "a3394090-c5b4-49b4-974c-00a6eac755ab",
-      "nsName" : "vcpe1"
-    }
+    "uri" : "/api/nslcm/v1/ns"
   },
   "response" : {
     "status" : 201,
diff --git a/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/nslcm/vfc-nslcm-delete-schema-moco.json b/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/nslcm/vfc-nslcm-delete-schema-moco.json
new file mode 100644
index 00000000..de6743cc
--- /dev/null
+++ b/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/nslcm/vfc-nslcm-delete-schema-moco.json
@@ -0,0 +1,10 @@
+[ {
+  "request" : {
+    "method" : "delete",
+    "uri" : "/api/nslcm/v1/ns/25f3159c-ff2d-4ad0-ac66-3270941bfa52"
+  },
+  "response" : {
+    "status" : 204,
+    "json" : null
+  }
+} ]
diff --git a/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/nslcm/vfc-nslcm-delete-schema-sample.yaml b/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/nslcm/vfc-nslcm-delete-schema-sample.yaml
new file mode 100644
index 00000000..4ce418b8
--- /dev/null
+++ b/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/nslcm/vfc-nslcm-delete-schema-sample.yaml
@@ -0,0 +1,9 @@
+open_cli_sample_version: 1.0
+name: vfc-nslcm-delete
+version: onap-dublin
+samples:
+  sample1:
+    name: vfc-nslcm-delete
+    input: --host-url http://localhost:12306 --ns-instance-id 25f3159c-ff2d-4ad0-ac66-3270941bfa52
+    moco: vfc-nslcm-delete-schema-moco.json
+    output:
\ No newline at end of file
diff --git a/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/nslcm/vfc-nslcm-instantiate-schema-moco.json b/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/nslcm/vfc-nslcm-instantiate-schema-moco.json
new file mode 100644
index 00000000..94a357b3
--- /dev/null
+++ b/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/nslcm/vfc-nslcm-instantiate-schema-moco.json
@@ -0,0 +1,12 @@
+[ {
+  "request" : {
+    "method" : "post",
+    "uri" : "/api/nslcm/v1/ns/25f3159c-ff2d-4ad0-ac66-3270941bfa52/instantiate"
+  },
+  "response" : {
+    "status" : 200,
+    "json" : {
+      "jobId" : "7b06898d-e67a-4c9f-b1ce-90346ed6e520"
+    }
+  }
+} ]
diff --git a/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/nslcm/vfc-nslcm-instantiate-schema-sample.yaml b/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/nslcm/vfc-nslcm-instantiate-schema-sample.yaml
new file mode 100644
index 00000000..bdda2352
--- /dev/null
+++ b/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/nslcm/vfc-nslcm-instantiate-schema-sample.yaml
@@ -0,0 +1,14 @@
+open_cli_sample_version: 1.0
+name: vfc-nslcm-instantiate
+version: onap-dublin
+samples:
+  sample1:
+    name: vfc-nslcm-instantiate
+    input: --host-url http://localhost:12306 --ns-instance-id 25f3159c-ff2d-4ad0-ac66-3270941bfa52 --location OCOMP-lcm3_RegionOVP --sdn-controller-id 1
+    moco: vfc-nslcm-instantiate-schema-moco.json
+    output: |
+      +--------------------------------------+
+      |job-id                                |
+      +--------------------------------------+
+      |7b06898d-e67a-4c9f-b1ce-90346ed6e520  |
+      +--------------------------------------+
diff --git a/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/nslcm/vfc-nslcm-terminate-schema-moco.json b/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/nslcm/vfc-nslcm-terminate-schema-moco.json
new file mode 100644
index 00000000..f7d43635
--- /dev/null
+++ b/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/nslcm/vfc-nslcm-terminate-schema-moco.json
@@ -0,0 +1,12 @@
+[ {
+  "request" : {
+    "method" : "post",
+    "uri" : "/api/nslcm/v1/ns/25f3159c-ff2d-4ad0-ac66-3270941bfa52/terminate"
+  },
+  "response" : {
+    "status" : 202,
+    "json" : {
+      "jobId" : "f479d5eb-82a1-4a1f-9174-e071ee46c841"
+    }
+  }
+} ]
diff --git a/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/nslcm/vfc-nslcm-terminate-schema-sample.yaml b/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/nslcm/vfc-nslcm-terminate-schema-sample.yaml
new file mode 100644
index 00000000..e6bdfbce
--- /dev/null
+++ b/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/nslcm/vfc-nslcm-terminate-schema-sample.yaml
@@ -0,0 +1,14 @@
+open_cli_sample_version: 1.0
+name: vfc-nslcm-terminate
+version: onap-dublin
+samples:
+  sample1:
+    name: vfc-nslcm-terminate
+    input: --host-url http://localhost:12306 --ns-instance-id 25f3159c-ff2d-4ad0-ac66-3270941bfa52
+    moco: vfc-nslcm-terminate-schema-moco.json
+    output: |
+      +--------------------------------------+
+      |job-id                                |
+      +--------------------------------------+
+      |f479d5eb-82a1-4a1f-9174-e071ee46c841  |
+      +--------------------------------------+
diff --git a/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/nslcm/vfc-nslcm-create-schema.yaml b/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/nslcm/vfc-nslcm-create-schema.yaml
index 29fceccd..777e33bb 100644
--- a/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/nslcm/vfc-nslcm-create-schema.yaml
+++ b/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/nslcm/vfc-nslcm-create-schema.yaml
@@ -48,7 +48,7 @@ parameters:
     is_optional: false
 
 results:
-  direction: landscape
+  direction: portrait
   attributes:
     - name: ns-instance-id
       description: ns-instance-id
diff --git a/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/nslcm/vfc-nslcm-delete-schema.yaml b/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/nslcm/vfc-nslcm-delete-schema.yaml
index 4850e070..cda2e7f8 100644
--- a/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/nslcm/vfc-nslcm-delete-schema.yaml
+++ b/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/nslcm/vfc-nslcm-delete-schema.yaml
@@ -29,14 +29,6 @@ parameters:
     long_option: ns-instance-id
     is_optional: false
 
-results:
-  direction: landscape
-  attributes:
-    - name: status
-      description: status
-      scope: short
-      type: string
-
 http:
   service:
     auth: none
@@ -52,5 +44,4 @@ http:
       Accept: application/json
   success_codes:
     - 204
-  result_map:
-    status: ${success_codes}
+
diff --git a/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/nslcm/vfc-nslcm-get-schema.yaml b/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/nslcm/vfc-nslcm-get-schema.yaml
index d6fa4398..984a1dc7 100644
--- a/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/nslcm/vfc-nslcm-get-schema.yaml
+++ b/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/nslcm/vfc-nslcm-get-schema.yaml
@@ -22,7 +22,7 @@ info:
   author: ONAP HPA Integration Team (haibin.huang@intel.com)
 
 results:
-  direction: landscape
+  direction: portrait
   attributes:
     - name: ns-instance-id
       description: ns-instance-id
diff --git a/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/nslcm/vfc-nslcm-instantiate-schema.yaml b/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/nslcm/vfc-nslcm-instantiate-schema.yaml
index b31d4e4f..91387f03 100644
--- a/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/nslcm/vfc-nslcm-instantiate-schema.yaml
+++ b/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/nslcm/vfc-nslcm-instantiate-schema.yaml
@@ -42,7 +42,7 @@ parameters:
     is_optional: false
 
 results:
-  direction: landscape
+  direction: portrait
   attributes:
     - name: job-id
       description: job id
diff --git a/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/nslcm/vfc-nslcm-terminate-schema.yaml b/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/nslcm/vfc-nslcm-terminate-schema.yaml
index 19f68666..387ab16c 100644
--- a/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/nslcm/vfc-nslcm-terminate-schema.yaml
+++ b/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/nslcm/vfc-nslcm-terminate-schema.yaml
@@ -30,7 +30,7 @@ parameters:
     is_optional: false
 
 results:
-  direction: landscape
+  direction: portrait
   attributes:
     - name: job-id
       description: job id