X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=platform-logic%2Fgeneric-resource-api%2Fsrc%2Fmain%2Fxml%2FGENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-create-huawei.xml;h=94173333ae56cba527fa5efa6fb3cf208eff419e;hb=refs%2Fheads%2Fmaster;hp=b207014c5bc7dc08bae34d1cc73f757c37aa380f;hpb=b54cda2494fedce1c53818aae059b6cd1fd48188;p=sdnc%2Foam.git

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-create-huawei.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-create-huawei.xml
index b207014c..94173333 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-create-huawei.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-create-huawei.xml
@@ -16,7 +16,7 @@
             </execute>
             <for index='idx' start='0' end='`$network-input-parameters.param_length`' >
                 <block>
-                    <switch test="`$network-input-parameters.param[$idx].name == 'accessID'`">
+                    <switch test="`$network-input-parameters.param[$idx].name == 'remote_id'`">
                         <outcome value='true'>
                             <switch test='`$network-input-parameters.param[$idx].value`'>
                                 <outcome value=''>
@@ -28,7 +28,7 @@
                                 </outcome>
                                 <outcome value='Other'>
                                     <set>
-                                        <parameter name='prop.bbs.accessID' value='`$network-input-parameters.param[$idx].value`' />
+                                        <parameter name='prop.bbs.remote_id' value='`$network-input-parameters.param[$idx].value`' />
                                     </set>
                                 </outcome>
                             </switch>
@@ -156,11 +156,6 @@
                                 <set>
                                     <parameter name='prop.bbs.serviceID' value="`$service-result.accessE2Eservice.serviceID`"/>
                                 </set>
-                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                    <parameter name="file" value="/opt/oak/logx.txt" />
-                                    <parameter name="field1" value="createAccessConnectivityService success!" />
-                                    <parameter name="field2" value="`$service-result.accessE2Eservice.serviceID`" />
-                                </record>
                             </block>
                         </outcome>
                     </switch>
@@ -174,12 +169,7 @@
                             <parameter name="ctx_memory_result_key" value="prop.random-data-list"/>
                             <parameter name="original_string" value="`$prop.random-data`"/>
                             <parameter name="regex" value="-"/>
-                            <outcome value='success'>
-                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                    <parameter name="file" value="/opt/oak/logx.txt" />
-                                    <parameter name="field1" value="`$prop.random-data`" />
-                                </record>
-                            </outcome>
+                            <outcome value='success'></outcome>
                         </execute>
                     </outcome>
                 </execute>
@@ -194,8 +184,6 @@
                     <parameter name=  "service-id" value = "`$network-topology-operation-input.service-information.service-id`"/>
                     <parameter name=  "prov-status" value = "ACTIVE"/>
                     <parameter name=  "orchestration-status" value = "Active"/>
-                    <parameter name=  "ipv4-oam-address" value = "169.254.236.13"/>
-                    <parameter name=  "in-maint" value = "false" />
                     <parameter name=  "is-closed-loop-disabled" value = "false" />
                     <parameter name=  "model-invariant-id" value = "`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`"/>
                     <parameter name=  "model-version-id" value = "`$network-topology-operation-input.network-information.onap-model-information.model-uuid`"/>
@@ -214,12 +202,7 @@
                             <parameter name="error-message" value="generic-vnf instance does not exist in AAI" />
                         </return>
                     </outcome>
-                    <outcome value='success'>
-                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                            <parameter name="file" value="/opt/oak/logx.txt" />
-                            <parameter name="field1" value="save generic-vnf success!" />
-                        </record>
-                    </outcome>
+                    <outcome value='success'></outcome>
                 </save>
                 <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="service-instance:metadata"
  key="service-instance.service-instance-id = $network-topology-operation-input.service-information.service-id  
@@ -228,7 +211,7 @@
 	  AND service-instance.service-instance-id =  $network-topology-operation-input.service-information.service-instance-id"  force="true" pfx="tmp.AnAI-data"
     >
                     <parameter name="metadata.metadatum[0].metaname" value="remote-id" />
-                    <parameter name="metadata.metadatum[0].metaval" value="`$prop.bbs.accessID`" />
+                    <parameter name="metadata.metadatum[0].metaval" value="`$prop.bbs.remote_id`" />
                     <parameter name="metadata.metadatum[1].metaname" value="controller-service-id" />
                     <parameter name="metadata.metadatum[1].metaval" value="`$prop.bbs.serviceID`" />
                     <outcome value='failure'>
@@ -245,12 +228,32 @@
                             <parameter name="error-message" value="metadatum instance does not exist in AAI" />
                         </return>
                     </outcome>
-                    <outcome value='success'>
-                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                            <parameter name="file" value="/opt/oak/logx.txt" />
-                            <parameter name="field1" value="save metadatum success!" />
-                        </record>
+                    <outcome value='success'></outcome>
+                </save>
+                <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="service-instance:relationship-list" 
+      key="service-instance.service-instance-id =  $network-topology-operation-input.service-information.service-id
+         AND customer.global-customer-id = $network-topology-operation-input.service-information.global-customer-id
+         AND service-subscription.service-type =  $network-topology-operation-input.service-information.subscription-service-type 
+         AND service-instance.service-instance-id =  $network-topology-operation-input.service-information.service-instance-id" force="true" pfx="tmp.AnAI-data">
+                    <parameter name="relationship-list.relationship[0].related-to" value="generic-vnf" />
+                    <parameter name="relationship-list.relationship[0].related-link" value="`'/network/generic-vnfs/generic-vnf/' + $vnf-id`" />
+                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="generic-vnf.vnf-id" />
+                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$vnf-id`" />
+                    <outcome value='failure'>
+                        <return status='failure'>
+                            <parameter name='ack-final' value='Y'/>
+                            <parameter name="error-code" value="500" />
+                            <parameter name="error-message" value="Failure calling AAI to save metadatum" />
+                        </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="metadatum instance does not exist in AAI" />
+                        </return>
                     </outcome>
+                    <outcome value='success'></outcome>
                 </save>
             </block>
             <return status='success'>
@@ -260,4 +263,4 @@
             </return>
         </block>
     </method>
-</service-logic>
\ No newline at end of file
+</service-logic>