From 69f82ea41d1c21f15be97cc99babf5754fb5fe68 Mon Sep 17 00:00:00 2001
From: "Cheung, Pat" <kc1472@att.com>
Date: Fri, 7 Sep 2018 20:56:24 +0000
Subject: self-serve DG for Casablanca

Add new self-serve DG and update existing self-serve DG for Casablanca

Change-Id: Ib4c3ccf3ce2acc986df8c1a1d3374048e9ec73a1
Issue-ID: SDNC-437
Signed-off-by: Cheung, Pat <kc1472@att.com>

Former-commit-id: a132f1f5d11eff79a10dd0040db351e209c197d1
---
 ...RESOURCE-API_self-serve-vfmodule-ra-assignment.xml | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

(limited to 'platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vfmodule-ra-assignment.xml')

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vfmodule-ra-assignment.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vfmodule-ra-assignment.xml
index 1d8f6fc4..66243dd4 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vfmodule-ra-assignment.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vfmodule-ra-assignment.xml
@@ -71,6 +71,13 @@
                                     <parameter name="error-message" value="Error reading VF_MODEL table" />
                                 </return>
                             </outcome>
+                            <outcome value='not-found'>
+                                <return status='failure'>
+                                    <parameter name='ack-final' value='Y'/>
+                                    <parameter name="error-code" value="500" />
+                                    <parameter name="error-message" value="`'No VF_MODEL found with customization_uuid = ' + $vf-module-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`" />
+                                </return>
+                            </outcome>
                             <outcome value='success'>
                                 <set>
                                     <parameter name='tmp.sdnc-model-name' value='`$db1.vf-model.sdnc-model-name`' />
@@ -79,7 +86,8 @@
                             </outcome>
                         </get-resource>
                         <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
-  key='SELECT vf_module_label from VF_MODULE_MODEL WHERE vf_customization_uuid = $vf-module-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid'
+  key='SELECT vf_module_label from VF_MODULE_MODEL WHERE customization_uuid = $vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid 
+  	AND vf_module_label is not null'
   pfx='db1.vf-module-model'>
                             <outcome value='failure'>
                                 <return status='failure'>
@@ -88,6 +96,13 @@
                                     <parameter name="error-message" value="Error reading VF_MODULE_MODEL table" />
                                 </return>
                             </outcome>
+                            <outcome value='not-found'>
+                                <return status='failure'>
+                                    <parameter name='ack-final' value='Y'/>
+                                    <parameter name="error-code" value="500" />
+                                    <parameter name="error-message" value="`'vf_module_label not found in VF_MODULE_MODEL WHERE customization_uuid = ' + $vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`" />
+                                </return>
+                            </outcome>
                             <outcome value='success'>
                                 <set>
                                     <parameter name='tmp.vf-module-label' value='`$db1.vf-module-model.vf-module-label`' />
@@ -106,7 +121,7 @@
                 <parameter name="tmp.config-name-value-payload9" value="`$tmp.config-name-value-payload8 + '&quot;aic-cloud-region&quot;:&quot;' + $vf-module-topology-operation-input.vf-module-request-input.aic-cloud-region + '&quot;'`"/>
                 <parameter name="tmp.config-name-value-payload91" value="`'{' + $tmp.config-name-value-payload9 + '}'`" />
             </set>
-            <execute plugin='org.openecomp.sdnc.config.assignment.service.ConfigAssignmentNode' method='process'>
+            <execute plugin='org.onap.ccsdk.config.assignment.service.ConfigAssignmentNode' method='process'>
                 <parameter name="request-id" value='`$request-id`' />
                 <parameter name="resource-id" value='`$resource-id`' />
                 <parameter name="resource-type" value='`$resource-type`' />
-- 
cgit 1.2.3-korg