Fix bbs dgs bug,replace 'vendor' by 'manufacturer'

Issue-ID: SDNC-698,SDNC-699,SDNC-700

Change-Id: Ida80d2ca97f786be36e4610ed0e4e18fab15773a
Signed-off-by: Gxxxx <guofengbei@huawei.com>

Former-commit-id: 879baef9f68011412253def6a014fcbfe261c4da

3 files changed, 122 insertions, 21 deletions

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 ae4e0f96..b207014c 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
@@ -111,7 +111,7 @@
                             <return status='failure'>
                                 <parameter name='ack-final' value='Y'/>
                                 <parameter name="error-code" value="500" />
-                                <parameter name="error-message" value="Error executing Get token rest api" />
+                                <parameter name="error-message" value="Error executing queryTokenID,vaule is null" />
                             </return>
                         </outcome>
                     </switch>
@@ -120,7 +120,7 @@
                     <return status='failure'>
                         <parameter name='ack-final' value='Y'/>
                         <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="Error executing Get token rest api" />
+                        <parameter name="error-message" value="Error failed to call queryTokenID" />
                     </return>
                 </outcome>
             </execute>
@@ -139,7 +139,7 @@
                     <return status='failure'>
                         <parameter name='ack-final' value='Y'/>
                         <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="Error executing Get token rest api" />
+                        <parameter name="error-message" value="Error failed to call  createAccessConnectivityService" />
                     </return>
                 </outcome>
                 <outcome value='success'>
@@ -148,15 +148,111 @@
                             <return status='failure'>
                                 <parameter name='ack-final' value='Y'/>
                                 <parameter name="error-code" value="500" />
-                                <parameter name="error-message" value="`'Error createAccessConnectivityService failed: '+$service-result.errors.error[0].error-message`" />
+                                <parameter name="error-message" value="`'Error createAccessConnectivityService return: '+$service-result.errors.error[0].error-message`" />
                             </return>
                         </outcome>
                         <outcome value=''>
-                            <block></block>
+                            <block>
+                                <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>
                 </outcome>
             </execute>
+            <block>
+                <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="generateUUID">
+                    <parameter name="ctx-destination" value="prop.random-data"/>
+                    <outcome value='success'>
+                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                            <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>
+                        </execute>
+                    </outcome>
+                </execute>
+                <set>
+                    <parameter name='vnf-id' value="`$prop.random-data-list[3]`"/>
+                    <parameter name='vnf-name' value="`'vnf-'+$prop.random-data-list[4]`"/>
+                </set>
+                <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="generic-vnf" key="generic-vnf.vnf-id = $vnf-id" >
+                    <parameter name= "vnf-id" value = "`$vnf-id`"/>
+                    <parameter name=  "vnf-name" value = "`$vnf-name`"/>
+                    <parameter name=  "vnf-type" value = "AccessConnectivity"/>
+                    <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`"/>
+                    <parameter name=  "model-customization-id" value = "`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`"/>
+                    <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 generic-vnf" />
+                        </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="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>
+                </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  
+	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="metadata.metadatum[0].metaname" value="remote-id" />
+                    <parameter name="metadata.metadatum[0].metaval" value="`$prop.bbs.accessID`" />
+                    <parameter name="metadata.metadatum[1].metaname" value="controller-service-id" />
+                    <parameter name="metadata.metadatum[1].metaval" value="`$prop.bbs.serviceID`" />
+                    <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'>
+                        <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>
+                </save>
+            </block>
             <return status='success'>
                 <parameter name="ack-final-indicator" value="Y" />
                 <parameter name="error-code" value="200" />
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-delete-huawei.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-delete-huawei.xml
index e5b59771..732f4f39 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-delete-huawei.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-delete-huawei.xml
@@ -26,7 +26,7 @@
                     <return status='failure'>
                         <parameter name='ack-final' value='Y'/>
                         <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="Error executing Get token rest api" />
+                        <parameter name="error-message" value="Error failed to call queryTokenID" />
                     </return>
                 </outcome>
                 <outcome value='success'>
@@ -35,7 +35,7 @@
                             <return status='failure'>
                                 <parameter name='ack-final' value='Y'/>
                                 <parameter name="error-code" value="500" />
-                                <parameter name="error-message" value="Error executing Get token rest api" />
+                                <parameter name="error-message" value="Error executing queryTokenID,vaule is null" />
                             </return>
                         </outcome>
                         <outcome value='Other'>
@@ -59,7 +59,7 @@
                                 <return status='failure'>
                                     <parameter name='ack-final' value='Y'/>
                                     <parameter name="error-code" value="500" />
-                                    <parameter name="error-message" value="invalid network-input-parameters.param in bbs-access-connectivity-network-topology-operation-delete" />
+                                    <parameter name="error-message" value="$network-input-parameters.param[$idx].name  +' value is null, please check it.'" />
                                 </return>
                             </outcome>
                         </switch>
@@ -80,7 +80,7 @@
                     <return status='failure'>
                         <parameter name='ack-final' value='Y'/>
                         <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="invalid network-input-parameters.param in bbs-access-connectivity-network-topology-operation-delete" />
+                        <parameter name="error-message" value="Error failed to call deleteAccessConnectivityService" />
                     </return>
                 </outcome>
                 <outcome value='success'>
@@ -90,11 +90,16 @@
                                 <return status='failure'>
                                     <parameter name='ack-final' value='Y'/>
                                     <parameter name="error-code" value="500" />
-                                    <parameter name="error-message" value="`'Error deleteAccessConnectivityService failed: '+$service-result.errors.error[0].error-message`" />
+                                    <parameter name="error-message" value="`'Error deleteAccessConnectivityService return: '+$service-result.errors.error[0].error-message`" />
                                 </return>
                             </outcome>
                             <outcome value=''>
-                                <block></block>
+                                <block>
+                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                        <parameter name="file" value="/opt/oak/logx.txt" />
+                                        <parameter name="field1" value="deleteAccessConnectivityService success!" />
+                                    </record>
+                                </block>
                             </outcome>
                         </switch>
                     </block>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation.xml
index 06456da7..51d6b6a8 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation.xml
@@ -380,7 +380,7 @@
                     <switch test='`$network-topology-operation-input.request-information.request-action`'>
                         <outcome value='ChangeInternetProfileInstance'>
                             <for index='idx' start='0' end='`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`' >
-                                <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'vendor'`">
+                                <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'manufacturer'`">
                                     <outcome value='true'>
                                         <switch test='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`'>
                                             <outcome value='HUAWEI'>
@@ -393,7 +393,7 @@
                                                 <return status='failure'>
                                                     <parameter name='ack-final' value='Y'/>
                                                     <parameter name="error-code" value="500" />
-                                                    <parameter name="error-message" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name+' is invalid vendor,please check!'`" />
+                                                    <parameter name="error-message" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name+' is invalid manufacturer,please check!'`" />
                                                 </return>
                                             </outcome>
                                         </switch>
@@ -427,7 +427,7 @@
                         </outcome>
                         <outcome value='CreateInternetProfileInstance'>
                             <for index='idx' start='0' end='`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`' >
-                                <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'vendor'`">
+                                <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'manufacturer'`">
                                     <outcome value='true'>
                                         <switch test='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`'>
                                             <outcome value='HUAWEI'>
@@ -440,7 +440,7 @@
                                                 <return status='failure'>
                                                     <parameter name='ack-final' value='Y'/>
                                                     <parameter name="error-code" value="500" />
-                                                    <parameter name="error-message" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name+' is invalid vendor,please check!'`" />
+                                                    <parameter name="error-message" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name+' is invalid manufacturer,please check!'`" />
                                                 </return>
                                             </outcome>
                                         </switch>
@@ -450,7 +450,7 @@
                         </outcome>
                         <outcome value='CreateAccessConnectivityInstance'>
                             <for index='idx' start='0' end='`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`' >
-                                <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'vendor'`">
+                                <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'manufacturer'`">
                                     <outcome value='true'>
                                         <switch test='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`'>
                                             <outcome value='HUAWEI'>
@@ -463,7 +463,7 @@
                                                 <return status='failure'>
                                                     <parameter name='ack-final' value='Y'/>
                                                     <parameter name="error-code" value="500" />
-                                                    <parameter name="error-message" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name+' is invalid vendor,please check!'`" />
+                                                    <parameter name="error-message" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name+' is invalid manufacturer,please check!'`" />
                                                 </return>
                                             </outcome>
                                         </switch>
@@ -497,14 +497,14 @@
                         </outcome>
                         <outcome value='DeleteAccessConnectivityInstance'>
                             <for index='idx' start='0' end='`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`' >
-                                <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'vendor'`">
+                                <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'manufacturer'`">
                                     <outcome value='true'>
                                         <switch test='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`'>
                                             <outcome value='Other'>
                                                 <return status='failure'>
                                                     <parameter name='ack-final' value='Y'/>
                                                     <parameter name="error-code" value="500" />
-                                                    <parameter name="error-message" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name+' is invalid vendor,please check!'`" />
+                                                    <parameter name="error-message" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name+' is invalid manufacturer,please check!'`" />
                                                 </return>
                                             </outcome>
                                             <outcome value='HUAWEI'>
@@ -520,14 +520,14 @@
                         </outcome>
                         <outcome value='DeleteInternetProfileInstance'>
                             <for index='idx' start='0' end='`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`' >
-                                <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'vendor'`">
+                                <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'manufacturer'`">
                                     <outcome value='true'>
                                         <switch test='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`'>
                                             <outcome value='Other'>
                                                 <return status='failure'>
                                                     <parameter name='ack-final' value='Y'/>
                                                     <parameter name="error-code" value="500" />
-                                                    <parameter name="error-message" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name+' is invalid vendor,please check!'`" />
+                                                    <parameter name="error-message" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name+' is invalid manufacturer,please check!'`" />
                                                 </return>
                                             </outcome>
                                             <outcome value='HUAWEI'>