diff options
| author |   Hesam Rahimi <hesam.rahimi@huawei.com> | 2021-04-27 16:33:33 +0000 |
|---|---|---|
| committer | Hesam Rahimi <hesam.rahimi@huawei.com> | 2021-04-27 17:48:12 +0000 |
| commit | 71eb3ab680b9d51cfd6fb324d49bcd09c6ff7464 (patch) | |
| tree | b17634ca9f94c1c18bb36562f64e2dac44bc1536 | |
| parent | a9d94a31471280c0da6aabcae367262d3ed3937d (diff) | |
Bug fixing required for H release.
1) fixing and issue in the modify operation
2) fixing automatic loading of the delete/deallocate DG
3) fixing ESR registration issue
Issue-ID: SDNC-1528
Signed-off-by: Hesam Rahimi <hesam.rahimi@huawei.com>
Change-Id: I2c95d00c400559d8aae57b106bcde3886ed096a6
Former-commit-id: 79ad1bea4f5f5dc831e3d4159b21a3028ef775b3
5 files changed, 112 insertions, 51 deletions
diff --git a/platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc-discovery.json b/platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc-discovery.json index 862817a3..7b0ea050 100644 --- a/platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc-discovery.json +++ b/platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc-discovery.json @@ -412,8 +412,8 @@ {
"id": "6f99e35d.de977c",
"type": "other",
- "name": "SOTN",
- "xml": "<outcome value='SOTN'>\n",
+ "name": "WAN",
+ "xml": "<outcome value='WAN'>\n",
"comments": "",
"outputs": 1,
"x": 1082,
diff --git a/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-discovery.xml b/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-discovery.xml index 05c011b2..b49057ed 100644 --- a/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-discovery.xml +++ b/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-discovery.xml @@ -9,7 +9,7 @@ <outcome value='Update'>
<block>
<switch test="`$prop.sdncRestApi.type`">
- <outcome value='SOTN'>
+ <outcome value='WAN'>
<block atomic="true">
<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
<parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
diff --git a/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-modify.json b/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-modify.json index f55ef066..0d4161a1 100644 --- a/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-modify.json +++ b/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-modify.json @@ -230,15 +230,17 @@ "atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1715,
- "y": 201,
+ "x": 1675,
+ "y": 295,
"z": "a1c94a24.22ed9",
"wires": [
[
"8f80cd4e.6bb588",
"1ad0a363.7d61cd",
"2ea54daa.f8c89a",
- "19fc5975.9c891f"
+ "19fc5975.9c891f",
+ "30222136.8f9b9e",
+ "d51e1ac2.752b08"
]
]
},
@@ -461,7 +463,8 @@ "4e189d8f.8297c4",
"c6ccb3e9.91ea18",
"6963f6fb.4a135",
- "40ae5836.eda238"
+ "40ae5836.eda238",
+ "31cde3.5ded021e"
]
]
},
@@ -655,9 +658,9 @@ [
"3d7f3635.a666da",
"5948d066.6a7168",
- "363286ce.e60c2a",
"92d55b48.2c361",
- "60b689f0.bdfe6"
+ "60b689f0.bdfe6",
+ "363286ce.e60c2a"
]
]
},
@@ -966,20 +969,6 @@ "wires": []
},
{
- "id": "363286ce.e60c2a",
- "type": "save",
- "name": "save connectivity resource in AAI",
- "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='vpn-type' value='`$prop.sotn.vpnType`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $network-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network/' + $prop.sotn.network-id + '/network-data/'` \" />\n",
- "comments": "",
- "outputs": 1,
- "x": 5538,
- "y": 1096,
- "z": "a1c94a24.22ed9",
- "wires": [
- []
- ]
- },
- {
"id": "5948d066.6a7168",
"type": "execute",
"name": "execute UUID generator for connectivity domainA",
@@ -1160,8 +1149,8 @@ "xml": "<call module='GENERIC-RESOURCE-API' rpc='tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof' mode='sync' >\n\n",
"comments": "",
"outputs": 1,
- "x": 4456,
- "y": 2256,
+ "x": 4457,
+ "y": 2197,
"z": "a1c94a24.22ed9",
"wires": [
[]
@@ -1173,8 +1162,8 @@ "name": "set attachment_param",
"xml": "<set>\n<parameter name='prop.connection-attachment.access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='prop.connection-attachment.access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />\n<parameter name='prop.connection-attachment.access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />\n<parameter name='prop.connection-attachment.access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='prop.connection-attachment.access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n\n<parameter name='prop.remote.connection-attachment.access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />\n<parameter name='prop.remote.connection-attachment.access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />\n<parameter name='prop.remote.connection-attachment.access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />\n<parameter name='prop.remote.connection-attachment.access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<parameter name='prop.remote.connection-attachment.access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n\n<!--<parameter name='prop.remote.connection-attachment.access-provider-id' value='`$oof.vpn.access-provider-id`' />-->\n<!--<parameter name='prop.remote.connection-attachment.access-client-id' value='`$oof.vpn.access-client-id`' />-->\n<!--<parameter name='prop.remote.connection-attachment.access-topology-id' value='`$oof.vpn.access-topology-id`' />-->\n<!--<parameter name='prop.remote.connection-attachment.access-node-id' value='`$oof.vpn.access-node-id`' />-->\n<!--<parameter name='prop.remote.connection-attachment.access-ltp-id' value='`$oof.vpn.src-access-ltp-id`' />-->\n",
"comments": "",
- "x": 4250,
- "y": 2157,
+ "x": 4251,
+ "y": 2098,
"z": "a1c94a24.22ed9",
"wires": []
},
@@ -1184,8 +1173,8 @@ "name": "TODO: FIXME",
"info": "put proper values for src topology-id, node-id, ltp-id, etc (in domain A)\nand dst topology-id, node-id, ltp-id, etc (in domain B)",
"comments": "",
- "x": 4224,
- "y": 2110,
+ "x": 4225,
+ "y": 2051,
"z": "a1c94a24.22ed9",
"wires": []
},
@@ -2941,8 +2930,8 @@ "xml": "<for index='aridx' start='0' end='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 1914,
- "y": 201,
+ "x": 1933,
+ "y": 248,
"z": "a1c94a24.22ed9",
"wires": [
[
@@ -2968,8 +2957,8 @@ "name": "set query_param",
"xml": "<set>\n<parameter name='prop.ethsrvType' value='`$network-route-A`' />\n\n",
"comments": "",
- "x": 4239,
- "y": 2209,
+ "x": 4240,
+ "y": 2150,
"z": "a1c94a24.22ed9",
"wires": []
},
@@ -3069,9 +3058,7 @@ "y": 2896.25390625,
"z": "a1c94a24.22ed9",
"wires": [
- [
- "20917868.85ed"
- ]
+ []
]
},
{
@@ -3729,10 +3716,10 @@ "id": "1ad0a363.7d61cd",
"type": "set",
"name": "set tmp.arr",
- "xml": "<set>\n<parameter name='tmp.arr' value='' />\n<parameter name='tmp.arridx' value='0' />\n<parameter name='tmp.arr_length' value='0' />\n\n<parameter name='otn-tunnel-slice' value='' />\n<parameter name='otn-tunnel-slice_length' value='0' />\n\n<parameter name='tmp.slicevpns' value='' />\n<parameter name='tmp.slicevpns_length' value='0' />\n\n<parameter name='tmp.slicevpnuuids' value='' />\n<parameter name='tmp.slicevpnuuids.' value='' />\n\n<parameter name='bwModified' value='false' />\n\n\n",
+ "xml": "<set>\n<parameter name='tmp.arr' value='' />\n<parameter name='tmp.arridx' value='0' />\n<parameter name='tmp.arr_length' value='0' />\n\n<parameter name='otn-tunnel-slice' value='' />\n<parameter name='otn-tunnel-slice_length' value='0' />\n\n<!--<parameter name='tmp.slicevpns' value='' />-->\n<!--<parameter name='tmp.slicevpns_length' value='0' />-->\n\n<!--<parameter name='tmp.slicevpnuuids' value='' />-->\n<!--<parameter name='tmp.slicevpnuuids.' value='' />-->\n\n<parameter name='bwModified' value='false' />\n",
"comments": "",
- "x": 1896,
- "y": 147,
+ "x": 1892,
+ "y": 198,
"z": "a1c94a24.22ed9",
"wires": []
},
@@ -5574,5 +5561,72 @@ "wires": [
[]
]
+ },
+ {
+ "id": "54aaf2e0.b64b14",
+ "type": "comment",
+ "name": "The following two nodes are for PCE",
+ "info": "",
+ "comments": "",
+ "x": 1967,
+ "y": 53,
+ "z": "a1c94a24.22ed9",
+ "wires": []
+ },
+ {
+ "id": "d51e1ac2.752b08",
+ "type": "get-resource",
+ "name": "get-resource pnfs-list",
+ "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"pnfs\"\n\t key=\"selflink = 'https://aai.onap:8443/aai/v21/network/pnfs?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"ccsdkTopopnfs\" >",
+ "comments": "",
+ "outputs": 1,
+ "x": 1927,
+ "y": 97,
+ "z": "a1c94a24.22ed9",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "30222136.8f9b9e",
+ "type": "get-resource",
+ "name": "get-resource logical-links",
+ "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"logical-links\"\n\t key=\"selflink = 'https://aai.onap:8443/aai/v21/network/logical-links?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"ccsdkTopologicalLinks\" >",
+ "comments": "",
+ "outputs": 1,
+ "x": 1940,
+ "y": 142,
+ "z": "a1c94a24.22ed9",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "31cde3.5ded021e",
+ "type": "execute",
+ "name": "execute printContext",
+ "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n <parameter name=\"filename\" value=\"`$filenamemm`\" />\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 4247,
+ "y": 2259,
+ "z": "a1c94a24.22ed9",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "363286ce.e60c2a",
+ "type": "save",
+ "name": "save connectivity resource in AAI",
+ "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='vpn-type' value='`$prop.sotn.vpnType`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $network-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network/' + $prop.sotn.network-id + '/network-data/'` \" />\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 5538,
+ "y": 1096,
+ "z": "a1c94a24.22ed9",
+ "wires": [
+ []
+ ]
}
]
\ No newline at end of file diff --git a/platform-logic/generic-resource-api/src/main/resources/graph.versions b/platform-logic/generic-resource-api/src/main/resources/graph.versions index 51f2e1c2..64cfedce 100755 --- a/platform-logic/generic-resource-api/src/main/resources/graph.versions +++ b/platform-logic/generic-resource-api/src/main/resources/graph.versions @@ -284,7 +284,7 @@ GENERIC-RESOURCE-API sotn-get-vf-module-uni-param ${project.version} sync GENERIC-RESOURCE-API tsli-vnf-topology-operation-trans-slice-allocate ${project.version} sync GENERIC-RESOURCE-API tsli-vnf-topology-operation-trans-slice-activate ${project.version} sync GENERIC-RESOURCE-API tsli-vnf-topology-operation-trans-slice-deactivate ${project.version} sync -GENERIC-RESOURCE-API tsli-vnf-topology-operation-trans-slice-deallocate ${project.version} sync +GENERIC-RESOURCE-API tsli-vnf-topology-operation-trans-slice-delete ${project.version} sync GENERIC-RESOURCE-API tsli-vnf-topology-operation-trans-slice-modify ${project.version} sync GENERIC-RESOURCE-API tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof ${project.version} sync diff --git a/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-modify.xml b/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-modify.xml index 1205c97a..6d57a785 100644 --- a/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-modify.xml +++ b/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-modify.xml @@ -33,16 +33,26 @@ <outcome value='false'></outcome>
<outcome value='true'>
<block>
+ <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+ resource="pnfs"
+ key="selflink = 'https://aai.onap:8443/aai/v21/network/pnfs?depth=0'"
+ local-only="false"
+ pfx="ccsdkTopopnfs" ></get-resource>
+ <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+ resource="logical-links"
+ key="selflink = 'https://aai.onap:8443/aai/v21/network/logical-links?depth=0'"
+ local-only="false"
+ pfx="ccsdkTopologicalLinks" ></get-resource>
<set>
<parameter name='tmp.arr' value='' />
<parameter name='tmp.arridx' value='0' />
<parameter name='tmp.arr_length' value='0' />
<parameter name='otn-tunnel-slice' value='' />
<parameter name='otn-tunnel-slice_length' value='0' />
- <parameter name='tmp.slicevpns' value='' />
- <parameter name='tmp.slicevpns_length' value='0' />
- <parameter name='tmp.slicevpnuuids' value='' />
- <parameter name='tmp.slicevpnuuids.' value='' />
+ <!--<parameter name='tmp.slicevpns' value='' />-->
+ <!--<parameter name='tmp.slicevpns_length' value='0' />-->
+ <!--<parameter name='tmp.slicevpnuuids' value='' />-->
+ <!--<parameter name='tmp.slicevpnuuids.' value='' />-->
<parameter name='bwModified' value='false' />
</set>
<for index='aridx' start='0' end='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length`' >
@@ -835,6 +845,9 @@ <parameter name='prop.ethsrvType' value='`$network-route-A`' />
</set>
<call module='GENERIC-RESOURCE-API' rpc='tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof' mode='sync' ></call>
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >
+ <parameter name="filename" value="`$filenamemm`" />
+ </execute>
<for index='otnidx' start='0' end='`$tmp.otninfo_length`' >
<block atomic='true'>
<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
@@ -992,13 +1005,7 @@ <!-- The following line is in lieu of vpn-binding.slice-id (new attribute in latest AAI) -->
<parameter name='ops-note' value='`$tmp.aai.service-instance.service-instance-id`' />
<outcome value='success'>
- <block>
- <set>
- <parameter name='`tmp.slicevpns[$tmp.slicevpns_length]`' value="`$prop.vpn-binding-otnidx-uuid`" />
- <parameter name='tmp.slicevpns_length' value="`$tmp.slicevpns_length + 1`" />
- <parameter name='`tmp.slicevpnuuids[$prop.vpn-binding-otnidx-uuid]`' value="`$prop.vpn-binding-otnidx-uuid`" />
- </set>
- </block>
+ <block></block>
</outcome>
</save>
<switch test='`$otnidx == 0`'>
|