summaryrefslogtreecommitdiffstats
path: root/core/sliPluginUtils
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2021-10-29 15:04:35 -0400
committerDan Timoney <dtimoney@att.com>2021-10-29 15:04:41 -0400
commit1267516ac4ce6402a0d175328563d5557fd59c96 (patch)
tree0ed5d136977ea47f531412fd02941d627e35f03e /core/sliPluginUtils
parent9bdc825f7b9c1689aae71fcb01bf08aa6bcba995 (diff)
Sync local changes to support GRA microservice
Sync changes made downstream to support GRA microservice Issue-ID: CCSDK-3504 Signed-off-by: Dan Timoney <dtimoney@att.com> Change-Id: I854b5437c4a60023bd161e3625e08ff6e0771945
Diffstat (limited to 'core/sliPluginUtils')
-rw-r--r--core/sliPluginUtils/provider/src/test/resources/LogicalLinks.json22
-rw-r--r--core/sliPluginUtils/provider/src/test/resources/Pnfs.json18
2 files changed, 20 insertions, 20 deletions
diff --git a/core/sliPluginUtils/provider/src/test/resources/LogicalLinks.json b/core/sliPluginUtils/provider/src/test/resources/LogicalLinks.json
index 86a955088..aaaa66b0b 100644
--- a/core/sliPluginUtils/provider/src/test/resources/LogicalLinks.json
+++ b/core/sliPluginUtils/provider/src/test/resources/LogicalLinks.json
@@ -314,11 +314,11 @@
"link-id": "10.1.1.4-12"
},
{
- "link-name": "networkId-providerId-20-clientId-0-topologyId-1-linkId-10.2.1.4-22",
+ "link-name": "networkId-providerId-20-clientId-0-topologyId-1-linkId-10.2.1.5-22",
"in-maint": false,
"link-type": "point-to-point",
"resource-version": "1612592904374",
- "link-id": "10.2.1.4-22"
+ "link-id": "10.2.1.5-22"
},
{
"link-name": "networkId-providerId-10-clientId-0-topologyId-1-linkId-10.1.1.1-14",
@@ -412,15 +412,15 @@
{
"related-to": "p-interface",
"relationship-label": "tosca.relationships.network.LinksTo",
- "related-link": "/aai/v21/network/pnfs/pnf/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.4/p-interfaces/p-interface/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.4-ltpId-12",
+ "related-link": "/aai/v21/network/pnfs/pnf/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.5/p-interfaces/p-interface/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.5-ltpId-12",
"relationship-data": [
{
"relationship-key": "pnf.pnf-name",
- "relationship-value": "networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.4"
+ "relationship-value": "networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.5"
},
{
"relationship-key": "p-interface.interface-name",
- "relationship-value": "networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.4-ltpId-12"
+ "relationship-value": "networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.5-ltpId-12"
}
],
"related-to-property": [
@@ -681,15 +681,15 @@
{
"related-to": "p-interface",
"relationship-label": "tosca.relationships.network.LinksTo",
- "related-link": "/aai/v21/network/pnfs/pnf/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.4/p-interfaces/p-interface/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.4-ltpId-22",
+ "related-link": "/aai/v21/network/pnfs/pnf/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.5/p-interfaces/p-interface/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.5-ltpId-22",
"relationship-data": [
{
"relationship-key": "pnf.pnf-name",
- "relationship-value": "networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.4"
+ "relationship-value": "networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.5"
},
{
"relationship-key": "p-interface.interface-name",
- "relationship-value": "networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.4-ltpId-22"
+ "relationship-value": "networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.5-ltpId-22"
}
],
"related-to-property": [
@@ -722,11 +722,11 @@
}
},
{
- "link-name": "networkId-providerId-20-clientId-0-topologyId-1-linkId-10.2.1.4-12",
+ "link-name": "networkId-providerId-20-clientId-0-topologyId-1-linkId-10.2.1.5-12",
"in-maint": false,
"link-type": "point-to-point",
"resource-version": "1612592904030",
- "link-id": "10.2.1.4-12"
+ "link-id": "10.2.1.5-12"
}
]
-} \ No newline at end of file
+}
diff --git a/core/sliPluginUtils/provider/src/test/resources/Pnfs.json b/core/sliPluginUtils/provider/src/test/resources/Pnfs.json
index 0466c5403..0e7fb0ad1 100644
--- a/core/sliPluginUtils/provider/src/test/resources/Pnfs.json
+++ b/core/sliPluginUtils/provider/src/test/resources/Pnfs.json
@@ -537,8 +537,8 @@
}
},
{
- "pnf-name": "networkId-providerId-20-clientId-0-topologyId-2-nodeId-10.2.1.4",
- "pnf-id": "10.2.1.4",
+ "pnf-name": "networkId-providerId-20-clientId-0-topologyId-2-nodeId-10.2.1.5",
+ "pnf-id": "10.2.1.5",
"in-maint": true,
"resource-version": "1612592907394",
"admin-status": "up",
@@ -730,8 +730,8 @@
}
},
{
- "pnf-name": "networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.4",
- "pnf-id": "10.2.1.4",
+ "pnf-name": "networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.5",
+ "pnf-id": "10.2.1.5",
"in-maint": true,
"resource-version": "1612592893537",
"admin-status": "up",
@@ -741,22 +741,22 @@
{
"related-to": "tunnel-termination-point",
"relationship-label": "tosca.relationships.network.BindsTo",
- "related-link": "/aai/v21/network/tunnel-termination-points/tunnel-termination-point/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.4-ttpId-MjI%3D",
+ "related-link": "/aai/v21/network/tunnel-termination-points/tunnel-termination-point/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.5-ttpId-MjI%3D",
"relationship-data": [
{
"relationship-key": "tunnel-termination-point.ttp-id",
- "relationship-value": "networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.4-ttpId-MjI="
+ "relationship-value": "networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.5-ttpId-MjI="
}
]
},
{
"related-to": "tunnel-termination-point",
"relationship-label": "tosca.relationships.network.BindsTo",
- "related-link": "/aai/v21/network/tunnel-termination-points/tunnel-termination-point/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.4-ttpId-MTI%3D",
+ "related-link": "/aai/v21/network/tunnel-termination-points/tunnel-termination-point/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.5-ttpId-MTI%3D",
"relationship-data": [
{
"relationship-key": "tunnel-termination-point.ttp-id",
- "relationship-value": "networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.4-ttpId-MTI="
+ "relationship-value": "networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.5-ttpId-MTI="
}
]
},
@@ -905,4 +905,4 @@
}
}
]
-} \ No newline at end of file
+}