Merge "Terminate NS Backend Service"

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 c48d10b,c668709..78cdc79
--- 1/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
--- 2/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);
+     }
  }