Merge "Terminate NS Backend Service"

diff --combined 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
@@@ -22,10 -22,9 +22,10 @@@ package org.onap.so.etsi.nfvo.ns.lcm.bp
  import java.util.Optional;
  import org.onap.aai.domain.yang.GenericVnf;
  import org.onap.aai.domain.yang.ServiceInstance;
 -import org.onap.aaiclient.client.aai.AAIObjectType;
  import org.onap.aaiclient.client.aai.entities.uri.AAIResourceUri;
  import org.onap.aaiclient.client.aai.entities.uri.AAIUriFactory;
 +import org.onap.aaiclient.client.generated.fluentbuilders.AAIFluentTypeBuilder;
 +import org.onap.aaiclient.client.generated.fluentbuilders.AAIFluentTypeBuilder.Types;
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
  import org.springframework.beans.factory.annotation.Autowired;
@@@ -48,9 -47,8 +48,9 @@@ public class AaiServiceProviderImpl imp
      public void createServiceInstance(final String globalCustomerId, final String serviceType,
              final ServiceInstance aaiServiceInstance) {
          logger.info("Creating service instance in AAI: {}", aaiServiceInstance);
 -        final AAIResourceUri serviceInstanceURI = AAIUriFactory.createResourceUri(AAIObjectType.SERVICE_INSTANCE,
 -                globalCustomerId, serviceType, aaiServiceInstance.getServiceInstanceId());
 +        final AAIResourceUri serviceInstanceURI =
 +                AAIUriFactory.createResourceUri(AAIFluentTypeBuilder.business().customer(globalCustomerId)
 +                        .serviceSubscription(serviceType).serviceInstance(aaiServiceInstance.getServiceInstanceId()));
          aaiClientProvider.getAaiClient().createIfNotExists(serviceInstanceURI, Optional.of(aaiServiceInstance));
  
      }
@@@ -59,10 -57,9 +59,10 @@@
      public void createGenericVnfAndConnectServiceInstance(final String serviceInstanceId, final String vnfId,
              final GenericVnf genericVnf) {
          logger.info("Creating GenericVnf in AAI: {}", genericVnf);
 -        final AAIResourceUri genericVnfURI = AAIUriFactory.createResourceUri(AAIObjectType.GENERIC_VNF, vnfId);
 +        final AAIResourceUri genericVnfURI =
 +                AAIUriFactory.createResourceUri(AAIFluentTypeBuilder.network().genericVnf(vnfId));
          final AAIResourceUri serviceInstanceURI =
 -                AAIUriFactory.createResourceUri(AAIObjectType.SERVICE_INSTANCE, serviceInstanceId);
 +                AAIUriFactory.createResourceUri(Types.SERVICE_INSTANCE.getFragment(serviceInstanceId));
          aaiClientProvider.getAaiClient().createIfNotExists(genericVnfURI, Optional.of(genericVnf))
                  .connect(genericVnfURI, serviceInstanceURI);
  
@@@ -72,16 -69,22 +72,23 @@@
      public void connectGenericVnfToTenant(final String vnfId, final String cloudOwner, final String cloudRegion,
              final String tenantId) {
          logger.info("Connecting GenericVnf {} to {}/{}/{} in AAI", vnfId, cloudOwner, cloudRegion, tenantId);
 -        final AAIResourceUri tenantURI =
 -                AAIUriFactory.createResourceUri(AAIObjectType.TENANT, cloudOwner, cloudRegion, tenantId);
 -        final AAIResourceUri genericVnfURI = AAIUriFactory.createResourceUri(AAIObjectType.GENERIC_VNF, vnfId);
 +        final AAIResourceUri tenantURI = AAIUriFactory.createResourceUri(
 +                AAIFluentTypeBuilder.cloudInfrastructure().cloudRegion(cloudOwner, cloudRegion).tenant(tenantId));
 +        final AAIResourceUri genericVnfURI =
 +                AAIUriFactory.createResourceUri(AAIFluentTypeBuilder.network().genericVnf(vnfId));
          aaiClientProvider.getAaiClient().connect(tenantURI, genericVnfURI);
      }
  
      @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);
+     }
  }