Code Review / sdnc / oam.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
DG changes for the closed loop and async
[sdnc/oam.git] / platform-logic / optical-service / src / main / xml / optical-service_optical-service-create.xml
diff --git a/platform-logic/optical-service/src/main/xml/optical-service_optical-service-create.xml b/platform-logic/optical-service/src/main/xml/optical-service_optical-service-create.xml
index 2341c60..9cc1736 100644 (file)
--- a/platform-logic/optical-service/src/main/xml/optical-service_optical-service-create.xml
+++ b/platform-logic/optical-service/src/main/xml/optical-service_optical-service-create.xml
@@ -3,6 +3,9 @@
     xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='optical-service' version='${project.version}'>\r
     <method rpc='optical-service-create' mode='sync'>\r
         <block atomic='true'>\r
+            <set>\r
+                <parameter name='pinterface-list' value=""/>\r
+            </set>\r
             <for index='idx' start='0' end='`$optical-service-create-input.payload.param_length`' >\r
                 <set>\r
                     <parameter name='params' value='`$optical-service-create-input.payload.param[$idx]`' />\r
@@ -11,6 +14,7 @@
                     <outcome value='true'>\r
                         <set>\r
                             <parameter name='optical-service-create-input.payload.service-aend.port-id' value="`$optical-service-create-input.payload.param[$idx].value`"/>\r
+                            <parameter name='pinterface-aend' value="`'uni1_id--'+ $optical-service-create-input.payload.param[$idx].value`"/>\r
                         </set>\r
                     </outcome>\r
                 </switch>\r
@@ -23,6 +27,7 @@
                     <outcome value='true'>\r
                         <set>\r
                             <parameter name='optical-service-create-input.payload.service-zend.port-id' value="`$optical-service-create-input.payload.param[$idx].value`"/>\r
+                            <parameter name='pinterface-zend' value="`',uni2_id--'+ $optical-service-create-input.payload.param[$idx].value`"/>\r
                         </set>\r
                     </outcome>\r
                 </switch>\r
@@ -42,6 +47,7 @@
                     <outcome value='true'>\r
                         <set>\r
                             <parameter name='optical-service-create-input.payload.service-aend.port-id' value="`$optical-service-create-input.payload.param[$idx].value`"/>\r
+                            <parameter name='pinterface-aend' value="`'uni_id--'+ $optical-service-create-input.payload.param[$idx].value`"/>\r
                         </set>\r
                     </outcome>\r
                 </switch>\r
@@ -49,6 +55,7 @@
                     <outcome value='true'>\r
                         <set>\r
                             <parameter name='optical-service-create-input.payload.service-zend.port-id' value="`$optical-service-create-input.payload.param[$idx].value`"/>\r
+                            <parameter name='pinterface-zend' value="`',enni_id--'+ $optical-service-create-input.payload.param[$idx].value`"/>\r
                         </set>\r
                     </outcome>\r
                 </switch>\r
@@ -63,6 +70,7 @@
                     <outcome value='true'>\r
                         <set>\r
                             <parameter name='optical-service-create-input.payload.service-aend.port-id' value="`$optical-service-create-input.payload.param[$idx].value`"/>\r
+                            <parameter name='pinterface-aend' value="`'enni1_id--'+ $optical-service-create-input.payload.param[$idx].value`"/>\r
                         </set>\r
                     </outcome>\r
                 </switch>\r
@@ -70,6 +78,7 @@
                     <outcome value='true'>\r
                         <set>\r
                             <parameter name='optical-service-create-input.payload.service-zend.port-id' value="`$optical-service-create-input.payload.param[$idx].value`"/>\r
+                            <parameter name='pinterface-zend' value="`',enni2_id--'+ $optical-service-create-input.payload.param[$idx].value`"/>\r
                         </set>\r
                     </outcome>\r
                 </switch>\r
@@ -145,11 +154,21 @@ pfx='db.source2'>
             <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\r
                 <parameter name="ctx-destination" value="service2-request-id"/>\r
             </execute>\r
+            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">\r
+                <parameter name="file" value="/opt/opendaylight/current/data/log/optical-service-create.log" />\r
+                <parameter name="level" value="info" />\r
+                <parameter name="field1" value="Controller Ids"/>\r
+                <parameter name="field2" value="`$controller1`"/>\r
+                <parameter name="field3" value="`$controller2`"/>\r
+            </record>\r
+            <set>\r
+                <parameter name='pinterface-list' value="`$pinterface-aend + $pinterface-zend`"/>\r
+            </set>\r
             <switch test='`$controller1==$controller2`'>\r
                 <outcome value='true'>\r
                     <block>\r
                         <set>\r
-                            <parameter name='as-request-id' value='`$optical-service-create-input.request-id`' />\r
+                            <parameter name='access-request-id' value='`$optical-service-create-input.request-id`' />\r
                             <parameter name='as-svc-instance-id' value='`$optical-service-create-input.service-id`' />\r
                         </set>\r
                         <set>\r
@@ -164,22 +183,29 @@ pfx='db.source2'>
                             <parameter name="field1" value="`'domain rquest_' + $domain-requests`"/>\r
                             <parameter name="field2" value="`'Access rquest_' + $as-request-id`"/>\r
                         </record>\r
-                        <save plugin="org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource" resource="SQL" key="INSERT INTO REQUEST_DETAILS (request_id, controller_id, status, service_rate, service_instance_id, service_type, global_customer_id, notification_url, domain_requests ) VALUES ( $as-request-id , null , 'CREATING' , $optical-service-create-input.payload.service-rate ,  $as-svc-instance-id , $optical-service-create-input.service-type , $optical-service-create-input.global-customer-id , $optical-service-create-input.notification-url , $domain-requests );"></save>\r
+                        <save plugin="org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource" resource="SQL" key="INSERT INTO REQUEST_DETAILS (request_id, controller_id, status, service_rate, service_instance_id, service_type, global_customer_id, notification_url, domain_requests, pinterface_list ) VALUES ( $access-request-id , null , 'CREATING' , $optical-service-create-input.payload.service-rate ,  $as-svc-instance-id , $optical-service-create-input.service-type , $optical-service-create-input.global-customer-id , $optical-service-create-input.notification-url , $domain-requests , $pinterface-list );"></save>\r
                         <call module='optical-service' rpc='main-create' mode='sync' >\r
                             <outcome value='success'>\r
                                 <switch test='`$final-response-code`'>\r
                                     <outcome value='200'>\r
                                         <block>\r
-                                            <save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' \r
-resource='SQL' \r
-key='UPDATE REQUEST_DETAILS SET status = "CREATED" WHERE request_id = $as-request-id'\r
-force='true' pfx='save-result'></save>\r
                                             <call module='optical-service' rpc='create-service-relationship' mode='sync' ></call>\r
-                                            <return status='success'>\r
-                                                <parameter name='error-code' value='200' />\r
-                                                <parameter name='error-message' value='Service Created Successfully' />\r
-                                                <parameter name='ack-final-indicator' value='Y' />\r
-                                            </return>\r
+                                            <switch test="`$domain-type == 'MSA'`">\r
+                                                <outcome value='true'>\r
+                                                    <return status='success'>\r
+                                                        <parameter name='error-code' value='200' />\r
+                                                        <parameter name='error-message' value='Service Created Successfully' />\r
+                                                        <parameter name='ack-final-indicator' value='N' />\r
+                                                    </return>\r
+                                                </outcome>\r
+                                                <outcome value='false'>\r
+                                                    <return status='success'>\r
+                                                        <parameter name='error-code' value='200' />\r
+                                                        <parameter name='error-message' value='Service Created Successfully' />\r
+                                                        <parameter name='ack-final-indicator' value='Y' />\r
+                                                    </return>\r
+                                                </outcome>\r
+                                            </switch>\r
                                         </block>\r
                                     </outcome>\r
                                 </switch>\r
@@ -190,22 +216,23 @@ force='true' pfx='save-result'></save>
                 <outcome value='false'>\r
                     <block>\r
                         <set>\r
-                            <parameter name='as-request-id' value='`$optical-service-create-input.request-id`' />\r
+                            <parameter name='access-request-id' value='`$optical-service-create-input.request-id`' />\r
                             <parameter name='as-svc-instance-id' value='`$optical-service-create-input.service-id`' />\r
-                            <parameter name='domain-requests' value="`$service1-request-id + ',' + $service2-request-id`" />\r
+                            <parameter name='service-rate' value='`$optical-service-create-input.payload.service-rate`' />\r
+                        </set>\r
+                        <save plugin="org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource" resource="SQL" key="INSERT INTO REQUEST_DETAILS (request_id, controller_id, status, service_rate, service_instance_id, service_type, global_customer_id, notification_url, domain_requests, pinterface_list ) VALUES ( $access-request-id , null , 'CREATING' , $service-rate ,  $as-svc-instance-id , $optical-service-create-input.service-type , $optical-service-create-input.global-customer-id , $optical-service-create-input.notification-url , $domain-requests , $pinterface-list );"></save>\r
+                        <set>\r
+                            <parameter name='src-port-id' value="`$optical-service-create-input.payload.service-aend.port-id`"/>\r
+                            <parameter name='dst-port-id' value="`$optical-service-create-input.payload.service-zend.port-id`"/>\r
+                            <parameter name='access-service-name' value="`$optical-service-create-input.payload.service-name`"/>\r
                         </set>\r
                         <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">\r
                             <parameter name="file" value="/opt/opendaylight/current/data/log/optical-service-create.log" />\r
                             <parameter name="level" value="info" />\r
-                            <parameter name="field1" value="`'domain rquest_' + $domain-requests`"/>\r
-                            <parameter name="field2" value="`'Service 1 req id---' + $service1-request-id`"/>\r
-                            <parameter name="field3" value="`'Service 2 req id---' + $service2-request-id`"/>\r
+                            <parameter name="field1" value="Access service details"/>\r
+                            <parameter name="field2" value="`$access-request-id`"/>\r
+                            <parameter name="field3" value="`$src-port-id`"/>\r
                         </record>\r
-                        <save plugin="org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource" resource="SQL" key="INSERT INTO REQUEST_DETAILS (request_id, controller_id, status, service_rate, service_instance_id, service_type, global_customer_id, notification_url, domain_requests ) VALUES ( $as-request-id , null , 'CREATING' , $optical-service-create-input.payload.service-rate ,  $as-svc-instance-id , $optical-service-create-input.service-type , $optical-service-create-input.global-customer-id , $optical-service-create-input.notification-url , $domain-requests );"></save>\r
-                        <set>\r
-                            <parameter name='access-aend' value="`$optical-service-create-input.payload.service-aend.port-id`"/>\r
-                            <parameter name='access-zend' value="`$optical-service-create-input.payload.service-zend.port-id`"/>\r
-                        </set>\r
                         <call module='optical-service' rpc='inter-domain-handling' mode='sync' ></call>\r
                     </block>\r
                 </outcome>\r
SDNC OA&M tools