Bug fixes in CLI

- Fixed Bugs in vnf-create and vf-module-create commands
- Added sample files

Signed-off-by: Itohan Ukponmwan <itohan.ukponmwan@intel.com>
Issue-ID: CLI-229
Change-Id: Ib5ae987709aa2cf3a6edba1691d3ead34ea746a4

8 files changed, 334 insertions, 0 deletions

diff --git a/products/onap-elalto/features/sdnc/src/main/resources/open-cli-sample/vf-preload-schema-elalto-moco.json b/products/onap-elalto/features/sdnc/src/main/resources/open-cli-sample/vf-preload-schema-elalto-moco.json
new file mode 100644
index 00000000..45113fd4
--- /dev/null
+++ b/products/onap-elalto/features/sdnc/src/main/resources/open-cli-sample/vf-preload-schema-elalto-moco.json
@@ -0,0 +1,156 @@
+[ {
+  "request" : {
+    "method" : "post",
+    "uri" : "/restconf/operations/VNF-API:preload-vnf-topology-operation",
+    "headers" : {
+      "Authorization" : "Basic YWRtaW46S3A4Yko0U1hzek0wV1hsaGFrM2VIbGNzZTJnQXc4NHZhb0dHbUp2VXkyVQ==",
+      "X-FromAppId" : "ONAP CLI",
+      "Accept" : "application/json",
+      "X-TransactionId" : "req-e9172de6-46e0-4758-9348-66f5b46e9e00",
+      "Content-Type" : "application/json"
+    },
+    "json" : {
+      "input" : {
+        "request-information" : {
+          "notification-url" : "openecomp.org",
+          "order-number" : "1",
+          "order-version" : "1",
+          "request-action" : "PreloadVNFRequest",
+          "request-id" : "test"
+        },
+        "sdnc-request-header" : {
+          "svc-action" : "reserve",
+          "svc-notification-url" : "http://openecomp.org:8080/adapters/rest/SDNCNotify",
+          "svc-request-id" : "test"
+        },
+        "vnf-topology-information" : {
+          "vnf-assignments" : {
+            "availability-zones" : [ ],
+            "vnf-networks" : [ ],
+            "vnf-vms" : [ ]
+          },
+          "vnf-parameters" : [ {
+            "vnf-parameter-name" : "vfw_image_name",
+            "vnf-parameter-value" : "ubuntu-16.04"
+          }, {
+            "vnf-parameter-name" : "firewall_flavor_name",
+            "vnf-parameter-value" : "a"
+          }, {
+            "vnf-parameter-name" : "sink_flavor_name",
+            "vnf-parameter-value" : "b"
+          }, {
+            "vnf-parameter-name" : "packetgen_flavor_name",
+            "vnf-parameter-value" : "c"
+          }, {
+            "vnf-parameter-name" : "public_net_id",
+            "vnf-parameter-value" : "external"
+          }, {
+            "vnf-parameter-name" : "unprotected_private_net_id",
+            "vnf-parameter-value" : "unprotected_private_net_11"
+          }, {
+            "vnf-parameter-name" : "protected_private_net_id",
+            "vnf-parameter-value" : "protected_private_net_11"
+          }, {
+            "vnf-parameter-name" : "onap_private_net_id",
+            "vnf-parameter-value" : "oam_onap_vnf_test"
+          }, {
+            "vnf-parameter-name" : "protected_private_provider_net",
+            "vnf-parameter-value" : "private-0"
+          }, {
+            "vnf-parameter-name" : "unprotected_private_provider_net",
+            "vnf-parameter-value" : "private-0"
+          }, {
+            "vnf-parameter-name" : "onap_private_subnet_id",
+            "vnf-parameter-value" : "oam_onap_vnf_test"
+          }, {
+            "vnf-parameter-name" : "unprotected_private_net_cidr",
+            "vnf-parameter-value" : "192.168.10.0/24"
+          }, {
+            "vnf-parameter-name" : "protected_private_net_cidr",
+            "vnf-parameter-value" : "192.168.20.0/24"
+          }, {
+            "vnf-parameter-name" : "onap_private_net_cidr",
+            "vnf-parameter-value" : "10.0.0.0/16"
+          }, {
+            "vnf-parameter-name" : "vfw_private_ip_0",
+            "vnf-parameter-value" : "192.168.10.100"
+          }, {
+            "vnf-parameter-name" : "vfw_private_ip_1",
+            "vnf-parameter-value" : "192.168.20.100"
+          }, {
+            "vnf-parameter-name" : "vfw_private_ip_2",
+            "vnf-parameter-value" : "10.0.100.11"
+          }, {
+            "vnf-parameter-name" : "vpg_private_ip_0",
+            "vnf-parameter-value" : "192.168.10.200"
+          }, {
+            "vnf-parameter-name" : "vpg_private_ip_1",
+            "vnf-parameter-value" : "10.0.100.12"
+          }, {
+            "vnf-parameter-name" : "vsn_private_ip_0",
+            "vnf-parameter-value" : "192.168.20.250"
+          }, {
+            "vnf-parameter-name" : "vsn_private_ip_1",
+            "vnf-parameter-value" : "10.0.100.13"
+          }, {
+            "vnf-parameter-name" : "vfw_name_0",
+            "vnf-parameter-value" : "vfw"
+          }, {
+            "vnf-parameter-name" : "vpg_name_0",
+            "vnf-parameter-value" : "vpktgen"
+          }, {
+            "vnf-parameter-name" : "vsn_name_0",
+            "vnf-parameter-value" : "vsink"
+          }, {
+            "vnf-parameter-name" : "vfw_private_0_port_vnic_type",
+            "vnf-parameter-value" : "normal"
+          }, {
+            "vnf-parameter-name" : "vfw_private_1_port_vnic_type",
+            "vnf-parameter-value" : "normal"
+          }, {
+            "vnf-parameter-name" : "vfw_private_2_port_vnic_type",
+            "vnf-parameter-value" : "normal"
+          }, {
+            "vnf-parameter-name" : "vpg_private_0_port_vnic_type",
+            "vnf-parameter-value" : "normal"
+          }, {
+            "vnf-parameter-name" : "vpg_private_1_port_vnic_type",
+            "vnf-parameter-value" : "normal"
+          }, {
+            "vnf-parameter-name" : "vsn_private_0_port_vnic_type",
+            "vnf-parameter-value" : "normal"
+          }, {
+            "vnf-parameter-name" : "vsn_private_1_port_vnic_type",
+            "vnf-parameter-value" : "normal"
+          }, {
+            "vnf-parameter-name" : "vf_module_id",
+            "vnf-parameter-value" : "HpaVf0..base_vfw..module-0"
+          }, {
+            "vnf-parameter-name" : "sec_group",
+            "vnf-parameter-value" : "default"
+          }, {
+            "vnf-parameter-name" : "template_type",
+            "vnf-parameter-value" : "heat"
+          } ],
+          "vnf-topology-identifier" : {
+            "generic-vnf-name" : "vfw-hpa-vnf",
+            "generic-vnf-type" : "hpa-vf-0 0",
+            "service-type" : "9545d48f-03da-467e-8994-ae0716e7372d",
+            "vnf-name" : "vfw-sriov-cli",
+            "vnf-type" : "HpaVf0..base_vfw..module-0"
+          }
+        }
+      }
+    }
+  },
+  "response" : {
+    "status" : 200,
+    "json" : {
+      "output" : {
+        "svc-request-id" : "test",
+        "response-code" : "200",
+        "ack-final-indicator" : "Y"
+      }
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/products/onap-elalto/features/sdnc/src/main/resources/open-cli-sample/vf-preload-schema-elalto-sample.yaml b/products/onap-elalto/features/sdnc/src/main/resources/open-cli-sample/vf-preload-schema-elalto-sample.yaml
new file mode 100644
index 00000000..2db81d5a
--- /dev/null
+++ b/products/onap-elalto/features/sdnc/src/main/resources/open-cli-sample/vf-preload-schema-elalto-sample.yaml
@@ -0,0 +1,9 @@
+open_cli_sample_version: 1.0
+name: vf-preload
+version: onap-elalto
+samples:
+  sample1:
+    name: vf-preload
+    input: -u admin -p Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U -y /root/automation_stuff/integration/test/hpa_automation/heat/sample_vfw_hpa_preload_sriov_fake.txt -m http://10.12.5.110:30059
+    moco: vf-preload-schema-elalto-moco.json
+    output:
\ No newline at end of file
diff --git a/products/onap-elalto/features/so/src/main/resources/open-cli-sample/vf-module-create-schema-elalto-moco.json b/products/onap-elalto/features/so/src/main/resources/open-cli-sample/vf-module-create-schema-elalto-moco.json
new file mode 100644
index 00000000..3af8c117
--- /dev/null
+++ b/products/onap-elalto/features/so/src/main/resources/open-cli-sample/vf-module-create-schema-elalto-moco.json
@@ -0,0 +1,77 @@
+[ {
+  "request" : {
+    "method" : "post",
+    "uri" : "/onap/so/infra/serviceInstantiation/v7/serviceInstances/9545d48f-03da-467e-8994-ae0716e7372d/vnfs/067c71c2-2fa5-4573-9c6d-aa7bf49f7c51/vfModules",
+    "headers" : {
+      "Authorization" : "Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA==",
+      "X-FromAppId" : "ONAP CLI",
+      "Accept" : "application/json",
+      "X-TransactionId" : "ed017684-b0ca-46e2-8037-3b2a9ba0f6f5",
+      "Content-Type" : "application/json"
+    },
+    "json" : {
+      "requestDetails" : {
+        "modelInfo" : {
+          "modelType" : "vfModule",
+          "modelInvariantId" : "ab1c39d3-d32b-44f3-971b-942ab47d2723",
+          "modelVersionId" : "44968d8f-9299-490d-9c44-43c38816decc",
+          "modelName" : "HpaVf0..base_vfw..module-0",
+          "modelVersion" : "1",
+          "modelCustomizationId" : "23ceb926-02db-4595-94a3-5c13556946e4",
+          "modelCustomizationName" : "HpaVf0..base_vfw..module-0"
+        },
+        "cloudConfiguration" : {
+          "lcpCloudRegionId" : "ONAP-POD-01-Rail-07",
+          "tenantId" : "709ba629fe194f8699b12f9d6ffd86a0",
+          "cloudOwner" : "CloudOwner"
+        },
+        "requestInfo" : {
+          "instanceName" : "vfw-sriov-cli",
+          "source" : "VID",
+          "suppressRollback" : "false",
+          "requestorId" : "demo"
+        },
+        "relatedInstanceList" : [ {
+          "relatedInstance" : {
+            "instanceId" : "9545d48f-03da-467e-8994-ae0716e7372d",
+            "modelInfo" : {
+              "modelType" : "service",
+              "modelInvariantId" : "51e3401d-2924-40e7-827f-ca7ec567e5de",
+              "modelVersionId" : "a9031c62-bb9e-4db4-bee0-691768ed94f4",
+              "modelName" : "vfw-hpa-01",
+              "modelVersion" : "1.0"
+            }
+          }
+        }, {
+          "relatedInstance" : {
+            "instanceId" : "067c71c2-2fa5-4573-9c6d-aa7bf49f7c51",
+            "modelInfo" : {
+              "modelType" : "vnf",
+              "modelInvariantId" : "ddc48ee5-28ed-4fc4-98d6-bc0cdcc57a89",
+              "modelVersionId" : "76756a3e-ab7d-49df-9002-3d8008233a2b",
+              "modelName" : "hpa-vf-0",
+              "modelVersion" : "1.0",
+              "modelCustomizationId" : "a51ec934-6b32-4818-965c-5f18cf2cd254",
+              "modelCustomizationName" : "hpa-vf-0 0"
+            }
+          }
+        } ],
+        "requestParameters" : {
+          "userParams" : [ ],
+          "testApi" : "VNF_API",
+          "usePreload" : true
+        }
+      }
+    }
+  },
+  "response" : {
+    "status" : 202,
+    "json" : {
+      "requestReferences" : {
+        "requestId" : "ed017684-b0ca-46e2-8037-3b2a9ba0f6f5",
+        "instanceId" : "56bd8d30-9ef9-491f-809e-c1212ca7db76",
+        "requestSelfLink" : "http://10.12.5.110:30277/orchestrationRequests/v7/ed017684-b0ca-46e2-8037-3b2a9ba0f6f5"
+      }
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/products/onap-elalto/features/so/src/main/resources/open-cli-sample/vf-module-create-schema-elalto-sample.yaml b/products/onap-elalto/features/so/src/main/resources/open-cli-sample/vf-module-create-schema-elalto-sample.yaml
new file mode 100644
index 00000000..f7e0a189
--- /dev/null
+++ b/products/onap-elalto/features/so/src/main/resources/open-cli-sample/vf-module-create-schema-elalto-sample.yaml
@@ -0,0 +1,9 @@
+open_cli_sample_version: 1.0
+name: vf-module-create
+version: onap-elalto
+samples:
+  sample1:
+    name: vf-module-create
+    input: -w 709ba629fe194f8699b12f9d6ffd86a0 -mn hpa-vf-0 0 -x 9545d48f-03da-467e-8994-ae0716e7372d -l ONAP-POD-01-Rail-07 -sv 1.0 -vc 23ceb926-02db-4595-94a3-5c13556946e4 -vm 1 -mv 1.0 -i vfw-sriov-cli -vf hpa-vf-0 -vi ab1c39d3-d32b-44f3-971b-942ab47d2723 -r false -mc a51ec934-6b32-4818-965c-5f18cf2cd254 -api VNF_API -mi ddc48ee5-28ed-4fc4-98d6-bc0cdcc57a89 -vid 76756a3e-ab7d-49df-9002-3d8008233a2b -y 067c71c2-2fa5-4573-9c6d-aa7bf49f7c51 -R demo -si a9031c62-bb9e-4db4-bee0-691768ed94f4 -up true -sd 51e3401d-2924-40e7-827f-ca7ec567e5de -z vfw-hpa-01 -vn HpaVf0..base_vfw..module-0 -vv 44968d8f-9299-490d-9c44-43c38816decc -co CloudOwner -u InfraPortalClient -p password1$ -m http://10.12.5.110:30277
+    moco: vf-module-create-schema-elalto-moco.json
+    output:
\ No newline at end of file
diff --git a/products/onap-elalto/features/so/src/main/resources/open-cli-sample/vnf-create-schema-elalto-moco.json b/products/onap-elalto/features/so/src/main/resources/open-cli-sample/vnf-create-schema-elalto-moco.json
new file mode 100644
index 00000000..277db954
--- /dev/null
+++ b/products/onap-elalto/features/so/src/main/resources/open-cli-sample/vnf-create-schema-elalto-moco.json
@@ -0,0 +1,65 @@
+[ {
+  "request" : {
+    "method" : "post",
+    "uri" : "/onap/so/infra/serviceInstantiation/v7/serviceInstances/9545d48f-03da-467e-8994-ae0716e7372d/vnfs",
+    "headers" : {
+      "Authorization" : "Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA==",
+      "X-FromAppId" : "ONAP CLI",
+      "Accept" : "application/json",
+      "X-TransactionId" : "21cb637e-b1f4-4c48-b12f-dbc33d2a021c",
+      "Content-Type" : "application/json"
+    },
+    "json" : {
+      "requestDetails" : {
+        "modelInfo" : {
+          "modelType" : "vnf",
+          "modelInvariantId" : "ddc48ee5-28ed-4fc4-98d6-bc0cdcc57a89",
+          "modelVersionId" : "76756a3e-ab7d-49df-9002-3d8008233a2b",
+          "modelName" : "hpa-vf-0",
+          "modelVersion" : "1.0",
+          "modelCustomizationId" : "a51ec934-6b32-4818-965c-5f18cf2cd254",
+          "modelCustomizationName" : "hpa-vf-0 0"
+        },
+        "cloudConfiguration" : {
+          "lcpCloudRegionId" : "ONAP-POD-01-Rail-07",
+          "tenantId" : "709ba629fe194f8699b12f9d6ffd86a0"
+        },
+        "requestInfo" : {
+          "requestorId" : "demo",
+          "instanceName" : "vfw-hpa-vnf",
+          "source" : "VID",
+          "productFamilyId" : "vFW"
+        },
+        "platform" : {
+          "platformName" : "Platform-Demonstration"
+        },
+        "lineOfBusiness" : {
+          "lineOfBusinessName" : "LOB-Demonstration"
+        },
+        "relatedInstanceList" : [ {
+          "relatedInstance" : {
+            "instanceId" : "9545d48f-03da-467e-8994-ae0716e7372d",
+            "modelInfo" : {
+              "modelType" : "service",
+              "modelInvariantId" : "51e3401d-2924-40e7-827f-ca7ec567e5de",
+              "modelVersionId" : "a9031c62-bb9e-4db4-bee0-691768ed94f4",
+              "modelName" : "vfw-hpa-01",
+              "modelVersion" : "1.0"
+            }
+          }
+        } ],
+        "requestParameters" : { }
+      }
+    }
+  },
+  "response" : {
+    "status" : 202,
+    "json" : {
+      "requestReferences" : {
+        "requestId" : "21cb637e-b1f4-4c48-b12f-dbc33d2a021c",
+        "instanceId" : "067c71c2-2fa5-4573-9c6d-aa7bf49f7c51",
+        "requestSelfLink" : "http://10.12.5.110:30277/orchestrationRequests/v7/21cb637e-b1f4-4c48-b12f-dbc33d2a021c"
+      }
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/products/onap-elalto/features/so/src/main/resources/open-cli-sample/vnf-create-schema-elalto-sample.yaml b/products/onap-elalto/features/so/src/main/resources/open-cli-sample/vnf-create-schema-elalto-sample.yaml
new file mode 100644
index 00000000..80bbb38a
--- /dev/null
+++ b/products/onap-elalto/features/so/src/main/resources/open-cli-sample/vnf-create-schema-elalto-sample.yaml
@@ -0,0 +1,14 @@
+open_cli_sample_version: 1.0
+name: vnf-create
+version: onap-elalto
+samples:
+  sample1:
+    name: vnf-create
+    input: -j 51e3401d-2924-40e7-827f-ca7ec567e5de -q vfw-hpa-01 -k a9031c62-bb9e-4db4-bee0-691768ed94f4 -l ONAP-POD-01-Rail-07 -y 9545d48f-03da-467e-8994-ae0716e7372d -z 709ba629fe194f8699b12f9d6ffd86a0 -r demo -c 76756a3e-ab7d-49df-9002-3d8008233a2b -o vfw-hpa-vnf -e hpa-vf-0 -g 1.0 -b ddc48ee5-28ed-4fc4-98d6-bc0cdcc57a89 -n 1.0 -i a51ec934-6b32-4818-965c-5f18cf2cd254 -vn hpa-vf-0 0 -w vFW -pn Platform-Demonstration -lob LOB-Demonstration -u InfraPortalClient -p password1$ -m http://10.12.5.110:30277
+    moco: vnf-create-schema-elalto-moco.json
+    output: |
+      +----------+--------------------------------------+
+      |property  |value                                 |
+      +----------+--------------------------------------+
+      |vf-id     |067c71c2-2fa5-4573-9c6d-aa7bf49f7c51  |
+      +----------+--------------------------------------+
diff --git a/products/onap-elalto/features/so/src/main/resources/open-cli-schema/vf-module-create-schema-elalto.yaml b/products/onap-elalto/features/so/src/main/resources/open-cli-schema/vf-module-create-schema-elalto.yaml
index 9e6a78f7..cdd42340 100644
--- a/products/onap-elalto/features/so/src/main/resources/open-cli-schema/vf-module-create-schema-elalto.yaml
+++ b/products/onap-elalto/features/so/src/main/resources/open-cli-schema/vf-module-create-schema-elalto.yaml
@@ -190,6 +190,8 @@ http:
   request:

     uri: /onap/so/infra/serviceInstantiation/v7/serviceInstances/${service-instance-id}/vnfs/${vnf-instance-id}/vfModules

     method: POST

+    headers:

+      X-TransactionId: $s{uuid}

     body: '{

               "requestDetails":{

                  "modelInfo":{

diff --git a/products/onap-elalto/features/so/src/main/resources/open-cli-schema/vnf-create-schema-elalto.yaml b/products/onap-elalto/features/so/src/main/resources/open-cli-schema/vnf-create-schema-elalto.yaml
index 3dc06057..b2bf410c 100644
--- a/products/onap-elalto/features/so/src/main/resources/open-cli-schema/vnf-create-schema-elalto.yaml
+++ b/products/onap-elalto/features/so/src/main/resources/open-cli-schema/vnf-create-schema-elalto.yaml
@@ -152,6 +152,8 @@ http:
   request:

     uri: /onap/so/infra/serviceInstantiation/v7/serviceInstances/${service-instance-id}/vnfs

     method: POST

+    headers:

+      X-TransactionId: $s{uuid}

     body: '{

               "requestDetails":{

                  "modelInfo":{