summaryrefslogtreecommitdiffstats
path: root/adapters/mso-openstack-adapters/src/main/java/org/onap
diff options
context:
space:
mode:
authorMunir Ahmad <munir.ahmad@bell.ca>2020-08-04 12:26:19 -0400
committerMunir Ahmad <munir.ahmad@bell.ca>2020-08-04 12:26:19 -0400
commit563f30382c8031b8d348b26be010dbe5fe91c55c (patch)
tree874d627ce6ada597833c8d4f78afc8c63729dc6b /adapters/mso-openstack-adapters/src/main/java/org/onap
parentd9c694b4c4123bbd3e62f8a64484c27c6be1b100 (diff)
[SO] heatbridge implemention to delete L3Network and its subnet from AAI
Issue-ID: SO-3109 Signed-off-by: Munir Ahmad <munir.ahmad@bell.ca> Change-Id: Ib59975fea3efe54b301e0484e38d08b07d5fc947
Diffstat (limited to 'adapters/mso-openstack-adapters/src/main/java/org/onap')
-rw-r--r--adapters/mso-openstack-adapters/src/main/java/org/onap/so/heatbridge/HeatBridgeImpl.java14
1 files changed, 14 insertions, 0 deletions
diff --git a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/heatbridge/HeatBridgeImpl.java b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/heatbridge/HeatBridgeImpl.java
index 92958004ca..ef2577d6fe 100644
--- a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/heatbridge/HeatBridgeImpl.java
+++ b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/heatbridge/HeatBridgeImpl.java
@@ -552,6 +552,20 @@ public class HeatBridgeImpl implements HeatBridgeApi {
Optional<Relationships> relationships = resultWrapper.getRelationships();
logger.debug("VfModule contains relationships in AAI: {}", relationships.isPresent());
if (relationships.isPresent()) {
+
+ List<AAIResourceUri> l3NetworkUris = relationships.get().getRelatedUris(AAIObjectType.L3_NETWORK);
+ logger.debug("L3Network contains {} relationships in AAI", l3NetworkUris.size());
+
+ if (!l3NetworkUris.isEmpty()) {
+ for (AAIResourceUri l3NetworkUri : l3NetworkUris) {
+ if (env.getProperty("heatBridgeDryrun", Boolean.class, true)) {
+ logger.debug("Would delete L3Network: {}", l3NetworkUri.build().toString());
+ } else {
+ resourcesClient.delete(l3NetworkUri);
+ }
+ }
+ }
+
List<AAIResourceUri> vserverUris = relationships.get().getRelatedUris(AAIObjectType.VSERVER);
logger.debug("VServer contains {} relationships in AAI", vserverUris.size());
createTransactionToDeleteSriovPfFromPserver(vserverUris);