[SO] Create changes for SO-API and BPMN-INFRA to support CNF's through ASD

Issue-ID: SO-4069
Signed-off-by: raviteja.karumuri <raviteja.karumuri@est.tech>
Change-Id: Ia8defe62c70e126df683ca523b10efe55a26db87

10 files changed, 457 insertions, 4 deletions

diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/cnfm/tasks/CnfInstantiateTask.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/cnfm/tasks/CnfInstantiateTask.java
new file mode 100644
index 0000000000..ab20a08e74
--- /dev/null
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/cnfm/tasks/CnfInstantiateTask.java
@@ -0,0 +1,167 @@
+/*-
+ * ============LICENSE_START=======================================================
+ *  Copyright (C) 2023 Nordix Foundation.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.so.bpmn.infrastructure.adapter.cnfm.tasks;
+
+import static java.util.Objects.isNull;
+import static org.onap.so.cnfm.lcm.model.utils.AdditionalParamsConstants.CLOUD_OWNER_PARAM_KEY;
+import static org.onap.so.cnfm.lcm.model.utils.AdditionalParamsConstants.CLOUD_REGION_PARAM_KEY;
+import static org.onap.so.cnfm.lcm.model.utils.AdditionalParamsConstants.SERVICE_INSTANCE_ID_PARAM_KEY;
+import static org.onap.so.cnfm.lcm.model.utils.AdditionalParamsConstants.SERVICE_INSTANCE_NAME_PARAM_KEY;
+import static org.onap.so.cnfm.lcm.model.utils.AdditionalParamsConstants.TENANT_ID_PARAM_KEY;
+import java.util.Optional;
+import org.apache.groovy.util.Maps;
+import org.onap.logging.filter.base.ONAPComponents;
+import org.onap.so.bpmn.common.BuildingBlockExecution;
+import org.onap.so.bpmn.servicedecomposition.bbobjects.ServiceInstance;
+import org.onap.so.bpmn.servicedecomposition.entities.ExecuteBuildingBlock;
+import org.onap.so.bpmn.servicedecomposition.entities.GeneralBuildingBlock;
+import org.onap.so.client.exception.ExceptionBuilder;
+import org.onap.so.cnfm.lcm.model.AsInstance;
+import org.onap.so.cnfm.lcm.model.CreateAsRequest;
+import org.onap.so.cnfm.lcm.model.InstantiateAsRequest;
+import org.onap.so.serviceinstancebeans.CloudConfiguration;
+import org.onap.so.serviceinstancebeans.ModelInfo;
+import org.onap.so.serviceinstancebeans.RequestDetails;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+
+/**
+ * This class performs CNF Instantiation
+ *
+ * @author sagar.shetty@est.tech
+ * @author Waqas Ikram (waqas.ikram@est.tech)
+ * @author Raviteja Karumuri (raviteja.karumuri@est.tech)
+ */
+@Component
+public class CnfInstantiateTask {
+    private static final String CREATE_AS_REQUEST_OBJECT = "CreateAsRequestObject";
+    private static final String INSTANTIATE_AS_REQUEST_OBJECT = "InstantiateAsRequest";
+    private static final String AS_INSTANCE_ID = "asInstanceid";
+    private static final Logger LOGGER = LoggerFactory.getLogger(CnfInstantiateTask.class);
+    private final ExceptionBuilder exceptionUtil;
+    private final CnfmHttpServiceProvider cnfmHttpServiceProvider;
+
+    @Autowired
+    public CnfInstantiateTask(final CnfmHttpServiceProvider cnfmHttpServiceProvider,
+            final ExceptionBuilder exceptionUtil) {
+        this.cnfmHttpServiceProvider = cnfmHttpServiceProvider;
+        this.exceptionUtil = exceptionUtil;
+    }
+
+    public void createCreateAsRequest(final BuildingBlockExecution execution) {
+        try {
+            LOGGER.debug("Executing createAsRequest task  ...");
+            final ExecuteBuildingBlock executeBuildingBlock =
+                    (ExecuteBuildingBlock) execution.getVariable("buildingBlock");
+
+            final GeneralBuildingBlock generalBuildingBlock = execution.getGeneralBuildingBlock();
+
+            final RequestDetails requestDetails = executeBuildingBlock.getRequestDetails();
+            LOGGER.debug("RequestDetails: {}", requestDetails);
+
+            if (isNull(requestDetails) && isNull(requestDetails.getModelInfo())
+                    && isNull(requestDetails.getRequestInfo()) && isNull(requestDetails.getCloudConfiguration())
+                    && isNull(generalBuildingBlock)) {
+                LOGGER.error("Missing Mandatory attribute from RequestDetails: {} or GeneralBuildingBlock: {}",
+                        requestDetails, generalBuildingBlock);
+                exceptionUtil.buildAndThrowWorkflowException(execution, 2000,
+                        "Missing Mandatory attribute from RequestDetails or GeneralBuildingBlock", ONAPComponents.SO);
+            }
+
+            final ModelInfo modelInfo = requestDetails.getModelInfo();
+            final CloudConfiguration cloudConfiguration = requestDetails.getCloudConfiguration();
+            final ServiceInstance serviceInstance = generalBuildingBlock.getServiceInstance();
+
+            final CreateAsRequest createAsRequest = new CreateAsRequest().asdId(modelInfo.getModelVersionId())
+                    .asInstanceName(requestDetails.getRequestInfo().getInstanceName())
+                    .additionalParams(Maps.of(CLOUD_OWNER_PARAM_KEY, cloudConfiguration.getCloudOwner(),
+                            CLOUD_REGION_PARAM_KEY, cloudConfiguration.getLcpCloudRegionId(), TENANT_ID_PARAM_KEY,
+                            cloudConfiguration.getTenantId(), SERVICE_INSTANCE_ID_PARAM_KEY,
+                            serviceInstance.getServiceInstanceId(), SERVICE_INSTANCE_NAME_PARAM_KEY,
+                            serviceInstance.getServiceInstanceName()));
+
+            LOGGER.debug("Adding CreateAsRequest to execution {}", createAsRequest);
+
+            execution.setVariable(CREATE_AS_REQUEST_OBJECT, createAsRequest);
+            LOGGER.debug("Finished executing createAsRequest task ...");
+
+        } catch (final Exception exception) {
+            LOGGER.error("Unable to create CreateAsRequest", exception);
+            exceptionUtil.buildAndThrowWorkflowException(execution, 2001, exception);
+        }
+    }
+
+    public void invokeCnfmWithCreateAsRequest(final BuildingBlockExecution execution) {
+        try {
+            final CreateAsRequest createAsRequest = execution.getVariable(CREATE_AS_REQUEST_OBJECT);
+
+            final Optional<AsInstance> optional = cnfmHttpServiceProvider.invokeCreateAsRequest(createAsRequest);
+
+            if (optional.isEmpty()) {
+                LOGGER.error("Unable to invoke CNFM for CreateAsRequest : {}", createAsRequest);
+                exceptionUtil.buildAndThrowWorkflowException(execution, 2003,
+                        "Unable to invoke CNFM for CreateAsRequest", ONAPComponents.SO);
+            }
+
+            final AsInstance asInstance = optional.orElseThrow();
+            execution.setVariable(AS_INSTANCE_ID, asInstance.getAsInstanceid());
+            LOGGER.debug("Successfully invoked CNFM response: {}", asInstance);
+
+        } catch (final Exception exception) {
+            LOGGER.error("Unable to invoke CNFM AsCreateRequest", exception);
+            exceptionUtil.buildAndThrowWorkflowException(execution, 2004, exception);
+        }
+    }
+
+    public void createAsInstanceRequest(final BuildingBlockExecution execution) {
+        try {
+            LOGGER.debug("Executing createAsInstanceRequest task  ...");
+
+            final InstantiateAsRequest instantiateAsRequest = new InstantiateAsRequest();
+
+            LOGGER.debug("Adding InstantiateAsRequest to execution {}", instantiateAsRequest);
+
+            execution.setVariable(INSTANTIATE_AS_REQUEST_OBJECT, instantiateAsRequest);
+            LOGGER.debug("Finished executing createAsInstanceRequest task ...");
+
+        } catch (final Exception exception) {
+            LOGGER.error("Unable to create CreateAsInstanceRequest", exception);
+            exceptionUtil.buildAndThrowWorkflowException(execution, 2002, exception);
+        }
+    }
+
+    public void invokeCnfmWithInstantiateAsRequest(final BuildingBlockExecution execution) {
+        try {
+            final InstantiateAsRequest instantiateAsRequest = execution.getVariable(INSTANTIATE_AS_REQUEST_OBJECT);
+            final String asInstanceId = execution.getVariable(AS_INSTANCE_ID);
+            cnfmHttpServiceProvider.invokeInstantiateAsRequest(instantiateAsRequest, asInstanceId);
+            LOGGER.debug("Successfully invoked CNFM instantiate AS request: {}", asInstanceId);
+
+        } catch (final Exception exception) {
+            LOGGER.error("Unable to invoke CNFM InstantiateAsRequest", exception);
+            exceptionUtil.buildAndThrowWorkflowException(execution, 2005, exception);
+        }
+    }
+
+}
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/cnfm/tasks/CnfmHttpServiceConfiguration.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/cnfm/tasks/CnfmHttpServiceConfiguration.java
new file mode 100644
index 0000000000..1028c28e77
--- /dev/null
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/cnfm/tasks/CnfmHttpServiceConfiguration.java
@@ -0,0 +1,80 @@
+/*-
+ * ============LICENSE_START=======================================================
+ *  Copyright (C) 2023 Nordix Foundation.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.so.bpmn.infrastructure.adapter.cnfm.tasks;
+
+import javax.ws.rs.core.MediaType;
+import org.onap.logging.filter.spring.SpringClientPayloadFilter;
+import org.onap.so.configuration.rest.HttpComponentsClientConfiguration;
+import org.onap.so.logging.jaxrs.filter.SOSpringClientFilter;
+import org.onap.so.rest.service.HttpRestServiceProvider;
+import org.onap.so.rest.service.HttpRestServiceProviderImpl;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.client.BufferingClientHttpRequestFactory;
+import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
+import org.springframework.web.client.RestTemplate;
+
+/**
+ * @author waqas.ikram@est.tech
+ * @author Raviteja Karumuri (raviteja.karumuri@est.tech)
+ */
+@Configuration
+public class CnfmHttpServiceConfiguration {
+
+    private static final Logger logger = LoggerFactory.getLogger(CnfmHttpServiceConfiguration.class);
+    public static final String CNFM_REST_TEMPLATE_CLIENT_BEAN = "cnfmRestTemplateBean";
+    public static final String CNFM_HTTP_REST_SERVICE_PROVIDER_BEAN = "cnfmHttpRestServiceProvider";
+
+    @Bean
+    @Qualifier(CNFM_REST_TEMPLATE_CLIENT_BEAN)
+    public RestTemplate cnfmRestTemplateBean(
+            @Autowired final HttpComponentsClientConfiguration httpComponentsClientConfiguration) {
+        logger.debug("Setting up cnfm RestTemplate bean...");
+        final HttpComponentsClientHttpRequestFactory clientHttpRequestFactory =
+                httpComponentsClientConfiguration.httpComponentsClientHttpRequestFactory();
+
+        final RestTemplate restTemplate =
+                new RestTemplate(new BufferingClientHttpRequestFactory(clientHttpRequestFactory));
+        restTemplate.getInterceptors().add(new SOSpringClientFilter());
+        restTemplate.getInterceptors().add((new SpringClientPayloadFilter()));
+        return restTemplate;
+
+    }
+
+    @Bean
+    @Qualifier(CNFM_HTTP_REST_SERVICE_PROVIDER_BEAN)
+    public HttpRestServiceProvider cnfmHttpRestServiceProvider(
+            @Qualifier(CNFM_REST_TEMPLATE_CLIENT_BEAN) @Autowired final RestTemplate restTemplate) {
+
+        logger.debug("Setting up cnfm HttpRestServiceProvider bean...");
+        final HttpHeaders hearders = new HttpHeaders();
+        hearders.add(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON);
+        hearders.add(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON);
+
+        return new HttpRestServiceProviderImpl(restTemplate, hearders);
+    }
+
+}
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/cnfm/tasks/CnfmHttpServiceProvider.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/cnfm/tasks/CnfmHttpServiceProvider.java
new file mode 100644
index 0000000000..5e9112f3e0
--- /dev/null
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/cnfm/tasks/CnfmHttpServiceProvider.java
@@ -0,0 +1,39 @@
+/*-
+ * ============LICENSE_START=======================================================
+ *  Copyright (C) 2023 Nordix Foundation.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.so.bpmn.infrastructure.adapter.cnfm.tasks;
+
+import java.util.Optional;
+import org.onap.so.cnfm.lcm.model.AsInstance;
+import org.onap.so.cnfm.lcm.model.CreateAsRequest;
+import org.onap.so.cnfm.lcm.model.InstantiateAsRequest;
+
+/**
+ * @author Sagar Shetty (sagar.shetty@est.tech)
+ * @author Waqas Ikram (waqas.ikram@est.tech)
+ * @author Raviteja Karumuri (raviteja.karumuri@est.tech)
+ *
+ */
+public interface CnfmHttpServiceProvider {
+
+    Optional<AsInstance> invokeCreateAsRequest(final CreateAsRequest createAsRequest);
+
+    void invokeInstantiateAsRequest(InstantiateAsRequest instantiateAsRequest, String asInstanceId);
+
+}
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/cnfm/tasks/CnfmHttpServiceProviderImpl.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/cnfm/tasks/CnfmHttpServiceProviderImpl.java
new file mode 100644
index 0000000000..3f78896b5d
--- /dev/null
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/cnfm/tasks/CnfmHttpServiceProviderImpl.java
@@ -0,0 +1,106 @@
+/*-
+ * ============LICENSE_START=======================================================
+ *  Copyright (C) 2023 Nordix Foundation.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.so.bpmn.infrastructure.adapter.cnfm.tasks;
+
+import static org.onap.so.bpmn.infrastructure.adapter.cnfm.tasks.CnfmHttpServiceConfiguration.CNFM_HTTP_REST_SERVICE_PROVIDER_BEAN;
+import java.util.Optional;
+import org.onap.so.cnfm.lcm.model.AsInstance;
+import org.onap.so.cnfm.lcm.model.CreateAsRequest;
+import org.onap.so.rest.exceptions.HttpResouceNotFoundException;
+import org.onap.so.rest.exceptions.InvalidRestRequestException;
+import org.onap.so.rest.exceptions.RestProcessingException;
+import org.onap.so.rest.service.HttpRestServiceProvider;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+import org.onap.so.cnfm.lcm.model.InstantiateAsRequest;
+
+@Service
+public class CnfmHttpServiceProviderImpl implements CnfmHttpServiceProvider {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(CnfmHttpServiceProviderImpl.class);
+    private final CnfmUrlProvider cnfmUrlProvider;
+    private final HttpRestServiceProvider httpServiceProvider;
+
+    @Autowired
+    public CnfmHttpServiceProviderImpl(final CnfmUrlProvider cnfmUrlProvider,
+            @Qualifier(CNFM_HTTP_REST_SERVICE_PROVIDER_BEAN) final HttpRestServiceProvider httpServiceProvider) {
+        this.cnfmUrlProvider = cnfmUrlProvider;
+        this.httpServiceProvider = httpServiceProvider;
+    }
+
+    @Override
+    public Optional<AsInstance> invokeCreateAsRequest(final CreateAsRequest createAsRequest) {
+        try {
+            final String url = cnfmUrlProvider.getCreateAsRequestUrl();
+            final ResponseEntity<AsInstance> response =
+                    httpServiceProvider.postHttpRequest(createAsRequest, url, AsInstance.class);
+
+            final HttpStatus httpStatus = response.getStatusCode();
+            if (httpStatus.is2xxSuccessful()) {
+                if (!response.hasBody()) {
+                    LOGGER.error("Received response without body: {}", response);
+                    return Optional.empty();
+                }
+
+                final AsInstance asInstance = response.getBody();
+                if (asInstance.getAsInstanceid() == null || asInstance.getAsInstanceid().isEmpty()) {
+                    LOGGER.error("Received invalid response missing asInstanceid: {}", response);
+                    return Optional.empty();
+                }
+                return Optional.of(asInstance);
+            }
+            LOGGER.error("Unable to invoke HTTP POST using URL: {}, Response Code: {}", url, httpStatus.value());
+            return Optional.empty();
+
+        } catch (final RestProcessingException | InvalidRestRequestException
+                | HttpResouceNotFoundException httpInvocationException) {
+            LOGGER.error("Unexpected error while processing create and instantiation request", httpInvocationException);
+            return Optional.empty();
+        }
+    }
+
+    @Override
+    public void invokeInstantiateAsRequest(InstantiateAsRequest instantiateAsRequest, String asInstanceId) {
+        try {
+
+            final String url = cnfmUrlProvider.getInstantiateAsRequestUrl(asInstanceId);
+            final ResponseEntity<AsInstance> response =
+                    httpServiceProvider.postHttpRequest(instantiateAsRequest, url, AsInstance.class);
+
+            final HttpStatus httpStatus = response.getStatusCode();
+            if (httpStatus.is2xxSuccessful() && !(response.hasBody())) {
+                LOGGER.error("Response received without body: {}", response);
+            }
+            LOGGER.error("Unable to invoke HTTP POST using URL: {}, Response Code: {}", url, httpStatus.value());
+
+        } catch (final RestProcessingException | InvalidRestRequestException
+                | HttpResouceNotFoundException httpInvocationException) {
+            LOGGER.error("Unexpected error while processing instantiation request", httpInvocationException);
+        }
+
+    }
+
+}
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/cnfm/tasks/CnfmUrlProvider.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/cnfm/tasks/CnfmUrlProvider.java
new file mode 100644
index 0000000000..cef2f3f818
--- /dev/null
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/cnfm/tasks/CnfmUrlProvider.java
@@ -0,0 +1,54 @@
+/*-
+ * ============LICENSE_START=======================================================
+ *  Copyright (C) 2023 Nordix Foundation.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.so.bpmn.infrastructure.adapter.cnfm.tasks;
+
+import java.net.URI;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.web.util.UriComponentsBuilder;
+
+/**
+ * @author Sagar Shetty (sagar.shetty@est.tech)
+ * @author Waqas Ikram (waqas.ikram@est.tech)
+ * @author Raviteja Karumuri (raviteja.karumuri@est.tech)
+ *
+ */
+@Service
+public class CnfmUrlProvider {
+
+    private final URI baseUri;
+
+    @Autowired
+    public CnfmUrlProvider(@Value("${cnfm.endpoint:http://so-cnfm-lcm.onap:9888}") final String baseUrl) {
+        this.baseUri = UriComponentsBuilder.fromHttpUrl(baseUrl).path("/so/so-cnfm/v1/api/aslcm/v1").build().toUri();
+    }
+
+    public String getCreateAsRequestUrl() {
+        return UriComponentsBuilder.fromUri(baseUri).pathSegment("as_instances").build().toString();
+    }
+
+    public String getInstantiateAsRequestUrl(String asInstanceId) {
+        return UriComponentsBuilder.fromUri(baseUri).pathSegment("as_instances").pathSegment(asInstanceId)
+                .pathSegment("instantiate").build().toString();
+    }
+
+}
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/vnfm/tasks/VnfmAdapterCreateVnfTaskConfiguration.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/vnfm/tasks/VnfmAdapterCreateVnfTaskConfiguration.java
index c3c0047fff..fc3d6ab96c 100644
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/vnfm/tasks/VnfmAdapterCreateVnfTaskConfiguration.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/vnfm/tasks/VnfmAdapterCreateVnfTaskConfiguration.java
@@ -58,6 +58,8 @@ import org.springframework.web.client.RestTemplate;
 @Configuration
 public class VnfmAdapterCreateVnfTaskConfiguration {
 
+    public static final String VNFM_HTTP_REST_SERVICE_PROVIDER_BEAN = "vnfmHttpRestServiceProvider";
+
     private static final Logger logger = LoggerFactory.getLogger(VnfmAdapterCreateVnfTaskConfiguration.class);
 
     @Value("${rest.http.client.configuration.ssl.trustStore:#{null}}")
@@ -73,7 +75,8 @@ public class VnfmAdapterCreateVnfTaskConfiguration {
     private String keyStorePassword;
 
     @Bean
-    public HttpRestServiceProvider databaseHttpRestServiceProvider(
+    @Qualifier(VNFM_HTTP_REST_SERVICE_PROVIDER_BEAN)
+    public HttpRestServiceProvider vnfmHttpRestServiceProvider(
             @Qualifier(CONFIGURABLE_REST_TEMPLATE) @Autowired final RestTemplate restTemplate,
             @Autowired final VnfmBasicHttpConfigProvider etsiVnfmAdapter) {
         if (trustStore != null) {
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/vnfm/tasks/VnfmAdapterServiceProviderImpl.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/vnfm/tasks/VnfmAdapterServiceProviderImpl.java
index ac2e0bf17a..94213bb93f 100644
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/vnfm/tasks/VnfmAdapterServiceProviderImpl.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/vnfm/tasks/VnfmAdapterServiceProviderImpl.java
@@ -20,6 +20,7 @@
 
 package org.onap.so.bpmn.infrastructure.adapter.vnfm.tasks;
 
+import static org.onap.so.bpmn.infrastructure.adapter.vnfm.tasks.VnfmAdapterCreateVnfTaskConfiguration.VNFM_HTTP_REST_SERVICE_PROVIDER_BEAN;
 import org.onap.so.adapters.etsisol003adapter.lcm.v1.model.CreateVnfRequest;
 import org.onap.so.adapters.etsisol003adapter.lcm.v1.model.CreateVnfResponse;
 import org.onap.so.adapters.etsisol003adapter.lcm.v1.model.DeleteVnfResponse;
@@ -31,6 +32,7 @@ import org.onap.so.rest.service.HttpRestServiceProvider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
@@ -50,7 +52,7 @@ public class VnfmAdapterServiceProviderImpl implements VnfmAdapterServiceProvide
 
     @Autowired
     public VnfmAdapterServiceProviderImpl(final VnfmAdapterUrlProvider urlProvider,
-            final HttpRestServiceProvider httpServiceProvider) {
+            @Qualifier(VNFM_HTTP_REST_SERVICE_PROVIDER_BEAN) final HttpRestServiceProvider httpServiceProvider) {
         this.urlProvider = urlProvider;
         this.httpServiceProvider = httpServiceProvider;
     }
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/OrchestrationStatusValidator.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/OrchestrationStatusValidator.java
index f233de2baa..b9d06789bd 100644
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/OrchestrationStatusValidator.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/OrchestrationStatusValidator.java
@@ -154,6 +154,7 @@ public class OrchestrationStatusValidator {
                 orchestrationStatus = serviceInstance.getOrchestrationStatus();
                 break;
             case VNF:
+            case CNF:
                 GenericVnf genericVnf = extractPojosForBB.extractByKey(execution, ResourceKey.GENERIC_VNF_ID);
                 orchestrationStatus = genericVnf.getOrchestrationStatus();
                 break;
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowAction.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowAction.java
index 64e623ba98..64ae9cb5e0 100755
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowAction.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowAction.java
@@ -112,7 +112,7 @@ public class WorkflowAction {
     private static final String VNF_TYPE = "vnfType";
     private static final String CONFIGURATION = "Configuration";
     private static final String SUPPORTEDTYPES =
-            "vnfs|pnfs|vfModules|networks|networkCollections|volumeGroups|serviceInstances|instanceGroups";
+            "vnfs|pnfs|cnfs|vfModules|networks|networkCollections|volumeGroups|serviceInstances|instanceGroups";
     private static final String HOMINGSOLUTION = "Homing_Solution";
     private static final String SERVICE_TYPE_TRANSPORT = "TRANSPORT";
     private static final String SERVICE_TYPE_BONDING = "BONDING";
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowType.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowType.java
index 1eb5cf7437..0a60724b6c 100644
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowType.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowType.java
@@ -31,7 +31,8 @@ public enum WorkflowType {
     VIRTUAL_LINK("VirtualLink"),
     NETWORKCOLLECTION("NetworkCollection"),
     CONFIGURATION("Configuration"),
-    INSTANCE_GROUP("InstanceGroup");
+    INSTANCE_GROUP("InstanceGroup"),
+    CNF("Cnf");
 
     private final String type;