self-serve DG for Casablanca

[sdnc/oam.git] / 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 1d8f6fc..66243dd 100644 (file)
--- 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" />\r
                                 </return>\r
                             </outcome>\r
+                            <outcome value='not-found'>\r
+                                <return status='failure'>\r
+                                    <parameter name='ack-final' value='Y'/>\r
+                                    <parameter name="error-code" value="500" />\r
+                                    <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`" />\r
+                                </return>\r
+                            </outcome>\r
                             <outcome value='success'>\r
                                 <set>\r
                                     <parameter name='tmp.sdnc-model-name' value='`$db1.vf-model.sdnc-model-name`' />\r
@@ -79,7 +86,8 @@
                             </outcome>\r
                         </get-resource>\r
                         <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\r
-  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'\r
+  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 \r
+       AND vf_module_label is not null'\r
   pfx='db1.vf-module-model'>\r
                             <outcome value='failure'>\r
                                 <return status='failure'>\r
@@ -88,6 +96,13 @@
                                     <parameter name="error-message" value="Error reading VF_MODULE_MODEL table" />\r
                                 </return>\r
                             </outcome>\r
+                            <outcome value='not-found'>\r
+                                <return status='failure'>\r
+                                    <parameter name='ack-final' value='Y'/>\r
+                                    <parameter name="error-code" value="500" />\r
+                                    <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`" />\r
+                                </return>\r
+                            </outcome>\r
                             <outcome value='success'>\r
                                 <set>\r
                                     <parameter name='tmp.vf-module-label' value='`$db1.vf-module-model.vf-module-label`' />\r
@@ -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;'`"/>\r
                 <parameter name="tmp.config-name-value-payload91" value="`'{' + $tmp.config-name-value-payload9 + '}'`" />\r
             </set>\r
-            <execute plugin='org.openecomp.sdnc.config.assignment.service.ConfigAssignmentNode' method='process'>\r
+            <execute plugin='org.onap.ccsdk.config.assignment.service.ConfigAssignmentNode' method='process'>\r
                 <parameter name="request-id" value='`$request-id`' />\r
                 <parameter name="resource-id" value='`$resource-id`' />\r
                 <parameter name="resource-type" value='`$resource-type`' />\r