aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSalichos Michail, INI-INO-ECO-HCT <michail.salichos@gmail.com>2019-05-01 12:24:01 +0200
committerDan Timoney <dtimoney@att.com>2019-05-05 23:02:38 +0000
commit480c84bd22d63d04d80dee43c3683442275d9644 (patch)
tree71f8bee1fda7428e98ed6d789ca4421daaa65f9a
parent32910e33d3bd0034b799604fb9112a4701122844 (diff)
Replace access_id with remote_id
Replace all the occurences of access_id with remote_id in the DGs Issue-ID: SDNC-738 Change-Id: I13073f30b9238f566a6df22cdd0d15e7393af5e7 Signed-off-by: Salichos Michail, INI-INO-ECO-HCT <michail.salichos@gmail.com> (cherry picked from commit cb27b38f922fc90c47cb4fa71d6677b5392e29f1 [formerly 10d60e05a8c778598cabfc81d4134e9a68bf763b]) Former-commit-id: a603c5aad40a078c655234fa19d4de598ce86d37
-rw-r--r--platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-create-huawei.json16
-rw-r--r--platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-common-huawei.json14
-rw-r--r--platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-create-huawei.xml8
-rw-r--r--platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-common-huawei.xml8
-rw-r--r--platform-logic/restapi-templates/src/main/json/bbs-access-connectivity-create.json2
-rw-r--r--platform-logic/restapi-templates/src/main/json/bbs-internet-profile-operation.json2
6 files changed, 25 insertions, 25 deletions
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-create-huawei.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-create-huawei.json
index d02c6c82..aed52855 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-create-huawei.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-create-huawei.json
@@ -283,7 +283,7 @@
"id": "1c40c39.920b2bc",
"type": "record",
"name": "log file",
- "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n <parameter name=\"file\" value=\"/opt/oak/logx.txt\" />\n <parameter name=\"field1\" value=\"__TIMESTAMP__\" />\n <parameter name=\"field2\" value=\"`$prop.bbs.accessID`\" />\n <parameter name=\"field3\" value=\"`$prop.bbs.ONTSN`\" />\n <parameter name=\"field4\" value=\"`$prop.bbs.CVLAN`\" />\n <parameter name=\"field5\" value=\"`$prop.bbs.SVLAN`\" />\n <parameter name=\"field6\" value=\"`$prop.bbs.HsiPackage`\" />\n <parameter name=\"field7\" value=\"`$prop.bbs.HsiType`\" />",
+ "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n <parameter name=\"file\" value=\"/opt/oak/logx.txt\" />\n <parameter name=\"field1\" value=\"__TIMESTAMP__\" />\n <parameter name=\"field2\" value=\"`$prop.bbs.remote_id`\" />\n <parameter name=\"field3\" value=\"`$prop.bbs.ONTSN`\" />\n <parameter name=\"field4\" value=\"`$prop.bbs.CVLAN`\" />\n <parameter name=\"field5\" value=\"`$prop.bbs.SVLAN`\" />\n <parameter name=\"field6\" value=\"`$prop.bbs.HsiPackage`\" />\n <parameter name=\"field7\" value=\"`$prop.bbs.HsiType`\" />",
"comments": "",
"outputs": 1,
"x": 1973.0005187988281,
@@ -389,8 +389,8 @@
{
"id": "ab021836.64d55",
"type": "switchNode",
- "name": "switch:accessID",
- "xml": "<switch test=\"`$network-input-parameters.param[$idx].name == 'accessID'`\">\n",
+ "name": "switch:remote_id",
+ "xml": "<switch test=\"`$network-input-parameters.param[$idx].name == 'remote_id'`\">\n",
"comments": "",
"outputs": 1,
"x": 2588.5004920959473,
@@ -421,8 +421,8 @@
{
"id": "c399b374.94be5",
"type": "set",
- "name": "set:accessID",
- "xml": "<set>\n<parameter name='prop.bbs.accessID' value='`$network-input-parameters.param[$idx].value`' />\n",
+ "name": "set:remote_id",
+ "xml": "<set>\n<parameter name='prop.bbs.remote_id' value='`$network-input-parameters.param[$idx].value`' />\n",
"comments": "",
"x": 3509.5001678466797,
"y": 481.6001958847046,
@@ -581,7 +581,7 @@
{
"id": "6416001f.b55fe8",
"type": "switchNode",
- "name": "switch:accessID value",
+ "name": "switch:remote_id value",
"xml": "<switch test='`$network-input-parameters.param[$idx].value`'>\n",
"comments": "",
"outputs": 1,
@@ -905,7 +905,7 @@
"id": "116359fa.597806",
"type": "save",
"name": "save:metadata",
- "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource=\"service-instance:metadata\"\n key=\"service-instance.service-instance-id = $network-topology-operation-input.service-information.service-id \n\tAND customer.global-customer-id = $network-topology-operation-input.service-information.global-customer-id\n\t AND service-subscription.service-type = $network-topology-operation-input.service-information.subscription-service-type\n\t AND service-instance.service-instance-id = $network-topology-operation-input.service-information.service-instance-id\" force=\"true\" pfx=\"tmp.AnAI-data\"\n >\n <parameter name=\"metadata.metadatum[0].metaname\" value=\"remote-id\" />\n <parameter name=\"metadata.metadatum[0].metaval\" value=\"`$prop.bbs.accessID`\" />\n <parameter name=\"metadata.metadatum[1].metaname\" value=\"controller-service-id\" />\n <parameter name=\"metadata.metadatum[1].metaval\" value=\"`$prop.bbs.serviceID`\" />",
+ "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource=\"service-instance:metadata\"\n key=\"service-instance.service-instance-id = $network-topology-operation-input.service-information.service-id \n\tAND customer.global-customer-id = $network-topology-operation-input.service-information.global-customer-id\n\t AND service-subscription.service-type = $network-topology-operation-input.service-information.subscription-service-type\n\t AND service-instance.service-instance-id = $network-topology-operation-input.service-information.service-instance-id\" force=\"true\" pfx=\"tmp.AnAI-data\"\n >\n <parameter name=\"metadata.metadatum[0].metaname\" value=\"remote-id\" />\n <parameter name=\"metadata.metadatum[0].metaval\" value=\"`$prop.bbs.remote_id`\" />\n <parameter name=\"metadata.metadatum[1].metaname\" value=\"controller-service-id\" />\n <parameter name=\"metadata.metadatum[1].metaval\" value=\"`$prop.bbs.serviceID`\" />",
"comments": "",
"outputs": 1,
"x": 2261.032783508301,
@@ -1134,4 +1134,4 @@
"z": "b55dc3b9.0674e8",
"wires": []
}
-] \ No newline at end of file
+]
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-common-huawei.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-common-huawei.json
index 4d6235cc..9fb4ecb4 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-common-huawei.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-common-huawei.json
@@ -126,8 +126,8 @@
{
"id": "8a494a8.20a8bb8",
"type": "switchNode",
- "name": "switch:ip_access_id",
- "xml": "<switch test=\"`$network-input-parameters.param[$idx].name == 'ip_access_id'`\">\n",
+ "name": "switch:ip_remote_id",
+ "xml": "<switch test=\"`$network-input-parameters.param[$idx].name == 'ip_remote_id'`\">\n",
"comments": "",
"outputs": 1,
"x": 2606.5004272460938,
@@ -158,8 +158,8 @@
{
"id": "a7d3481c.08f7b8",
"type": "set",
- "name": "set:access_id",
- "xml": "<set>\n<parameter name='prop.bbs.access_id' value='`$network-input-parameters.param[$idx].value`' />\n",
+ "name": "set:remote_id",
+ "xml": "<set>\n<parameter name='prop.bbs.remote_id' value='`$network-input-parameters.param[$idx].value`' />\n",
"comments": "",
"x": 3529.5007095336914,
"y": 416.60026264190674,
@@ -322,7 +322,7 @@
{
"id": "8225c847.1697b",
"type": "switchNode",
- "name": "switch:ip_access_id value",
+ "name": "switch:ip_remote_id value",
"xml": "<switch test='`$network-input-parameters.param[$idx].value`'>\n",
"comments": "",
"outputs": 1,
@@ -861,7 +861,7 @@
"id": "38f1d224.3b5b8e",
"type": "record",
"name": "log file",
- "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n <parameter name=\"file\" value=\"/opt/oak/logx.txt\" />\n <parameter name=\"field1\" value=\"bbs-internet-profile-common\" />\n <parameter name=\"field2\" value=\"`$prop.bbs.service_id`\" />\n <parameter name=\"field3\" value=\"`$prop.bbs.access_id`\" />\n <parameter name=\"field4\" value=\"`$prop.bbs.ont_sn`\" />\n <parameter name=\"field5\" value=\"`$prop.bbs.service_type`\" />\n <parameter name=\"field6\" value=\"`$prop.bbs.mac`\" />\n <parameter name=\"field7\" value=\"`$prop.bbs.up_speed`\" />\n <parameter name=\"field8\" value=\"`$prop.bbs.down_speed`\" />\n <parameter name=\"field9\" value=\"`$prop.bbs.s_vlan`\" />\n <parameter name=\"field10\" value=\"`$prop.bbs.c_vlan`\" />",
+ "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n <parameter name=\"file\" value=\"/opt/oak/logx.txt\" />\n <parameter name=\"field1\" value=\"bbs-internet-profile-common\" />\n <parameter name=\"field2\" value=\"`$prop.bbs.service_id`\" />\n <parameter name=\"field3\" value=\"`$prop.bbs.remote_id`\" />\n <parameter name=\"field4\" value=\"`$prop.bbs.ont_sn`\" />\n <parameter name=\"field5\" value=\"`$prop.bbs.service_type`\" />\n <parameter name=\"field6\" value=\"`$prop.bbs.mac`\" />\n <parameter name=\"field7\" value=\"`$prop.bbs.up_speed`\" />\n <parameter name=\"field8\" value=\"`$prop.bbs.down_speed`\" />\n <parameter name=\"field9\" value=\"`$prop.bbs.s_vlan`\" />\n <parameter name=\"field10\" value=\"`$prop.bbs.c_vlan`\" />",
"comments": "",
"outputs": 1,
"x": 1944.222095489502,
@@ -871,4 +871,4 @@
[]
]
}
-] \ No newline at end of file
+]
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..0137e010 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>
@@ -228,7 +228,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'>
@@ -260,4 +260,4 @@
</return>
</block>
</method>
-</service-logic> \ No newline at end of file
+</service-logic>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-common-huawei.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-common-huawei.xml
index 95a3ac11..0eea0e09 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-common-huawei.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-common-huawei.xml
@@ -15,7 +15,7 @@
</execute>
<for index='idx' start='0' end='`$network-input-parameters.param_length`' >
<block>
- <switch test="`$network-input-parameters.param[$idx].name == 'ip_access_id'`">
+ <switch test="`$network-input-parameters.param[$idx].name == 'ip_remote_id'`">
<outcome value='true'>
<switch test='`$network-input-parameters.param[$idx].value`'>
<outcome value=''>
@@ -27,7 +27,7 @@
</outcome>
<outcome value='Other'>
<set>
- <parameter name='prop.bbs.access_id' value='`$network-input-parameters.param[$idx].value`' />
+ <parameter name='prop.bbs.remote_id' value='`$network-input-parameters.param[$idx].value`' />
</set>
</outcome>
</switch>
@@ -165,7 +165,7 @@
<parameter name="file" value="/opt/oak/logx.txt" />
<parameter name="field1" value="bbs-internet-profile-common" />
<parameter name="field2" value="`$prop.bbs.service_id`" />
- <parameter name="field3" value="`$prop.bbs.access_id`" />
+ <parameter name="field3" value="`$prop.bbs.remote_id`" />
<parameter name="field4" value="`$prop.bbs.ont_sn`" />
<parameter name="field5" value="`$prop.bbs.service_type`" />
<parameter name="field6" value="`$prop.bbs.mac`" />
@@ -176,4 +176,4 @@
</record>
</block>
</method>
-</service-logic> \ No newline at end of file
+</service-logic>
diff --git a/platform-logic/restapi-templates/src/main/json/bbs-access-connectivity-create.json b/platform-logic/restapi-templates/src/main/json/bbs-access-connectivity-create.json
index 0cab56ef..a8039313 100644
--- a/platform-logic/restapi-templates/src/main/json/bbs-access-connectivity-create.json
+++ b/platform-logic/restapi-templates/src/main/json/bbs-access-connectivity-create.json
@@ -2,7 +2,7 @@
"accessE2Eservice" : {
"serviceID" : "",
"subscriberInfo" : {
- "accessID" : "",
+ "remote_id" : "",
"extendParas" : {},
"dpName":""
},
diff --git a/platform-logic/restapi-templates/src/main/json/bbs-internet-profile-operation.json b/platform-logic/restapi-templates/src/main/json/bbs-internet-profile-operation.json
index 31d59ead..dc44ad30 100644
--- a/platform-logic/restapi-templates/src/main/json/bbs-internet-profile-operation.json
+++ b/platform-logic/restapi-templates/src/main/json/bbs-internet-profile-operation.json
@@ -1,6 +1,6 @@
{
"service_id":${prop.bbs.service_id},
- "access_id":${prop.bbs.access_id},
+ "remote_id":${prop.bbs.remote_id},
"ont_sn":${prop.bbs.ont_sn},
"service_type":${prop.bbs.service_type},
"mac":${prop.bbs.mac},