service-model-create updates

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

3 files changed, 315 insertions, 326 deletions

diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/service-model/service-model-create-schema-dublin-moco.json b/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/service-model/service-model-create-schema-dublin-moco.json
index 3f92fde4..e90c53ba 100644
--- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/service-model/service-model-create-schema-dublin-moco.json
+++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/service-model/service-model-create-schema-dublin-moco.json
@@ -7,7 +7,7 @@
       "X-FromAppId" : "ONAP CLI",
       "Accept" : "application/json",
       "USER_ID" : "cs0008",
-      "X-TransactionId" : "req-c3ef85bc-a393-4c6c-9b01-93f15997b01f",
+      "X-TransactionId" : "req-4e1a8e59-a73b-4a3c-9019-cb8ff43b3b28",
       "Content-Type" : "application/json"
     },
     "json" : {
@@ -25,17 +25,17 @@
         "empty" : false,
         "type" : null
       } ],
-      "description" : "create service model with cli",
+      "description" : "Created by Open Command Platform - OCOMP",
       "icon" : "defaulticon",
       "componentInstancesProperties" : { },
       "componentInstancesAttributes" : { },
-      "name" : "cli-service",
-      "tags" : [ "cli-service" ],
+      "name" : "vgwocompvtp Service",
+      "tags" : [ "vgwocompvtp Service" ],
       "capabilities" : { },
       "requirements" : { },
       "deploymentArtifacts" : { },
       "componentType" : "SERVICE",
-      "projectCode" : "000000",
+      "projectCode" : "OCOMP",
       "componentInstances" : [ ],
       "properties" : [ ],
       "attributes" : [ ],
@@ -51,325 +51,325 @@
     "json" : {
       "artifacts" : {
         "servicequestionnaire" : {
-          "creationDate" : 1553192910413,
+          "creationDate" : 1567068764424,
           "timeout" : 0,
-          "lastUpdateDate" : 1553192910413,
-          "artifactLabel" : "servicequestionnaire",
-          "artifactVersion" : "0",
-          "artifactGroupType" : "INFORMATIONAL",
           "artifactType" : "OTHER",
+          "uniqueId" : "58620731-40a9-4f8e-95db-ef9fc478a705.servicequestionnaire",
           "artifactDisplayName" : "Service Questionnaire",
+          "artifactLabel" : "servicequestionnaire",
+          "artifactGroupType" : "INFORMATIONAL",
           "userIdCreator" : "cs0008",
           "updaterFullName" : "Carlos Santana",
           "creatorFullName" : "Carlos Santana",
           "userIdLastUpdater" : "cs0008",
           "mandatory" : true,
-          "uniqueId" : "fb8ffb35-a8e3-493f-9b9b-b31321b68dfa.servicequestionnaire",
           "serviceApi" : false,
-          "duplicated" : false,
-          "isFromCsar" : false,
           "generated" : false,
+          "isFromCsar" : false,
+          "lastUpdateDate" : 1567068764424,
+          "artifactVersion" : "0",
+          "duplicated" : false,
           "empty" : false
         },
         "dimensioninginfo" : {
-          "creationDate" : 1553192910413,
+          "creationDate" : 1567068764424,
           "timeout" : 0,
-          "lastUpdateDate" : 1553192910413,
-          "artifactLabel" : "dimensioninginfo",
-          "artifactVersion" : "0",
-          "artifactGroupType" : "INFORMATIONAL",
           "artifactType" : "OTHER",
+          "uniqueId" : "58620731-40a9-4f8e-95db-ef9fc478a705.dimensioninginfo",
           "artifactDisplayName" : "Dimensioning Info",
+          "artifactLabel" : "dimensioninginfo",
+          "artifactGroupType" : "INFORMATIONAL",
           "userIdCreator" : "cs0008",
           "updaterFullName" : "Carlos Santana",
           "creatorFullName" : "Carlos Santana",
           "userIdLastUpdater" : "cs0008",
           "mandatory" : true,
-          "uniqueId" : "fb8ffb35-a8e3-493f-9b9b-b31321b68dfa.dimensioninginfo",
           "serviceApi" : false,
-          "duplicated" : false,
-          "isFromCsar" : false,
           "generated" : false,
+          "isFromCsar" : false,
+          "lastUpdateDate" : 1567068764424,
+          "artifactVersion" : "0",
+          "duplicated" : false,
           "empty" : false
         },
         "controlloopfunctions" : {
-          "creationDate" : 1553192910413,
+          "creationDate" : 1567068764424,
           "timeout" : 0,
-          "lastUpdateDate" : 1553192910413,
-          "artifactLabel" : "controlloopfunctions",
-          "artifactVersion" : "0",
-          "artifactGroupType" : "INFORMATIONAL",
           "artifactType" : "OTHER",
+          "uniqueId" : "58620731-40a9-4f8e-95db-ef9fc478a705.controlloopfunctions",
           "artifactDisplayName" : "Control Loop Functions",
+          "artifactLabel" : "controlloopfunctions",
+          "artifactGroupType" : "INFORMATIONAL",
           "userIdCreator" : "cs0008",
           "updaterFullName" : "Carlos Santana",
           "creatorFullName" : "Carlos Santana",
           "userIdLastUpdater" : "cs0008",
           "mandatory" : true,
-          "uniqueId" : "fb8ffb35-a8e3-493f-9b9b-b31321b68dfa.controlloopfunctions",
           "serviceApi" : false,
-          "duplicated" : false,
-          "isFromCsar" : false,
           "generated" : false,
+          "isFromCsar" : false,
+          "lastUpdateDate" : 1567068764424,
+          "artifactVersion" : "0",
+          "duplicated" : false,
           "empty" : false
         },
         "affinityrules" : {
-          "creationDate" : 1553192910413,
+          "creationDate" : 1567068764424,
           "timeout" : 0,
-          "lastUpdateDate" : 1553192910413,
-          "artifactLabel" : "affinityrules",
-          "artifactVersion" : "0",
-          "artifactGroupType" : "INFORMATIONAL",
           "artifactType" : "OTHER",
+          "uniqueId" : "58620731-40a9-4f8e-95db-ef9fc478a705.affinityrules",
           "artifactDisplayName" : "Affinity Rules",
+          "artifactLabel" : "affinityrules",
+          "artifactGroupType" : "INFORMATIONAL",
           "userIdCreator" : "cs0008",
           "updaterFullName" : "Carlos Santana",
           "creatorFullName" : "Carlos Santana",
           "userIdLastUpdater" : "cs0008",
           "mandatory" : true,
-          "uniqueId" : "fb8ffb35-a8e3-493f-9b9b-b31321b68dfa.affinityrules",
           "serviceApi" : false,
-          "duplicated" : false,
-          "isFromCsar" : false,
           "generated" : false,
+          "isFromCsar" : false,
+          "lastUpdateDate" : 1567068764424,
+          "artifactVersion" : "0",
+          "duplicated" : false,
           "empty" : false
         },
         "operationalpolicies" : {
-          "creationDate" : 1553192910413,
+          "creationDate" : 1567068764424,
           "timeout" : 0,
-          "lastUpdateDate" : 1553192910413,
-          "artifactLabel" : "operationalpolicies",
-          "artifactVersion" : "0",
-          "artifactGroupType" : "INFORMATIONAL",
           "artifactType" : "OTHER",
+          "uniqueId" : "58620731-40a9-4f8e-95db-ef9fc478a705.operationalpolicies",
           "artifactDisplayName" : "Operational Policies",
+          "artifactLabel" : "operationalpolicies",
+          "artifactGroupType" : "INFORMATIONAL",
           "userIdCreator" : "cs0008",
           "updaterFullName" : "Carlos Santana",
           "creatorFullName" : "Carlos Santana",
           "userIdLastUpdater" : "cs0008",
           "mandatory" : true,
-          "uniqueId" : "fb8ffb35-a8e3-493f-9b9b-b31321b68dfa.operationalpolicies",
           "serviceApi" : false,
-          "duplicated" : false,
-          "isFromCsar" : false,
           "generated" : false,
+          "isFromCsar" : false,
+          "lastUpdateDate" : 1567068764424,
+          "artifactVersion" : "0",
+          "duplicated" : false,
           "empty" : false
         },
         "certificationtestresults" : {
-          "creationDate" : 1553192910413,
+          "creationDate" : 1567068764424,
           "timeout" : 0,
-          "lastUpdateDate" : 1553192910413,
-          "artifactLabel" : "certificationtestresults",
-          "artifactVersion" : "0",
-          "artifactGroupType" : "INFORMATIONAL",
           "artifactType" : "OTHER",
+          "uniqueId" : "58620731-40a9-4f8e-95db-ef9fc478a705.certificationtestresults",
           "artifactDisplayName" : "TD Certification Test Results",
+          "artifactLabel" : "certificationtestresults",
+          "artifactGroupType" : "INFORMATIONAL",
           "userIdCreator" : "cs0008",
           "updaterFullName" : "Carlos Santana",
           "creatorFullName" : "Carlos Santana",
           "userIdLastUpdater" : "cs0008",
           "mandatory" : true,
-          "uniqueId" : "fb8ffb35-a8e3-493f-9b9b-b31321b68dfa.certificationtestresults",
           "serviceApi" : false,
-          "duplicated" : false,
-          "isFromCsar" : false,
           "generated" : false,
+          "isFromCsar" : false,
+          "lastUpdateDate" : 1567068764424,
+          "artifactVersion" : "0",
+          "duplicated" : false,
           "empty" : false
         },
         "deploymentvotingrecord" : {
-          "creationDate" : 1553192910413,
+          "creationDate" : 1567068764424,
           "timeout" : 0,
-          "lastUpdateDate" : 1553192910413,
-          "artifactLabel" : "deploymentvotingrecord",
-          "artifactVersion" : "0",
-          "artifactGroupType" : "INFORMATIONAL",
           "artifactType" : "OTHER",
+          "uniqueId" : "58620731-40a9-4f8e-95db-ef9fc478a705.deploymentvotingrecord",
           "artifactDisplayName" : "Deployment Voting Record",
+          "artifactLabel" : "deploymentvotingrecord",
+          "artifactGroupType" : "INFORMATIONAL",
           "userIdCreator" : "cs0008",
           "updaterFullName" : "Carlos Santana",
           "creatorFullName" : "Carlos Santana",
           "userIdLastUpdater" : "cs0008",
           "mandatory" : true,
-          "uniqueId" : "fb8ffb35-a8e3-493f-9b9b-b31321b68dfa.deploymentvotingrecord",
           "serviceApi" : false,
-          "duplicated" : false,
-          "isFromCsar" : false,
           "generated" : false,
+          "isFromCsar" : false,
+          "lastUpdateDate" : 1567068764424,
+          "artifactVersion" : "0",
+          "duplicated" : false,
           "empty" : false
         },
         "serviceartifactplan" : {
-          "creationDate" : 1553192910413,
+          "creationDate" : 1567068764424,
           "timeout" : 0,
-          "lastUpdateDate" : 1553192910413,
-          "artifactLabel" : "serviceartifactplan",
-          "artifactVersion" : "0",
-          "artifactGroupType" : "INFORMATIONAL",
           "artifactType" : "OTHER",
+          "uniqueId" : "58620731-40a9-4f8e-95db-ef9fc478a705.serviceartifactplan",
           "artifactDisplayName" : "Service Artifact Plan",
+          "artifactLabel" : "serviceartifactplan",
+          "artifactGroupType" : "INFORMATIONAL",
           "userIdCreator" : "cs0008",
           "updaterFullName" : "Carlos Santana",
           "creatorFullName" : "Carlos Santana",
           "userIdLastUpdater" : "cs0008",
           "mandatory" : true,
-          "uniqueId" : "fb8ffb35-a8e3-493f-9b9b-b31321b68dfa.serviceartifactplan",
           "serviceApi" : false,
-          "duplicated" : false,
-          "isFromCsar" : false,
           "generated" : false,
+          "isFromCsar" : false,
+          "lastUpdateDate" : 1567068764424,
+          "artifactVersion" : "0",
+          "duplicated" : false,
           "empty" : false
         },
         "servicespecificpolicies" : {
-          "creationDate" : 1553192910413,
+          "creationDate" : 1567068764424,
           "timeout" : 0,
-          "lastUpdateDate" : 1553192910413,
-          "artifactLabel" : "servicespecificpolicies",
-          "artifactVersion" : "0",
-          "artifactGroupType" : "INFORMATIONAL",
           "artifactType" : "OTHER",
+          "uniqueId" : "58620731-40a9-4f8e-95db-ef9fc478a705.servicespecificpolicies",
           "artifactDisplayName" : "Service-specific Policies",
+          "artifactLabel" : "servicespecificpolicies",
+          "artifactGroupType" : "INFORMATIONAL",
           "userIdCreator" : "cs0008",
           "updaterFullName" : "Carlos Santana",
           "creatorFullName" : "Carlos Santana",
           "userIdLastUpdater" : "cs0008",
           "mandatory" : true,
-          "uniqueId" : "fb8ffb35-a8e3-493f-9b9b-b31321b68dfa.servicespecificpolicies",
           "serviceApi" : false,
-          "duplicated" : false,
-          "isFromCsar" : false,
           "generated" : false,
+          "isFromCsar" : false,
+          "lastUpdateDate" : 1567068764424,
+          "artifactVersion" : "0",
+          "duplicated" : false,
           "empty" : false
         },
         "servicesecuritytemplate" : {
-          "creationDate" : 1553192910413,
+          "creationDate" : 1567068764424,
           "timeout" : 0,
-          "lastUpdateDate" : 1553192910413,
-          "artifactLabel" : "servicesecuritytemplate",
-          "artifactVersion" : "0",
-          "artifactGroupType" : "INFORMATIONAL",
           "artifactType" : "OTHER",
+          "uniqueId" : "58620731-40a9-4f8e-95db-ef9fc478a705.servicesecuritytemplate",
           "artifactDisplayName" : "Service Security Template",
+          "artifactLabel" : "servicesecuritytemplate",
+          "artifactGroupType" : "INFORMATIONAL",
           "userIdCreator" : "cs0008",
           "updaterFullName" : "Carlos Santana",
           "creatorFullName" : "Carlos Santana",
           "userIdLastUpdater" : "cs0008",
           "mandatory" : true,
-          "uniqueId" : "fb8ffb35-a8e3-493f-9b9b-b31321b68dfa.servicesecuritytemplate",
           "serviceApi" : false,
-          "duplicated" : false,
-          "isFromCsar" : false,
           "generated" : false,
+          "isFromCsar" : false,
+          "lastUpdateDate" : 1567068764424,
+          "artifactVersion" : "0",
+          "duplicated" : false,
           "empty" : false
         },
         "engineeringrules" : {
-          "creationDate" : 1553192910413,
+          "creationDate" : 1567068764424,
           "timeout" : 0,
-          "lastUpdateDate" : 1553192910413,
-          "artifactLabel" : "engineeringrules",
-          "artifactVersion" : "0",
-          "artifactGroupType" : "INFORMATIONAL",
           "artifactType" : "OTHER",
+          "uniqueId" : "58620731-40a9-4f8e-95db-ef9fc478a705.engineeringrules",
           "artifactDisplayName" : "Engineering Rules (ERD)",
+          "artifactLabel" : "engineeringrules",
+          "artifactGroupType" : "INFORMATIONAL",
           "userIdCreator" : "cs0008",
           "updaterFullName" : "Carlos Santana",
           "creatorFullName" : "Carlos Santana",
           "userIdLastUpdater" : "cs0008",
           "mandatory" : true,
-          "uniqueId" : "fb8ffb35-a8e3-493f-9b9b-b31321b68dfa.engineeringrules",
           "serviceApi" : false,
-          "duplicated" : false,
-          "isFromCsar" : false,
           "generated" : false,
+          "isFromCsar" : false,
+          "lastUpdateDate" : 1567068764424,
+          "artifactVersion" : "0",
+          "duplicated" : false,
           "empty" : false
         },
         "distributioninstructions" : {
-          "creationDate" : 1553192910413,
+          "creationDate" : 1567068764424,
           "timeout" : 0,
-          "lastUpdateDate" : 1553192910413,
-          "artifactLabel" : "distributioninstructions",
-          "artifactVersion" : "0",
-          "artifactGroupType" : "INFORMATIONAL",
           "artifactType" : "OTHER",
+          "uniqueId" : "58620731-40a9-4f8e-95db-ef9fc478a705.distributioninstructions",
           "artifactDisplayName" : "Distribution Instructions",
+          "artifactLabel" : "distributioninstructions",
+          "artifactGroupType" : "INFORMATIONAL",
           "userIdCreator" : "cs0008",
           "updaterFullName" : "Carlos Santana",
           "creatorFullName" : "Carlos Santana",
           "userIdLastUpdater" : "cs0008",
           "mandatory" : true,
-          "uniqueId" : "fb8ffb35-a8e3-493f-9b9b-b31321b68dfa.distributioninstructions",
           "serviceApi" : false,
-          "duplicated" : false,
-          "isFromCsar" : false,
           "generated" : false,
+          "isFromCsar" : false,
+          "lastUpdateDate" : 1567068764424,
+          "artifactVersion" : "0",
+          "duplicated" : false,
           "empty" : false
         },
         "summaryofimpactstoecompelements" : {
-          "creationDate" : 1553192910413,
+          "creationDate" : 1567068764424,
           "timeout" : 0,
-          "lastUpdateDate" : 1553192910413,
-          "artifactLabel" : "summaryofimpactstoecompelements",
-          "artifactVersion" : "0",
-          "artifactGroupType" : "INFORMATIONAL",
           "artifactType" : "OTHER",
+          "uniqueId" : "58620731-40a9-4f8e-95db-ef9fc478a705.summaryofimpactstoecompelements",
           "artifactDisplayName" : "Summary of impacts to ECOMP elements,OSSs, BSSs",
+          "artifactLabel" : "summaryofimpactstoecompelements",
+          "artifactGroupType" : "INFORMATIONAL",
           "userIdCreator" : "cs0008",
           "updaterFullName" : "Carlos Santana",
           "creatorFullName" : "Carlos Santana",
           "userIdLastUpdater" : "cs0008",
           "mandatory" : true,
-          "uniqueId" : "fb8ffb35-a8e3-493f-9b9b-b31321b68dfa.summaryofimpactstoecompelements",
           "serviceApi" : false,
-          "duplicated" : false,
-          "isFromCsar" : false,
           "generated" : false,
+          "isFromCsar" : false,
+          "lastUpdateDate" : 1567068764424,
+          "artifactVersion" : "0",
+          "duplicated" : false,
           "empty" : false
         }
       },
       "deploymentArtifacts" : { },
       "toscaArtifacts" : {
         "assettoscacsar" : {
-          "creationDate" : 1553192910414,
-          "timeout" : 0,
+          "creationDate" : 1567068764424,
           "description" : "TOSCA definition package of the asset",
-          "lastUpdateDate" : 1553192910414,
-          "artifactLabel" : "assettoscacsar",
-          "artifactVersion" : "0",
-          "artifactGroupType" : "TOSCA",
-          "artifactName" : "service-CliService-csar.csar",
+          "timeout" : 0,
           "artifactType" : "TOSCA_CSAR",
+          "uniqueId" : "58620731-40a9-4f8e-95db-ef9fc478a705.assettoscacsar",
+          "artifactName" : "service-VgwocompvtpService-csar.csar",
           "artifactDisplayName" : "Tosca Model",
+          "artifactLabel" : "assettoscacsar",
+          "artifactGroupType" : "TOSCA",
           "userIdCreator" : "cs0008",
           "updaterFullName" : "Carlos Santana",
           "creatorFullName" : "Carlos Santana",
           "userIdLastUpdater" : "cs0008",
           "mandatory" : true,
-          "uniqueId" : "fb8ffb35-a8e3-493f-9b9b-b31321b68dfa.assettoscacsar",
           "serviceApi" : false,
-          "duplicated" : false,
-          "isFromCsar" : false,
           "generated" : false,
+          "isFromCsar" : false,
+          "lastUpdateDate" : 1567068764424,
+          "artifactVersion" : "0",
+          "duplicated" : false,
           "empty" : false
         },
         "assettoscatemplate" : {
-          "creationDate" : 1553192910414,
-          "timeout" : 0,
+          "creationDate" : 1567068764424,
           "description" : "TOSCA representation of the asset",
-          "lastUpdateDate" : 1553192910414,
-          "artifactLabel" : "assettoscatemplate",
-          "artifactVersion" : "0",
-          "artifactGroupType" : "TOSCA",
-          "artifactName" : "service-CliService-template.yml",
+          "timeout" : 0,
           "artifactType" : "TOSCA_TEMPLATE",
+          "uniqueId" : "58620731-40a9-4f8e-95db-ef9fc478a705.assettoscatemplate",
+          "artifactName" : "service-VgwocompvtpService-template.yml",
           "artifactDisplayName" : "Tosca Template",
+          "artifactLabel" : "assettoscatemplate",
+          "artifactGroupType" : "TOSCA",
           "userIdCreator" : "cs0008",
           "updaterFullName" : "Carlos Santana",
           "creatorFullName" : "Carlos Santana",
           "userIdLastUpdater" : "cs0008",
           "mandatory" : true,
-          "uniqueId" : "fb8ffb35-a8e3-493f-9b9b-b31321b68dfa.assettoscatemplate",
           "serviceApi" : false,
-          "duplicated" : false,
-          "isFromCsar" : false,
           "generated" : false,
+          "isFromCsar" : false,
+          "lastUpdateDate" : 1567068764424,
+          "artifactVersion" : "0",
+          "duplicated" : false,
           "empty" : false
         }
       },
@@ -385,445 +385,446 @@
       "derivedFromGenericType" : "org.openecomp.resource.abstract.nodes.service",
       "derivedFromGenericVersion" : "1.0",
       "toscaType" : "topology_template",
+      "nodeFilterComponents" : { },
       "interfaces" : { },
       "serviceApiArtifacts" : {
         "configuration" : {
-          "creationDate" : 1553192910413,
+          "creationDate" : 1567068764424,
           "timeout" : 0,
-          "lastUpdateDate" : 1553192910413,
-          "artifactLabel" : "configuration",
-          "artifactVersion" : "0",
-          "artifactGroupType" : "SERVICE_API",
           "artifactType" : "OTHER",
+          "uniqueId" : "58620731-40a9-4f8e-95db-ef9fc478a705.configuration",
           "artifactDisplayName" : "Configuration",
+          "artifactLabel" : "configuration",
+          "artifactGroupType" : "SERVICE_API",
           "userIdCreator" : "cs0008",
           "updaterFullName" : "Carlos Santana",
           "creatorFullName" : "Carlos Santana",
           "userIdLastUpdater" : "cs0008",
           "mandatory" : false,
-          "uniqueId" : "fb8ffb35-a8e3-493f-9b9b-b31321b68dfa.configuration",
           "serviceApi" : true,
-          "duplicated" : false,
-          "isFromCsar" : false,
           "generated" : false,
+          "isFromCsar" : false,
+          "lastUpdateDate" : 1567068764424,
+          "artifactVersion" : "0",
+          "duplicated" : false,
           "empty" : false
         },
         "testing" : {
-          "creationDate" : 1553192910413,
+          "creationDate" : 1567068764424,
           "timeout" : 0,
-          "lastUpdateDate" : 1553192910413,
-          "artifactLabel" : "testing",
-          "artifactVersion" : "0",
-          "artifactGroupType" : "SERVICE_API",
           "artifactType" : "OTHER",
+          "uniqueId" : "58620731-40a9-4f8e-95db-ef9fc478a705.testing",
           "artifactDisplayName" : "Testing",
+          "artifactLabel" : "testing",
+          "artifactGroupType" : "SERVICE_API",
           "userIdCreator" : "cs0008",
           "updaterFullName" : "Carlos Santana",
           "creatorFullName" : "Carlos Santana",
           "userIdLastUpdater" : "cs0008",
           "mandatory" : false,
-          "uniqueId" : "fb8ffb35-a8e3-493f-9b9b-b31321b68dfa.testing",
           "serviceApi" : true,
-          "duplicated" : false,
-          "isFromCsar" : false,
           "generated" : false,
+          "isFromCsar" : false,
+          "lastUpdateDate" : 1567068764424,
+          "artifactVersion" : "0",
+          "duplicated" : false,
           "empty" : false
         },
         "logging" : {
-          "creationDate" : 1553192910413,
+          "creationDate" : 1567068764424,
           "timeout" : 0,
-          "lastUpdateDate" : 1553192910413,
-          "artifactLabel" : "logging",
-          "artifactVersion" : "0",
-          "artifactGroupType" : "SERVICE_API",
           "artifactType" : "OTHER",
+          "uniqueId" : "58620731-40a9-4f8e-95db-ef9fc478a705.logging",
           "artifactDisplayName" : "Logging",
+          "artifactLabel" : "logging",
+          "artifactGroupType" : "SERVICE_API",
           "userIdCreator" : "cs0008",
           "updaterFullName" : "Carlos Santana",
           "creatorFullName" : "Carlos Santana",
           "userIdLastUpdater" : "cs0008",
           "mandatory" : false,
-          "uniqueId" : "fb8ffb35-a8e3-493f-9b9b-b31321b68dfa.logging",
           "serviceApi" : true,
-          "duplicated" : false,
-          "isFromCsar" : false,
           "generated" : false,
+          "isFromCsar" : false,
+          "lastUpdateDate" : 1567068764424,
+          "artifactVersion" : "0",
+          "duplicated" : false,
           "empty" : false
         },
         "monitoring" : {
-          "creationDate" : 1553192910413,
+          "creationDate" : 1567068764424,
           "timeout" : 0,
-          "lastUpdateDate" : 1553192910413,
-          "artifactLabel" : "monitoring",
-          "artifactVersion" : "0",
-          "artifactGroupType" : "SERVICE_API",
           "artifactType" : "OTHER",
+          "uniqueId" : "58620731-40a9-4f8e-95db-ef9fc478a705.monitoring",
           "artifactDisplayName" : "Monitoring",
+          "artifactLabel" : "monitoring",
+          "artifactGroupType" : "SERVICE_API",
           "userIdCreator" : "cs0008",
           "updaterFullName" : "Carlos Santana",
           "creatorFullName" : "Carlos Santana",
           "userIdLastUpdater" : "cs0008",
           "mandatory" : false,
-          "uniqueId" : "fb8ffb35-a8e3-493f-9b9b-b31321b68dfa.monitoring",
           "serviceApi" : true,
-          "duplicated" : false,
-          "isFromCsar" : false,
           "generated" : false,
+          "isFromCsar" : false,
+          "lastUpdateDate" : 1567068764424,
+          "artifactVersion" : "0",
+          "duplicated" : false,
           "empty" : false
         },
         "reporting" : {
-          "creationDate" : 1553192910413,
+          "creationDate" : 1567068764424,
           "timeout" : 0,
-          "lastUpdateDate" : 1553192910413,
-          "artifactLabel" : "reporting",
-          "artifactVersion" : "0",
-          "artifactGroupType" : "SERVICE_API",
           "artifactType" : "OTHER",
+          "uniqueId" : "58620731-40a9-4f8e-95db-ef9fc478a705.reporting",
           "artifactDisplayName" : "Reporting",
+          "artifactLabel" : "reporting",
+          "artifactGroupType" : "SERVICE_API",
           "userIdCreator" : "cs0008",
           "updaterFullName" : "Carlos Santana",
           "creatorFullName" : "Carlos Santana",
           "userIdLastUpdater" : "cs0008",
           "mandatory" : false,
-          "uniqueId" : "fb8ffb35-a8e3-493f-9b9b-b31321b68dfa.reporting",
           "serviceApi" : true,
-          "duplicated" : false,
-          "isFromCsar" : false,
           "generated" : false,
+          "isFromCsar" : false,
+          "lastUpdateDate" : 1567068764424,
+          "artifactVersion" : "0",
+          "duplicated" : false,
           "empty" : false
         },
         "instantiation" : {
-          "creationDate" : 1553192910413,
+          "creationDate" : 1567068764424,
           "timeout" : 0,
-          "lastUpdateDate" : 1553192910413,
-          "artifactLabel" : "instantiation",
-          "artifactVersion" : "0",
-          "artifactGroupType" : "SERVICE_API",
           "artifactType" : "OTHER",
+          "uniqueId" : "58620731-40a9-4f8e-95db-ef9fc478a705.instantiation",
           "artifactDisplayName" : "Instantiation",
+          "artifactLabel" : "instantiation",
+          "artifactGroupType" : "SERVICE_API",
           "userIdCreator" : "cs0008",
           "updaterFullName" : "Carlos Santana",
           "creatorFullName" : "Carlos Santana",
           "userIdLastUpdater" : "cs0008",
           "mandatory" : false,
-          "uniqueId" : "fb8ffb35-a8e3-493f-9b9b-b31321b68dfa.instantiation",
           "serviceApi" : true,
-          "duplicated" : false,
-          "isFromCsar" : false,
           "generated" : false,
+          "isFromCsar" : false,
+          "lastUpdateDate" : 1567068764424,
+          "artifactVersion" : "0",
+          "duplicated" : false,
           "empty" : false
         }
       },
       "forwardingPaths" : { },
-      "distributionStatus" : "DISTRIBUTION_NOT_APPROVED",
-      "projectCode" : "000000",
       "environmentContext" : "General_Revenue-Bearing",
+      "projectCode" : "OCOMP",
       "serviceType" : "",
       "serviceRole" : "",
       "ecompGeneratedNaming" : true,
       "namingPolicy" : "",
       "instantiationType" : "A-la-carte",
-      "creationDate" : 1553192910482,
+      "distributionStatus" : "DISTRIBUTION_NOT_APPROVED",
       "version" : "0.1",
-      "description" : "create service model with cli",
-      "componentType" : "SERVICE",
-      "lifecycleState" : "NOT_CERTIFIED_CHECKOUT",
-      "systemName" : "CliService",
-      "lastUpdateDate" : 1553192910482,
-      "highestVersion" : true,
-      "creatorFullName" : "Carlos Santana",
-      "normalizedName" : "cliservice",
+      "contactId" : "cs0008",
+      "creatorUserId" : "cs0008",
+      "lastUpdaterUserId" : "cs0008",
+      "lastUpdaterFullName" : "Carlos Santana",
+      "creationDate" : 1567068764463,
       "actualComponentType" : "Service",
       "topologyTemplate" : true,
+      "tags" : [ "vgwocompvtp Service" ],
       "vspArchived" : false,
-      "archived" : false,
-      "contactId" : "cs0008",
+      "highestVersion" : true,
+      "description" : "Created by Open Command Platform - OCOMP",
+      "uuid" : "ea98398d-1858-4a22-b227-74eb0e60df49",
       "conformanceLevel" : "9.0",
-      "lastUpdaterFullName" : "Carlos Santana",
-      "tags" : [ "cli-service" ],
-      "uniqueId" : "fb8ffb35-a8e3-493f-9b9b-b31321b68dfa",
-      "uuid" : "788289e1-161a-42b8-89ed-14adde63c600",
+      "uniqueId" : "58620731-40a9-4f8e-95db-ef9fc478a705",
+      "creatorFullName" : "Carlos Santana",
+      "normalizedName" : "vgwocompvtpservice",
+      "lifecycleState" : "NOT_CERTIFIED_CHECKOUT",
       "icon" : "defaulticon",
-      "lastUpdaterUserId" : "cs0008",
-      "creatorUserId" : "cs0008",
-      "invariantUUID" : "4dd682d8-4c3c-4f6c-96b1-9e19eed5987c",
       "allArtifacts" : {
         "controlloopfunctions" : {
-          "creationDate" : 1553192910413,
+          "creationDate" : 1567068764424,
           "timeout" : 0,
-          "lastUpdateDate" : 1553192910413,
-          "artifactLabel" : "controlloopfunctions",
-          "artifactVersion" : "0",
-          "artifactGroupType" : "INFORMATIONAL",
           "artifactType" : "OTHER",
+          "uniqueId" : "58620731-40a9-4f8e-95db-ef9fc478a705.controlloopfunctions",
           "artifactDisplayName" : "Control Loop Functions",
+          "artifactLabel" : "controlloopfunctions",
+          "artifactGroupType" : "INFORMATIONAL",
           "userIdCreator" : "cs0008",
           "updaterFullName" : "Carlos Santana",
           "creatorFullName" : "Carlos Santana",
           "userIdLastUpdater" : "cs0008",
           "mandatory" : true,
-          "uniqueId" : "fb8ffb35-a8e3-493f-9b9b-b31321b68dfa.controlloopfunctions",
           "serviceApi" : false,
-          "duplicated" : false,
-          "isFromCsar" : false,
           "generated" : false,
+          "isFromCsar" : false,
+          "lastUpdateDate" : 1567068764424,
+          "artifactVersion" : "0",
+          "duplicated" : false,
           "empty" : false
         },
         "operationalpolicies" : {
-          "creationDate" : 1553192910413,
+          "creationDate" : 1567068764424,
           "timeout" : 0,
-          "lastUpdateDate" : 1553192910413,
-          "artifactLabel" : "operationalpolicies",
-          "artifactVersion" : "0",
-          "artifactGroupType" : "INFORMATIONAL",
           "artifactType" : "OTHER",
+          "uniqueId" : "58620731-40a9-4f8e-95db-ef9fc478a705.operationalpolicies",
           "artifactDisplayName" : "Operational Policies",
+          "artifactLabel" : "operationalpolicies",
+          "artifactGroupType" : "INFORMATIONAL",
           "userIdCreator" : "cs0008",
           "updaterFullName" : "Carlos Santana",
           "creatorFullName" : "Carlos Santana",
           "userIdLastUpdater" : "cs0008",
           "mandatory" : true,
-          "uniqueId" : "fb8ffb35-a8e3-493f-9b9b-b31321b68dfa.operationalpolicies",
           "serviceApi" : false,
-          "duplicated" : false,
-          "isFromCsar" : false,
           "generated" : false,
+          "isFromCsar" : false,
+          "lastUpdateDate" : 1567068764424,
+          "artifactVersion" : "0",
+          "duplicated" : false,
           "empty" : false
         },
         "certificationtestresults" : {
-          "creationDate" : 1553192910413,
+          "creationDate" : 1567068764424,
           "timeout" : 0,
-          "lastUpdateDate" : 1553192910413,
-          "artifactLabel" : "certificationtestresults",
-          "artifactVersion" : "0",
-          "artifactGroupType" : "INFORMATIONAL",
           "artifactType" : "OTHER",
+          "uniqueId" : "58620731-40a9-4f8e-95db-ef9fc478a705.certificationtestresults",
           "artifactDisplayName" : "TD Certification Test Results",
+          "artifactLabel" : "certificationtestresults",
+          "artifactGroupType" : "INFORMATIONAL",
           "userIdCreator" : "cs0008",
           "updaterFullName" : "Carlos Santana",
           "creatorFullName" : "Carlos Santana",
           "userIdLastUpdater" : "cs0008",
           "mandatory" : true,
-          "uniqueId" : "fb8ffb35-a8e3-493f-9b9b-b31321b68dfa.certificationtestresults",
           "serviceApi" : false,
-          "duplicated" : false,
-          "isFromCsar" : false,
           "generated" : false,
+          "isFromCsar" : false,
+          "lastUpdateDate" : 1567068764424,
+          "artifactVersion" : "0",
+          "duplicated" : false,
           "empty" : false
         },
         "deploymentvotingrecord" : {
-          "creationDate" : 1553192910413,
+          "creationDate" : 1567068764424,
           "timeout" : 0,
-          "lastUpdateDate" : 1553192910413,
-          "artifactLabel" : "deploymentvotingrecord",
-          "artifactVersion" : "0",
-          "artifactGroupType" : "INFORMATIONAL",
           "artifactType" : "OTHER",
+          "uniqueId" : "58620731-40a9-4f8e-95db-ef9fc478a705.deploymentvotingrecord",
           "artifactDisplayName" : "Deployment Voting Record",
+          "artifactLabel" : "deploymentvotingrecord",
+          "artifactGroupType" : "INFORMATIONAL",
           "userIdCreator" : "cs0008",
           "updaterFullName" : "Carlos Santana",
           "creatorFullName" : "Carlos Santana",
           "userIdLastUpdater" : "cs0008",
           "mandatory" : true,
-          "uniqueId" : "fb8ffb35-a8e3-493f-9b9b-b31321b68dfa.deploymentvotingrecord",
           "serviceApi" : false,
-          "duplicated" : false,
-          "isFromCsar" : false,
           "generated" : false,
+          "isFromCsar" : false,
+          "lastUpdateDate" : 1567068764424,
+          "artifactVersion" : "0",
+          "duplicated" : false,
           "empty" : false
         },
         "servicequestionnaire" : {
-          "creationDate" : 1553192910413,
+          "creationDate" : 1567068764424,
           "timeout" : 0,
-          "lastUpdateDate" : 1553192910413,
-          "artifactLabel" : "servicequestionnaire",
-          "artifactVersion" : "0",
-          "artifactGroupType" : "INFORMATIONAL",
           "artifactType" : "OTHER",
+          "uniqueId" : "58620731-40a9-4f8e-95db-ef9fc478a705.servicequestionnaire",
           "artifactDisplayName" : "Service Questionnaire",
+          "artifactLabel" : "servicequestionnaire",
+          "artifactGroupType" : "INFORMATIONAL",
           "userIdCreator" : "cs0008",
           "updaterFullName" : "Carlos Santana",
           "creatorFullName" : "Carlos Santana",
           "userIdLastUpdater" : "cs0008",
           "mandatory" : true,
-          "uniqueId" : "fb8ffb35-a8e3-493f-9b9b-b31321b68dfa.servicequestionnaire",
           "serviceApi" : false,
-          "duplicated" : false,
-          "isFromCsar" : false,
           "generated" : false,
+          "isFromCsar" : false,
+          "lastUpdateDate" : 1567068764424,
+          "artifactVersion" : "0",
+          "duplicated" : false,
           "empty" : false
         },
         "dimensioninginfo" : {
-          "creationDate" : 1553192910413,
+          "creationDate" : 1567068764424,
           "timeout" : 0,
-          "lastUpdateDate" : 1553192910413,
-          "artifactLabel" : "dimensioninginfo",
-          "artifactVersion" : "0",
-          "artifactGroupType" : "INFORMATIONAL",
           "artifactType" : "OTHER",
+          "uniqueId" : "58620731-40a9-4f8e-95db-ef9fc478a705.dimensioninginfo",
           "artifactDisplayName" : "Dimensioning Info",
+          "artifactLabel" : "dimensioninginfo",
+          "artifactGroupType" : "INFORMATIONAL",
           "userIdCreator" : "cs0008",
           "updaterFullName" : "Carlos Santana",
           "creatorFullName" : "Carlos Santana",
           "userIdLastUpdater" : "cs0008",
           "mandatory" : true,
-          "uniqueId" : "fb8ffb35-a8e3-493f-9b9b-b31321b68dfa.dimensioninginfo",
           "serviceApi" : false,
-          "duplicated" : false,
-          "isFromCsar" : false,
           "generated" : false,
+          "isFromCsar" : false,
+          "lastUpdateDate" : 1567068764424,
+          "artifactVersion" : "0",
+          "duplicated" : false,
           "empty" : false
         },
         "affinityrules" : {
-          "creationDate" : 1553192910413,
+          "creationDate" : 1567068764424,
           "timeout" : 0,
-          "lastUpdateDate" : 1553192910413,
-          "artifactLabel" : "affinityrules",
-          "artifactVersion" : "0",
-          "artifactGroupType" : "INFORMATIONAL",
           "artifactType" : "OTHER",
+          "uniqueId" : "58620731-40a9-4f8e-95db-ef9fc478a705.affinityrules",
           "artifactDisplayName" : "Affinity Rules",
+          "artifactLabel" : "affinityrules",
+          "artifactGroupType" : "INFORMATIONAL",
           "userIdCreator" : "cs0008",
           "updaterFullName" : "Carlos Santana",
           "creatorFullName" : "Carlos Santana",
           "userIdLastUpdater" : "cs0008",
           "mandatory" : true,
-          "uniqueId" : "fb8ffb35-a8e3-493f-9b9b-b31321b68dfa.affinityrules",
           "serviceApi" : false,
-          "duplicated" : false,
-          "isFromCsar" : false,
           "generated" : false,
+          "isFromCsar" : false,
+          "lastUpdateDate" : 1567068764424,
+          "artifactVersion" : "0",
+          "duplicated" : false,
           "empty" : false
         },
         "serviceartifactplan" : {
-          "creationDate" : 1553192910413,
+          "creationDate" : 1567068764424,
           "timeout" : 0,
-          "lastUpdateDate" : 1553192910413,
-          "artifactLabel" : "serviceartifactplan",
-          "artifactVersion" : "0",
-          "artifactGroupType" : "INFORMATIONAL",
           "artifactType" : "OTHER",
+          "uniqueId" : "58620731-40a9-4f8e-95db-ef9fc478a705.serviceartifactplan",
           "artifactDisplayName" : "Service Artifact Plan",
+          "artifactLabel" : "serviceartifactplan",
+          "artifactGroupType" : "INFORMATIONAL",
           "userIdCreator" : "cs0008",
           "updaterFullName" : "Carlos Santana",
           "creatorFullName" : "Carlos Santana",
           "userIdLastUpdater" : "cs0008",
           "mandatory" : true,
-          "uniqueId" : "fb8ffb35-a8e3-493f-9b9b-b31321b68dfa.serviceartifactplan",
           "serviceApi" : false,
-          "duplicated" : false,
-          "isFromCsar" : false,
           "generated" : false,
+          "isFromCsar" : false,
+          "lastUpdateDate" : 1567068764424,
+          "artifactVersion" : "0",
+          "duplicated" : false,
           "empty" : false
         },
         "servicespecificpolicies" : {
-          "creationDate" : 1553192910413,
+          "creationDate" : 1567068764424,
           "timeout" : 0,
-          "lastUpdateDate" : 1553192910413,
-          "artifactLabel" : "servicespecificpolicies",
-          "artifactVersion" : "0",
-          "artifactGroupType" : "INFORMATIONAL",
           "artifactType" : "OTHER",
+          "uniqueId" : "58620731-40a9-4f8e-95db-ef9fc478a705.servicespecificpolicies",
           "artifactDisplayName" : "Service-specific Policies",
+          "artifactLabel" : "servicespecificpolicies",
+          "artifactGroupType" : "INFORMATIONAL",
           "userIdCreator" : "cs0008",
           "updaterFullName" : "Carlos Santana",
           "creatorFullName" : "Carlos Santana",
           "userIdLastUpdater" : "cs0008",
           "mandatory" : true,
-          "uniqueId" : "fb8ffb35-a8e3-493f-9b9b-b31321b68dfa.servicespecificpolicies",
           "serviceApi" : false,
-          "duplicated" : false,
-          "isFromCsar" : false,
           "generated" : false,
+          "isFromCsar" : false,
+          "lastUpdateDate" : 1567068764424,
+          "artifactVersion" : "0",
+          "duplicated" : false,
           "empty" : false
         },
         "servicesecuritytemplate" : {
-          "creationDate" : 1553192910413,
+          "creationDate" : 1567068764424,
           "timeout" : 0,
-          "lastUpdateDate" : 1553192910413,
-          "artifactLabel" : "servicesecuritytemplate",
-          "artifactVersion" : "0",
-          "artifactGroupType" : "INFORMATIONAL",
           "artifactType" : "OTHER",
+          "uniqueId" : "58620731-40a9-4f8e-95db-ef9fc478a705.servicesecuritytemplate",
           "artifactDisplayName" : "Service Security Template",
+          "artifactLabel" : "servicesecuritytemplate",
+          "artifactGroupType" : "INFORMATIONAL",
           "userIdCreator" : "cs0008",
           "updaterFullName" : "Carlos Santana",
           "creatorFullName" : "Carlos Santana",
           "userIdLastUpdater" : "cs0008",
           "mandatory" : true,
-          "uniqueId" : "fb8ffb35-a8e3-493f-9b9b-b31321b68dfa.servicesecuritytemplate",
           "serviceApi" : false,
-          "duplicated" : false,
-          "isFromCsar" : false,
           "generated" : false,
+          "isFromCsar" : false,
+          "lastUpdateDate" : 1567068764424,
+          "artifactVersion" : "0",
+          "duplicated" : false,
           "empty" : false
         },
         "engineeringrules" : {
-          "creationDate" : 1553192910413,
+          "creationDate" : 1567068764424,
           "timeout" : 0,
-          "lastUpdateDate" : 1553192910413,
-          "artifactLabel" : "engineeringrules",
-          "artifactVersion" : "0",
-          "artifactGroupType" : "INFORMATIONAL",
           "artifactType" : "OTHER",
+          "uniqueId" : "58620731-40a9-4f8e-95db-ef9fc478a705.engineeringrules",
           "artifactDisplayName" : "Engineering Rules (ERD)",
+          "artifactLabel" : "engineeringrules",
+          "artifactGroupType" : "INFORMATIONAL",
           "userIdCreator" : "cs0008",
           "updaterFullName" : "Carlos Santana",
           "creatorFullName" : "Carlos Santana",
           "userIdLastUpdater" : "cs0008",
           "mandatory" : true,
-          "uniqueId" : "fb8ffb35-a8e3-493f-9b9b-b31321b68dfa.engineeringrules",
           "serviceApi" : false,
-          "duplicated" : false,
-          "isFromCsar" : false,
           "generated" : false,
+          "isFromCsar" : false,
+          "lastUpdateDate" : 1567068764424,
+          "artifactVersion" : "0",
+          "duplicated" : false,
           "empty" : false
         },
         "distributioninstructions" : {
-          "creationDate" : 1553192910413,
+          "creationDate" : 1567068764424,
           "timeout" : 0,
-          "lastUpdateDate" : 1553192910413,
-          "artifactLabel" : "distributioninstructions",
-          "artifactVersion" : "0",
-          "artifactGroupType" : "INFORMATIONAL",
           "artifactType" : "OTHER",
+          "uniqueId" : "58620731-40a9-4f8e-95db-ef9fc478a705.distributioninstructions",
           "artifactDisplayName" : "Distribution Instructions",
+          "artifactLabel" : "distributioninstructions",
+          "artifactGroupType" : "INFORMATIONAL",
           "userIdCreator" : "cs0008",
           "updaterFullName" : "Carlos Santana",
           "creatorFullName" : "Carlos Santana",
           "userIdLastUpdater" : "cs0008",
           "mandatory" : true,
-          "uniqueId" : "fb8ffb35-a8e3-493f-9b9b-b31321b68dfa.distributioninstructions",
           "serviceApi" : false,
-          "duplicated" : false,
-          "isFromCsar" : false,
           "generated" : false,
+          "isFromCsar" : false,
+          "lastUpdateDate" : 1567068764424,
+          "artifactVersion" : "0",
+          "duplicated" : false,
           "empty" : false
         },
         "summaryofimpactstoecompelements" : {
-          "creationDate" : 1553192910413,
+          "creationDate" : 1567068764424,
           "timeout" : 0,
-          "lastUpdateDate" : 1553192910413,
-          "artifactLabel" : "summaryofimpactstoecompelements",
-          "artifactVersion" : "0",
-          "artifactGroupType" : "INFORMATIONAL",
           "artifactType" : "OTHER",
+          "uniqueId" : "58620731-40a9-4f8e-95db-ef9fc478a705.summaryofimpactstoecompelements",
           "artifactDisplayName" : "Summary of impacts to ECOMP elements,OSSs, BSSs",
+          "artifactLabel" : "summaryofimpactstoecompelements",
+          "artifactGroupType" : "INFORMATIONAL",
           "userIdCreator" : "cs0008",
           "updaterFullName" : "Carlos Santana",
           "creatorFullName" : "Carlos Santana",
           "userIdLastUpdater" : "cs0008",
           "mandatory" : true,
-          "uniqueId" : "fb8ffb35-a8e3-493f-9b9b-b31321b68dfa.summaryofimpactstoecompelements",
           "serviceApi" : false,
-          "duplicated" : false,
-          "isFromCsar" : false,
           "generated" : false,
+          "isFromCsar" : false,
+          "lastUpdateDate" : 1567068764424,
+          "artifactVersion" : "0",
+          "duplicated" : false,
           "empty" : false
         }
       },
+      "componentType" : "SERVICE",
+      "systemName" : "VgwocompvtpService",
+      "lastUpdateDate" : 1567068764463,
+      "archived" : false,
+      "invariantUUID" : "1b6d7385-916d-4f96-aebd-f2cd03c59079",
       "archiveTime" : 0,
-      "name" : "cli-service"
+      "name" : "vgwocompvtp Service"
     }
   }
 } ]
\ No newline at end of file
diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/service-model/service-model-create-schema-dublin-sample.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/service-model/service-model-create-schema-dublin-sample.yaml
index 3cb63df1..ec64441d 100644
--- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/service-model/service-model-create-schema-dublin-sample.yaml
+++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/service-model/service-model-create-schema-dublin-sample.yaml
@@ -1,27 +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: -z
+name: service-model-create
 version: onap-dublin
 samples:
   sample1:
-    name: -z
-    input: 000000 -y create service model with cli -e network_l_1-3 -x cli-service -c Network L1-3 -u cs0008 -b network l1-3 -p demo123456! -m http://10.12.6.129:30205
+    name: service-model-create
+    input: --format json --category network l1-3 --description Created by Open Command Platform - OCOMP --project-code OCOMP --icon-id network_l_1-3 --service-name vgwocompvtp Service --category-display-name Network L1-3
     moco: service-model-create-schema-dublin-moco.json
     output: |
-      +----------+--------------------------------------+
-      |property  |value                                 |
-      +----------+--------------------------------------+
-      |ID        |fb8ffb35-a8e3-493f-9b9b-b31321b68dfa  |
-      +----------+--------------------------------------+
+      {"id":"58620731-40a9-4f8e-95db-ef9fc478a705","uuid":"ea98398d-1858-4a22-b227-74eb0e60df49"}
diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-create-schema-dublin.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-create-schema-dublin.yaml
index ebc0c468..aa0e004b 100644
--- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-create-schema-dublin.yaml
+++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-create-schema-dublin.yaml
@@ -18,7 +18,7 @@ description: Create Service model in SDC
 
 info:
   product: onap-dublin
-  service: sdc
+  service: sdc.catalog
   author: ONAP HPA Team onap-discuss@lists.onap.org
 
 
@@ -66,10 +66,14 @@ parameters:
 results:
   direction: portrait
   attributes:
-    - name: ID
+    - name: id
       description: Service ID
       scope: short
       type: string
+    - name: uuid
+      description: Service UUID
+      scope: short
+      type: string
 http:
   service:
     name: sdc
@@ -117,4 +121,5 @@ http:
     - 200
     - 201
   result_map:
-    ID: $b{$.uniqueId}
+    id: $b{$.uniqueId}
+    uuid: $b{$.uuid}