service-model-test-accept updates

Change-Id: I1c7aa7da214f6e541d9b69f4af91a403f5426b3b
Issue-ID: CLI-166
Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>

3 files changed, 47 insertions, 41 deletions

diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/service-model/service-model-test-accept-schema-dublin-moco.json b/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/service-model/service-model-test-accept-schema-dublin-moco.json
index 2a34e279..7ca2ad1b 100644
--- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/service-model/service-model-test-accept-schema-dublin-moco.json
+++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/service-model/service-model-test-accept-schema-dublin-moco.json
@@ -1,40 +1,40 @@
 [ {
   "request" : {
     "method" : "post",
-    "uri" : "/sdc2/rest/v1/catalog/services/fb8ffb35-a8e3-493f-9b9b-b31321b68dfa/lifecycleState/certify",
+    "uri" : "/sdc2/rest/v1/catalog/services/58620731-40a9-4f8e-95db-ef9fc478a705/lifecycleState/certify",
     "headers" : {
       "Authorization" : "Basic am0wMDA3OmRlbW8xMjM0NTYh",
       "X-FromAppId" : "ONAP CLI",
       "Accept" : "application/json",
       "USER_ID" : "jm0007",
-      "X-TransactionId" : "req-c6dc01f3-123a-4ec5-b800-6786b1900a2d",
+      "X-TransactionId" : "req-3a94168f-d5bf-4f7c-86a8-8e57fa3228bd",
       "Content-Type" : "application/json"
     },
     "json" : {
-      "userRemarks" : "cli-tested"
+      "userRemarks" : "Created by Open Command Platform - OCOMP"
     }
   },
   "response" : {
     "status" : 200,
     "json" : {
-      "uniqueId" : "87d3570a-2d08-4b5a-bb51-c7744b32b8de",
-      "name" : "cli-service",
+      "uniqueId" : "402a8ba7-5425-4072-8d05-40d7acbb4411",
+      "name" : "vgwocompvtp Service",
       "version" : "1.0",
       "isHighestVersion" : true,
-      "creationDate" : 1553192910482,
-      "lastUpdateDate" : 1553194117643,
-      "description" : "create service model with cli",
+      "creationDate" : 1567068764463,
+      "lastUpdateDate" : 1567068805262,
+      "description" : "Created by Open Command Platform - OCOMP",
       "lifecycleState" : "CERTIFIED",
-      "tags" : [ "cli-service" ],
+      "tags" : [ "vgwocompvtp Service" ],
       "icon" : "defaulticon",
-      "normalizedName" : "cliservice",
-      "systemName" : "CliService",
+      "normalizedName" : "vgwocompvtpservice",
+      "systemName" : "VgwocompvtpService",
       "contactId" : "cs0008",
       "allVersions" : {
-        "1.0" : "87d3570a-2d08-4b5a-bb51-c7744b32b8de"
+        "1.0" : "402a8ba7-5425-4072-8d05-40d7acbb4411"
       },
-      "projectCode" : "000000",
-      "invariantUUID" : "4dd682d8-4c3c-4f6c-96b1-9e19eed5987c",
+      "projectCode" : "OCOMP",
+      "invariantUUID" : "1b6d7385-916d-4f96-aebd-f2cd03c59079",
       "componentType" : "SERVICE",
       "categories" : [ {
         "name" : "Network L1-3",
@@ -55,8 +55,8 @@
       "environmentContext" : "General_Revenue-Bearing",
       "instantiationType" : "A-la-carte",
       "vspArchived" : false,
-      "archived" : false,
-      "uuid" : "788289e1-161a-42b8-89ed-14adde63c600"
+      "uuid" : "ea98398d-1858-4a22-b227-74eb0e60df49",
+      "archived" : false
     }
   }
 } ]
\ No newline at end of file
diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/service-model/service-model-test-accept-schema-dublin-sample.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/service-model/service-model-test-accept-schema-dublin-sample.yaml
index 3fb4acc4..6ca42491 100644
--- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/service-model/service-model-test-accept-schema-dublin-sample.yaml
+++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/service-model/service-model-test-accept-schema-dublin-sample.yaml
@@ -1,22 +1,10 @@
-# Copyright © Intel Corporation 2019
-#
-# 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_sample_version: 1.0
-name: -b
+name: service-model-test-accept
 version: onap-dublin
 samples:
   sample1:
-    name: -b
-    input: fb8ffb35-a8e3-493f-9b9b-b31321b68dfa -r cli-tested -u jm0007 -p demo123456! -m http://10.12.6.129:30205
+    name: service-model-test-accept
+    input: --format json --remarks Created by Open Command Platform - OCOMP --service-id 58620731-40a9-4f8e-95db-ef9fc478a705
     moco: service-model-test-accept-schema-dublin-moco.json
-    output:
\ No newline at end of file
+    output: |
+      {"id":"402a8ba7-5425-4072-8d05-40d7acbb4411","uuid":"","version":"1.0"}
diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-test-accept-schema-dublin.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-test-accept-schema-dublin.yaml
index 85a31861..8522ea6a 100644
--- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-test-accept-schema-dublin.yaml
+++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-test-accept-schema-dublin.yaml
@@ -18,24 +18,38 @@ description: Accepts the Service model test in SDC
 
 info:
   product: onap-dublin
-  service: sdc
+  service: sdc.catalog
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
 
 parameters:
-  - name: service-model-id
+  - name: service-id
     description: Service model ID
     type: string
-    long_option: service-model-id
+    long_option: service-id
     short_option: b
     is_optional: false
-  - name: test-remark
+  - name: remarks
     description: Remarks when accepting test
     type: string
-    long_option: test-remark
+    long_option: remarks
     short_option: r
     is_optional: false
-
+results:
+  direction: portrait
+  attributes:
+    - name: id
+      description: NS checked out version unique ID
+      scope: short
+      type: string
+    - name: uuid
+      description: NS checked out version unique ID
+      scope: short
+      type: string
+    - name: version
+      description: VF version
+      scope: short
+      type: string
 http:
   service:
     name: sdc
@@ -43,8 +57,12 @@ http:
     auth: basic
     mode: direct
   request:
-    uri: /sdc2/rest/v1/catalog/services/${service-model-id}/lifecycleState/certify
+    uri: /sdc2/rest/v1/catalog/services/${service-id}/lifecycleState/certify
     method: POST
-    body: '{"userRemarks": "${test-remark}"}'
+    body: '{"userRemarks": "${remarks}"}'
   success_codes:
     - 200
+  result_map:
+    id: $b{$.uniqueId}
+    version: $b{$.version}
+    uuid: $b{$.unid}
\ No newline at end of file