From: Byung-Woo Jun <byung-woo.jun@est.tech>
Date: Fri, 25 Sep 2020 11:23:13 +0000 (+0000)
Subject: Merge "Terminate NS Backend Service"
X-Git-Tag: 1.7.4~48
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=0f8b52fead32497543616b1d42d46e7319b22059;p=so.git

Merge "Terminate NS Backend Service"
---

0f8b52fead32497543616b1d42d46e7319b22059
diff --cc so-etsi-nfvo/so-etsi-nfvo-ns-lcm/so-etsi-nfvo-ns-lcm-bpmn-flows/src/main/java/org/onap/so/etsi/nfvo/ns/lcm/bpmn/flows/extclients/aai/AaiServiceProviderImpl.java
index c48d10bb69,c6687096a2..78cdc797bc
--- a/so-etsi-nfvo/so-etsi-nfvo-ns-lcm/so-etsi-nfvo-ns-lcm-bpmn-flows/src/main/java/org/onap/so/etsi/nfvo/ns/lcm/bpmn/flows/extclients/aai/AaiServiceProviderImpl.java
+++ b/so-etsi-nfvo/so-etsi-nfvo-ns-lcm/so-etsi-nfvo-ns-lcm-bpmn-flows/src/main/java/org/onap/so/etsi/nfvo/ns/lcm/bpmn/flows/extclients/aai/AaiServiceProviderImpl.java
@@@ -82,6 -78,13 +82,13 @@@ public class AaiServiceProviderImpl imp
      @Override
      public Optional<GenericVnf> getGenericVnf(final String vnfId) {
          return aaiClientProvider.getAaiClient().get(GenericVnf.class,
 -                AAIUriFactory.createResourceUri(AAIObjectType.GENERIC_VNF, vnfId));
 +                AAIUriFactory.createResourceUri(AAIFluentTypeBuilder.network().genericVnf(vnfId)));
      }
+ 
+     @Override
+     public void deleteGenericVnf(final String vnfId) {
+         logger.info("Deleting GenericVnf with id: {} from AAI.", vnfId);
+         final AAIResourceUri aaiResourceUri = AAIUriFactory.createResourceUri(AAIObjectType.GENERIC_VNF, vnfId);
+         aaiClientProvider.getAaiClient().delete(aaiResourceUri);
+     }
  }