Containerization feature of SO

Change-Id: I95381232eeefcd247a66a5cec370a8ce1c288e18
Issue-ID: SO-670
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>

44 files changed, 7543 insertions, 0 deletions

diff --git a/asdc-controller/src/main/java/org/onap/so/asdc/ASDCControllerSingleton.java b/asdc-controller/src/main/java/org/onap/so/asdc/ASDCControllerSingleton.java
new file mode 100644
index 0000000000..0ed878446f
--- /dev/null
+++ b/asdc-controller/src/main/java/org/onap/so/asdc/ASDCControllerSingleton.java
@@ -0,0 +1,67 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.so.asdc;
+
+import javax.annotation.PreDestroy;
+
+import org.onap.so.asdc.client.ASDCController;
+import org.onap.so.asdc.client.exceptions.ASDCControllerException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Profile;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.security.SecureRandom;
+
+@Component
+@Profile("!test")
+public class ASDCControllerSingleton {
+   
+   
+    @Autowired
+    private ASDCController asdcController;    
+  
+
+
+    @Scheduled (fixedRate = 50000)
+	public void periodicControllerTask() {
+       
+		try {
+            int randomNumber = new SecureRandom().nextInt(Integer.MAX_VALUE);
+			asdcController.setControllerName("mso-controller"+randomNumber);
+			asdcController.initASDC();
+		} catch (ASDCControllerException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+	}
+   
+   @PreDestroy
+   private void terminate () {
+	   try {
+		asdcController.closeASDC ();
+	} catch (ASDCControllerException e) {
+		// TODO Auto-generated catch block
+		e.printStackTrace();
+	}
+   }
+
+}
diff --git a/asdc-controller/src/main/java/org/onap/so/asdc/Application.java b/asdc-controller/src/main/java/org/onap/so/asdc/Application.java
new file mode 100644
index 0000000000..a365d0740d
--- /dev/null
+++ b/asdc-controller/src/main/java/org/onap/so/asdc/Application.java
@@ -0,0 +1,44 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.so.asdc;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication(scanBasePackages = { "org.onap.so" })
+public class Application {
+
+	private static final String LOGS_DIR = "logs_dir";
+
+	private static void setLogsDir() {
+		if (System.getProperty(LOGS_DIR) == null) {
+			System.getProperties().setProperty(LOGS_DIR, "./logs/asdc/");
+		}
+	}
+
+	public static void main(String[] args) {
+		SpringApplication.run(Application.class, args);
+		System.getProperties().setProperty("mso.db", "MARIADB");
+		System.getProperties().setProperty("mso.config.path", ".");
+		System.getProperties().setProperty("server.name", "Springboot");
+		setLogsDir();
+	}
+}
diff --git a/asdc-controller/src/main/java/org/onap/so/asdc/CatalogDBConfig.java b/asdc-controller/src/main/java/org/onap/so/asdc/CatalogDBConfig.java
new file mode 100644
index 0000000000..48f0990bf3
--- /dev/null
+++ b/asdc-controller/src/main/java/org/onap/so/asdc/CatalogDBConfig.java
@@ -0,0 +1,79 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.so.asdc;
+
+
+import javax.persistence.EntityManagerFactory;
+import javax.sql.DataSource;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceBuilder;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import org.springframework.context.annotation.Profile;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
+import org.springframework.orm.jpa.JpaTransactionManager;
+import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
+import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+@Configuration
+@EnableTransactionManagement
+@EnableJpaRepositories(
+		entityManagerFactoryRef = "entityManagerFactory",
+		basePackages = {"org.onap.so.db.catalog.data.repository"}
+		)
+@Profile({"!test"})
+public class CatalogDBConfig {
+	
+	@Primary
+	@Bean(name = "dataSource")
+	@ConfigurationProperties(prefix = "spring.datasource")
+	public DataSource dataSource() {
+		return DataSourceBuilder.create().build();
+	}
+
+	@Primary
+	@Bean(name = "entityManagerFactory")
+	public LocalContainerEntityManagerFactoryBean 
+	entityManagerFactory(
+			EntityManagerFactoryBuilder builder,
+			@Qualifier("dataSource") DataSource dataSource
+			) {
+		return builder
+				.dataSource(dataSource)
+				.packages("org.onap.so.db.catalog.beans")
+				.persistenceUnit("catalogDB")
+				.build();
+	}
+
+	@Primary
+	@Bean(name = "transactionManager")
+	public PlatformTransactionManager transactionManager(
+			@Qualifier("entityManagerFactory") EntityManagerFactory 
+			entityManagerFactory
+			) {
+		return new JpaTransactionManager(entityManagerFactory);
+	}
+
+}
diff --git a/asdc-controller/src/main/java/org/onap/so/asdc/JerseyConfiguration.java b/asdc-controller/src/main/java/org/onap/so/asdc/JerseyConfiguration.java
new file mode 100644
index 0000000000..3a26b7b60c
--- /dev/null
+++ b/asdc-controller/src/main/java/org/onap/so/asdc/JerseyConfiguration.java
@@ -0,0 +1,52 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.so.asdc;
+
+import javax.annotation.PostConstruct;
+import javax.ws.rs.ApplicationPath;
+import org.glassfish.jersey.server.ResourceConfig;
+import org.onap.so.asdc.client.test.rest.ASDCRestInterface;
+import org.springframework.context.annotation.Configuration;
+import io.swagger.jaxrs.config.BeanConfig;
+import io.swagger.jaxrs.listing.ApiListingResource;
+import io.swagger.jaxrs.listing.SwaggerSerializers;
+
+@Configuration
+@ApplicationPath("/test")
+public class JerseyConfiguration extends ResourceConfig {
+
+
+	@PostConstruct
+	public void setUp() {
+		register(ASDCRestInterface.class);	
+		register(ApiListingResource.class);
+		register(SwaggerSerializers.class);
+		
+		BeanConfig beanConfig = new BeanConfig();
+		beanConfig.setVersion("1.0.2");
+		beanConfig.setSchemes(new String[] { "http" });
+		beanConfig.setHost("localhost:8080");
+		beanConfig.setBasePath("/mso");
+		beanConfig.setResourcePackage("org.onap.so.apihandlerinfra");
+		beanConfig.setPrettyPrint(true);
+		beanConfig.setScan(true);
+	}
+}
diff --git a/asdc-controller/src/main/java/org/onap/so/asdc/RequestDBConfig.java b/asdc-controller/src/main/java/org/onap/so/asdc/RequestDBConfig.java
new file mode 100644
index 0000000000..da2fb2e8be
--- /dev/null
+++ b/asdc-controller/src/main/java/org/onap/so/asdc/RequestDBConfig.java
@@ -0,0 +1,78 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.so.asdc;
+
+
+import javax.persistence.EntityManagerFactory;
+import javax.sql.DataSource;
+
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceBuilder;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
+import org.springframework.orm.jpa.JpaTransactionManager;
+import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
+import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+@Configuration
+@EnableTransactionManagement
+@EnableJpaRepositories(
+		entityManagerFactoryRef = "requestEntityManagerFactory",transactionManagerRef = "requestTransactionManager",
+		basePackages = { "org.onap.so.db.request.data.repository" }
+		)
+@Profile({"!test"})
+public class RequestDBConfig {
+
+	@Bean(name = "requestDataSource")
+	@ConfigurationProperties(prefix = "request.datasource")
+	public DataSource dataSource() {
+		return DataSourceBuilder.create().build();
+	}
+
+
+	@Bean(name = "requestEntityManagerFactory")
+	public LocalContainerEntityManagerFactoryBean 
+	entityManagerFactory(
+			EntityManagerFactoryBuilder builder,
+			@Qualifier("requestDataSource") DataSource dataSource
+			) {
+		return builder
+				.dataSource(dataSource)
+				.packages("org.onap.so.db.request.beans")
+				.persistenceUnit("requestDB")
+				.build();
+	}
+
+
+	@Bean(name = "requestTransactionManager")
+	public PlatformTransactionManager transactionManager(
+			@Qualifier("requestEntityManagerFactory") EntityManagerFactory 
+			entityManagerFactory
+			) {
+		return new JpaTransactionManager(entityManagerFactory);
+	}
+
+}
diff --git a/asdc-controller/src/main/java/org/onap/so/asdc/WebSecurityConfigImpl.java b/asdc-controller/src/main/java/org/onap/so/asdc/WebSecurityConfigImpl.java
new file mode 100644
index 0000000000..bbd7cc06e3
--- /dev/null
+++ b/asdc-controller/src/main/java/org/onap/so/asdc/WebSecurityConfigImpl.java
@@ -0,0 +1,51 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 - 2018 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.so.asdc;
+
+import org.onap.so.security.MSOSpringFirewall;
+import org.onap.so.security.WebSecurityConfig;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.builders.WebSecurity;
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.web.firewall.StrictHttpFirewall;
+import org.springframework.util.StringUtils;
+
+@EnableWebSecurity
+public class WebSecurityConfigImpl extends WebSecurityConfig {
+
+	@Override
+	protected void configure(HttpSecurity http) throws Exception {
+		http.csrf().disable()
+		.authorizeRequests()
+		.antMatchers("/manage/health","/manage/info").permitAll()
+		.antMatchers("/**").hasAnyRole(StringUtils.collectionToDelimitedString(getRoles(),",").toString())
+		.and()
+		.httpBasic();
+	}
+	
+	@Override
+	public void configure(WebSecurity web) throws Exception {
+		super.configure(web);
+		StrictHttpFirewall firewall = new MSOSpringFirewall();
+		web.httpFirewall(firewall);
+	}
+
+}
diff --git a/asdc-controller/src/main/java/org/onap/so/asdc/client/ASDCConfiguration.java b/asdc-controller/src/main/java/org/onap/so/asdc/client/ASDCConfiguration.java
new file mode 100644
index 0000000000..85e3e9e747
--- /dev/null
+++ b/asdc-controller/src/main/java/org/onap/so/asdc/client/ASDCConfiguration.java
@@ -0,0 +1,263 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.so.asdc.client;
+
+
+import java.security.GeneralSecurityException;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.onap.sdc.api.consumer.IConfiguration;
+import org.onap.so.logger.MsoLogger;
+import org.onap.so.utils.CryptoUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.env.Environment;
+import org.springframework.stereotype.Component;
+
+@Component
+public class ASDCConfiguration implements IConfiguration {
+
+    // SHell command to obtain the same encryption, 128 bits key, key must be HEX
+    // echo -n "This is a test string" | openssl aes-128-ecb -e -K 546573746F736973546573746F736973 -nosalt | xxd
+
+   
+
+    private String asdcControllerName;
+
+    public static final String MSO_PROP_ASDC = "MSO_PROP_ASDC";
+    public static final String PARAMETER_PATTERN = "asdc-connections";
+    public static final String MSG_BUS_ADDRESS_ATTRIBUTE_NAME = "messageBusAddress";
+    public static final String WATCHDOG_TIMEOUT_NAME = "watchDogTimeout";
+
+    public static final String CONSUMER_GROUP_ATTRIBUTE_NAME = "consumerGroup";
+    public static final String CONSUMER_ID_ATTRIBUTE_NAME = "consumerId";
+    public static final String ENVIRONMENT_NAME_ATTRIBUTE_NAME = "environmentName";
+    public static final String PASSWORD_ATTRIBUTE_NAME = "password";
+    public static final String POLLING_INTERVAL_ATTRIBUTE_NAME = "pollingInterval";
+    public static final String RELEVANT_ARTIFACT_TYPES_ATTRIBUTE_NAME = "relevantArtifactTypes";
+    public static final String USER_ATTRIBUTE_NAME = "user";
+    public static final String ASDC_ADDRESS_ATTRIBUTE_NAME = "asdcAddress";
+    public static final String POLLING_TIMEOUT_ATTRIBUTE_NAME = "pollingTimeout";
+    public static final String ACTIVATE_SERVER_TLS_AUTH = "activateServerTLSAuth";
+    public static final String KEY_STORE_PASSWORD = "keyStorePassword";
+    public static final String KEY_STORE_PATH = "keyStorePath";
+
+    public static final String HEAT="HEAT";
+    public static final String HEAT_ARTIFACT="HEAT_ARTIFACT";
+    public static final String HEAT_ENV="HEAT_ENV";
+    public static final String HEAT_NESTED="HEAT_NESTED";
+    public static final String HEAT_NET="HEAT_NET";
+    public static final String HEAT_VOL="HEAT_VOL";
+    public static final String OTHER="OTHER";
+    public static final String TOSCA_CSAR="TOSCA_CSAR";
+    public static final String VF_MODULES_METADATA="VF_MODULES_METADATA";
+    private static MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.ASDC,ASDCConfiguration.class);
+    
+   
+
+    private static final String[] SUPPORTED_ARTIFACT_TYPES = {HEAT,
+    		HEAT_ARTIFACT,
+    		HEAT_ENV,
+    		HEAT_NESTED,
+    		HEAT_NET,
+    		HEAT_VOL,
+    		OTHER,
+    		TOSCA_CSAR,
+    		VF_MODULES_METADATA};
+
+    public static final List<String>  SUPPORTED_ARTIFACT_TYPES_LIST =  Collections.unmodifiableList(Arrays.asList(SUPPORTED_ARTIFACT_TYPES));
+
+    @Autowired
+    private Environment env;
+     
+    @Value("${mso.asdc.config.key}")
+    private String configKey;
+    
+    @Value("${mso.asdc-connections.asdc-controller1.messageBusAddress}")    
+    private String[] messageBusAddress;
+    
+    
+    public void setAsdcControllerName(String asdcControllerName) {
+		this.asdcControllerName = asdcControllerName;
+	}
+
+
+	@Override
+    public java.lang.Boolean isUseHttpsWithDmaap() {
+    	return false;
+    }
+    
+    @Override
+    public boolean isConsumeProduceStatusTopic(){
+    	return true;
+    }
+    
+    @Override
+    public List<String> getMsgBusAddress(){      
+        if (messageBusAddress.length > 0) {
+           return Arrays.asList(messageBusAddress);
+        } else {
+            return Collections.emptyList();
+        } 
+    	
+    	
+    }
+  
+    public String getAsdcControllerName () {
+        return asdcControllerName;
+    }
+
+
+	@Override
+	public String getConsumerGroup() {
+		return getPropertyOrNull("mso.asdc-connections.asdc-controller1.consumerGroup");
+	}
+    
+    public int getWatchDogTimeout () {
+    	return getIntegerPropertyOrZero("mso.asdc-connections.asdc-controller1.watchDogTimeout");     
+		
+    }
+
+    @Override
+    public String getConsumerID () {
+    	return getPropertyOrNull("mso.asdc-connections.asdc-controller1.consumerId");
+    }
+    
+    public int getIntegerPropertyOrZero (String propertyName) {
+    	String property = env.getProperty(propertyName);
+		if (property == null || "NULL".equals(property) || property.isEmpty()) {
+			return 0;
+		} else {
+			try {
+				return Integer.parseInt(property);
+			} catch (NumberFormatException e) {				
+				return 0;
+			}
+		}
+    }
+    
+    public String getPropertyOrNull (String propertyName) {
+    	String config = env.getProperty(propertyName);
+		if (config==null || "NULL".equals(config) || config.isEmpty()) {
+			return null;
+		} else {
+			return config;
+		}
+    }
+    
+    public String getEncryptedPropertyOrNull (String propertyName) {
+    	String decryptedKey;
+    	String config = env.getProperty(propertyName);
+    	
+    	if (config==null || "NULL".equals(config) || config.isEmpty()) {
+			return null;
+		} 
+
+		try {
+				decryptedKey = CryptoUtils.decrypt(config, this.configKey);
+			} catch (GeneralSecurityException e) {
+				msoLogger.debug("Exception while decrypting property: " + propertyName, e);
+				return null;
+			}
+			
+			if (decryptedKey.isEmpty ()) {
+                return null;
+            } else {
+                return decryptedKey;
+            }
+	}
+    
+    public boolean getBooleanPropertyWithDefault (String propertyName, boolean defaultValue) {
+    	String config = env.getProperty(propertyName);
+		if (config == null || "NULL".equals(config) || config.isEmpty()) {
+			return defaultValue;
+		} else {
+			try {
+				return Boolean.valueOf(config);
+			} catch (Exception e) {			
+				return defaultValue;
+			}
+		}
+    }
+
+    @Override
+    public String getEnvironmentName () {
+    	return getPropertyOrNull("mso.asdc-connections.asdc-controller1.environmentName");
+    }
+
+    @Override
+    public String getPassword () {
+    	return getEncryptedPropertyOrNull("mso.asdc-connections.asdc-controller1.password");
+    }
+
+    @Override
+    public int getPollingInterval () {
+    	return getIntegerPropertyOrZero("mso.asdc-connections.asdc-controller1.pollingInterval");
+    }
+
+    @Override
+    public List <String> getRelevantArtifactTypes () {
+    	// DO not return the Static List SUPPORTED_ARTIFACT_TYPES_LIST because the ASDC Client will try to modify it !!!
+    	return Arrays.asList(SUPPORTED_ARTIFACT_TYPES);
+    }
+
+    @Override
+    public String getUser () {
+    	return getPropertyOrNull("mso.asdc-connections.asdc-controller1.user");
+    }
+
+    @Override
+    public String getAsdcAddress () {
+    	return getPropertyOrNull("mso.asdc-connections.asdc-controller1.asdcAddress");
+    }
+
+    @Override
+    public int getPollingTimeout () {
+    	return getIntegerPropertyOrZero("mso.asdc-connections.asdc-controller1.pollingTimeout");
+    }
+
+	@Override
+	public boolean activateServerTLSAuth() {
+		return getBooleanPropertyWithDefault("mso.asdc-connections.asdc-controller1.activateServerTLSAuth", true);
+	}
+
+	@Override
+	public String getKeyStorePassword() {
+		return getPropertyOrNull("mso.asdc-connections.asdc-controller1.keyStorePassword");
+	}
+
+	@Override
+	public String getKeyStorePath() {
+		return getPropertyOrNull("mso.asdc-connections.asdc-controller1.keyStorePath");
+	}
+
+    /**
+     * The flag allows the client to receive metadata for all resources of the service regardless of the artifacts associated to them.
+     * Setting the flag to false will preserve legacy behavior.
+     */
+	@Override
+    public boolean isFilterInEmptyResources() {
+		return getBooleanPropertyWithDefault("mso.asdc-connections.asdc-controller1.isFilterInEmptyResources", true);
+    }
+
+}
diff --git a/asdc-controller/src/main/java/org/onap/so/asdc/client/ASDCController.java b/asdc-controller/src/main/java/org/onap/so/asdc/client/ASDCController.java
new file mode 100644
index 0000000000..7423a7a197
--- /dev/null
+++ b/asdc-controller/src/main/java/org/onap/so/asdc/client/ASDCController.java
@@ -0,0 +1,776 @@
+/*-
+d * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017 Huawei Technologies Co., Ltd. All rights reserved.
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.so.asdc.client;
+
+
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.util.List;
+
+import org.onap.sdc.api.IDistributionClient;
+import org.onap.sdc.api.consumer.IDistributionStatusMessage;
+import org.onap.sdc.api.consumer.IFinalDistrStatusMessage;
+import org.onap.sdc.api.notification.IArtifactInfo;
+import org.onap.sdc.api.notification.INotificationData;
+import org.onap.sdc.api.notification.IResourceInstance;
+import org.onap.sdc.api.results.IDistributionClientDownloadResult;
+import org.onap.sdc.api.results.IDistributionClientResult;
+import org.onap.sdc.impl.DistributionClientFactory;
+import org.onap.sdc.utils.DistributionActionResultEnum;
+import org.onap.sdc.utils.DistributionStatusEnum;
+import org.onap.so.asdc.client.exceptions.ASDCControllerException;
+import org.onap.so.asdc.client.exceptions.ASDCDownloadException;
+import org.onap.so.asdc.client.exceptions.ASDCParametersException;
+import org.onap.so.asdc.client.exceptions.ArtifactInstallerException;
+import org.onap.so.asdc.installer.IVfResourceInstaller;
+import org.onap.so.asdc.installer.ToscaResourceStructure;
+import org.onap.so.asdc.installer.VfResourceStructure;
+import org.onap.so.asdc.installer.heat.ToscaResourceInstaller;
+import org.onap.so.asdc.tenantIsolation.DistributionStatus;
+import org.onap.so.asdc.tenantIsolation.WatchdogDistribution;
+import org.onap.so.asdc.util.ASDCNotificationLogging;
+import org.onap.so.db.request.beans.WatchdogDistributionStatus;
+import org.onap.so.db.request.data.repository.WatchdogDistributionStatusRepository;
+import org.onap.so.logger.MessageEnum;
+import org.onap.so.logger.MsoAlarmLogger;
+import org.onap.so.logger.MsoLogger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+public class ASDCController {
+
+    protected static final MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.ASDC,ASDCController.class);
+
+    protected static MsoAlarmLogger alarmLogger = new MsoAlarmLogger ();
+
+    protected boolean isAsdcClientAutoManaged = false;
+
+    protected String controllerName;
+    
+    private ASDCControllerStatus controllerStatus = ASDCControllerStatus.STOPPED;
+    
+    protected int nbOfNotificationsOngoing = 0;
+
+    @Autowired
+    private ToscaResourceInstaller toscaInstaller;
+    
+    @Autowired
+    private WatchdogDistributionStatusRepository wdsRepo;
+    
+    @Autowired
+    private ASDCConfiguration asdcConfig;
+    
+    @Autowired
+    private ASDCStatusCallBack asdcStatusCallBack;
+    
+    @Autowired
+    private ASDCNotificationCallBack asdcNotificationCallBack;
+    
+    private IDistributionClient distributionClient;
+    
+    private static final String UUID_PARAM = "(UUID:";
+    
+    @Autowired
+    private WatchdogDistribution wd;
+   
+
+    public int getNbOfNotificationsOngoing () {
+        return nbOfNotificationsOngoing;
+    }    
+
+    public IDistributionClient getDistributionClient() {
+		return distributionClient;
+	}
+
+
+
+	public void setDistributionClient(IDistributionClient distributionClient) {
+		this.distributionClient = distributionClient;
+	}
+
+
+
+	protected void changeControllerStatus (ASDCControllerStatus newControllerStatus) {
+        switch (newControllerStatus) {
+
+            case BUSY:
+                ++this.nbOfNotificationsOngoing;
+                this.controllerStatus = newControllerStatus;
+                break;
+
+            case IDLE:
+                if (this.nbOfNotificationsOngoing > 1) {
+                    --this.nbOfNotificationsOngoing;
+                } else {
+                    this.nbOfNotificationsOngoing = 0;
+                    this.controllerStatus = newControllerStatus;
+                }
+
+                break;
+            default:
+                this.controllerStatus = newControllerStatus;
+                break;
+
+        }
+    }
+
+    public ASDCControllerStatus getControllerStatus () {
+        return this.controllerStatus;
+    }
+    
+    public ASDCController () {
+        isAsdcClientAutoManaged = true;        
+    }
+
+    public ASDCController (String controllerConfigName) {
+        isAsdcClientAutoManaged = true;
+        this.controllerName = controllerConfigName;
+    }
+
+    public ASDCController (String controllerConfigName, IDistributionClient asdcClient, IVfResourceInstaller resourceinstaller) {
+        distributionClient = asdcClient;       
+    }
+
+    public ASDCController (String controllerConfigName,IDistributionClient asdcClient) {
+        distributionClient = asdcClient;
+        this.controllerName = controllerConfigName;     
+    }
+    public String getControllerName() {
+		return controllerName;
+	}
+
+	public void setControllerName(String controllerName) {
+		this.controllerName = controllerName;
+	}
+
+	/**
+     * This method initializes the ASDC Controller and the ASDC Client.
+     *
+     * @throws ASDCControllerException It throws an exception if the ASDC Client cannot be instantiated or if an init
+     *         attempt is done when already initialized
+     * @throws ASDCParametersException If there is an issue with the parameters provided
+     * @throws IOException In case of issues when trying to load the key file
+     */
+    public void initASDC () throws ASDCControllerException {
+        String event = "Initialize the ASDC Controller";
+        MsoLogger.setServiceName ("InitASDC");
+        LOGGER.debug (event);
+        if (this.getControllerStatus () != ASDCControllerStatus.STOPPED) {
+            String endEvent = "The controller is already initialized, call the closeASDC method first";
+            throw new ASDCControllerException (endEvent);
+        }
+
+        if (asdcConfig != null) {          
+            asdcConfig.setAsdcControllerName(controllerName);
+        }    
+
+        if (this.distributionClient == null) {
+            distributionClient = DistributionClientFactory.createDistributionClient ();
+        }
+        
+        long initStartTime = System.currentTimeMillis ();
+        IDistributionClientResult result = this.distributionClient.init (asdcConfig,
+                                                                         asdcNotificationCallBack, asdcStatusCallBack);
+        if (!result.getDistributionActionResult ().equals (DistributionActionResultEnum.SUCCESS)) {
+            String endEvent = "ASDC distribution client init failed with reason:"
+                              + result.getDistributionMessageResult ();
+            LOGGER.recordMetricEvent (initStartTime, MsoLogger.StatusCode.ERROR, MsoLogger.ResponseCode.UnknownError, "Initialization of the ASDC Controller failed with reason:" + result.getDistributionMessageResult (), "ASDC", "init", null);
+            LOGGER.debug (endEvent);
+            this.changeControllerStatus (ASDCControllerStatus.STOPPED);
+            throw new ASDCControllerException ("Initialization of the ASDC Controller failed with reason: "
+                                               + result.getDistributionMessageResult ());
+        }
+        LOGGER.recordMetricEvent (initStartTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, "Successfully initialize ASDC Controller", "ASDC", "init", null);
+
+        long clientstartStartTime = System.currentTimeMillis ();
+        result = this.distributionClient.start ();
+        if (!result.getDistributionActionResult ().equals (DistributionActionResultEnum.SUCCESS)) {
+            String endEvent = "ASDC distribution client start failed with reason:"
+                              + result.getDistributionMessageResult ();
+            LOGGER.recordMetricEvent (clientstartStartTime, MsoLogger.StatusCode.ERROR, MsoLogger.ResponseCode.UnknownError, endEvent, "ASDC", "start", null);
+            LOGGER.debug (endEvent);           
+            this.changeControllerStatus (ASDCControllerStatus.STOPPED);
+            throw new ASDCControllerException ("Startup of the ASDC Controller failed with reason: "
+                                               + result.getDistributionMessageResult ());
+        }
+        LOGGER.recordMetricEvent (clientstartStartTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, "Successfully start ASDC distribution client", "ASDC", "start", null);
+
+
+        this.changeControllerStatus (ASDCControllerStatus.IDLE);
+        LOGGER.info (MessageEnum.ASDC_INIT_ASDC_CLIENT_SUC, "ASDC", "changeControllerStatus","");
+    }
+
+    /**
+     * This method closes the ASDC Controller and the ASDC Client.
+     *
+     * @throws ASDCControllerException It throws an exception if the ASDC Client cannot be closed because
+     *         it's currently BUSY in processing notifications.
+     */
+    public void closeASDC () throws ASDCControllerException {
+
+        MsoLogger.setServiceName ("CloseController");
+        if (this.getControllerStatus () == ASDCControllerStatus.BUSY) {
+            throw new ASDCControllerException ("Cannot close the ASDC controller as it's currently in BUSY state");
+        }
+        if (this.distributionClient != null) {
+            this.distributionClient.stop ();
+            // If auto managed we can set it to Null, ASDCController controls it.
+            // In the other case the client of this class has specified it, so we can't reset it
+            if (isAsdcClientAutoManaged) {
+                // Next init will initialize it with a new ASDC Client
+                this.distributionClient = null;
+            }
+
+        }
+        this.changeControllerStatus (ASDCControllerStatus.STOPPED);
+    }
+
+    private boolean checkResourceAlreadyDeployed (VfResourceStructure resource) throws ArtifactInstallerException {
+
+    	
+   		if (toscaInstaller.isResourceAlreadyDeployed (resource)) {
+    			LOGGER.info (MessageEnum.ASDC_ARTIFACT_ALREADY_EXIST,
+                    resource.getResourceInstance().getResourceInstanceName(),
+                    resource.getResourceInstance().getResourceUUID(),
+                    resource.getResourceInstance().getResourceName(), "", "");
+
+    			this.sendDeployNotificationsForResource(resource,DistributionStatusEnum.ALREADY_DOWNLOADED,null);
+    			this.sendDeployNotificationsForResource(resource,DistributionStatusEnum.ALREADY_DEPLOYED,null);
+
+    		return true;
+    	} else {
+    		return false;
+    	}
+    }
+
+   
+
+    private IDistributionClientDownloadResult downloadTheArtifact (IArtifactInfo artifact,
+                                                                   String distributionId) throws ASDCDownloadException {
+
+        LOGGER.debug ("Trying to download the artifact : " + artifact.getArtifactURL ()
+                      + UUID_PARAM
+                      + artifact.getArtifactUUID ()
+                      + ")");
+        IDistributionClientDownloadResult downloadResult;
+
+
+        try {
+            downloadResult = distributionClient.download (artifact);
+            if (null == downloadResult) {
+            	LOGGER.info (MessageEnum.ASDC_ARTIFACT_NULL, artifact.getArtifactUUID (), "", "");
+            	return downloadResult;
+            }
+        } catch (RuntimeException e) {
+            LOGGER.debug ("Not able to download the artifact due to an exception: " + artifact.getArtifactURL ());
+            this.sendASDCNotification (NotificationType.DOWNLOAD,
+                                       artifact.getArtifactURL (),
+                                       asdcConfig.getConsumerID (),
+                                       distributionId,
+                                       DistributionStatusEnum.DOWNLOAD_ERROR,
+                                       e.getMessage (),
+                                       System.currentTimeMillis ());
+
+            throw new ASDCDownloadException ("Exception caught when downloading the artifact", e);
+        }
+
+        if (DistributionActionResultEnum.SUCCESS.equals(downloadResult.getDistributionActionResult ())) {
+
+            LOGGER.info (MessageEnum.ASDC_ARTIFACT_DOWNLOAD_SUC,
+                         artifact.getArtifactURL (),
+                         artifact.getArtifactUUID (),
+                         String.valueOf (downloadResult.getArtifactPayload ().length), "", "");
+
+        } else {
+
+            LOGGER.error (MessageEnum.ASDC_ARTIFACT_DOWNLOAD_FAIL,
+                          artifact.getArtifactName (),
+                          artifact.getArtifactURL (),
+                          artifact.getArtifactUUID (),
+                          downloadResult.getDistributionMessageResult (), "", "", MsoLogger.ErrorCode.DataError, "ASDC artifact download fail");
+
+            this.sendASDCNotification (NotificationType.DOWNLOAD,
+                                       artifact.getArtifactURL (),
+                                       asdcConfig.getConsumerID (),
+                                       distributionId,
+                                       DistributionStatusEnum.DOWNLOAD_ERROR,
+                                       downloadResult.getDistributionMessageResult (),
+                                       System.currentTimeMillis ());
+
+            throw new ASDCDownloadException ("Artifact " + artifact.getArtifactName ()
+                                             + " could not be downloaded from ASDC URL "
+                                             + artifact.getArtifactURL ()
+                                             + UUID_PARAM
+                                             + artifact.getArtifactUUID ()
+                                             + ")"
+                                             + System.lineSeparator ()
+                                             + "Error message is "
+                                             + downloadResult.getDistributionMessageResult ()
+                                             + System.lineSeparator ());
+
+        }
+
+        this.sendASDCNotification (NotificationType.DOWNLOAD,
+                                   artifact.getArtifactURL (),
+                                   asdcConfig.getConsumerID (),
+                                   distributionId,
+                                   DistributionStatusEnum.DOWNLOAD_OK,
+                                   null,
+                                   System.currentTimeMillis ());
+        return downloadResult;
+
+    }
+
+    private void writeArtifactToFile (IArtifactInfo artifact,
+    		IDistributionClientDownloadResult resultArtifact) {
+
+    	LOGGER.debug ("Trying to write artifact to file : " + artifact.getArtifactURL ()
+    			+ UUID_PARAM
+    			+ artifact.getArtifactUUID ()
+    			+ ")");
+    	
+    	byte[] payloadBytes = resultArtifact.getArtifactPayload();
+    	
+    	try (FileOutputStream outFile = new FileOutputStream(System.getProperty("mso.config.path") + "/ASDC" + "/" + artifact.getArtifactName())) {
+    		LOGGER.info(MessageEnum.ASDC_RECEIVE_SERVICE_NOTIF, "***WRITE FILE ARTIFACT NAME", "ASDC", artifact.getArtifactName());
+    		outFile.write(payloadBytes, 0, payloadBytes.length);
+    		outFile.close();
+    	} catch (Exception e) { 
+			LOGGER.debug("Exception :",e);
+            LOGGER.error(MessageEnum.ASDC_ARTIFACT_DOWNLOAD_FAIL,
+    				artifact.getArtifactName (),
+    				artifact.getArtifactURL (),
+    				artifact.getArtifactUUID (),
+    				resultArtifact.getDistributionMessageResult (), "", "", MsoLogger.ErrorCode.DataError, "ASDC write to file failed"); 
+        } 
+    	
+    }
+
+
+    private void sendDeployNotificationsForResource(VfResourceStructure vfResourceStructure,DistributionStatusEnum distribStatus, String errorReason) {
+
+    	for (IArtifactInfo artifactInfo : vfResourceStructure.getResourceInstance().getArtifacts()) {
+
+    		if ((DistributionStatusEnum.DEPLOY_OK.equals(distribStatus) && !artifactInfo.getArtifactType().equalsIgnoreCase("OTHER") && !vfResourceStructure.isAlreadyDeployed())
+    				// This could be NULL if the artifact is a VF module artifact, this won't be present in the MAP
+    				&& vfResourceStructure.getArtifactsMapByUUID().get(artifactInfo.getArtifactUUID()) != null
+    				&& vfResourceStructure.getArtifactsMapByUUID().get(artifactInfo.getArtifactUUID()).getDeployedInDb() == 0) {
+    			this.sendASDCNotification (NotificationType.DEPLOY,
+	    				artifactInfo.getArtifactURL (),
+	                  asdcConfig.getConsumerID (),
+	                  vfResourceStructure.getNotification().getDistributionID(),
+	                  DistributionStatusEnum.DEPLOY_ERROR,
+	                  "The artifact has not been used by the modules defined in the resource",
+	                  System.currentTimeMillis ());
+    		} else {
+	    		this.sendASDCNotification (NotificationType.DEPLOY,
+	    				artifactInfo.getArtifactURL (),
+	                  asdcConfig.getConsumerID (),
+	                  vfResourceStructure.getNotification().getDistributionID(),
+	                  distribStatus,
+	                  errorReason,
+	                  System.currentTimeMillis ());
+    		}
+    	}
+    }
+    
+    private void sendCsarDeployNotification(INotificationData iNotif, VfResourceStructure resourceStructure, ToscaResourceStructure toscaResourceStructure, boolean deploySuccessful, String errorReason) {
+    	
+		IArtifactInfo csarArtifact = toscaResourceStructure.getToscaArtifact();
+		
+		if(deploySuccessful){
+			
+    		this.sendASDCNotification (NotificationType.DEPLOY,
+ 	    			  csarArtifact.getArtifactURL (),
+	                  asdcConfig.getConsumerID (),
+	                  resourceStructure.getNotification().getDistributionID(),
+	                  DistributionStatusEnum.DEPLOY_OK,
+	                  errorReason,
+	                  System.currentTimeMillis ());
+			
+		} else {
+			
+			this.sendASDCNotification (NotificationType.DEPLOY,
+    			  csarArtifact.getArtifactURL (),
+                  asdcConfig.getConsumerID (),
+                  resourceStructure.getNotification().getDistributionID(),
+                  DistributionStatusEnum.DEPLOY_ERROR,
+                  errorReason,
+                  System.currentTimeMillis ());
+			
+		}
+    }
+    
+    private void deployResourceStructure (VfResourceStructure resourceStructure, ToscaResourceStructure toscaResourceStructure) throws ArtifactInstallerException {
+
+    	LOGGER.info (MessageEnum.ASDC_START_DEPLOY_ARTIFACT, resourceStructure.getResourceInstance().getResourceInstanceName(), resourceStructure.getResourceInstance().getResourceUUID(), "ASDC");
+        try {
+        	String resourceType = resourceStructure.getResourceInstance().getResourceType();
+        	String category = resourceStructure.getResourceInstance().getCategory();
+        	if("VF".equals(resourceType) && !"Allotted Resource".equalsIgnoreCase(category)){
+        		resourceStructure.createVfModuleStructures();
+        	}
+        	toscaInstaller.installTheResource(toscaResourceStructure, resourceStructure);        	        				
+
+        } catch (ArtifactInstallerException e) {
+        	LOGGER.info (MessageEnum.ASDC_ARTIFACT_DOWNLOAD_FAIL,
+	           		resourceStructure.getResourceInstance().getResourceName(),
+	          		resourceStructure.getResourceInstance().getResourceUUID(),
+	                String.valueOf (resourceStructure.getVfModuleStructure().size()), "ASDC", "deployResourceStructure");
+        	sendDeployNotificationsForResource(resourceStructure,DistributionStatusEnum.DEPLOY_ERROR,e.getMessage());
+        	throw e;
+        }
+
+        if (resourceStructure.isDeployedSuccessfully() || toscaResourceStructure.isDeployedSuccessfully()) {
+	        LOGGER.info (MessageEnum.ASDC_ARTIFACT_DEPLOY_SUC,
+	           		resourceStructure.getResourceInstance().getResourceName(),
+	          		resourceStructure.getResourceInstance().getResourceUUID(),
+	                String.valueOf (resourceStructure.getVfModuleStructure().size()), "ASDC", "deployResourceStructure");
+	        sendDeployNotificationsForResource(resourceStructure,DistributionStatusEnum.DEPLOY_OK ,null);
+        }
+
+    }
+    
+
+    private enum NotificationType {
+    	DOWNLOAD, DEPLOY
+    }
+
+    private void sendASDCNotification (NotificationType notificationType,
+                                       String artifactURL,
+                                       String consumerID,
+                                       String distributionID,
+                                       DistributionStatusEnum status,
+                                       String errorReason,
+                                       long timestamp) {
+
+        String event = "Sending " + notificationType.name ()
+                       + "("
+                       + status.name ()
+                       + ")"
+                       + " notification to ASDC for artifact:"
+                       + artifactURL;
+
+        if (errorReason != null) {
+        	event=event+"("+errorReason+")";
+        }
+        LOGGER.info (MessageEnum.ASDC_SEND_NOTIF_ASDC, notificationType.name (), status.name (), artifactURL, "ASDC", "sendASDCNotification");
+        LOGGER.debug (event);
+
+        long subStarttime = System.currentTimeMillis ();
+        String action = "";
+        try {
+            IDistributionStatusMessage message = new DistributionStatusMessage (artifactURL,
+                                                                                consumerID,
+                                                                                distributionID,
+                                                                                status,
+                                                                                timestamp);
+
+            switch (notificationType) {
+                case DOWNLOAD:
+                    if (errorReason != null) {
+                        this.distributionClient.sendDownloadStatus (message, errorReason);
+                    } else {
+                        this.distributionClient.sendDownloadStatus (message);
+                    }
+                    action = "sendDownloadStatus";
+                    break;
+                case DEPLOY:
+                    if (errorReason != null) {
+                        this.distributionClient.sendDeploymentStatus (message, errorReason);
+                    } else {
+                        this.distributionClient.sendDeploymentStatus (message);
+                    }
+                    action = "sendDeploymentdStatus";
+                    break;
+                default:
+                	break;
+            }
+        } catch (RuntimeException e) {           
+            LOGGER.warn (MessageEnum.ASDC_SEND_NOTIF_ASDC_EXEC, "ASDC", "sendASDCNotification", MsoLogger.ErrorCode.SchemaError, "RuntimeException - sendASDCNotification", e);
+        }
+        LOGGER.recordMetricEvent (subStarttime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, "Successfully sent notification to ASDC", "ASDC", action, null);
+    }
+    
+    private void sendFinalDistributionStatus (
+    		String distributionID,
+    		DistributionStatusEnum status,
+    		String errorReason) {
+
+
+    	LOGGER.debug ("Enter sendFinalDistributionStatus with DistributionID " + distributionID + " and Status of " + status.name() + " and ErrorReason " + errorReason);
+
+    	long subStarttime = System.currentTimeMillis ();
+    	try {
+    		
+    		
+    		IFinalDistrStatusMessage finalDistribution = new FinalDistributionStatusMessage(distributionID,status,subStarttime, asdcConfig.getConsumerID());
+    		
+    		if(errorReason == null){
+    			this.distributionClient.sendFinalDistrStatus(finalDistribution);
+    		}else{
+    			this.distributionClient.sendFinalDistrStatus(finalDistribution, errorReason);
+    		}
+    		
+ 
+    	} catch (RuntimeException e) {    		
+    		LOGGER.debug ("Exception caught in sendFinalDistributionStatus " + e.getMessage());
+    		LOGGER.warn (MessageEnum.ASDC_SEND_NOTIF_ASDC_EXEC, "ASDC", "sendASDCNotification", MsoLogger.ErrorCode.SchemaError, "RuntimeException - sendASDCNotification", e);
+    	}
+    	LOGGER.recordMetricEvent (subStarttime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, "Successfully sent Final notification to ASDC", "ASDC", null, null);
+    }
+
+    public void treatNotification (INotificationData iNotif) {
+
+    	int noOfArtifacts = 0;
+    	
+
+    	for (IResourceInstance resource : iNotif.getResources ()) {
+    		noOfArtifacts += resource.getArtifacts ().size ();
+    	}
+        LOGGER.info (MessageEnum.ASDC_RECEIVE_CALLBACK_NOTIF,
+                     String.valueOf (noOfArtifacts),
+                     iNotif.getServiceUUID (), "ASDC");
+
+        try {
+        	LOGGER.debug(ASDCNotificationLogging.dumpASDCNotification(iNotif));
+			LOGGER.info(MessageEnum.ASDC_RECEIVE_SERVICE_NOTIF, iNotif.getServiceUUID(), "ASDC", "treatNotification");
+			this.changeControllerStatus(ASDCControllerStatus.BUSY);
+			toscaInstaller.processWatchdog(iNotif.getDistributionID(),iNotif.getServiceUUID());	
+			
+			// Process only the Resource artifacts in MSO				
+			this.processResourceNotification(iNotif);
+			
+			//********************************************************************************************************
+			//Start Watchdog loop and wait for all components to complete before reporting final status back. 
+			// **If timer expires first then we will report a Distribution Error back to ASDC
+			//********************************************************************************************************
+        	long initialStartTime = System.currentTimeMillis();
+        	boolean componentsComplete = false;
+        	String distributionStatus = null;
+        	String watchdogError = null;
+        	String overallStatus = null;
+        	int watchDogTimeout = asdcConfig.getWatchDogTimeout() * 1000;
+        	boolean isDeploySuccess = false;        	
+						
+        	while(!componentsComplete && (System.currentTimeMillis() - initialStartTime) < watchDogTimeout)
+        	{
+        		        		
+    			try{        		
+    				distributionStatus = wd.getOverallDistributionStatus(iNotif.getDistributionID());
+    				Thread.sleep(watchDogTimeout / 10);    		
+    			}catch(Exception e){
+    				LOGGER.debug ("Exception in Watchdog Loop " + e.getMessage());
+    				Thread.sleep(watchDogTimeout / 10);
+    			}
+    			
+    			if(distributionStatus != null && !distributionStatus.equalsIgnoreCase(DistributionStatus.INCOMPLETE.name())){
+    				
+    				if(distributionStatus.equalsIgnoreCase(DistributionStatus.SUCCESS.name())){
+    					isDeploySuccess = true;
+    					overallStatus = DistributionStatusEnum.DISTRIBUTION_COMPLETE_OK.name();
+    				}else{
+    					overallStatus = DistributionStatusEnum.DISTRIBUTION_COMPLETE_ERROR.name();
+    				}    				
+    				componentsComplete = true;
+    			}
+        	}
+        	
+        	if(!componentsComplete){
+        		LOGGER.debug("Timeout of " + watchDogTimeout + " seconds was reached before all components reported status");
+        		watchdogError = "Timeout occurred while waiting for all components to report status";
+        		overallStatus = DistributionStatusEnum.DISTRIBUTION_COMPLETE_ERROR.name();
+        	}
+        	
+        	if(distributionStatus == null){        	
+        		overallStatus = DistributionStatusEnum.DISTRIBUTION_COMPLETE_ERROR.name();
+        		LOGGER.debug("DistributionStatus is null for DistributionId: " + iNotif.getDistributionID());        		 	
+        	}
+        	
+        	try {
+        		wd.executePatchAAI(iNotif.getDistributionID(), iNotif.getServiceInvariantUUID(), overallStatus);
+        		LOGGER.debug ("A&AI Updated succefully with Distribution Status!");
+        	}
+        	catch(Exception e) {
+        		LOGGER.debug ("Exception in Watchdog executePatchAAI(): " + e.getMessage());
+        		watchdogError = "Error calling A&AI " + e.getMessage();
+        		if(e.getCause() != null) {
+        			LOGGER.debug ("Exception caused by: " + e.getCause().getMessage());
+        		}
+        	}
+     	
+        	
+        	if(isDeploySuccess && watchdogError == null){
+        		sendFinalDistributionStatus(iNotif.getDistributionID(), DistributionStatusEnum.DISTRIBUTION_COMPLETE_OK, null);
+        		WatchdogDistributionStatus wds = new WatchdogDistributionStatus(iNotif.getDistributionID());
+        		wds.setDistributionIdStatus(DistributionStatusEnum.DISTRIBUTION_COMPLETE_OK.toString());
+        		wdsRepo.save(wds);
+        	} else {
+        		sendFinalDistributionStatus(iNotif.getDistributionID(), DistributionStatusEnum.DISTRIBUTION_COMPLETE_ERROR, watchdogError);
+        		WatchdogDistributionStatus wds = new WatchdogDistributionStatus(iNotif.getDistributionID());
+        		wds.setDistributionIdStatus(DistributionStatusEnum.DISTRIBUTION_COMPLETE_ERROR.toString());
+        		wdsRepo.save(wds);
+        	}
+        	
+        	
+
+        } catch (Exception e) {
+            LOGGER.error (MessageEnum.ASDC_GENERAL_EXCEPTION_ARG,
+                          "Unexpected exception caught during the notification processing",  "ASDC", "treatNotification", MsoLogger.ErrorCode.SchemaError, "RuntimeException in treatNotification",
+                          e);
+            
+          	try {
+        		wd.executePatchAAI(iNotif.getDistributionID(), iNotif.getServiceInvariantUUID(), DistributionStatusEnum.DISTRIBUTION_COMPLETE_ERROR.name());
+        		LOGGER.debug ("A&AI Updated succefully with Distribution Status of " + DistributionStatusEnum.DISTRIBUTION_COMPLETE_ERROR.name());
+        	}
+        	catch(Exception aaiException) {
+        		LOGGER.debug ("Exception in executePatchAAI(): " + aaiException.getMessage());
+        		if(aaiException.getCause() != null) {
+        			LOGGER.debug ("Exception caused by: " + aaiException.getCause().getMessage());
+        		}
+        	}
+            
+             sendFinalDistributionStatus(iNotif.getDistributionID(), DistributionStatusEnum.DISTRIBUTION_COMPLETE_ERROR, e.getMessage());
+             
+        	 WatchdogDistributionStatus wds = new WatchdogDistributionStatus(iNotif.getDistributionID());
+        	 wds.setDistributionIdStatus(DistributionStatusEnum.DISTRIBUTION_COMPLETE_ERROR.toString());
+        	 wdsRepo.save(wds);
+            
+        } finally {
+            this.changeControllerStatus (ASDCControllerStatus.IDLE);
+        }
+    }
+
+    private void processResourceNotification (INotificationData iNotif) {
+    	// For each artifact, create a structure describing the VFModule in a ordered flat level
+    	VfResourceStructure resourceStructure = null;
+    	ToscaResourceStructure toscaResourceStructure = new ToscaResourceStructure();
+    	boolean deploySuccessful = true;
+    	String errorMessage = null;
+
+    	try {
+    		
+   			this.processCsarServiceArtifacts(iNotif, toscaResourceStructure);	
+   		 	
+    		for (IResourceInstance resource : iNotif.getResources()){
+    			
+    			resourceStructure = new VfResourceStructure(iNotif,resource);
+    			
+  	           	String resourceType = resourceStructure.getResourceInstance().getResourceType();
+            	String category = resourceStructure.getResourceInstance().getCategory();
+    				       	
+                LOGGER.debug("Processing Resource Type: " + resourceType + " and Model UUID: " + resourceStructure.getResourceInstance().getResourceUUID());
+                	
+				if("VF".equals(resourceType) && !"Allotted Resource".equalsIgnoreCase(category)){
+			
+	    			for (IArtifactInfo artifact : resource.getArtifacts()) {
+	    				IDistributionClientDownloadResult resultArtifact = this.downloadTheArtifact(artifact,
+	    						iNotif.getDistributionID());
+	    				if (resultArtifact != null) {
+	    					if (ASDCConfiguration.VF_MODULES_METADATA.equals(artifact.getArtifactType())) {
+	    						LOGGER.debug("VF_MODULE_ARTIFACT: "+new String(resultArtifact.getArtifactPayload(),"UTF-8"));
+	    						LOGGER.debug(ASDCNotificationLogging.dumpVfModuleMetaDataList(resourceStructure.decodeVfModuleArtifact(resultArtifact.getArtifactPayload())));
+	    					}
+	    					resourceStructure.addArtifactToStructure(distributionClient,artifact, resultArtifact);
+	    				}
+	    			}
+				}	    			
+    		 } 			
+			 try{
+
+				//Deploy All resources and artifacts
+				LOGGER.debug("Preparing to deploy Service: " + iNotif.getServiceUUID());
+				if(resourceStructure == null){
+					resourceStructure = new VfResourceStructure(iNotif,new ResourceInstance()); 
+				}
+				this.deployResourceStructure(resourceStructure, toscaResourceStructure);
+
+
+			 } catch(ArtifactInstallerException e){
+				deploySuccessful = false;
+				errorMessage = e.getMessage();
+			 }
+
+			 this.sendCsarDeployNotification(iNotif, resourceStructure, toscaResourceStructure, deploySuccessful, errorMessage);
+    		
+    	} catch (ASDCDownloadException | UnsupportedEncodingException e) {
+    		LOGGER.error(MessageEnum.ASDC_GENERAL_EXCEPTION_ARG,
+    				"Exception caught during Installation of artifact", "ASDC", "processResourceNotification", MsoLogger.ErrorCode.BusinessProcesssError, "Exception in processResourceNotification", e);
+    	}
+    }
+    private void processCsarServiceArtifacts (INotificationData iNotif, ToscaResourceStructure toscaResourceStructure) {
+    	
+    	List<IArtifactInfo> serviceArtifacts = iNotif.getServiceArtifacts();
+    	
+    		for(IArtifactInfo artifact : serviceArtifacts){
+    		
+    			if(artifact.getArtifactType().equals(ASDCConfiguration.TOSCA_CSAR)){
+ 				
+    				try{
+    					
+    					toscaResourceStructure.setToscaArtifact(artifact);
+    					
+    					IDistributionClientDownloadResult resultArtifact = this.downloadTheArtifact(artifact,iNotif.getDistributionID());
+    					
+    					writeArtifactToFile(artifact, resultArtifact);
+    					
+    					toscaResourceStructure.updateResourceStructure(artifact);
+    					
+    					toscaResourceStructure.setServiceVersion(iNotif.getServiceVersion());
+    					
+    					LOGGER.debug(ASDCNotificationLogging.dumpCSARNotification(iNotif, toscaResourceStructure));
+    					
+
+    				} catch(Exception e){
+    					LOGGER.error(MessageEnum.ASDC_GENERAL_EXCEPTION_ARG,
+    							"Exception caught during processCsarServiceArtifacts", "ASDC", "processCsarServiceArtifacts", MsoLogger.ErrorCode.BusinessProcesssError, "Exception in processCsarServiceArtifacts", e);
+    				}
+    			}
+    				
+    		}
+    }
+    
+    private static final String UNKNOWN="Unknown";
+
+    /**
+     * @return the address of the ASDC we are connected to.
+     */
+    public String getAddress () {
+        if (asdcConfig != null) {
+            return asdcConfig.getAsdcAddress ();
+        }
+        return UNKNOWN;
+    }
+
+    /**
+     * @return the environment name of the ASDC we are connected to.
+     */
+    public String getEnvironment () {
+        if (asdcConfig != null) {
+            return asdcConfig.getEnvironmentName ();
+        }
+        return UNKNOWN;
+    }
+
+}
diff --git a/asdc-controller/src/main/java/org/onap/so/asdc/client/ASDCControllerStatus.java b/asdc-controller/src/main/java/org/onap/so/asdc/client/ASDCControllerStatus.java
new file mode 100644
index 0000000000..e358fee4a1
--- /dev/null
+++ b/asdc-controller/src/main/java/org/onap/so/asdc/client/ASDCControllerStatus.java
@@ -0,0 +1,27 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.so.asdc.client;
+
+
+
+public enum ASDCControllerStatus {
+                                  STOPPED, IDLE, BUSY
+}
diff --git a/asdc-controller/src/main/java/org/onap/so/asdc/client/ASDCNotificationCallBack.java b/asdc-controller/src/main/java/org/onap/so/asdc/client/ASDCNotificationCallBack.java
new file mode 100644
index 0000000000..ab5b7aa39e
--- /dev/null
+++ b/asdc-controller/src/main/java/org/onap/so/asdc/client/ASDCNotificationCallBack.java
@@ -0,0 +1,58 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.so.asdc.client;
+
+import org.onap.sdc.api.consumer.INotificationCallback;
+import org.onap.sdc.api.notification.INotificationData;
+import org.onap.so.logger.MsoLogger;
+import org.onap.so.utils.UUIDChecker;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * Inner class for Notification callback
+ *
+ *
+ */
+@Component
+public final class ASDCNotificationCallBack implements INotificationCallback {
+
+	@Autowired
+    private ASDCController asdcController;
+    
+    protected static final MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.ASDC,ASDCNotificationCallBack.class);
+
+    /**
+     * This method can be called multiple times at the same moment.
+     * The controller must be thread safe !
+     */
+    @Override
+    public void activateCallback (INotificationData iNotif) {
+        long startTime = System.currentTimeMillis ();
+        UUIDChecker.generateUUID (LOGGER);
+        MsoLogger.setServiceName ("NotificationHandler");
+        MsoLogger.setLogContext (iNotif.getDistributionID (), iNotif.getServiceUUID ());
+        String event = "Receive a callback notification in ASDC, nb of resources: " + iNotif.getResources ().size ();
+        LOGGER.debug(event);
+        asdcController.treatNotification (iNotif);
+        LOGGER.recordAuditEvent (startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, "Completed the treatment of the notification");
+    }
+}
diff --git a/asdc-controller/src/main/java/org/onap/so/asdc/client/ASDCStatusCallBack.java b/asdc-controller/src/main/java/org/onap/so/asdc/client/ASDCStatusCallBack.java
new file mode 100644
index 0000000000..cbacd88870
--- /dev/null
+++ b/asdc-controller/src/main/java/org/onap/so/asdc/client/ASDCStatusCallBack.java
@@ -0,0 +1,75 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.so.asdc.client;
+
+import org.onap.sdc.api.consumer.IStatusCallback;
+import org.onap.sdc.api.notification.IStatusData;
+import org.onap.sdc.utils.DistributionStatusEnum;
+import org.onap.so.asdc.client.exceptions.ArtifactInstallerException;
+import org.onap.so.asdc.installer.heat.ToscaResourceInstaller;
+import org.onap.so.db.request.beans.WatchdogDistributionStatus;
+import org.onap.so.db.request.data.repository.WatchdogDistributionStatusRepository;
+import org.onap.so.logger.MsoLogger;
+import org.onap.so.utils.UUIDChecker;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+public final class ASDCStatusCallBack implements IStatusCallback {
+
+	@Autowired
+	private ToscaResourceInstaller toscaInstaller;
+
+	protected static final MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.ASDC,ASDCStatusCallBack.class);
+	
+	@Autowired
+	private WatchdogDistributionStatusRepository watchdogDistributionStatusRepository;
+
+	@Override
+	public void activateCallback (IStatusData iStatus) {
+		long startTime = System.currentTimeMillis ();
+		UUIDChecker.generateUUID (LOGGER);
+		MsoLogger.setServiceName ("ASDCStatusCallBack");
+		MsoLogger.setLogContext (iStatus.getDistributionID (), iStatus.getComponentName());
+		String event = "Receive a callback componentStatus in ASDC, for componentName: " + iStatus.getComponentName() + " and status of " + iStatus.getStatus() + " distributionID of " + iStatus.getDistributionID();
+
+		try{
+
+		  if(iStatus.getStatus() != null){	
+			if(iStatus.getStatus().equals(DistributionStatusEnum.COMPONENT_DONE_OK) || iStatus.getStatus().equals(DistributionStatusEnum.COMPONENT_DONE_ERROR)) {
+				WatchdogDistributionStatus watchdogDistributionStatus = watchdogDistributionStatusRepository.findOne(iStatus.getDistributionID ());
+				if(watchdogDistributionStatus==null){
+					watchdogDistributionStatus = new WatchdogDistributionStatus();
+					watchdogDistributionStatus.setDistributionId(iStatus.getDistributionID ());
+					watchdogDistributionStatusRepository.save(watchdogDistributionStatus);
+				}
+				LOGGER.debug(event); 
+				toscaInstaller.installTheComponentStatus(iStatus);
+				
+			}
+		  }
+		}catch(ArtifactInstallerException e){
+			LOGGER.error("Error in ASDCStatusCallback " + e.getMessage(),e);
+			LOGGER.debug("Error in ASDCStatusCallback " + e.getMessage());
+		}         
+		LOGGER.recordAuditEvent (startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, "Completed the treatment of the notification");
+	} 	
+}
\ No newline at end of file
diff --git a/asdc-controller/src/main/java/org/onap/so/asdc/client/DistributionStatusMessage.java b/asdc-controller/src/main/java/org/onap/so/asdc/client/DistributionStatusMessage.java
new file mode 100644
index 0000000000..db2d2c3bd3
--- /dev/null
+++ b/asdc-controller/src/main/java/org/onap/so/asdc/client/DistributionStatusMessage.java
@@ -0,0 +1,77 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.so.asdc.client;
+
+
+import org.onap.sdc.api.consumer.IDistributionStatusMessage;
+import org.onap.sdc.utils.DistributionStatusEnum;
+
+public class DistributionStatusMessage implements IDistributionStatusMessage {
+
+	private String artifactURL;
+	
+	private String consumerID;
+	
+	private String distributionID;
+	
+	private DistributionStatusEnum distributionStatus;
+	
+	private long timestamp;
+	
+	public DistributionStatusMessage (final String artifactUrl, final String consumerId,final String distributionId, final DistributionStatusEnum distributionStatusEnum, final long timestampL) {
+		artifactURL = artifactUrl;
+		consumerID = consumerId;
+		distributionID = distributionId;
+		distributionStatus = distributionStatusEnum;
+		timestamp = timestampL;
+	}
+	
+	@Override
+	public String getArtifactURL() {
+		
+		return artifactURL;
+	}
+
+	@Override
+	public String getConsumerID() {
+	
+		return consumerID;
+	}
+
+	@Override
+	public String getDistributionID() {
+		
+		return distributionID;
+	}
+
+	@Override
+	public DistributionStatusEnum getStatus() {
+	
+		return distributionStatus;
+	}
+
+	@Override
+	public long getTimestamp() {
+		
+		return timestamp;
+	}
+
+}
diff --git a/asdc-controller/src/main/java/org/onap/so/asdc/client/FinalDistributionStatusMessage.java b/asdc-controller/src/main/java/org/onap/so/asdc/client/FinalDistributionStatusMessage.java
new file mode 100644
index 0000000000..376b678c0e
--- /dev/null
+++ b/asdc-controller/src/main/java/org/onap/so/asdc/client/FinalDistributionStatusMessage.java
@@ -0,0 +1,86 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.so.asdc.client;
+
+import org.onap.sdc.api.consumer.IFinalDistrStatusMessage;
+import org.onap.sdc.utils.DistributionStatusEnum;
+
+public class FinalDistributionStatusMessage implements IFinalDistrStatusMessage{
+
+	private String componentName;
+
+	private String consumerID;
+	
+	private String distributionID;
+	
+	private DistributionStatusEnum status;
+	
+	private long timestamp;
+	
+	public FinalDistributionStatusMessage (String distributionId, final DistributionStatusEnum distributionStatusEnum, final long timestampL, String consumerId) {
+		//componentName = componentname;
+		consumerID = consumerId;
+		distributionID = distributionId;
+		status = distributionStatusEnum;
+		timestamp = timestampL;
+	}
+
+	public DistributionStatusEnum getStatus() {
+		return status;
+	}
+
+	public void setStatus(DistributionStatusEnum status) {
+		this.status = status;
+	}
+
+	public String getDistributionID() {
+		return distributionID;
+	}
+
+	public void setDistributionID(String distributionID) {
+		this.distributionID = distributionID;
+	}
+
+	public long getTimestamp() {
+		return timestamp;
+	}
+
+	public void setTimestamp(long timestamp) {
+		this.timestamp = timestamp;
+	}
+
+	public String getComponentName() {
+		return componentName;
+	}
+
+	public void setComponentName(String componentName) {
+		this.componentName = componentName;
+	}
+
+	public String getConsumerID() {
+		return consumerID;
+	}
+
+	public void setConsumerID(String consumerID) {
+		this.consumerID = consumerID;
+	}
+
+}
diff --git a/asdc-controller/src/main/java/org/onap/so/asdc/client/ResourceInstance.java b/asdc-controller/src/main/java/org/onap/so/asdc/client/ResourceInstance.java
new file mode 100644
index 0000000000..cfdff85bc3
--- /dev/null
+++ b/asdc-controller/src/main/java/org/onap/so/asdc/client/ResourceInstance.java
@@ -0,0 +1,79 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.so.asdc.client;
+
+import java.util.ArrayList;
+
+import org.onap.sdc.api.notification.IResourceInstance;
+
+final class ResourceInstance implements IResourceInstance {
+    
+    @Override
+    public String getResourceInstanceName(){
+    	return new String();
+    }
+    
+    @Override
+    public String getResourceName(){
+    	return new String();
+    }
+    
+    @Override
+    public String getResourceVersion(){
+    	return new String();
+    }
+    
+    @Override
+    public String getResourceType(){
+    	return new String();
+    }
+    
+    @Override
+    public String getResourceUUID(){
+    	return new String();
+    }
+    
+    @Override
+    public java.util.List getArtifacts(){
+    	return new ArrayList();
+    }
+    
+    @Override
+    public String getResourceInvariantUUID(){
+    	return new String();
+    }
+    
+    @Override
+    public String getResourceCustomizationUUID(){
+    	return new String();
+    }
+    
+    @Override
+    public String getCategory(){
+    	return new String();
+    }
+    
+    @Override
+    public String getSubcategory(){
+    	return new String();
+    }
+	
+}
diff --git a/asdc-controller/src/main/java/org/onap/so/asdc/client/exceptions/ASDCControllerException.java b/asdc-controller/src/main/java/org/onap/so/asdc/client/exceptions/ASDCControllerException.java
new file mode 100644
index 0000000000..98257f761c
--- /dev/null
+++ b/asdc-controller/src/main/java/org/onap/so/asdc/client/exceptions/ASDCControllerException.java
@@ -0,0 +1,51 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.so.asdc.client.exceptions;
+
+
+/**
+ * Exception of the ASDC controller.
+ */
+public class ASDCControllerException extends Exception {
+
+	/**
+     * serialization id.
+	 */
+	private static final long serialVersionUID = -4236006447255525130L;
+
+	/**
+     * @param message The message to dump
+     * @param cause The Throwable cause object
+     */
+    public ASDCControllerException (final String message) {
+        super (message);
+       
+    }
+	
+    /**
+     * @param message The message to dump
+     * @param cause The Throwable cause object
+     */
+    public ASDCControllerException (final String message, final Throwable cause) {
+        super (message, cause);
+       
+    }
+}
diff --git a/asdc-controller/src/main/java/org/onap/so/asdc/client/exceptions/ASDCDownloadException.java b/asdc-controller/src/main/java/org/onap/so/asdc/client/exceptions/ASDCDownloadException.java
new file mode 100644
index 0000000000..f4e0bf0327
--- /dev/null
+++ b/asdc-controller/src/main/java/org/onap/so/asdc/client/exceptions/ASDCDownloadException.java
@@ -0,0 +1,51 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.so.asdc.client.exceptions;
+
+
+/**
+ * Exception during download from ASDC.
+ */
+public class ASDCDownloadException extends Exception {
+
+	/**
+     * serialization id.
+	 */
+	private static final long serialVersionUID = -5276848693231134901L;
+
+	/**
+     * @param message The message to dump
+     * @param cause The Throwable cause object
+     */
+    public ASDCDownloadException (final String message) {
+        super (message);
+       
+    }
+	
+    /**
+     * @param message The message to dump
+     * @param cause The Throwable cause object
+     */
+    public ASDCDownloadException (final String message, final Throwable cause) {
+        super (message, cause);
+       
+    }
+}
diff --git a/asdc-controller/src/main/java/org/onap/so/asdc/client/exceptions/ASDCParametersException.java b/asdc-controller/src/main/java/org/onap/so/asdc/client/exceptions/ASDCParametersException.java
new file mode 100644
index 0000000000..aecb9223c9
--- /dev/null
+++ b/asdc-controller/src/main/java/org/onap/so/asdc/client/exceptions/ASDCParametersException.java
@@ -0,0 +1,51 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.so.asdc.client.exceptions;
+
+
+/**
+ * Exception of the ASDC controller.
+ */
+public class ASDCParametersException extends Exception {
+
+	/**
+     * serialization id.
+	 */
+	private static final long serialVersionUID = 8425657297510362736L;
+
+    /**
+     * @param message The message to dump
+     * @param cause The Throwable cause object
+     */
+    public ASDCParametersException (final String message) {
+        super (message);
+       
+    }
+	
+    /**
+     * @param message The message to dump
+     * @param cause The Throwable cause object
+     */
+    public ASDCParametersException (final String message, final Throwable cause) {
+        super (message, cause);
+       
+    }
+}
diff --git a/asdc-controller/src/main/java/org/onap/so/asdc/client/exceptions/ArtifactInstallerException.java b/asdc-controller/src/main/java/org/onap/so/asdc/client/exceptions/ArtifactInstallerException.java
new file mode 100644
index 0000000000..78ccb5da0a
--- /dev/null
+++ b/asdc-controller/src/main/java/org/onap/so/asdc/client/exceptions/ArtifactInstallerException.java
@@ -0,0 +1,51 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.so.asdc.client.exceptions;
+
+
+/**
+ * Exception during artifact installation.
+ */
+public class ArtifactInstallerException extends Exception {
+
+	/**
+     * serialization id.
+	 */
+	private static final long serialVersionUID = 4095937499475915021L;
+
+    /**
+     * @param message The message to dump
+     * @param cause The Throwable cause object
+     */
+    public ArtifactInstallerException (final String message) {
+        super (message);
+       
+    }
+	
+    /**
+     * @param message The message to dump
+     * @param cause The Throwable cause object
+     */
+    public ArtifactInstallerException (final String message, final Throwable cause) {
+        super (message, cause);
+       
+    }
+}
diff --git a/asdc-controller/src/main/java/org/onap/so/asdc/client/test/emulators/ArtifactInfoImpl.java b/asdc-controller/src/main/java/org/onap/so/asdc/client/test/emulators/ArtifactInfoImpl.java
new file mode 100644
index 0000000000..7dab49f82a
--- /dev/null
+++ b/asdc-controller/src/main/java/org/onap/so/asdc/client/test/emulators/ArtifactInfoImpl.java
@@ -0,0 +1,171 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.so.asdc.client.test.emulators;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.onap.sdc.api.notification.IArtifactInfo;
+
+public class ArtifactInfoImpl implements IArtifactInfo {
+
+	private String artifactName;
+	private String artifactType;
+	private String artifactURL;
+	private String artifactChecksum;
+	private String artifactDescription;
+	private Integer artifactTimeout;
+	private String artifactVersion;
+	private String artifactUUID;
+	private String generatedFromUUID;
+	private ArtifactInfoImpl generatedArtifact;
+	private List<IArtifactInfo> relatedArtifactsInfo;
+	private List<ArtifactInfoImpl> relatedArtifactsImpl;
+	ArtifactInfoImpl(){}
+	
+	private ArtifactInfoImpl(IArtifactInfo iArtifactInfo){
+		artifactName = iArtifactInfo.getArtifactName();
+		artifactType = iArtifactInfo.getArtifactType(); 
+		artifactURL = iArtifactInfo.getArtifactURL();
+		artifactChecksum = iArtifactInfo.getArtifactChecksum();
+		artifactDescription = iArtifactInfo.getArtifactDescription();
+		artifactTimeout = iArtifactInfo.getArtifactTimeout();
+		artifactVersion = iArtifactInfo.getArtifactVersion();
+		artifactUUID = iArtifactInfo.getArtifactUUID();
+		generatedArtifact = (ArtifactInfoImpl) iArtifactInfo.getGeneratedArtifact();
+		relatedArtifactsInfo = iArtifactInfo.getRelatedArtifacts();
+	}
+	
+	public static List<ArtifactInfoImpl> convertToArtifactInfoImpl(List<IArtifactInfo> list){
+		List<ArtifactInfoImpl> ret = new ArrayList<ArtifactInfoImpl>();
+		if( list != null ){
+			for(IArtifactInfo artifactInfo : list  ){
+				ret.add(new ArtifactInfoImpl(artifactInfo));
+			}
+		}
+		return ret;
+	}
+	
+	public String getArtifactName() {
+		return artifactName;
+	}
+
+	public void setArtifactName(String artifactName) {
+		this.artifactName = artifactName;
+	}
+
+	public String getArtifactType() {
+		return artifactType;
+	}
+
+	public void setArtifactType(String artifactType) {
+		this.artifactType = artifactType;
+	}
+
+	public String getArtifactURL() {
+		return artifactURL;
+	}
+
+	public void setArtifactURL(String artifactURL) {
+		this.artifactURL = artifactURL;
+	}
+
+	public String getArtifactChecksum() {
+		return artifactChecksum;
+	}
+
+	public void setArtifactChecksum(String artifactChecksum) {
+		this.artifactChecksum = artifactChecksum;
+	}
+
+	public String getArtifactDescription() {
+		return artifactDescription;
+	}
+
+	public void setArtifactDescription(String artifactDescription) {
+		this.artifactDescription = artifactDescription;
+	}
+
+	public Integer getArtifactTimeout() {
+		return artifactTimeout;
+	}
+
+	public void setArtifactTimeout(Integer artifactTimeout) {
+		this.artifactTimeout = artifactTimeout;
+	}
+
+	@Override
+	public String toString() {
+		return "BaseArtifactInfoImpl [artifactName=" + artifactName
+				+ ", artifactType=" + artifactType + ", artifactURL="
+				+ artifactURL + ", artifactChecksum=" + artifactChecksum
+				+ ", artifactDescription=" + artifactDescription
+				+ ", artifactVersion=" + artifactVersion
+				+ ", artifactUUID=" + artifactUUID
+				+ ", artifactTimeout=" + artifactTimeout + "]";
+	}
+
+	public String getArtifactVersion() {
+		return artifactVersion;
+	}
+
+	public void setArtifactVersion(String artifactVersion) {
+		this.artifactVersion = artifactVersion;
+	}
+
+	public String getArtifactUUID() {
+		return artifactUUID;
+	}
+
+	public void setArtifactUUID(String artifactUUID) {
+		this.artifactUUID = artifactUUID;
+	}
+
+	public String getGeneratedFromUUID() {
+		return generatedFromUUID;
+	}
+
+	public void setGeneratedFromUUID(String generatedFromUUID) {
+		this.generatedFromUUID = generatedFromUUID;
+	}
+	
+	@Override
+	public ArtifactInfoImpl getGeneratedArtifact() {
+		return generatedArtifact;
+	}
+
+	public void setGeneratedArtifact(ArtifactInfoImpl generatedArtifact) {
+		this.generatedArtifact = generatedArtifact;
+	}
+	
+	@Override
+	public List<IArtifactInfo> getRelatedArtifacts(){
+		List<IArtifactInfo> temp = new ArrayList<IArtifactInfo>();
+		if( relatedArtifactsInfo != null ){
+			temp.addAll(relatedArtifactsImpl);
+		}
+		return temp;
+	}
+	
+	public void setRelatedArtifacts(List<ArtifactInfoImpl> relatedArtifacts) {
+		this.relatedArtifactsImpl = relatedArtifacts;
+	}
+}
diff --git a/asdc-controller/src/main/java/org/onap/so/asdc/client/test/emulators/DistributionClientEmulator.java b/asdc-controller/src/main/java/org/onap/so/asdc/client/test/emulators/DistributionClientEmulator.java
new file mode 100644
index 0000000000..4f76d3fa17
--- /dev/null
+++ b/asdc-controller/src/main/java/org/onap/so/asdc/client/test/emulators/DistributionClientEmulator.java
@@ -0,0 +1,188 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.so.asdc.client.test.emulators;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.onap.so.asdc.installer.IVfModuleData;
+import org.onap.so.logger.MsoLogger;
+import org.onap.sdc.api.IDistributionClient;
+import org.onap.sdc.api.consumer.IComponentDoneStatusMessage;
+import org.onap.sdc.api.consumer.IConfiguration;
+import org.onap.sdc.api.consumer.IDistributionStatusMessage;
+import org.onap.sdc.api.consumer.IFinalDistrStatusMessage;
+import org.onap.sdc.api.consumer.INotificationCallback;
+import org.onap.sdc.api.consumer.IStatusCallback;
+import org.onap.sdc.api.notification.IArtifactInfo;
+import org.onap.sdc.api.notification.IVfModuleMetadata;
+import org.onap.sdc.api.results.IDistributionClientDownloadResult;
+import org.onap.sdc.api.results.IDistributionClientResult;
+import org.onap.sdc.impl.DistributionClientDownloadResultImpl;
+import org.onap.sdc.impl.DistributionClientResultImpl;
+import org.onap.sdc.utils.DistributionActionResultEnum;
+
+public class DistributionClientEmulator implements IDistributionClient {
+
+	private String resourcePath;
+	
+	private List<IVfModuleData> listVFModuleMetaData;
+	
+	private List<IDistributionStatusMessage> distributionMessageReceived = new LinkedList<>();
+	
+	
+	private static final MsoLogger logger = MsoLogger.getMsoLogger (MsoLogger.Catalog.ASDC,DistributionClientEmulator.class );
+	
+	public DistributionClientEmulator() {			
+	}
+	
+	public DistributionClientEmulator(String notifFolderInResource) {		
+		resourcePath = notifFolderInResource;
+	}
+
+	public List<IDistributionStatusMessage> getDistributionMessageReceived() {
+		return distributionMessageReceived;
+	}
+	
+	@Override
+	public List<IVfModuleMetadata> decodeVfModuleArtifact(byte[] arg0) {
+		return null;
+	}
+	
+	public String getResourcePath() {
+		return resourcePath;
+	}
+
+	public void setResourcePath(String resourcePath) {
+		this.resourcePath = resourcePath;
+	}
+
+	public List<IVfModuleData> getListVFModuleMetaData() {
+		return listVFModuleMetaData;
+	}
+
+	@Override
+	public IDistributionClientDownloadResult download (IArtifactInfo arg0) {		
+		
+		String filename = arg0.getArtifactURL();
+	
+		byte[] inputStream=null;
+		try {
+			inputStream = getData(filename);
+		} catch (IOException e) {			
+			e.printStackTrace();
+			logger.debug("InputStream is NULL for:"+ resourcePath + filename);
+		}		
+	
+		return new DistributionClientDownloadResultImpl(DistributionActionResultEnum.SUCCESS, DistributionActionResultEnum.SUCCESS.name(),arg0.getArtifactName(),inputStream);		
+	}
+	
+	private byte[] getData(String filename) throws IOException {
+		 return Files.readAllBytes(Paths.get(resourcePath + filename));
+	}
+
+	@Override
+	public IConfiguration getConfiguration() {
+		return null;
+	}
+
+	@Override
+	public IDistributionClientResult init(IConfiguration arg0, INotificationCallback arg1) {
+		return new DistributionClientResultImpl(DistributionActionResultEnum.SUCCESS,DistributionActionResultEnum.SUCCESS.name());
+	}
+	
+	@Override
+	public IDistributionClientResult init(IConfiguration arg0, INotificationCallback arg1, IStatusCallback arg2) {
+		return new DistributionClientResultImpl(DistributionActionResultEnum.SUCCESS,DistributionActionResultEnum.SUCCESS.name());
+	}
+
+	@Override
+	public IDistributionClientResult sendDeploymentStatus(IDistributionStatusMessage arg0) {
+		this.distributionMessageReceived.add(arg0);
+		return new DistributionClientResultImpl(DistributionActionResultEnum.SUCCESS,DistributionActionResultEnum.SUCCESS.name());
+	}
+
+	@Override
+	public IDistributionClientResult sendDeploymentStatus(IDistributionStatusMessage arg0, String arg1) {
+		this.distributionMessageReceived.add(arg0);
+		return new DistributionClientResultImpl(DistributionActionResultEnum.SUCCESS,DistributionActionResultEnum.SUCCESS.name());
+	}
+
+	@Override
+	public IDistributionClientResult sendDownloadStatus(IDistributionStatusMessage arg0) {
+		this.distributionMessageReceived.add(arg0);
+		return new DistributionClientResultImpl(DistributionActionResultEnum.SUCCESS,DistributionActionResultEnum.SUCCESS.name());
+	}
+
+	@Override
+	public IDistributionClientResult sendDownloadStatus(IDistributionStatusMessage arg0, String arg1) {
+		this.distributionMessageReceived.add(arg0);
+		return new DistributionClientResultImpl(DistributionActionResultEnum.SUCCESS,DistributionActionResultEnum.SUCCESS.name());
+	}
+
+	@Override
+	public IDistributionClientResult start() {
+		return new DistributionClientResultImpl(DistributionActionResultEnum.SUCCESS,DistributionActionResultEnum.SUCCESS.name());
+	}
+
+	@Override
+	public IDistributionClientResult stop() {
+		return new DistributionClientResultImpl(DistributionActionResultEnum.SUCCESS,DistributionActionResultEnum.SUCCESS.name());
+		
+	}
+
+	@Override
+	public IDistributionClientResult updateConfiguration(IConfiguration arg0) {
+		return new DistributionClientResultImpl(DistributionActionResultEnum.SUCCESS,DistributionActionResultEnum.SUCCESS.name());
+	}
+
+	@Override
+	public IDistributionClientResult sendComponentDoneStatus(
+			IComponentDoneStatusMessage arg0) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public IDistributionClientResult sendFinalDistrStatus(
+			IFinalDistrStatusMessage arg0) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public IDistributionClientResult sendComponentDoneStatus(
+			IComponentDoneStatusMessage arg0, String arg1) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public IDistributionClientResult sendFinalDistrStatus(
+			IFinalDistrStatusMessage arg0, String arg1) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+}
diff --git a/asdc-controller/src/main/java/org/onap/so/asdc/client/test/emulators/JsonStatusData.java b/asdc-controller/src/main/java/org/onap/so/asdc/client/test/emulators/JsonStatusData.java
new file mode 100644
index 0000000000..58193dbee6
--- /dev/null
+++ b/asdc-controller/src/main/java/org/onap/so/asdc/client/test/emulators/JsonStatusData.java
@@ -0,0 +1,124 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.so.asdc.client.test.emulators;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.onap.sdc.api.notification.IStatusData;
+import org.onap.sdc.utils.DistributionStatusEnum;
+
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+
+public class JsonStatusData implements IStatusData {
+	
+	@JsonIgnore
+	private static ObjectMapper mapper = new ObjectMapper();
+	
+	@JsonIgnore
+	private Map<String,Object> attributesMap = new HashMap<>();
+	
+	public JsonStatusData() {
+		
+	}
+	
+	@Override
+	public String getErrorReason(){
+		return "MSO FAILURE";
+	}
+	
+	@Override
+	public String getDistributionID(){
+		//return (String)this.attributesMap.get("distributionID");
+		return "35120a87-1f82-4276-9735-f6de5a244d65";
+	}
+	  
+	@Override
+	public String getConsumerID(){
+		//return (String)this.attributesMap.get("consumerID");
+		return "mso.123456";
+	}
+	  
+	@Override
+	public String getComponentName(){
+		//return (String)this.attributesMap.get("componentName");
+		return "SDN-C";
+	}
+	  
+	@Override
+	public Long getTimestamp(){
+		//return (String)this.attributesMap.get("timestamp");
+		return null;
+	}
+	  
+	@Override
+	public String getArtifactURL(){
+		//return (String)this.attributesMap.get("artifactURL");
+		return "/sdc/v1/catalog/services/srv1/2.0/resources/aaa/1.0/artifacts/aaa.yml";
+	}
+	  
+	@Override
+	public DistributionStatusEnum getStatus(){
+		//return (DistributionStatusEnum)this.attributesMap.get(DistributionStatusEnum.DEPLOY_OK);
+		return DistributionStatusEnum.COMPONENT_DONE_OK;
+	}
+		
+	/**
+	 * Method instantiate a INotificationData implementation from a JSON file.
+	 * 
+	 * @param notifFilePath The file path in String
+	 * @return A JsonNotificationData instance
+	 * @throws IOException in case of the file is not readable or not accessible 
+	 */
+	public static JsonStatusData instantiateNotifFromJsonFile(String notifFilePath) throws IOException {
+		
+		InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream(notifFilePath + "status-structure.json");
+		
+		//String fileLocation = System.getProperty("mso.config.path") + "notif-structure.json";
+		
+		//String source = fileLocation;
+		//InputStream is = IOUtils.toInputStream(source, "UTF-8");
+		
+		//String myString = IOUtils.toString(is, "UTF-8");
+		
+		
+		//System.out.println(myString);
+		
+		if (is == null) {
+			//throw new FileExistsException("Resource Path does not exist: "+notifFilePath);
+		}
+			return mapper.readValue(is, JsonStatusData.class);
+	}
+	
+	@SuppressWarnings("unused")
+	@JsonAnySetter
+	public final void setAttribute(String attrName, Object attrValue) {
+		if ((null != attrName) && (!attrName.isEmpty()) && (null != attrValue) && (null != attrValue.toString())) {
+			this.attributesMap.put(attrName,attrValue);
+		}
+	}
+	
+}
diff --git a/asdc-controller/src/main/java/org/onap/so/asdc/client/test/emulators/JsonVfModuleMetaData.java b/asdc-controller/src/main/java/org/onap/so/asdc/client/test/emulators/JsonVfModuleMetaData.java
new file mode 100644
index 0000000000..9202559868
--- /dev/null
+++ b/asdc-controller/src/main/java/org/onap/so/asdc/client/test/emulators/JsonVfModuleMetaData.java
@@ -0,0 +1,96 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.so.asdc.client.test.emulators;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.onap.so.asdc.installer.IVfModuleData;
+
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class JsonVfModuleMetaData implements IVfModuleData {
+
+	@JsonProperty("artifacts")
+	private List<String> artifacts;
+	@JsonProperty("properties")
+	//private List<Map<String, Object>> properties = new ArrayList<>();
+	private Map<String,String> properties = new HashMap<>();
+	
+	public Map<String, String> getProperties() {
+		return properties;
+	}
+	
+	@JsonIgnore
+	private Map<String,Object> attributesMap = new HashMap<>();
+	
+	@Override
+	public List<String> getArtifacts() {
+		return artifacts;
+	}
+
+	@Override
+	public String getVfModuleModelDescription() {
+		return (String)attributesMap.get("vfModuleModelDescription");
+	}
+
+	@Override
+	public String getVfModuleModelInvariantUUID() {
+		return (String)attributesMap.get("vfModuleModelInvariantUUID");
+	}
+	
+	@Override
+	public String getVfModuleModelCustomizationUUID() {
+		return (String)attributesMap.get("vfModuleModelCustomizationUUID");
+	}
+
+	@Override
+	public String getVfModuleModelName() {
+		return (String)attributesMap.get("vfModuleModelName");
+	}
+
+	@Override
+	public String getVfModuleModelUUID() {
+		return (String)attributesMap.get("vfModuleModelUUID");
+	}
+
+	@Override
+	public String getVfModuleModelVersion() {
+		return (String)attributesMap.get("vfModuleModelVersion");
+	}
+
+	@Override
+	public boolean isBase() {
+		return (boolean)attributesMap.get("isBase");
+	}
+	
+	@SuppressWarnings("unused")
+	@JsonAnySetter
+	public final void setAttribute(String attrName, Object attrValue) {
+		if ((null != attrName) && (!attrName.isEmpty()) && (null != attrValue) && (null != attrValue.toString())) {
+			this.attributesMap.put(attrName,attrValue);
+		}
+	}
+
+}
diff --git a/asdc-controller/src/main/java/org/onap/so/asdc/client/test/emulators/NotificationDataImpl.java b/asdc-controller/src/main/java/org/onap/so/asdc/client/test/emulators/NotificationDataImpl.java
new file mode 100644
index 0000000000..294221352c
--- /dev/null
+++ b/asdc-controller/src/main/java/org/onap/so/asdc/client/test/emulators/NotificationDataImpl.java
@@ -0,0 +1,175 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.so.asdc.client.test.emulators;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.onap.sdc.api.notification.IArtifactInfo;
+import org.onap.sdc.api.notification.INotificationData;
+import org.onap.sdc.api.notification.IResourceInstance;
+import org.springframework.stereotype.Component;
+
+@Component
+public class NotificationDataImpl implements INotificationData {
+
+	private String distributionID;
+	private String serviceName;
+	private String serviceVersion;
+	private String serviceUUID;
+	private String serviceDescription;
+	private String serviceInvariantUUID;
+	private List<ResourceInfoImpl> resources;
+	private List<ArtifactInfoImpl> serviceArtifacts;
+	private String workloadContext;
+
+	@Override
+	public String getDistributionID() {
+		return distributionID;
+	}
+
+	@Override
+	public String getServiceName() {
+		return serviceName;
+	}
+
+	@Override
+	public String getServiceVersion() {
+		return serviceVersion;
+	}
+
+	@Override
+	public String getServiceUUID() {
+		return serviceUUID;
+	}
+
+	public void setDistributionID(String distributionID) {
+		this.distributionID = distributionID;
+	}
+
+	public void setServiceName(String serviceName) {
+		this.serviceName = serviceName;
+	}
+
+	public void setServiceVersion(String serviceVersion) {
+		this.serviceVersion = serviceVersion;
+	}
+
+	public void setServiceUUID(String serviceUUID) {
+		this.serviceUUID = serviceUUID;
+	}
+
+	
+
+	public String getServiceDescription() {
+		return serviceDescription;
+	}
+
+	public void setServiceDescription(String serviceDescription) {
+		this.serviceDescription = serviceDescription;
+	}
+
+	@Override
+	public String getWorkloadContext() { 
+		return workloadContext; 
+	}
+
+	@Override
+	public void setWorkloadContext(String workloadContext) {
+		this.workloadContext = workloadContext;	
+	}
+
+	@Override
+	public String toString() {
+		return "NotificationDataImpl [distributionID=" + distributionID + ", serviceName=" + serviceName
+				+ ", serviceVersion=" + serviceVersion + ", serviceUUID=" + serviceUUID + ", serviceDescription="
+				+ serviceDescription + ", serviceInvariantUUID=" + serviceInvariantUUID + ", resources=" + resources
+				+ ", serviceArtifacts=" + serviceArtifacts + ", workloadContext=" + workloadContext + "]";
+	}
+
+	@Override
+	public List<IResourceInstance> getResources() {
+		List<IResourceInstance> ret = new ArrayList<IResourceInstance>();
+		if( resources != null ){
+			ret.addAll(resources);
+		}
+		return ret;
+	}
+	
+	public List<ResourceInfoImpl> getResourcesImpl(){
+		return resources;
+	}
+	
+	List<ArtifactInfoImpl> getServiceArtifactsImpl(){
+		return serviceArtifacts;
+	}
+
+	@Override
+	public List<IArtifactInfo> getServiceArtifacts() {
+		List<IArtifactInfo> temp = new ArrayList<IArtifactInfo>();
+		if( serviceArtifacts != null ){
+			temp.addAll(serviceArtifacts);
+		}
+		return temp;
+	}
+	
+	public void setServiceArtifacts(List<ArtifactInfoImpl> relevantServiceArtifacts) {
+		serviceArtifacts = relevantServiceArtifacts;
+		
+	}
+	
+	@Override
+	public String getServiceInvariantUUID() {
+		return serviceInvariantUUID;
+	}
+	
+	
+	public void setServiceInvariantUUID(String serviceInvariantUUID) {
+		this.serviceInvariantUUID = serviceInvariantUUID;
+	}
+	@Override
+	public IArtifactInfo getArtifactMetadataByUUID(String artifactUUID){
+		IArtifactInfo ret = findArtifactInfoByUUID(artifactUUID, serviceArtifacts);
+		if( ret == null && resources != null ){
+			for( ResourceInfoImpl currResourceInstance : resources ){
+				ret = findArtifactInfoByUUID(artifactUUID, currResourceInstance.getArtifactsImpl());
+				if( ret != null ){
+					break;
+				}
+			}
+		}
+		return ret;
+
+	}
+
+	private IArtifactInfo findArtifactInfoByUUID(String artifactUUID, List<ArtifactInfoImpl> listToCheck) {
+		IArtifactInfo ret = null;
+		if( listToCheck != null ){
+			for(IArtifactInfo curr: listToCheck ){
+				if(curr.getArtifactUUID().equals(artifactUUID) ){
+					ret = curr;
+					break;
+				}
+			}
+		}
+		return ret;
+	}
+}
diff --git a/asdc-controller/src/main/java/org/onap/so/asdc/client/test/emulators/ResourceInfoImpl.java b/asdc-controller/src/main/java/org/onap/so/asdc/client/test/emulators/ResourceInfoImpl.java
new file mode 100644
index 0000000000..eb4764dec1
--- /dev/null
+++ b/asdc-controller/src/main/java/org/onap/so/asdc/client/test/emulators/ResourceInfoImpl.java
@@ -0,0 +1,158 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.so.asdc.client.test.emulators;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.onap.sdc.api.notification.IArtifactInfo;
+import org.onap.sdc.api.notification.IResourceInstance;
+
+public class ResourceInfoImpl implements IResourceInstance{
+	ResourceInfoImpl (){}
+	private String resourceInstanceName;
+	private String resourceCustomizationUUID;
+	private String resourceName;
+	private String resourceVersion;
+	private String resourceType;
+	private String resourceUUID;
+	private String resourceInvariantUUID;
+	private String category;
+	private String subcategory;
+	private List<ArtifactInfoImpl> artifacts;
+	
+	private ResourceInfoImpl(IResourceInstance resourceInstance){
+		resourceInstanceName = resourceInstance.getResourceInstanceName();
+		resourceCustomizationUUID = resourceInstance.getResourceCustomizationUUID();
+		resourceName = resourceInstance.getResourceName();
+		resourceVersion = resourceInstance.getResourceVersion();
+		resourceType = resourceInstance.getResourceType();
+		resourceUUID = resourceInstance.getResourceUUID();
+		resourceInvariantUUID = resourceInstance.getResourceInvariantUUID();
+		category = resourceInstance.getCategory();
+		subcategory = resourceInstance.getSubcategory();
+		artifacts = ArtifactInfoImpl.convertToArtifactInfoImpl(resourceInstance.getArtifacts());
+	}
+	
+	public static List<ResourceInfoImpl> convertToJsonContainer(List<IResourceInstance> resources){
+		 List<ResourceInfoImpl> buildResources = new ArrayList<ResourceInfoImpl>();
+		 if( resources != null ){
+			 for( IResourceInstance resourceInstance : resources ){
+				 buildResources.add(new ResourceInfoImpl(resourceInstance));
+			 }
+		 }
+		 return buildResources;
+	}
+	
+	@Override
+	public String getResourceInstanceName() {
+		return resourceInstanceName;
+	}
+
+	public void setResourceInstanceName(String resourceInstanceName) {
+		this.resourceInstanceName = resourceInstanceName;
+	}
+	
+	@Override
+	public String getResourceName() {
+		return resourceName;
+	}
+
+	public void setResourceName(String resourceName) {
+		this.resourceName = resourceName;
+	}
+
+	@Override
+	public String getResourceVersion() {
+		return resourceVersion;
+	}
+
+	public void setResourceVersion(String resourceVersion) {
+		this.resourceVersion = resourceVersion;
+	}
+
+	@Override
+	public String getResourceType() {
+		return resourceType;
+	}
+
+	public void setResoucreType(String resourceType) {
+		this.resourceType = resourceType;
+	}
+
+	@Override
+	public String getResourceUUID() {
+		return resourceUUID;
+	}
+
+	public void setResourceUUID(String resourceUUID) {
+		this.resourceUUID = resourceUUID;
+	}
+
+	@Override
+	public List<IArtifactInfo> getArtifacts() {
+		List<IArtifactInfo> temp = new ArrayList<IArtifactInfo>();
+		if( artifacts != null ){
+			temp.addAll(artifacts);
+		}
+		return temp;
+	}
+
+	public void setArtifacts(List<ArtifactInfoImpl> artifacts) {
+		this.artifacts = artifacts;
+	}
+	
+	public List<ArtifactInfoImpl> getArtifactsImpl(){
+		return artifacts;
+	}
+	
+	@Override
+	public String getResourceInvariantUUID() {
+		return resourceInvariantUUID;
+	}
+	
+	public void setResourceInvariantUUID(String resourceInvariantUUID) {
+		this.resourceInvariantUUID = resourceInvariantUUID;
+	}
+	public String getResourceCustomizationUUID() {
+		return resourceCustomizationUUID;
+	}
+
+	public void setResourceCustomizationUUID(String resourceCustomizationUUID) {
+		this.resourceCustomizationUUID = resourceCustomizationUUID;
+	}
+
+	public String getCategory() {
+		return category;
+	}
+
+	public void setCategory(String category) {
+		this.category = category;
+	}
+
+	public String getSubcategory() {
+		return subcategory;
+	}
+
+	public void setSubcategory(String subcategory) {
+		this.subcategory = subcategory;
+	}
+}
diff --git a/asdc-controller/src/main/java/org/onap/so/asdc/client/test/rest/ASDCRestInterface.java b/asdc-controller/src/main/java/org/onap/so/asdc/client/test/rest/ASDCRestInterface.java
new file mode 100644
index 0000000000..e86fac72a6
--- /dev/null
+++ b/asdc-controller/src/main/java/org/onap/so/asdc/client/test/rest/ASDCRestInterface.java
@@ -0,0 +1,120 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.so.asdc.client.test.rest;
+
+
+import java.io.IOException;
+
+import javax.transaction.Transactional;
+import javax.ws.rs.HeaderParam;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+import org.onap.so.asdc.client.ASDCController;
+import org.onap.so.asdc.client.exceptions.ASDCControllerException;
+import org.onap.so.asdc.client.exceptions.ASDCParametersException;
+import org.onap.so.asdc.client.test.emulators.DistributionClientEmulator;
+import org.onap.so.asdc.client.test.emulators.NotificationDataImpl;
+import org.onap.so.asdc.client.test.emulators.JsonStatusData;
+import org.onap.so.asdc.installer.heat.ToscaResourceInstaller;
+import org.onap.so.logger.MessageEnum;
+import org.onap.so.logger.MsoLogger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Profile;
+import org.springframework.stereotype.Component;
+
+/**
+ * This is a TEST only rest interface.  It is not used in production, it is used to aid in testing the ASDC service on jboss without the need to be connected 
+ * to the ASDC service broker.  It starts the test at the treatNotification step and simulates both the notification step as well as the artifact download step.
+ * 
+ * i.e. http://localhost:8080/asdc/treatNotification/v1
+ * 
+ * i.e. http://localhost:8080/asdc/statusData/v1
+ * 
+ * @author jm5423
+ *
+ */
+
+@Path("/")
+@Component
+@Profile("test")
+public class ASDCRestInterface {
+
+	private static DistributionClientEmulator distributionClientEmulator;
+	
+	private static JsonStatusData statusData;
+	
+	private static final MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.ASDC,ASDCRestInterface.class );
+	
+	@Autowired
+	private ASDCController asdcController;
+	
+	@Autowired
+	private ToscaResourceInstaller toscaInstaller;
+
+	@POST
+	@Path("/treatNotification/v1")
+	@Produces(MediaType.APPLICATION_JSON)
+	@Transactional
+	public Response invokeASDCService(NotificationDataImpl request, @HeaderParam("resource-location") String resourceLocation)
+			throws ASDCControllerException, ASDCParametersException, IOException {
+		distributionClientEmulator = new DistributionClientEmulator(resourceLocation);
+		
+		asdcController.setControllerName("asdc-controller1");
+		asdcController.setDistributionClient(distributionClientEmulator);	
+		asdcController.initASDC();	
+		asdcController.treatNotification(request);
+		asdcController.closeASDC();
+		return Response.status(200).build();
+	}
+	
+	@POST
+	@Path("/statusData/v1")
+	@Produces(MediaType.APPLICATION_JSON)
+	@Transactional
+	public Response invokeASDCStatusData(String request) {
+				
+		try{
+			distributionClientEmulator = new DistributionClientEmulator("resource-examples/");
+			statusData = JsonStatusData.instantiateNotifFromJsonFile("resource-examples/");
+		
+			ASDCController asdcController = new ASDCController("asdc-controller1", distributionClientEmulator);
+			//LOGGER.info(MessageEnum.ASDC_INIT_ASDC_CLIENT_EXC, notifDataWithoutModuleInfo.getServiceUUID(), "ASDC", "initASDC()");
+			asdcController.initASDC();
+			//LOGGER.info(MessageEnum.ASDC_INIT_ASDC_CLIENT_EXC, notifDataWithoutModuleInfo.getServiceUUID(), "ASDC", "treatNotification()");
+			toscaInstaller.installTheComponentStatus(statusData);
+			//asdcController.treatNotification(notifDataWithoutModuleInfo);
+			//LOGGER.info(MessageEnum.ASDC_INIT_ASDC_CLIENT_EXC, notifDataWithoutModuleInfo.getServiceUUID(), "ASDC", "closeASDC()");
+			asdcController.closeASDC();
+		}catch(Exception e){
+			System.out.println("Error caught " + e.getMessage());
+			LOGGER.error(MessageEnum.ASDC_GENERAL_EXCEPTION,
+					"Exception caught during ASDCRestInterface", "ASDC", "invokeASDCService", MsoLogger.ErrorCode.BusinessProcesssError, "Exception in invokeASDCService", e);
+		}
+		System.out.println("ASDC Updates are complete");
+		LOGGER.info(MessageEnum.ASDC_ARTIFACT_DEPLOY_SUC, statusData.getDistributionID(), "ASDC", "ASDC Updates Are Complete");
+		
+		return null;
+	}
+}
diff --git a/asdc-controller/src/main/java/org/onap/so/asdc/installer/ASDCElementInfo.java b/asdc-controller/src/main/java/org/onap/so/asdc/installer/ASDCElementInfo.java
new file mode 100644
index 0000000000..1e227aefa1
--- /dev/null
+++ b/asdc-controller/src/main/java/org/onap/so/asdc/installer/ASDCElementInfo.java
@@ -0,0 +1,211 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.so.asdc.installer;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.onap.sdc.api.notification.IArtifactInfo;
+import org.onap.sdc.api.notification.IResourceInstance;
+import org.onap.so.asdc.client.ASDCConfiguration;
+
+/**
+ * A class representing a generic element whose information can be used for example to log artifacts, resource... data.
+ */
+public class ASDCElementInfo {
+
+	/**
+	 * A default, empty instance used in case a source element was not correctly provided.
+	 */
+	public static final ASDCElementInfo EMPTY_INSTANCE = new ASDCElementInfo();
+
+	/**
+	 * Used to define the other possible ASDC Element types (usually in addition to existing artifact types, etc.).<br/>
+	 * <br/>
+	 * Possible types allowed:<br/>
+	 * <ul>
+	 * <li>{@link ASDCElementTypeEnum#VNF_RESOURCE}</li>
+	 * <ul>
+	 */
+	public static enum ASDCElementTypeEnum {
+		/**
+		 * The type VNF_RESOURCE. Represents a VNF_RESOURCE element.
+		 */
+		VNF_RESOURCE
+	};
+
+	/**
+	 * The map of element information fields useful for logging. The complete contents of this list will be concatenated.
+	 */
+	private final Map<String, String> elementInfoMap = new HashMap<>();
+
+	/**
+	 * The type of this element.
+	 */
+	private final String type;
+
+	private ASDCElementInfo () {
+		// Private parameterless constructor. Not visible, only used for EMPTY_INSTANCE.
+		this.type = "";
+	}
+
+	/**
+	 * Artifact-type based constructor. Requires a valid artifact type.
+	 * @param artifactType The artifact type
+	 */
+	private ASDCElementInfo (String artifactType) {
+		// We need the exact type name here...
+		this.type = artifactType;
+	}
+
+	/**
+	 * 'Other element type'-based constructor. Requires a valid element type.
+	 * @param elementType An ASDCElementTypeEnum entry. This will usually contain enumerated types not in the existing
+	 */
+	private ASDCElementInfo (ASDCElementTypeEnum elementType) {
+		// We need the exact type name here...
+		this.type = elementType.name();
+	}
+
+	/**
+	 * Add an information entry (name, UUID, etc.) from an artifact/resource/..., once a at time.
+	 *
+	 * @param key The key (name) of the information entry (Artifact UUID, Resource Name, etc.)
+	 * @param value The value bound to the information entry.
+	 */
+	public final void addElementInfo(String key, String value) {
+		if ((key != null) && (value != null)) {
+			this.getElementInfoMap().put(key, value);
+		}
+	}
+
+	/**
+	 * Returns an aggregated, formatted list of the expected details about an ASDC element.
+	 * (non-Javadoc)
+	 * @return An aggregated list of element information entries, comma-separated.
+	 * @see java.lang.Object#toString()
+	 */
+	@Override
+	public final String toString() {
+		StringBuilder sb = new StringBuilder();
+		List<String> aggregatedElements = new ArrayList<>();
+		for (Entry<String, String> entry : this.getElementInfoMap().entrySet()) {
+			aggregatedElements.add(entry.getKey() + ": " + entry.getValue());
+		}
+		sb.append(aggregatedElements.size() > 0 ? aggregatedElements.get(0) : "");
+		if (aggregatedElements.size() > 1) {
+			for (int i = 1; i < aggregatedElements.size(); ++i) {
+				sb.append (", ");
+				sb.append(aggregatedElements.get(i));
+			}
+		}
+		return sb.toString();
+	}
+
+	/**
+	 * The type that was defined at creation time. This is typically VNF_RESOURCE, VF_MODULE_METADATA, HEAT_ENV, etc.
+	 * @return The type of this element information type. This will usually be either an ArtifactTypeEnum entry name or an ASDCElementTypeEnum entry name.
+	 * @see ASDCElementInfo.ASDCElementTypeEnum
+	 */
+	public String getType() {
+		return type;
+	}
+
+	/**
+	 * Provides the map of all element information entries for this type.
+	 * @return A map of all element information entries which will be used by the toString() method.
+	 * @see ASDCElementInfo#toString()
+	 */
+	protected Map<String, String> getElementInfoMap() {
+		return elementInfoMap;
+	}
+
+	/**
+	 * Create an ASDCElementInfo object from a VNF Resource.<br/>
+	 * <br/>
+	 * <b>Used information:</b><br/>
+	 * <ul>
+	 * <li>Resource Instance Name</li>
+	 * <li>Resource Instance UUID</li>
+	 * </ul>
+	 *
+	 * @param vfResourceStructure The VfResourceStructure to use as source of information (see {@link VfResourceStructure}).
+	 * @return an ASDCElementInfo using the information held in the VNF Resource.
+	 */
+	public static final ASDCElementInfo createElementFromVfResourceStructure (VfResourceStructure vfResourceStructure) {
+		if (vfResourceStructure == null) {
+			return EMPTY_INSTANCE;
+		}
+		ASDCElementInfo elementInfo = new ASDCElementInfo(ASDCElementTypeEnum.VNF_RESOURCE);
+		IResourceInstance resourceInstance = vfResourceStructure.getResourceInstance();
+		elementInfo.addElementInfo("Resource Instance Name", resourceInstance.getResourceInstanceName());
+		elementInfo.addElementInfo("Resource Instance Invariant UUID", resourceInstance.getResourceInvariantUUID());
+		return elementInfo;
+	}
+
+	/**
+	 * Create an ASDCElementInfo object from a VF Module.<br/>
+	 * <br/>
+	 * <b>Used information:</b><br/>
+	 * <ul>
+	 * <li>Module Model Name</li>
+	 * <li>Module Model UUID</li>
+	 * </ul>
+	 *
+	 * @param vfModuleStructure The VfModuleStructure to use as source of information (see {@link VfModuleStructure}).
+	 * @return an ASDCElementInfo using the information held in the VF Module.
+	 */
+	public static final ASDCElementInfo createElementFromVfModuleStructure (VfModuleStructure vfModuleStructure) {
+		if (vfModuleStructure == null) {
+			return EMPTY_INSTANCE;
+		}
+		ASDCElementInfo elementInfo = new ASDCElementInfo(ASDCConfiguration.VF_MODULES_METADATA);
+		IVfModuleData moduleMetadata = vfModuleStructure.getVfModuleMetadata();
+		elementInfo.addElementInfo("Module Model Name", moduleMetadata.getVfModuleModelName());
+		elementInfo.addElementInfo("Module Model Invariant UUID", moduleMetadata.getVfModuleModelInvariantUUID());
+		return elementInfo;
+	}
+
+	/**
+	 * Create an ASDCElementInfo object from an IArtfiactInfo instance.<br/>
+	 * <br/>
+	 * <b>Used information:</b><br/>
+	 * <ul>
+	 * <li>IArtifactInfo Name</li>
+	 * <li>IArtifactInfo UUID</li>
+	 * </ul>
+	 *
+	 * @param artifactInfo The VfModuleStructure to use as source of information (see {@link IArtifactInfo}).
+	 * @return an ASDCElementInfo using the information held in the IArtifactInfo instance.
+	 */
+	public static final ASDCElementInfo createElementFromVfArtifactInfo (IArtifactInfo artifactInfo) {
+		if (artifactInfo == null) {
+			return EMPTY_INSTANCE;
+		}
+		ASDCElementInfo elementInfo = new ASDCElementInfo(artifactInfo.getArtifactType());
+		elementInfo.addElementInfo(elementInfo.getType() + " Name", artifactInfo.getArtifactName());
+		elementInfo.addElementInfo(elementInfo.getType() + " UUID", artifactInfo.getArtifactUUID());
+		return elementInfo;
+	}
+}
diff --git a/asdc-controller/src/main/java/org/onap/so/asdc/installer/BigDecimalVersion.java b/asdc-controller/src/main/java/org/onap/so/asdc/installer/BigDecimalVersion.java
new file mode 100644
index 0000000000..1dd92eac7a
--- /dev/null
+++ b/asdc-controller/src/main/java/org/onap/so/asdc/installer/BigDecimalVersion.java
@@ -0,0 +1,62 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.so.asdc.installer;
+
+
+import java.math.BigDecimal;
+
+public class BigDecimalVersion {
+	  
+	/**
+     * This method truncates and convert the version String provided in the notification.
+     * 
+     * @param version The version to check
+     * @return A BigDecimal value checked and truncated
+     */
+    public static BigDecimal castAndCheckNotificationVersion(String version) {
+    	// Truncate the version if bad type
+    	String[] splitVersion = version.split("\\.");
+    	StringBuilder newVersion = new StringBuilder();
+    	if (splitVersion.length > 1) {
+	    	newVersion.append(splitVersion[0]);
+	    	newVersion.append(".");
+	    	newVersion.append(splitVersion[1]);
+    	} else {
+    		return new BigDecimal(splitVersion[0]);
+    	}
+    	
+    	for (int i=2;i<splitVersion.length;i++) {
+    		newVersion.append(splitVersion[i]);
+    	}
+    	
+    	return new BigDecimal(newVersion.toString());
+    }
+    
+    /**
+     * This method truncates and convert the version String provided in the notification.
+     * 
+     * @param version The version to check
+     * @return A String value checked and truncated to Decimal format
+     */
+    public static String castAndCheckNotificationVersionToString (String version) {
+    	return castAndCheckNotificationVersion(version).toString();
+    }
+}
diff --git a/asdc-controller/src/main/java/org/onap/so/asdc/installer/IArtifactOrchestrator.java b/asdc-controller/src/main/java/org/onap/so/asdc/installer/IArtifactOrchestrator.java
new file mode 100644
index 0000000000..ac43a66ffa
--- /dev/null
+++ b/asdc-controller/src/main/java/org/onap/so/asdc/installer/IArtifactOrchestrator.java
@@ -0,0 +1,37 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.so.asdc.installer;
+
+
+
+import org.onap.sdc.api.notification.IArtifactInfo;
+import org.onap.sdc.api.notification.INotificationData;
+import org.onap.sdc.api.notification.IResourceInstance;
+import org.onap.sdc.api.results.IDistributionClientDownloadResult;
+import org.onap.so.asdc.client.exceptions.ArtifactInstallerException;
+
+public interface IArtifactOrchestrator {
+
+	void installTheArtifact (INotificationData iNotif, IResourceInstance resource, IArtifactInfo artifact, IDistributionClientDownloadResult downloadResult) throws ArtifactInstallerException;
+
+	boolean isArtifactAlreadyDeployed (INotificationData iNotif,IResourceInstance resource,IArtifactInfo artifact) throws ArtifactInstallerException;
+
+}
diff --git a/asdc-controller/src/main/java/org/onap/so/asdc/installer/IVfModuleData.java b/asdc-controller/src/main/java/org/onap/so/asdc/installer/IVfModuleData.java
new file mode 100644
index 0000000000..f9524de2a1
--- /dev/null
+++ b/asdc-controller/src/main/java/org/onap/so/asdc/installer/IVfModuleData.java
@@ -0,0 +1,51 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.so.asdc.installer;
+
+public interface IVfModuleData {
+
+	  // Method descriptor #4 ()Ljava/lang/String;
+	  public abstract java.lang.String getVfModuleModelName();
+
+	  // Method descriptor #4 ()Ljava/lang/String;
+	  public abstract java.lang.String getVfModuleModelInvariantUUID();
+
+	  // Method descriptor #4 ()Ljava/lang/String;
+	  public abstract java.lang.String getVfModuleModelCustomizationUUID();
+
+	  // Method descriptor #4 ()Ljava/lang/String;
+	  public abstract java.lang.String getVfModuleModelVersion();
+
+	  // Method descriptor #4 ()Ljava/lang/String;
+	  public abstract java.lang.String getVfModuleModelUUID();
+
+	  // Method descriptor #4 ()Ljava/lang/String;
+	  public abstract java.lang.String getVfModuleModelDescription();
+
+	  // Method descriptor #10 ()Z
+	  public abstract boolean isBase();
+
+	  // Method descriptor #12 ()Ljava/util/List;
+	  // Signature: ()Ljava/util/List<Ljava/lang/String;>;
+	  public abstract java.util.List<String> getArtifacts();
+
+	  public abstract java.util.Map<String,String> getProperties();
+}
diff --git a/asdc-controller/src/main/java/org/onap/so/asdc/installer/IVfResourceInstaller.java b/asdc-controller/src/main/java/org/onap/so/asdc/installer/IVfResourceInstaller.java
new file mode 100644
index 0000000000..445b10b588
--- /dev/null
+++ b/asdc-controller/src/main/java/org/onap/so/asdc/installer/IVfResourceInstaller.java
@@ -0,0 +1,32 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.so.asdc.installer;
+
+
+
+import org.onap.so.asdc.client.exceptions.ArtifactInstallerException;
+
+public interface IVfResourceInstaller {
+
+	boolean isResourceAlreadyDeployed (VfResourceStructure vfResourceStructure) throws ArtifactInstallerException;
+
+	public void installTheResource (VfResourceStructure vfResourceStructure) throws ArtifactInstallerException;
+}
diff --git a/asdc-controller/src/main/java/org/onap/so/asdc/installer/ToscaResourceStructure.java b/asdc-controller/src/main/java/org/onap/so/asdc/installer/ToscaResourceStructure.java
new file mode 100644
index 0000000000..565ddf42b5
--- /dev/null
+++ b/asdc-controller/src/main/java/org/onap/so/asdc/installer/ToscaResourceStructure.java
@@ -0,0 +1,506 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.so.asdc.installer;
+
+import java.io.File;
+import java.util.List;
+
+import org.onap.sdc.api.notification.IArtifactInfo;
+import org.onap.sdc.tosca.parser.api.ISdcCsarHelper;
+import org.onap.sdc.tosca.parser.impl.SdcToscaParserFactory;
+import org.onap.sdc.toscaparser.api.NodeTemplate;
+import org.onap.sdc.toscaparser.api.elements.Metadata;
+import org.onap.so.asdc.client.exceptions.ASDCDownloadException;
+import org.onap.so.db.catalog.beans.AllottedResource;
+import org.onap.so.db.catalog.beans.AllottedResourceCustomization;
+import org.onap.so.db.catalog.beans.CollectionNetworkResourceCustomization;
+import org.onap.so.db.catalog.beans.CollectionResource;
+import org.onap.so.db.catalog.beans.CollectionResourceCustomization;
+import org.onap.so.db.catalog.beans.ConfigurationResource;
+import org.onap.so.db.catalog.beans.ConfigurationResourceCustomization;
+import org.onap.so.db.catalog.beans.NetworkCollectionResourceCustomization;
+import org.onap.so.db.catalog.beans.NetworkInstanceGroup;
+import org.onap.so.db.catalog.beans.NetworkResource;
+import org.onap.so.db.catalog.beans.NetworkResourceCustomization;
+import org.onap.so.db.catalog.beans.Service;
+import org.onap.so.db.catalog.beans.ServiceProxyResource;
+import org.onap.so.db.catalog.beans.ServiceProxyResourceCustomization;
+import org.onap.so.db.catalog.beans.TempNetworkHeatTemplateLookup;
+import org.onap.so.db.catalog.beans.ToscaCsar;
+import org.onap.so.db.catalog.beans.VfModule;
+import org.onap.so.db.catalog.beans.VfModuleCustomization;
+import org.onap.so.db.catalog.beans.VnfResourceCustomization;
+import org.onap.so.logger.MessageEnum;
+import org.onap.so.logger.MsoLogger;
+
+public class ToscaResourceStructure {
+	
+	Metadata serviceMetadata;
+	private Service catalogService;
+	ISdcCsarHelper sdcCsarHelper;
+	List<NodeTemplate> allottedList;
+	List<NodeTemplate> networkTypes; 
+	List<NodeTemplate> vfTypes; 
+	String heatTemplateUUID;
+	String volHeatTemplateUUID;
+	String volHeatEnvTemplateUUID;
+	String envHeatTemplateUUID;
+	String heatFilesUUID;
+	String workloadPerformance;
+	boolean isVnfAlreadyInstalled = false;
+	String serviceVersion;
+	private boolean isDeployedSuccessfully=false;
+	
+	
+	private NetworkResourceCustomization catalogNetworkResourceCustomization;
+	
+	private NetworkResource catalogNetworkResource;
+	
+	private List<NetworkInstanceGroup> catalogNetworkInstanceGroup;
+	
+	private CollectionNetworkResourceCustomization catalogCollectionNetworkResourceCustomization;
+	
+	private CollectionResource catalogCollectionResource;
+	
+	private CollectionResourceCustomization catalogCollectionResourceCustomization;
+	
+	private NetworkCollectionResourceCustomization catalogNetworkCollectionResourceCustomization;
+	
+	private ServiceProxyResource catalogServiceProxyResource;
+	
+	private ServiceProxyResourceCustomization catalogServiceProxyResourceCustomization;
+	
+	private ConfigurationResource catalogConfigurationResource;
+	
+	private ConfigurationResourceCustomization catalogConfigurationResourceCustomization;
+		
+	private AllottedResourceCustomization catalogResourceCustomization;
+	
+	private VfModule vfModule;
+	
+	private VfModuleCustomization vfModuleCustomization;
+	
+	//private VnfResource vnfResource;
+	
+	private VnfResourceCustomization vnfResourceCustomization;
+		
+	private AllottedResource allottedResource;
+	
+	private AllottedResourceCustomization allottedResourceCustomization;
+	
+	private TempNetworkHeatTemplateLookup tempNetworkHeatTemplateLookup;
+	
+	private IArtifactInfo toscaArtifact;
+	
+	private ToscaCsar toscaCsar;
+	
+	protected static final MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.ASDC, ToscaResourceStructure.class);
+		
+	
+	public ToscaResourceStructure(){
+	}
+	
+	public void updateResourceStructure(IArtifactInfo artifact) throws ASDCDownloadException {
+		
+				
+		try {
+				
+			SdcToscaParserFactory factory = SdcToscaParserFactory.getInstance();//Autoclosable
+			
+			LOGGER.debug("MSO config path is: " + System.getProperty("mso.config.path"));
+			
+			File spoolFile = new File(System.getProperty("mso.config.path") + "/ASDC/" + artifact.getArtifactName());
+ 
+			LOGGER.debug("ASDC File path is: " + spoolFile.getAbsolutePath());
+			LOGGER.info(MessageEnum.ASDC_RECEIVE_SERVICE_NOTIF, "***PATH", "ASDC", spoolFile.getAbsolutePath());
+			
+
+			sdcCsarHelper = factory.getSdcCsarHelper(spoolFile.getAbsolutePath());
+
+		}catch(Exception e){
+			System.out.println("System out " + e.getMessage());
+			LOGGER.error(MessageEnum.ASDC_GENERAL_EXCEPTION_ARG,
+					"Exception caught during parser *****LOOK********* " + artifact.getArtifactName(), "ASDC", "processResourceNotification", MsoLogger.ErrorCode.BusinessProcesssError, "Exception in processResourceNotification", e);
+			
+			throw new ASDCDownloadException ("Exception caught when passing the csar file to the parser ", e);
+		}	
+
+			serviceMetadata = sdcCsarHelper.getServiceMetadata();
+	
+	}
+	
+	public String getHeatTemplateUUID() {
+		return heatTemplateUUID;
+	}
+
+	public void setHeatTemplateUUID(String heatTemplateUUID) {
+		this.heatTemplateUUID = heatTemplateUUID;
+	}
+
+	public List<NodeTemplate> getAllottedList() {
+		return allottedList;
+	}
+
+	public void setAllottedList(List<NodeTemplate> allottedList) {
+		this.allottedList = allottedList;
+	}
+
+	public ISdcCsarHelper getSdcCsarHelper() {
+		return sdcCsarHelper;
+	}
+
+	public void setSdcCsarHelper(ISdcCsarHelper sdcCsarHelper) {
+		this.sdcCsarHelper = sdcCsarHelper;
+	}
+
+	public Metadata getServiceMetadata() {
+		return serviceMetadata;
+	}
+	
+	public Service getCatalogService() {
+		return catalogService;
+	}
+
+	public void setServiceMetadata(Metadata serviceMetadata) {
+		this.serviceMetadata = serviceMetadata;
+	}
+	
+	public void setCatalogService(Service catalogService) {
+		this.catalogService = catalogService;
+	}
+
+	public List<NodeTemplate> getNetworkTypes() {
+		return networkTypes;
+	}
+
+	public void setNetworkTypes(List<NodeTemplate> networkTypes) {
+		this.networkTypes = networkTypes;
+	}
+	
+	public List<NodeTemplate> getVfTypes() {
+		return vfTypes;
+	}
+
+	public void setVfTypes(List<NodeTemplate> vfTypes) {
+		this.vfTypes = vfTypes;
+	}
+
+	public AllottedResourceCustomization getCatalogResourceCustomization() {
+		return catalogResourceCustomization;
+	}
+
+	public void setCatalogResourceCustomization(
+			AllottedResourceCustomization catalogResourceCustomization) {
+		this.catalogResourceCustomization = catalogResourceCustomization;
+	}
+	
+	// Network Only
+	public NetworkResourceCustomization getCatalogNetworkResourceCustomization() {
+		return catalogNetworkResourceCustomization;
+	}
+	// Network Only
+	public void setCatalogNetworkResourceCustomization(NetworkResourceCustomization catalogNetworkResourceCustomization) {
+		this.catalogNetworkResourceCustomization = catalogNetworkResourceCustomization;
+	}
+
+	public NetworkResource getCatalogNetworkResource() {
+		return catalogNetworkResource;
+	}
+
+	public void setCatalogNetworkResource(NetworkResource catalogNetworkResource) {
+		this.catalogNetworkResource = catalogNetworkResource;
+	}
+
+	public VfModule getCatalogVfModule() {
+		return vfModule;
+	}
+
+	public void setCatalogVfModule(VfModule vfModule) {
+		this.vfModule = vfModule;
+	}
+/*
+	public VnfResource getCatalogVnfResource() {
+		return vnfResource;
+	}
+
+	public void setCatalogVnfResource(VnfResource vnfResource) {
+		this.vnfResource = vnfResource;
+	}
+	
+	*/
+
+	public VnfResourceCustomization getCatalogVnfResourceCustomization() {
+		return vnfResourceCustomization;
+	}
+
+	public void setCatalogVnfResourceCustomization(
+			VnfResourceCustomization vnfResourceCustomization) {
+		this.vnfResourceCustomization = vnfResourceCustomization;
+	}
+
+	public VfModuleCustomization getCatalogVfModuleCustomization() {
+		return vfModuleCustomization;
+	}
+
+	public void setCatalogVfModuleCustomization(VfModuleCustomization vfModuleCustomization) {
+		this.vfModuleCustomization = vfModuleCustomization;
+	}
+
+	public AllottedResource getAllottedResource() {
+		return allottedResource;
+	}
+
+	public void setAllottedResource(AllottedResource allottedResource) {
+		this.allottedResource = allottedResource;
+	}
+
+	public AllottedResourceCustomization getCatalogAllottedResourceCustomization() {
+		return allottedResourceCustomization;
+	}
+
+	public void setCatalogAllottedResourceCustomization(
+			AllottedResourceCustomization allottedResourceCustomization) {
+		this.allottedResourceCustomization = allottedResourceCustomization;
+	}
+
+	public TempNetworkHeatTemplateLookup getCatalogTempNetworkHeatTemplateLookup() {
+		return tempNetworkHeatTemplateLookup;
+	}
+
+	public void setCatalogTempNetworkHeatTemplateLookup(
+			TempNetworkHeatTemplateLookup tempNetworkHeatTemplateLookup) {
+		this.tempNetworkHeatTemplateLookup = tempNetworkHeatTemplateLookup;
+	}
+
+	public String getHeatFilesUUID() {
+		return heatFilesUUID;
+	}
+
+	public void setHeatFilesUUID(String heatFilesUUID) {
+		this.heatFilesUUID = heatFilesUUID;
+	}
+
+	public IArtifactInfo getToscaArtifact() {
+		return toscaArtifact;
+	}
+
+	public void setToscaArtifact(IArtifactInfo toscaArtifact) {
+		this.toscaArtifact = toscaArtifact;
+	}
+
+	public ToscaCsar getCatalogToscaCsar() {
+		return toscaCsar;
+	}
+
+	public void setCatalogToscaCsar(ToscaCsar toscaCsar) {
+		this.toscaCsar = toscaCsar;
+	}
+
+	public boolean isVnfAlreadyInstalled() {
+		return isVnfAlreadyInstalled;
+	}
+
+	public void setVnfAlreadyInstalled(boolean isVnfAlreadyInstalled) {
+		this.isVnfAlreadyInstalled = isVnfAlreadyInstalled;
+	}
+
+	public String getVolHeatTemplateUUID() {
+		return volHeatTemplateUUID;
+	}
+
+	public void setVolHeatTemplateUUID(String volHeatTemplateUUID) {
+		this.volHeatTemplateUUID = volHeatTemplateUUID;
+	}
+
+	public String getEnvHeatTemplateUUID() {
+		return envHeatTemplateUUID;
+	}
+
+	public void setEnvHeatTemplateUUID(String envHeatTemplateUUID) {
+		this.envHeatTemplateUUID = envHeatTemplateUUID;
+	}
+	
+	public String getVolHeatEnvTemplateUUID() {
+		return volHeatEnvTemplateUUID;
+	}
+
+	public void setVolHeatEnvTemplateUUID(String volHeatEnvTemplateUUID) {
+		this.volHeatEnvTemplateUUID = volHeatEnvTemplateUUID;
+	}
+
+	public String getServiceVersion() {
+		return serviceVersion;
+	}
+
+	public void setServiceVersion(String serviceVersion) {
+		this.serviceVersion = serviceVersion;
+	}
+
+	public String getWorkloadPerformance() {
+		return workloadPerformance;
+	}
+
+	public void setWorkloadPerformance(String workloadPerformance) {
+		this.workloadPerformance = workloadPerformance;
+	}
+
+	public VfModule getVfModule() {
+		return vfModule;
+	}
+
+	public void setVfModule(VfModule vfModule) {
+		this.vfModule = vfModule;
+	}
+
+	public VfModuleCustomization getVfModuleCustomization() {
+		return vfModuleCustomization;
+	}
+
+	public void setVfModuleCustomization(VfModuleCustomization vfModuleCustomization) {
+		this.vfModuleCustomization = vfModuleCustomization;
+	}
+
+
+	public VnfResourceCustomization getVnfResourceCustomization() {
+		return vnfResourceCustomization;
+	}
+
+	public void setVnfResourceCustomization(
+			VnfResourceCustomization vnfResourceCustomization) {
+		this.vnfResourceCustomization = vnfResourceCustomization;
+	}
+
+	public AllottedResourceCustomization getAllottedResourceCustomization() {
+		return allottedResourceCustomization;
+	}
+
+	public void setAllottedResourceCustomization(
+			AllottedResourceCustomization allottedResourceCustomization) {
+		this.allottedResourceCustomization = allottedResourceCustomization;
+	}
+
+	public TempNetworkHeatTemplateLookup getTempNetworkHeatTemplateLookup() {
+		return tempNetworkHeatTemplateLookup;
+	}
+
+	public void setTempNetworkHeatTemplateLookup(
+			TempNetworkHeatTemplateLookup tempNetworkHeatTemplateLookup) {
+		this.tempNetworkHeatTemplateLookup = tempNetworkHeatTemplateLookup;
+	}
+
+	public List<NetworkInstanceGroup> getCatalogNetworkInstanceGroup() {
+		return catalogNetworkInstanceGroup;
+	}
+
+	public void setCatalogNetworkInstanceGroup(List<NetworkInstanceGroup> catalogNetworkInstanceGroup) {
+		this.catalogNetworkInstanceGroup = catalogNetworkInstanceGroup;
+	}
+
+	public CollectionNetworkResourceCustomization getCatalogCollectionNetworkResourceCustomization() {
+		return catalogCollectionNetworkResourceCustomization;
+	}
+
+	public void setCatalogCollectionNetworkResourceCustomization(
+			CollectionNetworkResourceCustomization catalogCollectionNetworkResourceCustomization) {
+		this.catalogCollectionNetworkResourceCustomization = catalogCollectionNetworkResourceCustomization;
+	}
+
+	public CollectionResource getCatalogCollectionResource() {
+		return catalogCollectionResource;
+	}
+
+	public void setCatalogCollectionResource(CollectionResource catalogCollectionResource) {
+		this.catalogCollectionResource = catalogCollectionResource;
+	}
+
+	public CollectionResourceCustomization getCatalogCollectionResourceCustomization() {
+		return catalogCollectionResourceCustomization;
+	}
+
+	public void setCatalogCollectionResourceCustomization(
+			CollectionResourceCustomization catalogCollectionResourceCustomization) {
+		this.catalogCollectionResourceCustomization = catalogCollectionResourceCustomization;
+	}
+
+	public NetworkCollectionResourceCustomization getCatalogNetworkCollectionResourceCustomization() {
+		return catalogNetworkCollectionResourceCustomization;
+	}
+
+	public void setCatalogNetworkCollectionResourceCustomization(
+			NetworkCollectionResourceCustomization catalogNetworkCollectionResourceCustomization) {
+		this.catalogNetworkCollectionResourceCustomization = catalogNetworkCollectionResourceCustomization;
+	}
+
+	public ServiceProxyResource getCatalogServiceProxyResource() {
+		return catalogServiceProxyResource;
+	}
+
+	public void setCatalogServiceProxyResource(ServiceProxyResource catalogServiceProxyResource) {
+		this.catalogServiceProxyResource = catalogServiceProxyResource;
+	}
+
+	public ServiceProxyResourceCustomization getCatalogServiceProxyResourceCustomization() {
+		return catalogServiceProxyResourceCustomization;
+	}
+
+	public void setCatalogServiceProxyResourceCustomization(
+			ServiceProxyResourceCustomization catalogServiceProxyResourceCustomization) {
+		this.catalogServiceProxyResourceCustomization = catalogServiceProxyResourceCustomization;
+	}
+
+	public ConfigurationResource getCatalogConfigurationResource() {
+		return catalogConfigurationResource;
+	}
+
+	public void setCatalogConfigurationResource(ConfigurationResource catalogConfigurationResource) {
+		this.catalogConfigurationResource = catalogConfigurationResource;
+	}
+
+	public ConfigurationResourceCustomization getCatalogConfigurationResourceCustomization() {
+		return catalogConfigurationResourceCustomization;
+	}
+
+	public void setCatalogConfigurationResourceCustomization(
+			ConfigurationResourceCustomization catalogConfigurationResourceCustomization) {
+		this.catalogConfigurationResourceCustomization = catalogConfigurationResourceCustomization;
+	}
+
+	public ToscaCsar getToscaCsar() {
+		return toscaCsar;
+	}
+
+	public void setToscaCsar(ToscaCsar toscaCsar) {
+		this.toscaCsar = toscaCsar;
+	}
+
+	public static MsoLogger getLogger() {
+		return LOGGER;
+	}
+	
+	public boolean isDeployedSuccessfully() {
+		return isDeployedSuccessfully;
+	}
+
+	public void setSuccessfulDeployment() {
+		isDeployedSuccessfully = true;
+	}
+
+}
diff --git a/asdc-controller/src/main/java/org/onap/so/asdc/installer/VfModuleArtifact.java b/asdc-controller/src/main/java/org/onap/so/asdc/installer/VfModuleArtifact.java
new file mode 100644
index 0000000000..adc8071454
--- /dev/null
+++ b/asdc-controller/src/main/java/org/onap/so/asdc/installer/VfModuleArtifact.java
@@ -0,0 +1,90 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.so.asdc.installer;
+
+
+import java.io.UnsupportedEncodingException;
+
+import org.onap.so.db.catalog.beans.HeatEnvironment;
+import org.onap.so.db.catalog.beans.HeatFiles;
+import org.onap.so.db.catalog.beans.HeatTemplate;
+import org.onap.sdc.api.notification.IArtifactInfo;
+import org.onap.sdc.api.results.IDistributionClientDownloadResult;
+
+/**
+ * The structure that contains the artifactInfo and its associated DownloadedResult. 
+ *
+ */
+public final class VfModuleArtifact {
+	private final IArtifactInfo artifactInfo;
+	private int deployedInDb=0;
+	private final String result;			
+	private HeatFiles heatFiles;
+	private HeatTemplate heatTemplate;
+	private HeatEnvironment heatEnvironment;
+		
+	public VfModuleArtifact(IArtifactInfo artifactinfo,IDistributionClientDownloadResult clientResult) throws UnsupportedEncodingException {
+		artifactInfo=artifactinfo;
+		result = new String(clientResult.getArtifactPayload(), "UTF-8");
+		
+	}	
+
+	public HeatFiles getHeatFiles() {
+		return heatFiles;
+	}
+
+	public void setHeatFiles(HeatFiles heatFiles) {
+		this.heatFiles = heatFiles;
+	}
+
+	public HeatTemplate getHeatTemplate() {
+		return heatTemplate;
+	}
+
+	public void setHeatTemplate(HeatTemplate heatTemplate) {
+		this.heatTemplate = heatTemplate;
+	}
+
+	public IArtifactInfo getArtifactInfo() {
+		return artifactInfo;
+	}
+
+	public String getResult() {
+		return result;
+	}
+
+	public int getDeployedInDb() {
+		return deployedInDb;
+	}
+
+	public void incrementDeployedInDB() {
+		++deployedInDb;
+	}
+
+	public HeatEnvironment getHeatEnvironment() {
+		return heatEnvironment;
+	}
+
+	public void setHeatEnvironment(HeatEnvironment heatEnvironment) {
+		this.heatEnvironment=heatEnvironment;		
+	}
+	
+}
diff --git a/asdc-controller/src/main/java/org/onap/so/asdc/installer/VfModuleMetaData.java b/asdc-controller/src/main/java/org/onap/so/asdc/installer/VfModuleMetaData.java
new file mode 100644
index 0000000000..11000bec98
--- /dev/null
+++ b/asdc-controller/src/main/java/org/onap/so/asdc/installer/VfModuleMetaData.java
@@ -0,0 +1,96 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.so.asdc.installer;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class VfModuleMetaData implements IVfModuleData {
+
+	@JsonProperty("artifacts")
+	private List<String> artifacts;
+
+	@JsonProperty("properties")
+	//private List<Map<String, Object>> properties = new ArrayList<>();
+	private Map<String,String> properties = new HashMap<>();
+
+	@JsonIgnore
+	private Map<String,Object> attributesMap = new HashMap<>();
+
+	@Override
+	public List<String> getArtifacts() {
+		return artifacts;
+	}
+
+	public Map<String, String> getProperties() {
+		return properties;
+	}
+
+	@Override
+	public String getVfModuleModelDescription() {
+		return (String)attributesMap.get("vfModuleModelDescription");
+	}
+
+	@Override
+	public String getVfModuleModelInvariantUUID() {
+		return (String)attributesMap.get("vfModuleModelInvariantUUID");
+	}
+
+	public String getVfModuleModelCustomizationUUID() {
+		return (String)attributesMap.get("vfModuleModelCustomizationUUID");
+	}
+
+	@Override
+	public String getVfModuleModelName() {
+		return (String)attributesMap.get("vfModuleModelName");
+	}
+
+	@Override
+	public String getVfModuleModelUUID() {
+		return (String)attributesMap.get("vfModuleModelUUID");
+	}
+
+	@Override
+	public String getVfModuleModelVersion() {
+		return (String)attributesMap.get("vfModuleModelVersion");
+	}
+
+	@Override
+	public boolean isBase() {
+		return (boolean)attributesMap.get("isBase");
+	}
+
+
+
+	@SuppressWarnings("unused")
+	@JsonAnySetter
+	public final void setAttribute(String attrName, Object attrValue) {
+		if ((null != attrName) && (!attrName.isEmpty()) && (null != attrValue) && (null != attrValue.toString())) {
+			this.attributesMap.put(attrName,attrValue);
+		}
+	}
+
+}
diff --git a/asdc-controller/src/main/java/org/onap/so/asdc/installer/VfModuleStructure.java b/asdc-controller/src/main/java/org/onap/so/asdc/installer/VfModuleStructure.java
new file mode 100644
index 0000000000..9f0525db3d
--- /dev/null
+++ b/asdc-controller/src/main/java/org/onap/so/asdc/installer/VfModuleStructure.java
@@ -0,0 +1,114 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.so.asdc.installer;
+
+
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import org.onap.sdc.api.notification.IVfModuleMetadata;
+import org.onap.so.asdc.client.ASDCConfiguration;
+import org.onap.so.asdc.client.exceptions.ArtifactInstallerException;
+import org.onap.so.db.catalog.beans.VfModule;
+
+public final class VfModuleStructure {
+
+	private final IVfModuleData vfModuleMetadata;
+
+	private final VfResourceStructure parentVfResource;
+
+	private VfModule catalogVfModule;
+	/**
+	 * The list of artifact existing in this resource hashed by artifactType.
+	 */
+	private final Map<String, List<VfModuleArtifact>> artifactsMap;
+
+	public VfModuleStructure(VfResourceStructure vfParentResource,IVfModuleData vfmoduleMetadata) throws ArtifactInstallerException {
+
+		vfModuleMetadata = vfmoduleMetadata;
+		parentVfResource = vfParentResource;
+
+		artifactsMap = new HashMap<>();
+
+		for (String artifactUUID:this.vfModuleMetadata.getArtifacts()) {
+			if (vfParentResource.getArtifactsMapByUUID().containsKey(artifactUUID)) {
+				this.addToStructure(vfParentResource.getArtifactsMapByUUID().get(artifactUUID));
+			} else {
+				throw new ArtifactInstallerException("Artifact (UUID:"+artifactUUID+ ") referenced in the VFModule UUID list has not been downloaded, cancelling the Resource deployment");
+			}
+		}
+	}
+
+	private void addToStructure(VfModuleArtifact vfModuleArtifact) {
+
+		if (artifactsMap.containsKey(vfModuleArtifact.getArtifactInfo().getArtifactType())) {
+			artifactsMap.get(vfModuleArtifact.getArtifactInfo().getArtifactType()).add(vfModuleArtifact);
+
+		} else {
+			List<VfModuleArtifact> nestedList = new LinkedList<>();
+			nestedList.add(vfModuleArtifact);
+
+			artifactsMap.put(vfModuleArtifact.getArtifactInfo().getArtifactType(), nestedList);
+		}
+	}
+
+	public List<VfModuleArtifact> getOrderedArtifactList() {
+
+		List <VfModuleArtifact> artifactsList = new LinkedList<>();
+
+		artifactsList.addAll(artifactsMap.get(ASDCConfiguration.HEAT));
+		artifactsList.addAll(artifactsMap.get(ASDCConfiguration.HEAT_ENV));
+		artifactsList.addAll(artifactsMap.get(ASDCConfiguration.HEAT_VOL));
+
+		artifactsList.addAll((artifactsMap.get(ASDCConfiguration.HEAT_NESTED)));
+
+		artifactsList.addAll((artifactsMap.get(ASDCConfiguration.HEAT_ARTIFACT)));
+
+		artifactsList.addAll(artifactsMap.get(ASDCConfiguration.HEAT_VOL));
+
+		return null;
+	}
+
+	public IVfModuleData getVfModuleMetadata() {
+		return vfModuleMetadata;
+	}
+
+	public VfResourceStructure getParentVfResource() {
+		return parentVfResource;
+	}
+
+	public Map<String, List<VfModuleArtifact>> getArtifactsMap() {
+		return artifactsMap;
+	}
+
+
+	public VfModule getCatalogVfModule() {
+		return catalogVfModule;
+	}
+
+	public void setCatalogVfModule(VfModule catalogVfModule) {
+		this.catalogVfModule = catalogVfModule;
+	}
+
+
+}
diff --git a/asdc-controller/src/main/java/org/onap/so/asdc/installer/VfResourceStructure.java b/asdc-controller/src/main/java/org/onap/so/asdc/installer/VfResourceStructure.java
new file mode 100644
index 0000000000..a045c2bb3a
--- /dev/null
+++ b/asdc-controller/src/main/java/org/onap/so/asdc/installer/VfResourceStructure.java
@@ -0,0 +1,220 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017 Huawei Technologies Co., Ltd. All rights reserved.
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.so.asdc.installer;
+
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import org.onap.so.asdc.client.ASDCConfiguration;
+import org.onap.so.asdc.client.exceptions.ArtifactInstallerException;
+import org.onap.so.db.catalog.beans.AllottedResourceCustomization;
+import org.onap.so.db.catalog.beans.NetworkResourceCustomization;
+import org.onap.so.db.catalog.beans.Service;
+import org.onap.so.db.catalog.beans.VnfResource;
+import org.onap.so.logger.MsoLogger;
+import org.onap.sdc.api.IDistributionClient;
+import org.onap.sdc.api.notification.IArtifactInfo;
+import org.onap.sdc.api.notification.INotificationData;
+import org.onap.sdc.api.notification.IResourceInstance;
+import org.onap.sdc.api.results.IDistributionClientDownloadResult;
+import org.onap.so.logger.MessageEnum;
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+/**
+ * This structure exists to avoid having issues if the order of the vfResource/vfmodule artifact is not good (tree structure).
+ *
+ */
+
+
+public class VfResourceStructure {
+	
+	protected static final MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.ASDC, VfResourceStructure.class);
+
+	private boolean isDeployedSuccessfully=false;
+	/**
+	 * The Raw notification data.
+	 */
+	private final INotificationData notification;
+	/**
+	 * The Raw notification data.
+	 */
+	private boolean isAlreadyDeployed=false;
+
+	/**
+	 * The resource we will try to deploy.
+	 */
+	private final IResourceInstance resourceInstance;
+
+	/**
+	 * The list of VfModules defined for this resource.
+	 */
+	private final List<VfModuleStructure> vfModulesStructureList;
+
+	/**
+	 * The list of VfModulesMetadata defined for this resource.
+	 */
+	private List<IVfModuleData> vfModulesMetadataList;
+
+	private VnfResource catalogVnfResource;
+
+	private NetworkResourceCustomization catalogNetworkResourceCustomization;
+	
+	private AllottedResourceCustomization catalogResourceCustomization;
+
+	private Service catalogService;
+	
+	/**
+	 * The list of artifacts existing in this resource hashed by UUID.
+	 */
+	private final Map<String, VfModuleArtifact> artifactsMapByUUID;
+
+
+	public VfResourceStructure(INotificationData notificationdata, IResourceInstance resourceinstance) {
+		notification=notificationdata;
+		resourceInstance=resourceinstance;
+		vfModulesStructureList = new LinkedList<>();
+		artifactsMapByUUID = new HashMap<>();
+	}
+	
+	public void addArtifactToStructure(IDistributionClient distributionClient,IArtifactInfo artifactinfo,IDistributionClientDownloadResult clientResult) throws UnsupportedEncodingException {
+		VfModuleArtifact vfModuleArtifact = new VfModuleArtifact(artifactinfo,clientResult);
+
+		switch(artifactinfo.getArtifactType()) {
+			case ASDCConfiguration.HEAT:
+			case ASDCConfiguration.HEAT_ENV:
+			case ASDCConfiguration.HEAT_VOL:
+			case ASDCConfiguration.HEAT_NESTED:    // For 1607 only 1 level tree is supported
+			case ASDCConfiguration.HEAT_ARTIFACT:
+			case ASDCConfiguration.HEAT_NET:
+			case ASDCConfiguration.OTHER:
+				artifactsMapByUUID.put(artifactinfo.getArtifactUUID(), vfModuleArtifact);
+				break;
+			case ASDCConfiguration.VF_MODULES_METADATA:
+				vfModulesMetadataList = this.decodeVfModuleArtifact(clientResult.getArtifactPayload());	
+				break;
+			default:
+				break;
+		}
+	}
+
+	public void createVfModuleStructures() throws ArtifactInstallerException {
+
+		//for vender tosca VNF there is no VFModule in VF
+		if (vfModulesMetadataList == null) {
+		    LOGGER.info(MessageEnum.ASDC_GENERAL_INFO,"There is no VF mudules in the VF.", "ASDC", "createVfModuleStructures");
+		    return;
+		}
+			for (IVfModuleData vfModuleMeta:vfModulesMetadataList) {
+				vfModulesStructureList.add(new VfModuleStructure(this,vfModuleMeta));
+			}
+		}
+
+	public INotificationData getNotification() {
+		return notification;
+	}
+
+	public IResourceInstance getResourceInstance() {
+		return resourceInstance;
+	}
+
+	public List<VfModuleStructure> getVfModuleStructure() {
+		return vfModulesStructureList;
+	}
+
+	public boolean isDeployedSuccessfully() {
+		return isDeployedSuccessfully;
+	}
+
+	public void setSuccessfulDeployment() {
+		isDeployedSuccessfully = true;
+	}
+	
+	public boolean isAlreadyDeployed() {
+		return isAlreadyDeployed;
+	}
+
+	public void setAlreadyDeployed(boolean isAlreadyDeployed) {
+		this.isAlreadyDeployed = isAlreadyDeployed;
+	}
+
+	public Map<String, VfModuleArtifact> getArtifactsMapByUUID() {
+		return artifactsMapByUUID;
+	}
+
+	public List<VfModuleStructure> getVfModulesStructureList() {
+		return vfModulesStructureList;
+	}
+
+	public VnfResource getCatalogVnfResource() {
+		return catalogVnfResource;
+	}
+
+	public void setCatalogVnfResource(VnfResource catalogVnfResource) {
+		this.catalogVnfResource = catalogVnfResource;
+	}
+
+	// Network Only
+	public NetworkResourceCustomization getCatalogNetworkResourceCustomization() {
+		return catalogNetworkResourceCustomization;
+	}
+	// Network Only
+	public void setCatalogNetworkResourceCustomization(NetworkResourceCustomization catalogNetworkResourceCustomization) {
+		this.catalogNetworkResourceCustomization = catalogNetworkResourceCustomization;
+	}
+
+	public AllottedResourceCustomization getCatalogResourceCustomization() {
+		return catalogResourceCustomization;
+	}
+
+	public void setCatalogResourceCustomization(
+			AllottedResourceCustomization catalogResourceCustomization) {
+		this.catalogResourceCustomization = catalogResourceCustomization;
+	}
+
+	public Service getCatalogService() {
+		return catalogService;
+	}
+
+	public void setCatalogService(Service catalogService) {
+		this.catalogService = catalogService;
+	}
+
+	public List<IVfModuleData> decodeVfModuleArtifact(byte[] arg0) {
+		try {
+			List<IVfModuleData> listVFModuleMetaData = new ObjectMapper().readValue(arg0, new TypeReference<List<VfModuleMetaData>>(){});
+			return listVFModuleMetaData;
+
+		} catch (JsonParseException e) {
+			LOGGER.debug("JsonParseException : ",e);
+		} catch (JsonMappingException e) {
+			LOGGER.debug("JsonMappingException : ",e);
+		} catch (IOException e) {
+			LOGGER.debug("IOException : ",e);
+		}
+		return null;
+	}
+}
diff --git a/asdc-controller/src/main/java/org/onap/so/asdc/installer/heat/ToscaResourceInstaller.java b/asdc-controller/src/main/java/org/onap/so/asdc/installer/heat/ToscaResourceInstaller.java
new file mode 100644
index 0000000000..ea952f6daf
--- /dev/null
+++ b/asdc-controller/src/main/java/org/onap/so/asdc/installer/heat/ToscaResourceInstaller.java
@@ -0,0 +1,1589 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017 Huawei Technologies Co., Ltd. All rights reserved.
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.so.asdc.installer.heat;
+
+
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+
+import org.hibernate.exception.ConstraintViolationException;
+import org.hibernate.exception.LockAcquisitionException;
+import org.onap.sdc.api.notification.IArtifactInfo;
+import org.onap.sdc.api.notification.IStatusData;
+import org.onap.sdc.tosca.parser.impl.SdcPropertyNames;
+import org.onap.sdc.tosca.parser.impl.SdcTypes;
+import org.onap.sdc.toscaparser.api.CapabilityAssignment;
+import org.onap.sdc.toscaparser.api.CapabilityAssignments;
+import org.onap.sdc.toscaparser.api.Group;
+import org.onap.sdc.toscaparser.api.NodeTemplate;
+import org.onap.sdc.toscaparser.api.RequirementAssignment;
+import org.onap.sdc.toscaparser.api.elements.Metadata;
+import org.onap.sdc.utils.DistributionStatusEnum;
+import org.onap.so.asdc.client.ASDCConfiguration;
+import org.onap.so.asdc.client.exceptions.ArtifactInstallerException;
+import org.onap.so.asdc.installer.ASDCElementInfo;
+import org.onap.so.asdc.installer.BigDecimalVersion;
+import org.onap.so.asdc.installer.IVfModuleData;
+import org.onap.so.asdc.installer.ToscaResourceStructure;
+import org.onap.so.asdc.installer.VfModuleArtifact;
+import org.onap.so.asdc.installer.VfModuleStructure;
+import org.onap.so.asdc.installer.VfResourceStructure;
+import org.onap.so.asdc.util.YamlEditor;
+import org.onap.so.db.catalog.beans.AllottedResource;
+import org.onap.so.db.catalog.beans.AllottedResourceCustomization;
+import org.onap.so.db.catalog.beans.CollectionNetworkResourceCustomization;
+import org.onap.so.db.catalog.beans.CollectionResource;
+import org.onap.so.db.catalog.beans.CollectionResourceCustomization;
+import org.onap.so.db.catalog.beans.CollectionResourceInstanceGroupCustomization;
+import org.onap.so.db.catalog.beans.ConfigurationResource;
+import org.onap.so.db.catalog.beans.ConfigurationResourceCustomization;
+import org.onap.so.db.catalog.beans.ExternalServiceToInternalService;
+import org.onap.so.db.catalog.beans.HeatEnvironment;
+import org.onap.so.db.catalog.beans.HeatFiles;
+import org.onap.so.db.catalog.beans.HeatTemplate;
+import org.onap.so.db.catalog.beans.HeatTemplateParam;
+import org.onap.so.db.catalog.beans.InstanceGroupType;
+import org.onap.so.db.catalog.beans.NetworkCollectionResourceCustomization;
+import org.onap.so.db.catalog.beans.NetworkInstanceGroup;
+import org.onap.so.db.catalog.beans.NetworkResource;
+import org.onap.so.db.catalog.beans.NetworkResourceCustomization;
+import org.onap.so.db.catalog.beans.Service;
+import org.onap.so.db.catalog.beans.ServiceProxyResource;
+import org.onap.so.db.catalog.beans.ServiceProxyResourceCustomization;
+import org.onap.so.db.catalog.beans.SubType;
+import org.onap.so.db.catalog.beans.TempNetworkHeatTemplateLookup;
+import org.onap.so.db.catalog.beans.ToscaCsar;
+import org.onap.so.db.catalog.beans.VFCInstanceGroup;
+import org.onap.so.db.catalog.beans.VfModule;
+import org.onap.so.db.catalog.beans.VfModuleCustomization;
+import org.onap.so.db.catalog.beans.VnfResource;
+import org.onap.so.db.catalog.beans.VnfResourceCustomization;
+import org.onap.so.db.catalog.beans.VnfcInstanceGroupCustomization;
+import org.onap.so.db.catalog.data.repository.AllottedResourceCustomizationRepository;
+import org.onap.so.db.catalog.data.repository.AllottedResourceRepository;
+import org.onap.so.db.catalog.data.repository.CollectionResourceCustomizationRepository;
+import org.onap.so.db.catalog.data.repository.CollectionResourceRepository;
+import org.onap.so.db.catalog.data.repository.ConfigurationResourceCustomizationRepository;
+import org.onap.so.db.catalog.data.repository.ExternalServiceToInternalServiceRepository;
+import org.onap.so.db.catalog.data.repository.HeatTemplateRepository;
+import org.onap.so.db.catalog.data.repository.InstanceGroupRepository;
+import org.onap.so.db.catalog.data.repository.NetworkResourceCustomizationRepository;
+import org.onap.so.db.catalog.data.repository.NetworkResourceRepository;
+import org.onap.so.db.catalog.data.repository.ServiceProxyResourceCustomizationRepository;
+import org.onap.so.db.catalog.data.repository.ServiceRepository;
+import org.onap.so.db.catalog.data.repository.TempNetworkHeatTemplateRepository;
+import org.onap.so.db.catalog.data.repository.VFModuleCustomizationRepository;
+import org.onap.so.db.catalog.data.repository.VFModuleRepository;
+import org.onap.so.db.catalog.data.repository.VnfCustomizationRepository;
+import org.onap.so.db.catalog.data.repository.VnfResourceRepository;
+import org.onap.so.db.catalog.data.repository.VnfcInstanceGroupCustomizationRepository;
+import org.onap.so.db.request.beans.WatchdogComponentDistributionStatus;
+import org.onap.so.db.request.beans.WatchdogDistributionStatus;
+import org.onap.so.db.request.beans.WatchdogServiceModVerIdLookup;
+import org.onap.so.db.request.data.repository.WatchdogComponentDistributionStatusRepository;
+import org.onap.so.db.request.data.repository.WatchdogDistributionStatusRepository;
+import org.onap.so.db.request.data.repository.WatchdogServiceModVerIdLookupRepository;
+import org.onap.so.logger.MessageEnum;
+import org.onap.so.logger.MsoLogger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+@Component
+public class ToscaResourceInstaller {
+
+	protected static final String ALLOTTED_RESOURCE = "Allotted Resource";
+
+	protected static final String MULTI_STAGE_DESIGN = "multi_stage_design";
+
+	protected static final String SCALABLE = "scalable";
+
+	protected static final String BASIC = "BASIC";
+
+	protected static final String PROVIDER = "PROVIDER";
+
+	protected static final String HEAT = "HEAT";
+
+	protected static final String MANUAL_RECORD = "MANUAL_RECORD";
+
+	protected static final String MSO = "SO";
+
+
+	@Autowired
+	protected ServiceRepository serviceRepo;
+	
+	@Autowired
+	protected InstanceGroupRepository instanceGroupRepo;
+	
+	@Autowired
+	protected ServiceProxyResourceCustomizationRepository serviceProxyCustomizationRepo;
+	
+	@Autowired
+	protected CollectionResourceRepository collectionRepo;
+	
+	@Autowired
+	protected CollectionResourceCustomizationRepository collectionCustomizationRepo;
+	
+	@Autowired
+	protected ConfigurationResourceCustomizationRepository configCustomizationRepo;
+
+	@Autowired
+	protected VnfResourceRepository vnfRepo;
+
+	@Autowired
+	protected VnfCustomizationRepository vnfCustomizationRepo;
+	
+	@Autowired
+	protected VFModuleRepository vfModuleRepo;
+
+	@Autowired
+	protected VFModuleCustomizationRepository vfModuleCustomizationRepo;	
+	
+	@Autowired
+	protected VnfcInstanceGroupCustomizationRepository vnfcInstanceGroupCustomizationRepo;	
+
+	@Autowired
+	protected AllottedResourceRepository allottedRepo;
+
+	@Autowired
+	protected AllottedResourceCustomizationRepository allottedCustomizationRepo;
+
+	@Autowired
+	protected NetworkResourceRepository networkRepo;
+	 
+	@Autowired
+	protected HeatTemplateRepository heatRepo;
+
+	@Autowired
+	protected NetworkResourceCustomizationRepository networkCustomizationRepo;
+
+	@Autowired
+	protected WatchdogComponentDistributionStatusRepository watchdogCDStatusRepository;
+	@Autowired
+	protected WatchdogDistributionStatusRepository watchdogDistributionStatusRepository;
+	@Autowired
+	protected WatchdogServiceModVerIdLookupRepository watchdogModVerIdLookupRepository;	
+	
+	@Autowired
+	protected TempNetworkHeatTemplateRepository tempNetworkLookupRepo;
+	
+	@Autowired
+	protected ExternalServiceToInternalServiceRepository externalServiceToInternalServiceRepository;
+	
+	protected static final MsoLogger logger = MsoLogger.getMsoLogger (MsoLogger.Catalog.ASDC,ToscaResourceInstaller.class);
+
+	public boolean isResourceAlreadyDeployed(VfResourceStructure vfResourceStruct) throws ArtifactInstallerException {
+		boolean status = false;
+		VfResourceStructure vfResourceStructure = vfResourceStruct;
+		try {
+		    status = vfResourceStructure.isDeployedSuccessfully();
+		} catch (RuntimeException e) {
+		    status = false;
+		}
+		try {					
+			Service existingService = serviceRepo.findOneByModelUUID(vfResourceStructure.getNotification().getServiceUUID()); 
+			if(existingService != null)
+				status = true;
+			if (status) {
+				logger.info(vfResourceStructure.getResourceInstance().getResourceInstanceName(),
+						vfResourceStructure.getResourceInstance().getResourceCustomizationUUID(),
+						vfResourceStructure.getNotification().getServiceName(),
+						BigDecimalVersion.castAndCheckNotificationVersionToString(
+								vfResourceStructure.getNotification().getServiceVersion()),
+						vfResourceStructure.getNotification().getServiceUUID(),
+						vfResourceStructure.getResourceInstance().getResourceName(), "", "");
+				WatchdogComponentDistributionStatus wdStatus = new WatchdogComponentDistributionStatus(vfResourceStruct.getNotification().getDistributionID(), MSO);
+				wdStatus.setComponentDistributionStatus(DistributionStatusEnum.COMPONENT_DONE_OK.name());
+				watchdogCDStatusRepository.saveAndFlush(wdStatus);
+			} else {			
+				logger.info(vfResourceStructure.getResourceInstance().getResourceInstanceName(),
+						vfResourceStructure.getResourceInstance().getResourceCustomizationUUID(),
+						vfResourceStructure.getNotification().getServiceName(),
+						BigDecimalVersion.castAndCheckNotificationVersionToString(
+								vfResourceStructure.getNotification().getServiceVersion()),
+						vfResourceStructure.getNotification().getServiceUUID(),
+						vfResourceStructure.getResourceInstance().getResourceName(), "", "");
+			}
+			return status;
+		} catch (Exception e) {
+			logger.error(MessageEnum.ASDC_ARTIFACT_CHECK_EXC, "", "", MsoLogger.ErrorCode.SchemaError,
+					"Exception - isResourceAlreadyDeployed");
+			throw new ArtifactInstallerException("Exception caught during checking existence of the VNF Resource.", e);
+		}
+	}
+
+	public void installTheComponentStatus(IStatusData iStatus) throws ArtifactInstallerException {
+		logger.debug("Entering installTheComponentStatus for distributionId " + iStatus.getDistributionID()
+				+ " and ComponentName " + iStatus.getComponentName());
+
+		try {
+			WatchdogComponentDistributionStatus cdStatus = new WatchdogComponentDistributionStatus(iStatus.getDistributionID(),
+					iStatus.getComponentName());
+			cdStatus.setComponentDistributionStatus(iStatus.getStatus().toString());
+			watchdogCDStatusRepository.save(cdStatus);
+
+		} catch (Exception e) {
+			logger.debug("Exception caught in installTheComponentStatus " + e.getMessage());
+			throw new ArtifactInstallerException("Exception caught in installTheComponentStatus " + e.getMessage());
+		}
+	}
+
+	@Transactional(rollbackFor = { ArtifactInstallerException.class })
+	public void installTheResource(ToscaResourceStructure toscaResourceStruct, VfResourceStructure vfResourceStruct)
+			throws ArtifactInstallerException {		
+		VfResourceStructure vfResourceStructure = vfResourceStruct;
+		extractHeatInformation(toscaResourceStruct, vfResourceStructure);	
+
+		// PCLO: in case of deployment failure, use a string that will represent
+		// the type of artifact that failed...
+		List<ASDCElementInfo> artifactListForLogging = new ArrayList<>();
+		try {
+			createToscaCsar(toscaResourceStruct);			
+			createService(toscaResourceStruct, vfResourceStruct);			
+			Service service = toscaResourceStruct.getCatalogService();				
+			List<NodeTemplate> vfNodeTemplatesList = toscaResourceStruct.getSdcCsarHelper().getServiceVfList();
+			
+		
+			for (NodeTemplate nodeTemplate : vfNodeTemplatesList) {	
+				
+				Metadata metadata = nodeTemplate.getMetaData();		
+				String serviceType = toscaResourceStruct.getCatalogService().getServiceType();			
+				String vfCustomizationCategory = toscaResourceStruct.getSdcCsarHelper()
+						.getMetadataPropertyValue(metadata, SdcPropertyNames.PROPERTY_NAME_CATEGORY);
+				processVfModules(toscaResourceStruct, vfResourceStructure, service, nodeTemplate, metadata,
+						vfCustomizationCategory);
+			}
+
+			List<NodeTemplate> allottedResourceList = toscaResourceStruct.getSdcCsarHelper().getAllottedResources();
+			processAllottedResources(toscaResourceStruct, service, allottedResourceList);
+			processNetworks(toscaResourceStruct, service);	
+			// process Network Collections
+			processNetworkCollections(toscaResourceStruct, service);
+			// Process Service Proxy & Configuration
+			processServiceProxyAndConfiguration(toscaResourceStruct, service);
+			
+			serviceRepo.save(service);
+			
+			WatchdogComponentDistributionStatus status = new WatchdogComponentDistributionStatus(vfResourceStruct.getNotification().getDistributionID(), MSO);
+			status.setComponentDistributionStatus(DistributionStatusEnum.COMPONENT_DONE_OK.name());
+			watchdogCDStatusRepository.save(status);
+
+			toscaResourceStruct.setSuccessfulDeployment();
+
+		} catch (Exception e) {
+			logger.debug("Exception :", e);
+			WatchdogComponentDistributionStatus status = new WatchdogComponentDistributionStatus(vfResourceStruct.getNotification().getDistributionID(), MSO);
+			status.setComponentDistributionStatus(DistributionStatusEnum.COMPONENT_DONE_ERROR.name());
+			watchdogCDStatusRepository.save(status);
+			Throwable dbExceptionToCapture = e;
+			while (!(dbExceptionToCapture instanceof ConstraintViolationException
+					|| dbExceptionToCapture instanceof LockAcquisitionException)
+					&& (dbExceptionToCapture.getCause() != null)) {
+				dbExceptionToCapture = dbExceptionToCapture.getCause();
+			}
+
+			if (dbExceptionToCapture instanceof ConstraintViolationException
+					|| dbExceptionToCapture instanceof LockAcquisitionException) {
+				logger.warn(MessageEnum.ASDC_ARTIFACT_ALREADY_DEPLOYED,
+						vfResourceStructure.getResourceInstance().getResourceName(),
+						vfResourceStructure.getNotification().getServiceVersion(), "", MsoLogger.ErrorCode.DataError, "Exception - ASCDC Artifact already deployed", e);
+			} else {
+				String elementToLog = (!artifactListForLogging.isEmpty()
+						? artifactListForLogging.get(artifactListForLogging.size() - 1).toString()
+						: "No element listed");
+				logger.error(MessageEnum.ASDC_ARTIFACT_INSTALL_EXC, elementToLog, "", "", MsoLogger.ErrorCode.DataError,
+						"Exception caught during installation of "
+								+ vfResourceStructure.getResourceInstance().getResourceName()
+								+ ". Transaction rollback",
+						e);
+				throw new ArtifactInstallerException("Exception caught during installation of "
+						+ vfResourceStructure.getResourceInstance().getResourceName() + ". Transaction rollback.", e);
+			}
+		}
+	}
+
+	protected void processNetworks(ToscaResourceStructure toscaResourceStruct, Service service)
+			throws ArtifactInstallerException {
+		List<NodeTemplate> nodeTemplatesVLList = toscaResourceStruct.getSdcCsarHelper().getServiceVlList();
+
+		if (nodeTemplatesVLList != null) {
+			for (NodeTemplate vlNode : nodeTemplatesVLList) {
+				String networkResourceModelName = vlNode.getMetaData()
+						.getValue(SdcPropertyNames.PROPERTY_NAME_NAME);
+				
+				TempNetworkHeatTemplateLookup tempNetworkLookUp = tempNetworkLookupRepo.findFirstBynetworkResourceModelName(networkResourceModelName);
+				
+				if (tempNetworkLookUp != null ) {					
+						HeatTemplate heatTemplate =  heatRepo.findByArtifactUuid(tempNetworkLookUp.getHeatTemplateArtifactUuid());
+						if (heatTemplate != null ) {
+						NetworkResourceCustomization networkCustomization = createNetwork(vlNode, toscaResourceStruct, heatTemplate,tempNetworkLookUp.getAicVersionMax(),
+							tempNetworkLookUp.getAicVersionMin(),service);
+						service.getNetworkCustomizations()
+						.add(networkCustomization);
+					}
+					else{
+						throw new ArtifactInstallerException(					
+							"No HeatTemplate found for artifactUUID: "
+									+ tempNetworkLookUp.getHeatTemplateArtifactUuid());
+					}
+				} else {
+					throw new ArtifactInstallerException(
+							"No NetworkResourceName found in TempNetworkHeatTemplateLookup for "
+									+ networkResourceModelName);
+				}					
+				
+			}
+		}
+	}
+
+	protected void processAllottedResources(ToscaResourceStructure toscaResourceStruct, Service service,
+			List<NodeTemplate> allottedResourceList) {
+		if (allottedResourceList != null) {
+			for (NodeTemplate allottedNode : allottedResourceList) {									
+				service.getAllottedCustomizations()
+						.add(createAllottedResource(allottedNode, toscaResourceStruct, service));				
+			}
+		}
+	}
+	
+	protected void processServiceProxyAndConfiguration(ToscaResourceStructure toscaResourceStruct, Service service) {
+		
+		List<NodeTemplate> serviceProxyResourceList = toscaResourceStruct.getSdcCsarHelper().getServiceNodeTemplateBySdcType(SdcTypes.SERVICE_PROXY);
+		
+		List<NodeTemplate> configurationNodeTemplatesList = toscaResourceStruct.getSdcCsarHelper().getServiceNodeTemplateBySdcType(SdcTypes.CONFIGURATION);
+		
+		if (serviceProxyResourceList != null) {
+			for (NodeTemplate spNode : serviceProxyResourceList) {
+				createServiceProxy(spNode, service, toscaResourceStruct);
+				serviceProxyCustomizationRepo.saveAndFlush(toscaResourceStruct.getCatalogServiceProxyResourceCustomization());	
+
+				for (NodeTemplate configNode : configurationNodeTemplatesList) {
+					
+						List<RequirementAssignment> requirementsList = toscaResourceStruct.getSdcCsarHelper().getRequirementsOf(configNode).getAll();
+						for (RequirementAssignment requirement :  requirementsList) {
+							if (requirement.getNodeTemplateName().equals(spNode.getName())) {
+								createConfiguration(configNode, toscaResourceStruct, toscaResourceStruct.getCatalogServiceProxyResourceCustomization());
+								configCustomizationRepo.saveAndFlush(toscaResourceStruct.getCatalogConfigurationResourceCustomization());	
+								break;
+							}
+						}
+				}
+	
+			}
+		}
+	}
+	
+	protected void processNetworkCollections(ToscaResourceStructure toscaResourceStruct, Service service) {
+		
+		List<NodeTemplate> networkCollectionList = toscaResourceStruct.getSdcCsarHelper().getServiceNodeTemplateBySdcType(SdcTypes.CR);
+		
+		if (networkCollectionList != null) {
+			for (NodeTemplate crNode : networkCollectionList) {	
+				
+				createNetworkCollection(crNode, toscaResourceStruct, service);
+				collectionRepo.saveAndFlush(toscaResourceStruct.getCatalogCollectionResource());
+				
+				List<NetworkInstanceGroup> networkInstanceGroupList = toscaResourceStruct.getCatalogNetworkInstanceGroup();
+				for(NetworkInstanceGroup networkInstanceGroup : networkInstanceGroupList){
+					instanceGroupRepo.saveAndFlush(networkInstanceGroup);
+				}
+	
+			}
+		}
+		service.getCollectionResourceCustomizations().add(toscaResourceStruct.getCatalogCollectionResourceCustomization());
+	}
+
+	protected void processVfModules(ToscaResourceStructure toscaResourceStruct, VfResourceStructure vfResourceStructure,
+			Service service, NodeTemplate nodeTemplate, Metadata metadata, String vfCustomizationCategory) throws Exception {
+		if (!vfCustomizationCategory.equalsIgnoreCase(ALLOTTED_RESOURCE)) 
+		{
+
+			String vfCustomizationUUID = toscaResourceStruct.getSdcCsarHelper()
+					.getMetadataPropertyValue(metadata, SdcPropertyNames.PROPERTY_NAME_CUSTOMIZATIONUUID);
+			logger.debug("vfCustomizationUUID=" + vfCustomizationUUID);					
+			
+			VnfResourceCustomization vnfResource = createVnfResource(nodeTemplate, toscaResourceStruct, service);	
+			
+			for (VfModuleStructure vfModuleStructure : vfResourceStructure.getVfModuleStructure()) {			
+				logger.debug("vfModuleStructure:" + vfModuleStructure.toString());
+				List<org.onap.sdc.toscaparser.api.Group> vfGroups = toscaResourceStruct
+						.getSdcCsarHelper().getVfModulesByVf(vfCustomizationUUID);
+				IVfModuleData vfMetadata = vfModuleStructure.getVfModuleMetadata();		
+				Optional<org.onap.sdc.toscaparser.api.Group> matchingObject = vfGroups.stream().
+					    filter(group -> group.getMetadata().getValue("vfModuleModelCustomizationUUID").equals(vfMetadata.getVfModuleModelCustomizationUUID())).
+					    findFirst();
+				if(matchingObject.isPresent()){
+					VfModuleCustomization vfModuleCustomization = createVFModuleResource(matchingObject.get(), nodeTemplate, toscaResourceStruct, vfResourceStructure,vfMetadata, vnfResource);
+					vfModuleCustomization.getVfModule().setVnfResources(vnfResource.getVnfResources());
+				}else
+					throw (new Exception("Cannot find matching VFModule Customization"));
+				
+			}
+			service.getVnfCustomizations().add(vnfResource);
+		}
+	}
+
+	protected void processFlexware(ToscaResourceStructure toscaResourceStruct, Service service, NodeTemplate nodeTemplate,
+			String serviceType) {
+		if (serviceType != null && serviceType.equalsIgnoreCase("Flexware")) {
+
+			createVnfResource(nodeTemplate, toscaResourceStruct, service);
+			String modelName = toscaResourceStruct.getVnfResourceCustomization().getVnfResources().getModelName();
+			
+			String modelVersion = BigDecimalVersion.castAndCheckNotificationVersionToString(
+					toscaResourceStruct.getCatalogVnfResourceCustomization().getVnfResources().getModelVersion());
+			// check for duplicate record already in the database
+			VnfResource vnfResource = vnfRepo.findByModelNameAndModelVersion(modelName, modelVersion);
+
+			if (vnfResource != null) {
+				toscaResourceStruct.setVnfAlreadyInstalled(true);
+			}
+
+			vnfCustomizationRepo.saveAndFlush(toscaResourceStruct.getCatalogVnfResourceCustomization());					
+		}
+	}
+
+	public void processWatchdog(String distributionId, String servideUUID) {
+		WatchdogServiceModVerIdLookup modVerIdLookup = new WatchdogServiceModVerIdLookup(distributionId,servideUUID);
+		watchdogModVerIdLookupRepository.saveAndFlush(modVerIdLookup);
+		
+		WatchdogDistributionStatus distributionStatus = new WatchdogDistributionStatus(distributionId);
+		watchdogDistributionStatusRepository.saveAndFlush(distributionStatus);
+	}
+
+	protected void extractHeatInformation(ToscaResourceStructure toscaResourceStruct,
+			VfResourceStructure vfResourceStructure) {
+		for (VfModuleArtifact vfModuleArtifact : vfResourceStructure.getArtifactsMapByUUID().values()) {
+
+			switch (vfModuleArtifact.getArtifactInfo().getArtifactType()) {
+			case ASDCConfiguration.HEAT:
+			case ASDCConfiguration.HEAT_NESTED:
+				createHeatTemplateFromArtifact(vfResourceStructure, toscaResourceStruct,
+						vfModuleArtifact);
+				break;
+			case ASDCConfiguration.HEAT_VOL:
+				createHeatTemplateFromArtifact(vfResourceStructure, toscaResourceStruct,
+						vfModuleArtifact);
+				VfModuleArtifact envModuleArtifact = getHeatEnvArtifactFromGeneratedArtifact(vfResourceStructure, vfModuleArtifact);
+				createHeatEnvFromArtifact(vfResourceStructure, envModuleArtifact);
+				break;
+			case ASDCConfiguration.HEAT_ENV:
+				createHeatEnvFromArtifact(vfResourceStructure, vfModuleArtifact);
+				break;
+			case ASDCConfiguration.HEAT_ARTIFACT:
+				createHeatFileFromArtifact(vfResourceStructure, vfModuleArtifact,
+						toscaResourceStruct);
+				break;
+			case ASDCConfiguration.HEAT_NET:
+			case ASDCConfiguration.OTHER:
+				logger.warn(MessageEnum.ASDC_ARTIFACT_TYPE_NOT_SUPPORT,
+						vfModuleArtifact.getArtifactInfo().getArtifactType() + "(Artifact Name:"
+								+ vfModuleArtifact.getArtifactInfo().getArtifactName() + ")",
+						"", "", MsoLogger.ErrorCode.DataError, "Artifact type not supported");
+				break;
+			default:
+				break;
+
+			}
+		}
+	}
+
+	protected VfModuleArtifact getHeatEnvArtifactFromGeneratedArtifact(VfResourceStructure vfResourceStructure,
+			VfModuleArtifact vfModuleArtifact) {
+		String artifactName = vfModuleArtifact.getArtifactInfo().getArtifactName();
+		artifactName = artifactName.substring(0, artifactName.indexOf('.'));
+		for (VfModuleArtifact moduleArtifact : vfResourceStructure.getArtifactsMapByUUID().values()) {
+			if (moduleArtifact.getArtifactInfo().getArtifactName().contains(artifactName)
+					&& moduleArtifact.getArtifactInfo().getArtifactType().equals(ASDCConfiguration.HEAT_ENV)) {
+				return moduleArtifact;
+			}
+		}
+		return null;
+	}
+
+	public String verifyTheFilePrefixInArtifacts(String filebody, VfResourceStructure vfResourceStructure,
+			List<String> listTypes) {
+		String newFileBody = filebody;
+		for (VfModuleArtifact moduleArtifact : vfResourceStructure.getArtifactsMapByUUID().values()) {
+
+			if (listTypes.contains(moduleArtifact.getArtifactInfo().getArtifactType())) {
+
+				newFileBody = verifyTheFilePrefixInString(newFileBody,
+						moduleArtifact.getArtifactInfo().getArtifactName());
+			}
+		}
+		return newFileBody;
+	}
+
+	public String verifyTheFilePrefixInString(final String body, final String filenameToVerify) {
+
+		String needlePrefix = "file:///";
+		String prefixedFilenameToVerify = needlePrefix + filenameToVerify;
+
+		if ((body == null) || (body.length() == 0) || (filenameToVerify == null) || (filenameToVerify.length() == 0)) {
+			return body;
+		}
+
+		StringBuilder sb = new StringBuilder(body.length());
+
+		int currentIndex = 0;
+		int startIndex = 0;
+
+		while (currentIndex != -1) {
+			startIndex = currentIndex;
+			currentIndex = body.indexOf(prefixedFilenameToVerify, startIndex);
+
+			if (currentIndex == -1) {
+				break;
+			}
+			// We append from the startIndex up to currentIndex (start of File
+			// Name)
+			sb.append(body.substring(startIndex, currentIndex));
+			sb.append(filenameToVerify);
+
+			currentIndex += prefixedFilenameToVerify.length();
+		}
+
+		sb.append(body.substring(startIndex));
+
+		return sb.toString();
+	}
+
+	protected void createHeatTemplateFromArtifact(VfResourceStructure vfResourceStructure,
+			ToscaResourceStructure toscaResourceStruct, VfModuleArtifact vfModuleArtifact) {
+		HeatTemplate heatTemplate = new HeatTemplate();
+		List<String> typeList = new ArrayList<>();
+		typeList.add(ASDCConfiguration.HEAT_NESTED);
+		typeList.add(ASDCConfiguration.HEAT_ARTIFACT);
+
+		heatTemplate.setTemplateBody(
+				verifyTheFilePrefixInArtifacts(vfModuleArtifact.getResult(), vfResourceStructure, typeList));
+		heatTemplate.setTemplateName(vfModuleArtifact.getArtifactInfo().getArtifactName());
+
+		if (vfModuleArtifact.getArtifactInfo().getArtifactTimeout() != null) {
+			heatTemplate.setTimeoutMinutes(vfModuleArtifact.getArtifactInfo().getArtifactTimeout());
+		} else {
+			heatTemplate.setTimeoutMinutes(240);
+		}
+
+		heatTemplate.setDescription(vfModuleArtifact.getArtifactInfo().getArtifactDescription());
+		heatTemplate.setVersion(BigDecimalVersion
+				.castAndCheckNotificationVersionToString(vfModuleArtifact.getArtifactInfo().getArtifactVersion()));
+		heatTemplate.setArtifactUuid(vfModuleArtifact.getArtifactInfo().getArtifactUUID());
+
+		if (vfModuleArtifact.getArtifactInfo().getArtifactChecksum() != null) {
+			heatTemplate.setArtifactChecksum(vfModuleArtifact.getArtifactInfo().getArtifactChecksum());
+		} else {
+			heatTemplate.setArtifactChecksum(MANUAL_RECORD);
+		}
+
+		Set<HeatTemplateParam> heatParam = extractHeatTemplateParameters(
+				vfModuleArtifact.getResult(), vfModuleArtifact.getArtifactInfo().getArtifactUUID());
+		heatTemplate.setParameters(heatParam);	
+		vfModuleArtifact.setHeatTemplate(heatTemplate);
+	}
+
+	protected void createHeatEnvFromArtifact(VfResourceStructure vfResourceStructure,
+			VfModuleArtifact vfModuleArtifact) {
+		HeatEnvironment heatEnvironment = new HeatEnvironment();
+		heatEnvironment.setName(vfModuleArtifact.getArtifactInfo().getArtifactName());
+		List<String> typeList = new ArrayList<>();
+		typeList.add(ASDCConfiguration.HEAT);
+		typeList.add(ASDCConfiguration.HEAT_VOL);
+		heatEnvironment.setEnvironment(
+				verifyTheFilePrefixInArtifacts(vfModuleArtifact.getResult(), vfResourceStructure, typeList));
+		heatEnvironment.setDescription(vfModuleArtifact.getArtifactInfo().getArtifactDescription());
+		heatEnvironment.setVersion(BigDecimalVersion
+				.castAndCheckNotificationVersionToString(vfModuleArtifact.getArtifactInfo().getArtifactVersion()));	
+		heatEnvironment.setArtifactUuid(vfModuleArtifact.getArtifactInfo().getArtifactUUID());
+
+		if (vfModuleArtifact.getArtifactInfo().getArtifactChecksum() != null) {
+			heatEnvironment.setArtifactChecksum(vfModuleArtifact.getArtifactInfo().getArtifactChecksum());
+		} else {
+			heatEnvironment.setArtifactChecksum(MANUAL_RECORD);
+		}		
+		vfModuleArtifact.setHeatEnvironment(heatEnvironment);
+	}
+
+	protected void createHeatFileFromArtifact(VfResourceStructure vfResourceStructure,
+		VfModuleArtifact vfModuleArtifact, ToscaResourceStructure toscaResourceStruct) {
+		
+		HeatFiles heatFile = new HeatFiles();	
+		heatFile.setAsdcUuid(vfModuleArtifact.getArtifactInfo().getArtifactUUID());
+		heatFile.setDescription(vfModuleArtifact.getArtifactInfo().getArtifactDescription());
+		heatFile.setFileBody(vfModuleArtifact.getResult());
+		heatFile.setFileName(vfModuleArtifact.getArtifactInfo().getArtifactName());
+		heatFile.setVersion(BigDecimalVersion
+				.castAndCheckNotificationVersionToString(vfModuleArtifact.getArtifactInfo().getArtifactVersion()));
+		toscaResourceStruct.setHeatFilesUUID(vfModuleArtifact.getArtifactInfo().getArtifactUUID());
+		if (vfModuleArtifact.getArtifactInfo().getArtifactChecksum() != null) {
+			heatFile.setArtifactChecksum(vfModuleArtifact.getArtifactInfo().getArtifactChecksum());
+		} else {
+			heatFile.setArtifactChecksum(MANUAL_RECORD);
+		}
+		vfModuleArtifact.setHeatFiles(heatFile);
+	}
+
+	protected Service createService(ToscaResourceStructure toscaResourceStructure,
+			VfResourceStructure vfResourceStructure) {
+
+		toscaResourceStructure.getServiceMetadata();
+
+		Metadata serviceMetadata = toscaResourceStructure.getServiceMetadata();
+
+		Service service = new Service();
+
+		if (serviceMetadata != null) {
+
+			if (toscaResourceStructure.getServiceVersion() != null) {
+				service.setModelVersion(toscaResourceStructure.getServiceVersion());
+			}
+
+			service.setServiceType(serviceMetadata.getValue("serviceType"));
+			service.setServiceRole(serviceMetadata.getValue("serviceRole"));
+
+			service.setDescription(serviceMetadata.getValue(SdcPropertyNames.PROPERTY_NAME_DESCRIPTION));
+			service.setModelName(serviceMetadata.getValue(SdcPropertyNames.PROPERTY_NAME_NAME));
+			service.setModelUUID(serviceMetadata.getValue(SdcPropertyNames.PROPERTY_NAME_UUID));
+			service.setEnvironmentContext(serviceMetadata.getValue("environmentContext"));
+
+			if (vfResourceStructure != null) 
+				service.setWorkloadContext(vfResourceStructure.getNotification().getWorkloadContext());
+						
+			service.setModelInvariantUUID(serviceMetadata.getValue(SdcPropertyNames.PROPERTY_NAME_INVARIANTUUID));
+			service.setCsar(toscaResourceStructure.getCatalogToscaCsar());			
+		}
+		
+		
+		toscaResourceStructure.setCatalogService(service); 
+		return service;
+	}
+	
+	protected ServiceProxyResourceCustomization createServiceProxy(NodeTemplate nodeTemplate, Service service, ToscaResourceStructure toscaResourceStructure) {
+
+		Metadata spMetadata = nodeTemplate.getMetaData();
+		
+		ServiceProxyResource spResource = new ServiceProxyResource();
+		
+		spResource.setModelName(spMetadata.getValue(SdcPropertyNames.PROPERTY_NAME_NAME));
+		spResource.setModelInvariantUUID(spMetadata.getValue(SdcPropertyNames.PROPERTY_NAME_INVARIANTUUID));
+		spResource.setModelUUID(spMetadata.getValue(SdcPropertyNames.PROPERTY_NAME_UUID));
+		spResource.setModelVersion(spMetadata.getValue(SdcPropertyNames.PROPERTY_NAME_VERSION));
+		spResource.setDescription(spMetadata.getValue(SdcPropertyNames.PROPERTY_NAME_DESCRIPTION));	
+		
+		ServiceProxyResourceCustomization spCustomizationResource = new ServiceProxyResourceCustomization();
+		
+		Set<ServiceProxyResourceCustomization> serviceProxyCustomizationSet = new HashSet<>();
+		
+		spCustomizationResource.setModelCustomizationUUID(spMetadata.getValue(SdcPropertyNames.PROPERTY_NAME_CUSTOMIZATIONUUID));
+		spCustomizationResource.setModelInstanceName(nodeTemplate.getName());
+		spCustomizationResource.setToscaNodeType(nodeTemplate.getType());
+		spCustomizationResource.setSourceService(service);
+		spCustomizationResource.setServiceProxyResource(spResource);
+		spCustomizationResource.setToscaNodeType(nodeTemplate.getType());
+		spCustomizationResource.setServiceProxyResource(spResource);
+		serviceProxyCustomizationSet.add(spCustomizationResource);
+
+		
+		spResource.setServiceProxyCustomization(serviceProxyCustomizationSet); 		
+		
+		toscaResourceStructure.setCatalogServiceProxyResource(spResource);
+		
+		toscaResourceStructure.setCatalogServiceProxyResourceCustomization(spCustomizationResource);
+		
+		return spCustomizationResource;
+	}
+	
+	protected ConfigurationResourceCustomization createConfiguration(NodeTemplate nodeTemplate, ToscaResourceStructure toscaResourceStructure, ServiceProxyResourceCustomization spResourceCustomization) {
+
+		Metadata metadata = nodeTemplate.getMetaData();
+		
+		ConfigurationResource configResource = new ConfigurationResource();
+		
+		configResource.setModelName(metadata.getValue(SdcPropertyNames.PROPERTY_NAME_NAME));
+		configResource.setModelInvariantUUID(metadata.getValue(SdcPropertyNames.PROPERTY_NAME_INVARIANTUUID));
+		configResource.setModelUUID(metadata.getValue(SdcPropertyNames.PROPERTY_NAME_UUID));
+		configResource.setModelVersion(metadata.getValue(SdcPropertyNames.PROPERTY_NAME_VERSION));
+		configResource.setDescription(metadata.getValue(SdcPropertyNames.PROPERTY_NAME_DESCRIPTION));
+		configResource.setToscaNodeType(nodeTemplate.getType());
+		
+		ConfigurationResourceCustomization configCustomizationResource = new ConfigurationResourceCustomization();
+		
+		Set<ConfigurationResourceCustomization> configResourceCustomizationSet = new HashSet<>();
+		
+		configCustomizationResource.setModelCustomizationUUID(metadata.getValue(SdcPropertyNames.PROPERTY_NAME_CUSTOMIZATIONUUID));
+		configCustomizationResource.setModelInstanceName(nodeTemplate.getName());
+		
+		configCustomizationResource.setNfFunction(toscaResourceStructure.getSdcCsarHelper().getNodeTemplatePropertyLeafValue(nodeTemplate, SdcPropertyNames.PROPERTY_NAME_NFFUNCTION));
+		configCustomizationResource.setNfRole(toscaResourceStructure.getSdcCsarHelper().getNodeTemplatePropertyLeafValue(nodeTemplate, SdcPropertyNames.PROPERTY_NAME_NFROLE));
+		configCustomizationResource.setNfType(toscaResourceStructure.getSdcCsarHelper().getNodeTemplatePropertyLeafValue(nodeTemplate, SdcPropertyNames.PROPERTY_NAME_NFTYPE));
+		configCustomizationResource.setServiceProxyResourceCustomization(spResourceCustomization);
+		configCustomizationResource.setConfigResourceCustomization(configCustomizationResource);
+		configCustomizationResource.setConfigurationResource(configResource);
+		configResourceCustomizationSet.add(configCustomizationResource);
+
+		configResource.setConfigurationResourceCustomization(configResourceCustomizationSet); 	
+		
+		toscaResourceStructure.setCatalogConfigurationResource(configResource);
+		
+		toscaResourceStructure.setCatalogConfigurationResourceCustomization(configCustomizationResource);
+		
+		return configCustomizationResource;
+	}
+
+
+	protected void createToscaCsar(ToscaResourceStructure toscaResourceStructure) {
+		ToscaCsar toscaCsar = new ToscaCsar();
+		if (toscaResourceStructure.getToscaArtifact().getArtifactChecksum() != null) {
+			toscaCsar.setArtifactChecksum(toscaResourceStructure.getToscaArtifact().getArtifactChecksum());
+		} else {
+			toscaCsar.setArtifactChecksum(MANUAL_RECORD);
+		}
+		toscaCsar.setArtifactUUID(toscaResourceStructure.getToscaArtifact().getArtifactUUID());
+		toscaCsar.setName(toscaResourceStructure.getToscaArtifact().getArtifactName());
+		toscaCsar.setVersion(toscaResourceStructure.getToscaArtifact().getArtifactVersion());
+		toscaCsar.setDescription(toscaResourceStructure.getToscaArtifact().getArtifactDescription());
+		toscaCsar.setUrl(toscaResourceStructure.getToscaArtifact().getArtifactURL());
+
+		toscaResourceStructure.setCatalogToscaCsar(toscaCsar);
+	}
+
+	protected  NetworkResourceCustomization createNetwork(NodeTemplate networkNodeTemplate,
+			ToscaResourceStructure toscaResourceStructure, HeatTemplate heatTemplate, String aicMax, String aicMin,Service service) {
+		
+		NetworkResourceCustomization networkResourceCustomization=networkCustomizationRepo.findOneByModelCustomizationUUID(networkNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_CUSTOMIZATIONUUID));
+				if(networkResourceCustomization==null){
+			networkResourceCustomization = createNetworkResourceCustomization(networkNodeTemplate,
+					toscaResourceStructure);
+					
+			NetworkResource networkResource = findExistingNetworkResource(service,
+					networkNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_UUID));
+					if(networkResource == null)
+				networkResource = createNetworkResource(networkNodeTemplate, toscaResourceStructure, heatTemplate,
+						aicMax, aicMin);
+
+					networkResource.addNetworkResourceCustomization(networkResourceCustomization);		
+					networkResourceCustomization.setNetworkResource(networkResource);
+				}
+		return networkResourceCustomization;
+	}
+	
+	protected  NetworkResource findExistingNetworkResource(Service service, String modelUUID) {
+		NetworkResource networkResource = null;
+		for(NetworkResourceCustomization networkCustom : service.getNetworkCustomizations()){
+			if (networkCustom.getNetworkResource() != null
+					&& networkCustom.getNetworkResource().getModelUUID().equals(modelUUID)) {
+					networkResource = networkCustom.getNetworkResource();
+			}
+		}
+		if(networkResource==null)
+			networkResource = networkRepo.findResourceByModelUUID(modelUUID);
+		
+		return networkResource;
+	}
+	
+	protected NetworkResourceCustomization createNetworkResourceCustomization(NodeTemplate networkNodeTemplate,
+			ToscaResourceStructure toscaResourceStructure) {
+		NetworkResourceCustomization networkResourceCustomization = new NetworkResourceCustomization();
+		networkResourceCustomization.setModelInstanceName(
+				testNull(networkNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_NAME)));
+		networkResourceCustomization.setModelCustomizationUUID(
+				testNull(networkNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_CUSTOMIZATIONUUID)));		
+
+		networkResourceCustomization.setNetworkTechnology(
+				testNull(toscaResourceStructure.getSdcCsarHelper().getNodeTemplatePropertyLeafValue(networkNodeTemplate,
+						SdcPropertyNames.PROPERTY_NAME_NETWORKTECHNOLOGY)));
+		networkResourceCustomization.setNetworkType(testNull(toscaResourceStructure.getSdcCsarHelper()
+				.getNodeTemplatePropertyLeafValue(networkNodeTemplate, SdcPropertyNames.PROPERTY_NAME_NETWORKTYPE)));
+		networkResourceCustomization.setNetworkRole(testNull(toscaResourceStructure.getSdcCsarHelper()
+				.getNodeTemplatePropertyLeafValue(networkNodeTemplate, SdcPropertyNames.PROPERTY_NAME_NETWORKROLE)));
+		networkResourceCustomization.setNetworkScope(testNull(toscaResourceStructure.getSdcCsarHelper()
+				.getNodeTemplatePropertyLeafValue(networkNodeTemplate, SdcPropertyNames.PROPERTY_NAME_NETWORKSCOPE)));
+		return networkResourceCustomization;
+	}
+
+	protected NetworkResource createNetworkResource(NodeTemplate networkNodeTemplate,
+			ToscaResourceStructure toscaResourceStructure, HeatTemplate heatTemplate, String aicMax, String aicMin) {
+		NetworkResource networkResource = new NetworkResource();
+		String providerNetwork = toscaResourceStructure.getSdcCsarHelper().getNodeTemplatePropertyLeafValue(
+				networkNodeTemplate, SdcPropertyNames.PROPERTY_NAME_PROVIDERNETWORK_ISPROVIDERNETWORK);
+
+		if ("true".equalsIgnoreCase(providerNetwork)) {
+			networkResource.setNeutronNetworkType(PROVIDER);
+		} else {
+			networkResource.setNeutronNetworkType(BASIC);
+		}
+
+		networkResource.setModelName(
+				testNull(networkNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_NAME)));
+
+		networkResource.setModelInvariantUUID(
+				testNull(networkNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_INVARIANTUUID)));
+		networkResource.setModelUUID(
+				testNull(networkNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_UUID)));
+		networkResource.setModelVersion(
+				testNull(networkNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_VERSION)));
+
+		networkResource.setAicVersionMax(aicMax);		
+		networkResource.setAicVersionMin(aicMin);
+		networkResource.setToscaNodeType(networkNodeTemplate.getType());
+		networkResource.setDescription(
+				testNull(networkNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_DESCRIPTION)));
+		networkResource.setOrchestrationMode(HEAT);	
+		networkResource.setHeatTemplate(heatTemplate); 
+		return networkResource;
+	}
+	
+	protected  CollectionNetworkResourceCustomization createNetworkCollection(NodeTemplate networkNodeTemplate,
+			ToscaResourceStructure toscaResourceStructure, Service service) {
+
+		CollectionNetworkResourceCustomization collectionNetworkResourceCustomization = new CollectionNetworkResourceCustomization();
+
+		// **** Build Object to populate Collection_Resource table
+		CollectionResource collectionResource = new CollectionResource();
+
+		collectionResource
+				.setModelName(networkNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_NAME));
+		collectionResource.setModelInvariantUUID(
+				networkNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_INVARIANTUUID));
+		collectionResource
+				.setModelUUID(networkNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_UUID));
+		collectionResource
+				.setModelVersion(networkNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_VERSION));
+		collectionResource
+				.setDescription(networkNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_DESCRIPTION));
+		collectionResource.setToscaNodeType(networkNodeTemplate.getType());
+
+		toscaResourceStructure.setCatalogCollectionResource(collectionResource);
+
+		// **** Build object to populate Collection_Resource_Customization table
+		NetworkCollectionResourceCustomization ncfc = new NetworkCollectionResourceCustomization();
+		
+		ncfc.setFunction(toscaResourceStructure.getSdcCsarHelper().getNodeTemplatePropertyLeafValue(networkNodeTemplate,
+				"cr_function"));
+		ncfc.setRole(toscaResourceStructure.getSdcCsarHelper().getNodeTemplatePropertyLeafValue(networkNodeTemplate,
+				"cr_role"));
+		ncfc.setType(toscaResourceStructure.getSdcCsarHelper().getNodeTemplatePropertyLeafValue(networkNodeTemplate,
+				"cr_type"));
+
+		ncfc.setModelInstanceName(networkNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_NAME));
+		ncfc.setModelCustomizationUUID(
+				networkNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_CUSTOMIZATIONUUID));
+		
+		Set<CollectionNetworkResourceCustomization> networkResourceCustomizationSet = new HashSet<>();
+		networkResourceCustomizationSet.add(collectionNetworkResourceCustomization);
+
+		ncfc.setNetworkResourceCustomization(networkResourceCustomizationSet);
+
+		ncfc.setCollectionResource(collectionResource);
+		toscaResourceStructure.setCatalogCollectionResourceCustomization(ncfc);
+		
+		//*** Build object to populate the Instance_Group table
+		List<Group> groupList = toscaResourceStructure.getSdcCsarHelper()
+				.getGroupsOfOriginOfNodeTemplateByToscaGroupType(networkNodeTemplate,
+						"org.openecomp.groups.NetworkCollection");
+		
+		List<NetworkInstanceGroup> networkInstanceGroupList = new ArrayList<>();
+
+		List<CollectionResourceInstanceGroupCustomization> collectionResourceInstanceGroupCustomizationList = new ArrayList<CollectionResourceInstanceGroupCustomization>();
+
+		for (Group group : groupList) { 
+			
+			NetworkInstanceGroup networkInstanceGroup = new NetworkInstanceGroup();
+			Metadata instanceMetadata = group.getMetadata();
+			networkInstanceGroup.setModelName(instanceMetadata.getValue(SdcPropertyNames.PROPERTY_NAME_NAME));
+			networkInstanceGroup
+					.setModelInvariantUUID(instanceMetadata.getValue(SdcPropertyNames.PROPERTY_NAME_INVARIANTUUID));
+			networkInstanceGroup.setModelUUID(instanceMetadata.getValue(SdcPropertyNames.PROPERTY_NAME_UUID));
+			networkInstanceGroup.setModelVersion(instanceMetadata.getValue(SdcPropertyNames.PROPERTY_NAME_VERSION));
+			networkInstanceGroup.setToscaNodeType(group.getType());
+			networkInstanceGroup.setRole(SubType.SUB_INTERFACE.toString()); // Set
+																			// Role
+			networkInstanceGroup.setType(InstanceGroupType.L3_NETWORK); // Set
+																		// type
+			networkInstanceGroup.setCollectionResource(collectionResource);
+		
+			// ****Build object to populate
+			// Collection_Resource_Instance_Group_Customization table
+			CollectionResourceInstanceGroupCustomization crInstanceGroupCustomization = new CollectionResourceInstanceGroupCustomization();
+			crInstanceGroupCustomization.setInstanceGroup(networkInstanceGroup);
+			crInstanceGroupCustomization.setModelUUID(instanceMetadata.getValue(SdcPropertyNames.PROPERTY_NAME_UUID));
+			crInstanceGroupCustomization.setModelCustomizationUUID(
+					networkNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_CUSTOMIZATIONUUID));
+		
+			String quantityName = instanceMetadata.getValue(SdcPropertyNames.PROPERTY_NAME_NAME);
+			String fixedQuantity = quantityName.replace("NetworkCollection", "Fixed");
+			if (toscaResourceStructure.getSdcCsarHelper().getNodeTemplatePropertyLeafValue(networkNodeTemplate,
+					fixedQuantity + "_quantity") != null) {
+
+				crInstanceGroupCustomization.setSubInterfaceNetworkQuantity(Integer.parseInt(
+						toscaResourceStructure.getSdcCsarHelper().getNodeTemplatePropertyLeafValue(networkNodeTemplate,
+								fixedQuantity + "_quantity"))); 
+			}
+		
+			crInstanceGroupCustomization.setDescription(
+					toscaResourceStructure.getSdcCsarHelper().getNodeTemplatePropertyLeafValue(networkNodeTemplate,
+							instanceMetadata.getValue(SdcPropertyNames.PROPERTY_NAME_NAME)
+									+ "_network_collection_description"));
+			crInstanceGroupCustomization.setFunction(
+					toscaResourceStructure.getSdcCsarHelper().getNodeTemplatePropertyLeafValue(networkNodeTemplate,
+							instanceMetadata.getValue(SdcPropertyNames.PROPERTY_NAME_NAME)
+									+ "_network_collection_function"));
+			crInstanceGroupCustomization.setCollectionResourceCust(ncfc);
+			collectionResourceInstanceGroupCustomizationList.add(crInstanceGroupCustomization);
+
+			networkInstanceGroup
+					.setCollectionInstanceGroupCustomizations(collectionResourceInstanceGroupCustomizationList);
+
+			networkInstanceGroupList.add(networkInstanceGroup);
+
+		//}
+
+		toscaResourceStructure.setCatalogNetworkInstanceGroup(networkInstanceGroupList);
+
+		List<NodeTemplate> vlNodeList = toscaResourceStructure.getSdcCsarHelper()
+				.getNodeTemplateBySdcType(networkNodeTemplate, SdcTypes.VL);
+		
+		List<CollectionNetworkResourceCustomization> collectionNetworkResourceCustomizationList = new ArrayList<>();
+		
+		//*****Build object to populate the NetworkResource table
+		NetworkResource networkResource = new NetworkResource();
+		
+		for(NodeTemplate vlNodeTemplate : vlNodeList){
+
+			String providerNetwork = toscaResourceStructure.getSdcCsarHelper().getNodeTemplatePropertyLeafValue(
+					vlNodeTemplate, SdcPropertyNames.PROPERTY_NAME_PROVIDERNETWORK_ISPROVIDERNETWORK);
+
+			if ("true".equalsIgnoreCase(providerNetwork)) {
+				networkResource.setNeutronNetworkType(PROVIDER);
+			} else {
+				networkResource.setNeutronNetworkType(BASIC);
+			}
+
+			networkResource.setModelName(vlNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_NAME));
+
+			networkResource.setModelInvariantUUID(
+					vlNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_INVARIANTUUID));
+			networkResource.setModelUUID(vlNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_UUID));
+			networkResource
+					.setModelVersion(vlNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_VERSION));
+
+			networkResource.setAicVersionMax(
+					vlNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_MAXINSTANCES));
+			
+			TempNetworkHeatTemplateLookup tempNetworkLookUp = tempNetworkLookupRepo.findFirstBynetworkResourceModelName(
+					vlNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_NAME));
+			
+			if (tempNetworkLookUp != null ) {	
+					
+				HeatTemplate heatTemplate = heatRepo
+						.findByArtifactUuid(tempNetworkLookUp.getHeatTemplateArtifactUuid());
+					networkResource.setHeatTemplate(heatTemplate);
+					
+					networkResource.setAicVersionMin(tempNetworkLookUp.getAicVersionMin());
+					
+			}
+
+			networkResource.setToscaNodeType(vlNodeTemplate.getType());
+			networkResource
+					.setDescription(vlNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_DESCRIPTION));
+			networkResource.setOrchestrationMode(HEAT);
+			
+			// Build object to populate the
+			// Collection_Network_Resource_Customization table
+			for (NodeTemplate memberNode : group.getMemberNodes()) {
+				collectionNetworkResourceCustomization.setModelInstanceName(memberNode.getName());
+			}
+
+			collectionNetworkResourceCustomization.setModelCustomizationUUID(
+					vlNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_CUSTOMIZATIONUUID));
+
+			collectionNetworkResourceCustomization.setNetworkTechnology(
+					toscaResourceStructure.getSdcCsarHelper().getNodeTemplatePropertyLeafValue(vlNodeTemplate,
+							SdcPropertyNames.PROPERTY_NAME_NETWORKTECHNOLOGY));
+			collectionNetworkResourceCustomization.setNetworkType(toscaResourceStructure.getSdcCsarHelper()
+					.getNodeTemplatePropertyLeafValue(vlNodeTemplate, SdcPropertyNames.PROPERTY_NAME_NETWORKTYPE));
+			collectionNetworkResourceCustomization.setNetworkRole(toscaResourceStructure.getSdcCsarHelper()
+					.getNodeTemplatePropertyLeafValue(vlNodeTemplate, SdcPropertyNames.PROPERTY_NAME_NETWORKROLE));
+			collectionNetworkResourceCustomization.setNetworkScope(toscaResourceStructure.getSdcCsarHelper()
+					.getNodeTemplatePropertyLeafValue(vlNodeTemplate, SdcPropertyNames.PROPERTY_NAME_NETWORKSCOPE));
+			collectionNetworkResourceCustomization.setInstanceGroup(networkInstanceGroup);
+			collectionNetworkResourceCustomization.setNetworkResource(networkResource);
+			collectionNetworkResourceCustomization.setNetworkResourceCustomization(ncfc);
+			
+			collectionNetworkResourceCustomizationList.add(collectionNetworkResourceCustomization);
+		   }
+
+		}
+		
+		return collectionNetworkResourceCustomization;
+	}
+	
+	protected VnfcInstanceGroupCustomization createVNFCInstanceGroup(NodeTemplate vnfcNodeTemplate, Group group,
+			VnfResourceCustomization vnfResourceCustomization) {
+
+			Metadata instanceMetadata = group.getMetadata();
+			// Populate InstanceGroup
+			VFCInstanceGroup vfcInstanceGroup = new VFCInstanceGroup();
+			
+			vfcInstanceGroup.setModelName(instanceMetadata.getValue(SdcPropertyNames.PROPERTY_NAME_NAME));
+			vfcInstanceGroup.setModelInvariantUUID(instanceMetadata.getValue(SdcPropertyNames.PROPERTY_NAME_INVARIANTUUID));
+			vfcInstanceGroup.setModelUUID(instanceMetadata.getValue(SdcPropertyNames.PROPERTY_NAME_UUID));
+			vfcInstanceGroup.setModelVersion(instanceMetadata.getValue(SdcPropertyNames.PROPERTY_NAME_VERSION));
+		vfcInstanceGroup.setToscaNodeType(group.getType());
+			vfcInstanceGroup.setRole("SUB-INTERFACE");   // Set Role
+			vfcInstanceGroup.setType(InstanceGroupType.VNFC);  // Set type	
+			
+			//Populate VNFCInstanceGroupCustomization
+			VnfcInstanceGroupCustomization vfcInstanceGroupCustom = new VnfcInstanceGroupCustomization();
+			
+			vfcInstanceGroupCustom.setModelCustomizationUUID(vnfResourceCustomization.getModelCustomizationUUID());
+			vfcInstanceGroupCustom.setModelUUID(instanceMetadata.getValue(SdcPropertyNames.PROPERTY_NAME_UUID));
+			vfcInstanceGroupCustom.setDescription(instanceMetadata.getValue(SdcPropertyNames.PROPERTY_NAME_DESCRIPTION));
+			vfcInstanceGroupCustom.setFunction("FUNCTION");
+			vfcInstanceGroupCustom.setInstanceGroup(vfcInstanceGroup);
+			vfcInstanceGroupCustom.setVnfResourceCust(vnfResourceCustomization);		
+			
+		return vfcInstanceGroupCustom;
+
+	}
+	
+	protected VFCInstanceGroup findExistingVnfcInstanceGroup(VnfResourceCustomization vnfResourceCustomization,
+			String modelUUID) {
+		VFCInstanceGroup vfcInstanceGroup = null;
+		List<VnfcInstanceGroupCustomization> vnfInstanceGroupCustomizations = vnfResourceCustomization
+				.getVnfcInstanceGroupCustomizations();
+		if(vnfInstanceGroupCustomizations != null){
+			for (VnfcInstanceGroupCustomization vnfcInstanceGroupCustom : vnfResourceCustomization
+					.getVnfcInstanceGroupCustomizations()) {
+				if (vnfcInstanceGroupCustom.getInstanceGroup() != null
+						&& vnfcInstanceGroupCustom.getInstanceGroup().getModelUUID().equals(modelUUID)) {
+					vfcInstanceGroup = (VFCInstanceGroup)vnfcInstanceGroupCustom.getInstanceGroup();
+				}
+			}
+		}
+		if (vfcInstanceGroup == null)
+			vfcInstanceGroup = (VFCInstanceGroup) instanceGroupRepo.findByModelUUID(modelUUID);
+
+		return vfcInstanceGroup;
+	}
+	
+	protected VfModuleCustomization createVFModuleResource(Group group, NodeTemplate nodeTemplate,
+			ToscaResourceStructure toscaResourceStructure, VfResourceStructure vfResourceStructure,
+			IVfModuleData vfModuleData, VnfResourceCustomization vnfResource) {
+		VfModuleCustomization vfModuleCustomization = findExistingVfModuleCustomization(vnfResource,
+				vfModuleData.getVfModuleModelCustomizationUUID());
+		if(vfModuleCustomization == null){		
+			VfModule vfModule = findExistingVfModule(vnfResource,
+					nodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_VFMODULEMODELUUID));
+			Metadata vfMetadata = group.getMetadata();
+			if(vfModule==null)
+				vfModule=createVfModule(group, toscaResourceStructure, vfModuleData, vfMetadata);
+			
+			vfModuleCustomization = createVfModuleCustomzation(group, toscaResourceStructure, vfModule, vfModuleData);
+			setHeatInformationForVfModule(toscaResourceStructure, vfResourceStructure, vfModule, vfModuleCustomization,
+					vfMetadata);
+			vfModuleCustomization.setVfModule(vfModule);
+			vfModule.getVfModuleCustomization().add(vfModuleCustomization);
+			vnfResource.getVfModuleCustomizations().add(vfModuleCustomization);
+		} else {
+			vfResourceStructure.setAlreadyDeployed(true);
+		}
+		
+		return vfModuleCustomization;
+	}
+	
+	protected VfModuleCustomization findExistingVfModuleCustomization(VnfResourceCustomization vnfResource,
+			String vfModuleModelCustomizationUUID) {
+		VfModuleCustomization vfModuleCustomization = null;
+		for(VfModuleCustomization vfModuleCustom : vnfResource.getVfModuleCustomizations()){
+			if(vfModuleCustom.getModelCustomizationUUID().equalsIgnoreCase(vfModuleModelCustomizationUUID)){
+				vfModuleCustomization = vfModuleCustom;
+			}
+		}
+		if(vfModuleCustomization==null)
+			vfModuleCustomization = vfModuleCustomizationRepo
+					.findByModelCustomizationUUID(vfModuleModelCustomizationUUID);
+		
+		return vfModuleCustomization;
+	}
+
+	protected VfModule findExistingVfModule(VnfResourceCustomization vnfResource, String modelUUID) {
+		VfModule vfModule = null;
+		for(VfModuleCustomization vfModuleCustom : vnfResource.getVfModuleCustomizations()){
+			if(vfModuleCustom.getVfModule() != null && vfModuleCustom.getVfModule().getModelUUID().equals(modelUUID)){
+				vfModule = vfModuleCustom.getVfModule();
+			}
+		}
+		if(vfModule==null)
+			vfModule = vfModuleRepo.findByModelUUID(modelUUID);
+		
+		return vfModule;
+	}
+
+	protected VfModuleCustomization createVfModuleCustomzation(Group group,
+			ToscaResourceStructure toscaResourceStructure, VfModule vfModule, IVfModuleData vfModuleData) {
+		VfModuleCustomization vfModuleCustomization = new VfModuleCustomization();
+		
+		vfModuleCustomization.setModelCustomizationUUID(vfModuleData.getVfModuleModelCustomizationUUID());
+
+		vfModuleCustomization.setVfModule(vfModule);
+
+		String initialCount = toscaResourceStructure.getSdcCsarHelper().getGroupPropertyLeafValue(group,
+				SdcPropertyNames.PROPERTY_NAME_INITIALCOUNT);
+		if (initialCount != null && initialCount.length() > 0) {
+			vfModuleCustomization.setInitialCount(Integer.valueOf(initialCount));
+		}
+
+		vfModuleCustomization.setInitialCount(Integer.valueOf(toscaResourceStructure.getSdcCsarHelper()
+				.getGroupPropertyLeafValue(group, SdcPropertyNames.PROPERTY_NAME_INITIALCOUNT)));
+
+		String availabilityZoneCount = toscaResourceStructure.getSdcCsarHelper().getGroupPropertyLeafValue(group,
+				SdcPropertyNames.PROPERTY_NAME_AVAILABILITYZONECOUNT);
+		if (availabilityZoneCount != null && availabilityZoneCount.length() > 0) {
+			vfModuleCustomization.setAvailabilityZoneCount(Integer.valueOf(availabilityZoneCount));
+		}
+
+		vfModuleCustomization.setLabel(toscaResourceStructure.getSdcCsarHelper().getGroupPropertyLeafValue(group,
+				SdcPropertyNames.PROPERTY_NAME_VFMODULELABEL));
+
+		String maxInstances = toscaResourceStructure.getSdcCsarHelper().getGroupPropertyLeafValue(group,
+				SdcPropertyNames.PROPERTY_NAME_MAXVFMODULEINSTANCES);
+		if (maxInstances != null && maxInstances.length() > 0) {
+			vfModuleCustomization.setMaxInstances(Integer.valueOf(maxInstances));
+		}
+
+		String minInstances = toscaResourceStructure.getSdcCsarHelper().getGroupPropertyLeafValue(group,
+				SdcPropertyNames.PROPERTY_NAME_MINVFMODULEINSTANCES);
+		if (minInstances != null && minInstances.length() > 0) {
+			vfModuleCustomization.setMinInstances(Integer.valueOf(minInstances));
+		}
+		return vfModuleCustomization;
+	}
+
+	protected VfModule createVfModule(Group group, ToscaResourceStructure toscaResourceStructure,
+			IVfModuleData vfModuleData, Metadata vfMetadata) {
+		VfModule vfModule = new VfModule();
+		String vfModuleModelUUID = vfModuleData.getVfModuleModelUUID();
+
+		if(vfModuleModelUUID == null) {
+			vfModuleModelUUID = testNull(toscaResourceStructure.getSdcCsarHelper().getMetadataPropertyValue(vfMetadata,
+					SdcPropertyNames.PROPERTY_NAME_VFMODULEMODELUUID));
+		} else if (vfModuleModelUUID.indexOf('.') > -1) {
+			vfModuleModelUUID = vfModuleModelUUID.substring(0, vfModuleModelUUID.indexOf('.'));
+		}
+
+		vfModule.setModelInvariantUUID(testNull(toscaResourceStructure.getSdcCsarHelper()
+				.getMetadataPropertyValue(vfMetadata, SdcPropertyNames.PROPERTY_NAME_VFMODULEMODELINVARIANTUUID)));
+		vfModule.setModelName(testNull(toscaResourceStructure.getSdcCsarHelper().getMetadataPropertyValue(vfMetadata,
+				SdcPropertyNames.PROPERTY_NAME_VFMODULEMODELNAME)));
+		vfModule.setModelUUID(vfModuleModelUUID);
+		vfModule.setModelVersion(testNull(toscaResourceStructure.getSdcCsarHelper().getMetadataPropertyValue(vfMetadata,
+				SdcPropertyNames.PROPERTY_NAME_VFMODULEMODELVERSION)));
+		vfModule.setDescription(testNull(toscaResourceStructure.getSdcCsarHelper().getMetadataPropertyValue(vfMetadata,
+				SdcPropertyNames.PROPERTY_NAME_DESCRIPTION)));
+
+		String vfModuleType = toscaResourceStructure.getSdcCsarHelper().getGroupPropertyLeafValue(group,
+				SdcPropertyNames.PROPERTY_NAME_VFMODULETYPE);
+		if (vfModuleType != null && "Base".equalsIgnoreCase(vfModuleType)) {
+			vfModule.setIsBase(true);
+		} else {
+			vfModule.setIsBase(false);
+		}
+		return vfModule;
+	}
+
+	protected void setHeatInformationForVfModule(ToscaResourceStructure toscaResourceStructure,
+			VfResourceStructure vfResourceStructure, VfModule vfModule, VfModuleCustomization vfModuleCustomization,
+			Metadata vfMetadata) {
+		Optional<VfModuleStructure> matchingObject = vfResourceStructure.getVfModuleStructure().stream()
+				.filter(vfModuleStruct -> vfModuleStruct.getVfModuleMetadata().getVfModuleModelUUID()
+						.equalsIgnoreCase(toscaResourceStructure.getSdcCsarHelper().getMetadataPropertyValue(vfMetadata,
+								SdcPropertyNames.PROPERTY_NAME_VFMODULEMODELUUID)))
+				.findFirst();
+
+		if (matchingObject.isPresent()) {
+			List<HeatFiles> heatFilesList = new ArrayList<>();
+			List<HeatTemplate> volumeHeatChildTemplates = new ArrayList<HeatTemplate>();
+			List<HeatTemplate> heatChildTemplates = new ArrayList<HeatTemplate>();
+			HeatTemplate parentHeatTemplate = new HeatTemplate();
+			String parentArtifactType = null;
+			Set<String> artifacts = new HashSet<>(matchingObject.get().getVfModuleMetadata().getArtifacts());
+			for (VfModuleArtifact vfModuleArtifact : vfResourceStructure.getArtifactsMapByUUID().values()) {
+				
+				List<HeatTemplate> childNestedHeatTemplates = new ArrayList<HeatTemplate>();
+				
+				if (artifacts.contains(vfModuleArtifact.getArtifactInfo().getArtifactUUID())) {
+					checkVfModuleArtifactType(vfModule, vfModuleCustomization, heatFilesList, vfModuleArtifact,
+							childNestedHeatTemplates, parentHeatTemplate, vfResourceStructure);
+				}
+				
+				if(vfModuleArtifact.getArtifactInfo().getArtifactType().equals(ASDCConfiguration.HEAT_NESTED)){
+					parentArtifactType = identifyParentOfNestedTemplate(matchingObject.get(), vfModuleArtifact);
+					
+					if(!childNestedHeatTemplates.isEmpty()){
+					
+						if (parentArtifactType != null && parentArtifactType.equalsIgnoreCase(ASDCConfiguration.HEAT_VOL)) {
+							volumeHeatChildTemplates.add(childNestedHeatTemplates.get(0));
+						} else {
+							heatChildTemplates.add(childNestedHeatTemplates.get(0));
+						}
+					}
+				}
+				
+			}
+			if(!heatFilesList.isEmpty()){
+				vfModule.setHeatFiles(heatFilesList);
+			}
+			
+			
+			// Set all Child Templates related to HEAT_VOLUME
+			if(!volumeHeatChildTemplates.isEmpty()){
+				vfModule.getVolumeHeatTemplate().setChildTemplates(volumeHeatChildTemplates);
+			}
+			
+			// Set all Child Templates related to HEAT
+			if(!heatChildTemplates.isEmpty()){
+				vfModule.getVolumeHeatTemplate().setChildTemplates(heatChildTemplates);
+			}
+		}
+	}
+
+	protected void checkVfModuleArtifactType(VfModule vfModule, VfModuleCustomization vfModuleCustomization,
+			List<HeatFiles> heatFilesList, VfModuleArtifact vfModuleArtifact, List<HeatTemplate> nestedHeatTemplates,
+			HeatTemplate parentHeatTemplate, VfResourceStructure vfResourceStructure) {
+		if (vfModuleArtifact.getArtifactInfo().getArtifactType().equals(ASDCConfiguration.HEAT)) {
+			vfModuleArtifact.incrementDeployedInDB();
+			vfModule.setModuleHeatTemplate(vfModuleArtifact.getHeatTemplate());
+		} else if (vfModuleArtifact.getArtifactInfo().getArtifactType().equals(ASDCConfiguration.HEAT_VOL)) {
+			vfModule.setVolumeHeatTemplate(vfModuleArtifact.getHeatTemplate());
+			VfModuleArtifact volVfModuleArtifact = this.getHeatEnvArtifactFromGeneratedArtifact(vfResourceStructure, vfModuleArtifact);
+			vfModuleCustomization.setVolumeHeatEnv(volVfModuleArtifact.getHeatEnvironment());
+			vfModuleArtifact.incrementDeployedInDB();
+		} else if (vfModuleArtifact.getArtifactInfo().getArtifactType().equals(ASDCConfiguration.HEAT_ENV)) {
+			if(vfModuleArtifact.getHeatEnvironment().getName().contains("volume")) {
+				vfModuleCustomization.setVolumeHeatEnv(vfModuleArtifact.getHeatEnvironment());
+			} else { 
+			vfModuleCustomization.setHeatEnvironment(vfModuleArtifact.getHeatEnvironment());
+			}
+			vfModuleArtifact.incrementDeployedInDB();
+		} else if (vfModuleArtifact.getArtifactInfo().getArtifactType().equals(ASDCConfiguration.HEAT_ARTIFACT)) {
+			heatFilesList.add(vfModuleArtifact.getHeatFiles());							
+			vfModuleArtifact.incrementDeployedInDB();
+		} else if (vfModuleArtifact.getArtifactInfo().getArtifactType().equals(ASDCConfiguration.HEAT_NESTED)) {
+			nestedHeatTemplates.add(vfModuleArtifact.getHeatTemplate());				
+			vfModuleArtifact.incrementDeployedInDB();
+		}
+	}
+
+	protected VnfResourceCustomization createVnfResource(NodeTemplate vfNodeTemplate,
+			ToscaResourceStructure toscaResourceStructure, Service service) {
+		VnfResourceCustomization vnfResourceCustomization = vnfCustomizationRepo.findOneByModelCustomizationUUID(
+				vfNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_CUSTOMIZATIONUUID));
+		if(vnfResourceCustomization == null){		
+			VnfResource vnfResource = findExistingVnfResource(service,
+					vfNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_UUID));
+			
+			if(vnfResource==null)
+				vnfResource=createVnfResource(vfNodeTemplate);
+			
+			vnfResourceCustomization = createVnfResourceCustomization(vfNodeTemplate, toscaResourceStructure,
+					vnfResource);
+			vnfResourceCustomization.setVnfResources(vnfResource);
+			vnfResource.getVnfResourceCustomizations().add(vnfResourceCustomization);
+			
+			// Fetch VNFC Instance Group Info				
+			List<Group> groupList = toscaResourceStructure.getSdcCsarHelper()
+					.getGroupsOfOriginOfNodeTemplateByToscaGroupType(vfNodeTemplate,
+							"org.openecomp.groups.VfcInstanceGroup");
+				
+			for (Group group : groupList) { 
+				
+				VFCInstanceGroup vfcInstanceGroup = findExistingVnfcInstanceGroup(vnfResourceCustomization,
+						group.getMetadata().getValue(SdcPropertyNames.PROPERTY_NAME_UUID));
+				if(vfcInstanceGroup == null){
+					VnfcInstanceGroupCustomization vnfcInstanceGroupCustomization = createVNFCInstanceGroup(
+							vfNodeTemplate, group, vnfResourceCustomization);
+				
+					vnfcInstanceGroupCustomizationRepo.saveAndFlush(vnfcInstanceGroupCustomization);
+				}
+			}
+			
+		}
+		return vnfResourceCustomization;
+	}
+	
+	protected VnfResource findExistingVnfResource(Service service, String modelUUID) {
+		VnfResource vnfResource = null;
+		for(VnfResourceCustomization vnfResourceCustom : service.getVnfCustomizations()){
+			if (vnfResourceCustom.getVnfResources() != null
+					&& vnfResourceCustom.getVnfResources().getModelUUID().equals(modelUUID)) {
+				vnfResource = vnfResourceCustom.getVnfResources();
+			}
+		}
+		if(vnfResource==null)
+			vnfResource = vnfRepo.findResourceByModelUUID(modelUUID);
+		
+		return vnfResource;
+	}
+
+	protected VnfResourceCustomization createVnfResourceCustomization(NodeTemplate vfNodeTemplate,
+			ToscaResourceStructure toscaResourceStructure, VnfResource vnfResource) {
+		VnfResourceCustomization vnfResourceCustomization = new VnfResourceCustomization();
+		vnfResourceCustomization.setModelCustomizationUUID(
+				testNull(vfNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_CUSTOMIZATIONUUID)));
+		vnfResourceCustomization.setModelInstanceName(vfNodeTemplate.getName());
+
+		vnfResourceCustomization.setNfFunction(testNull(toscaResourceStructure.getSdcCsarHelper()
+				.getNodeTemplatePropertyLeafValue(vfNodeTemplate, SdcPropertyNames.PROPERTY_NAME_NFFUNCTION)));
+		vnfResourceCustomization.setNfNamingCode(testNull(toscaResourceStructure.getSdcCsarHelper()
+				.getNodeTemplatePropertyLeafValue(vfNodeTemplate, "nf_naming_code")));
+		vnfResourceCustomization.setNfRole(testNull(toscaResourceStructure.getSdcCsarHelper()
+				.getNodeTemplatePropertyLeafValue(vfNodeTemplate, SdcPropertyNames.PROPERTY_NAME_NFROLE)));
+		vnfResourceCustomization.setNfType(testNull(toscaResourceStructure.getSdcCsarHelper()
+				.getNodeTemplatePropertyLeafValue(vfNodeTemplate, SdcPropertyNames.PROPERTY_NAME_NFTYPE)));
+
+		vnfResourceCustomization.setMultiStageDesign(toscaResourceStructure.getSdcCsarHelper()
+				.getNodeTemplatePropertyLeafValue(vfNodeTemplate, MULTI_STAGE_DESIGN));
+
+		vnfResourceCustomization.setVnfResources(vnfResource);
+		vnfResourceCustomization.setAvailabilityZoneMaxCount(Integer.getInteger(
+				vfNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_AVAILABILITYZONECOUNT)));	
+
+		CapabilityAssignments vnfCustomizationCapability = toscaResourceStructure.getSdcCsarHelper()
+				.getCapabilitiesOf(vfNodeTemplate);
+
+		if (vnfCustomizationCapability != null) {
+			CapabilityAssignment capAssign = vnfCustomizationCapability.getCapabilityByName(SCALABLE);
+
+			if (capAssign != null) {
+				vnfResourceCustomization.setMinInstances(Integer.getInteger(toscaResourceStructure.getSdcCsarHelper()
+						.getCapabilityPropertyLeafValue(capAssign, SdcPropertyNames.PROPERTY_NAME_MININSTANCES)));
+				vnfResourceCustomization.setMaxInstances(Integer.getInteger(toscaResourceStructure.getSdcCsarHelper()
+						.getCapabilityPropertyLeafValue(capAssign, SdcPropertyNames.PROPERTY_NAME_MAXINSTANCES)));
+			}
+
+		}
+		
+		toscaResourceStructure.setCatalogVnfResourceCustomization(vnfResourceCustomization);
+		
+		return vnfResourceCustomization;
+	}
+
+	protected VnfResource createVnfResource(NodeTemplate vfNodeTemplate) {
+		VnfResource vnfResource = new VnfResource();
+		vnfResource.setModelInvariantUUID(
+				testNull(vfNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_INVARIANTUUID)));
+		vnfResource.setModelName(testNull(vfNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_NAME)));
+		vnfResource.setModelUUID(testNull(vfNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_UUID)));
+
+		vnfResource.setModelVersion(
+				testNull(vfNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_VERSION)));
+		vnfResource.setDescription(
+				testNull(vfNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_DESCRIPTION)));
+		vnfResource.setOrchestrationMode(HEAT);
+		vnfResource.setToscaNodeType(testNull(vfNodeTemplate.getType()));
+		vnfResource.setAicVersionMax(
+				testNull(vfNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_MAXINSTANCES)));
+		vnfResource.setAicVersionMin(
+				testNull(vfNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_MININSTANCES)));
+		
+		return vnfResource;
+	}
+
+	protected AllottedResourceCustomization createAllottedResource(NodeTemplate nodeTemplate,
+			ToscaResourceStructure toscaResourceStructure, Service service) {
+		AllottedResourceCustomization allottedResourceCustomization = allottedCustomizationRepo
+				.findOneByModelCustomizationUUID(
+				nodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_CUSTOMIZATIONUUID));
+			
+		if(allottedResourceCustomization == null){			
+			AllottedResource allottedResource = findExistingAllottedResource(service,
+					nodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_UUID));
+			
+			if(allottedResource==null)
+				allottedResource=createAR(nodeTemplate);
+			
+			toscaResourceStructure.setAllottedResource(allottedResource);			
+			allottedResourceCustomization = createAllottedResourceCustomization(nodeTemplate, toscaResourceStructure);
+			allottedResourceCustomization.setAllottedResource(allottedResource);
+			allottedResource.getAllotedResourceCustomization().add(allottedResourceCustomization);
+		}
+		return allottedResourceCustomization;
+	}
+	
+	protected AllottedResource findExistingAllottedResource(Service service, String modelUUID) {
+		AllottedResource allottedResource = null;
+		for(AllottedResourceCustomization allottedResourceCustom : service.getAllottedCustomizations()){
+			if (allottedResourceCustom.getAllottedResource() != null
+					&& allottedResourceCustom.getAllottedResource().getModelUUID().equals(modelUUID)) {
+				allottedResource = allottedResourceCustom.getAllottedResource();
+			}
+		}
+		if(allottedResource==null)
+			allottedResource = allottedRepo.findResourceByModelUUID(modelUUID);
+		
+		return allottedResource;
+	}
+	
+	protected AllottedResourceCustomization createAllottedResourceCustomization(NodeTemplate nodeTemplate,
+			ToscaResourceStructure toscaResourceStructure) {
+		AllottedResourceCustomization allottedResourceCustomization = new AllottedResourceCustomization();
+		allottedResourceCustomization.setModelCustomizationUUID(
+				testNull(nodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_CUSTOMIZATIONUUID)));
+		allottedResourceCustomization.setModelInstanceName(nodeTemplate.getName());
+		
+
+		allottedResourceCustomization.setNfFunction(testNull(toscaResourceStructure.getSdcCsarHelper()
+				.getNodeTemplatePropertyLeafValue(nodeTemplate, SdcPropertyNames.PROPERTY_NAME_NFFUNCTION)));
+		allottedResourceCustomization.setNfNamingCode(testNull(toscaResourceStructure.getSdcCsarHelper()
+				.getNodeTemplatePropertyLeafValue(nodeTemplate, "nf_naming_code")));
+		allottedResourceCustomization.setNfRole(testNull(toscaResourceStructure.getSdcCsarHelper()
+				.getNodeTemplatePropertyLeafValue(nodeTemplate, SdcPropertyNames.PROPERTY_NAME_NFROLE)));
+		allottedResourceCustomization.setNfType(testNull(toscaResourceStructure.getSdcCsarHelper()
+				.getNodeTemplatePropertyLeafValue(nodeTemplate, SdcPropertyNames.PROPERTY_NAME_NFTYPE)));
+
+		List<NodeTemplate> vfcNodes = toscaResourceStructure.getSdcCsarHelper().getVfcListByVf(allottedResourceCustomization.getModelCustomizationUUID());
+		
+		if(vfcNodes != null){
+			for(NodeTemplate vfcNode : vfcNodes){
+			
+				allottedResourceCustomization.setProvidingServiceModelUUID(toscaResourceStructure.getSdcCsarHelper().getNodeTemplatePropertyLeafValue(vfcNode, "providing_service_uuid"));
+				allottedResourceCustomization.setProvidingServiceModelInvariantUUID(toscaResourceStructure.getSdcCsarHelper().getNodeTemplatePropertyLeafValue(vfcNode, "providing_service_invariant_uuid"));
+				allottedResourceCustomization.setProvidingServiceModelName(toscaResourceStructure.getSdcCsarHelper().getNodeTemplatePropertyLeafValue(vfcNode, "providing_service_name"));
+			}
+		}
+		
+
+		CapabilityAssignments arCustomizationCapability = toscaResourceStructure.getSdcCsarHelper()
+				.getCapabilitiesOf(nodeTemplate);
+
+		if (arCustomizationCapability != null) {
+			CapabilityAssignment capAssign = arCustomizationCapability.getCapabilityByName(SCALABLE);
+
+			if (capAssign != null) {
+				allottedResourceCustomization.setMinInstances(
+						Integer.getInteger(toscaResourceStructure.getSdcCsarHelper().getCapabilityPropertyLeafValue(
+								capAssign, SdcPropertyNames.PROPERTY_NAME_MININSTANCES)));
+				allottedResourceCustomization.setMaxInstances(
+						Integer.getInteger(toscaResourceStructure.getSdcCsarHelper().getCapabilityPropertyLeafValue(
+								capAssign, SdcPropertyNames.PROPERTY_NAME_MAXINSTANCES)));
+			}
+		}
+		return allottedResourceCustomization;
+	}
+
+	protected AllottedResource createAR(NodeTemplate nodeTemplate) {
+		AllottedResource allottedResource = new AllottedResource();
+		allottedResource
+		.setModelUUID(testNull(nodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_UUID)));
+		allottedResource.setModelInvariantUUID(
+				testNull(nodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_INVARIANTUUID)));
+		allottedResource
+		.setModelName(testNull(nodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_NAME)));
+		allottedResource
+		.setModelVersion(testNull(nodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_VERSION)));
+		allottedResource.setToscaNodeType(testNull(nodeTemplate.getType()));
+		allottedResource.setSubcategory(
+				testNull(nodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_SUBCATEGORY)));
+		allottedResource
+		.setDescription(nodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_DESCRIPTION));
+		return allottedResource;
+	}
+
+	protected Set<HeatTemplateParam> extractHeatTemplateParameters(String yamlFile, String artifactUUID) {
+		// Scan the payload downloadResult and extract the HeatTemplate
+		// parameters
+		YamlEditor yamlEditor = new YamlEditor(yamlFile.getBytes());
+		return yamlEditor.getParameterList(artifactUUID);
+	}	
+
+	protected String testNull(Object object) {
+
+		if (object == null) {
+			return null;
+		} else if (object.equals("NULL")) {
+			return null;
+		} else if (object instanceof Integer) {
+			return object.toString();
+		} else if (object instanceof String) {
+			return (String) object;
+		} else {
+			return "Type not recognized";
+		}
+	}
+	
+	protected static String identifyParentOfNestedTemplate(VfModuleStructure vfModuleStructure,
+			VfModuleArtifact heatNestedArtifact) {
+
+		if (vfModuleStructure.getArtifactsMap().get(ASDCConfiguration.HEAT) != null && vfModuleStructure
+				.getArtifactsMap().get(ASDCConfiguration.HEAT).get(0).getArtifactInfo().getRelatedArtifacts() != null) {
+			for (IArtifactInfo unknownArtifact : vfModuleStructure.getArtifactsMap().get(ASDCConfiguration.HEAT).get(0)
+					.getArtifactInfo().getRelatedArtifacts()) {
+				if (heatNestedArtifact.getArtifactInfo().getArtifactUUID().equals(unknownArtifact.getArtifactUUID())) {
+					return ASDCConfiguration.HEAT;
+				}
+
+			}
+		} 
+		
+		if (vfModuleStructure.getArtifactsMap().get(ASDCConfiguration.HEAT_VOL) != null 
+				&& vfModuleStructure.getArtifactsMap().get(ASDCConfiguration.HEAT_VOL).get(0).getArtifactInfo()
+						.getRelatedArtifacts() != null) {
+			for (IArtifactInfo unknownArtifact : vfModuleStructure.getArtifactsMap().get(ASDCConfiguration.HEAT_VOL)
+					.get(0).getArtifactInfo().getRelatedArtifacts()) {
+				if (heatNestedArtifact.getArtifactInfo().getArtifactUUID().equals(unknownArtifact.getArtifactUUID())) {
+					return ASDCConfiguration.HEAT_VOL;
+				}
+			
+			}
+		}
+		
+		// Does not belong to anything
+		return null;
+			
+	}
+	
+	protected static String createVNFName(VfResourceStructure vfResourceStructure) {
+
+		return vfResourceStructure.getNotification().getServiceName() + "/"
+				+ vfResourceStructure.getResourceInstance().getResourceInstanceName();
+	}
+
+	protected static String createVfModuleName(VfModuleStructure vfModuleStructure) {
+		
+		return createVNFName(vfModuleStructure.getParentVfResource()) + "::"
+				+ vfModuleStructure.getVfModuleMetadata().getVfModuleModelName();
+	}
+	
+	
+	protected static Timestamp getCurrentTimeStamp() {
+		
+		return new Timestamp(new Date().getTime());
+	}
+
+}
diff --git a/asdc-controller/src/main/java/org/onap/so/asdc/tenantIsolation/AaiClientPropertiesImpl.java b/asdc-controller/src/main/java/org/onap/so/asdc/tenantIsolation/AaiClientPropertiesImpl.java
new file mode 100644
index 0000000000..dcfeb10845
--- /dev/null
+++ b/asdc-controller/src/main/java/org/onap/so/asdc/tenantIsolation/AaiClientPropertiesImpl.java
@@ -0,0 +1,70 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.so.asdc.tenantIsolation;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import org.onap.so.client.aai.AAIProperties;
+import org.onap.so.client.aai.AAIVersion;
+import org.springframework.context.ApplicationContext;
+
+public class AaiClientPropertiesImpl implements AAIProperties {
+
+	private String aaiEndpoint;
+	private String auth;
+	private String key;
+	private static final String SYSTEM_NAME = "MSO";
+	
+	public AaiClientPropertiesImpl() {
+		ApplicationContext context = SpringContextHelper.getAppContext();
+		aaiEndpoint = context.getEnvironment().getProperty("mso.aai.endpoint");
+		this.auth = context.getEnvironment().getProperty("aai.auth");
+		this.key = context.getEnvironment().getProperty("mso.msoKey");
+	}
+
+	@Override
+	public URL getEndpoint() throws MalformedURLException {
+		ApplicationContext context = SpringContextHelper.getAppContext();
+		aaiEndpoint = context.getEnvironment().getProperty("mso.aai.endpoint");
+		return new URL(aaiEndpoint);
+	}
+
+	@Override
+	public String getSystemName() {
+		return SYSTEM_NAME;
+	}
+	
+	@Override
+	public AAIVersion getDefaultVersion() {
+		return AAIVersion.LATEST;
+	}
+	
+	@Override
+	public String getAuth() {
+		return this.auth;
+	}
+
+	@Override
+	public String getKey() {
+		return this.key;
+	}
+}
diff --git a/asdc-controller/src/main/java/org/onap/so/asdc/tenantIsolation/DistributionStatus.java b/asdc-controller/src/main/java/org/onap/so/asdc/tenantIsolation/DistributionStatus.java
new file mode 100644
index 0000000000..d092712a8b
--- /dev/null
+++ b/asdc-controller/src/main/java/org/onap/so/asdc/tenantIsolation/DistributionStatus.java
@@ -0,0 +1,29 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.so.asdc.tenantIsolation;
+
+public enum DistributionStatus {
+
+	SUCCESS,
+	FAILURE,
+	TIMEOUT,
+	INCOMPLETE
+}
diff --git a/asdc-controller/src/main/java/org/onap/so/asdc/tenantIsolation/SpringContextHelper.java b/asdc-controller/src/main/java/org/onap/so/asdc/tenantIsolation/SpringContextHelper.java
new file mode 100644
index 0000000000..5f30edd8d9
--- /dev/null
+++ b/asdc-controller/src/main/java/org/onap/so/asdc/tenantIsolation/SpringContextHelper.java
@@ -0,0 +1,41 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.so.asdc.tenantIsolation;
+
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.stereotype.Component;
+
+@Component
+public class SpringContextHelper implements ApplicationContextAware {
+
+	private static ApplicationContext context;
+
+	@Override
+	public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+		context = applicationContext;
+	}
+
+	public static ApplicationContext getAppContext() {
+		return context;
+	}
+}
diff --git a/asdc-controller/src/main/java/org/onap/so/asdc/tenantIsolation/WatchdogDistribution.java b/asdc-controller/src/main/java/org/onap/so/asdc/tenantIsolation/WatchdogDistribution.java
new file mode 100644
index 0000000000..3f0392a04f
--- /dev/null
+++ b/asdc-controller/src/main/java/org/onap/so/asdc/tenantIsolation/WatchdogDistribution.java
@@ -0,0 +1,194 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.so.asdc.tenantIsolation;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.onap.so.client.aai.AAIObjectType;
+import org.onap.so.client.aai.AAIResourcesClient;
+import org.onap.so.client.aai.entities.uri.AAIResourceUri;
+import org.onap.so.client.aai.entities.uri.AAIUriFactory;
+import org.onap.so.client.graphinventory.entities.uri.Depth;
+import org.onap.so.db.catalog.data.repository.ServiceRepository;
+import org.onap.so.db.request.beans.WatchdogComponentDistributionStatus;
+import org.onap.so.db.request.beans.WatchdogDistributionStatus;
+import org.onap.so.db.request.beans.WatchdogServiceModVerIdLookup;
+import org.onap.so.db.request.data.repository.WatchdogComponentDistributionStatusRepository;
+import org.onap.so.db.request.data.repository.WatchdogDistributionStatusRepository;
+import org.onap.so.db.request.data.repository.WatchdogServiceModVerIdLookupRepository;
+import org.onap.so.logger.MsoLogger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+@Component
+public class WatchdogDistribution {
+
+	private static final MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.ASDC,WatchdogDistribution.class);
+
+	private AAIResourcesClient aaiClient;
+	
+	@Autowired
+	private WatchdogDistributionStatusRepository watchdogDistributionStatusRepository;
+	
+	@Autowired
+	private WatchdogComponentDistributionStatusRepository watchdogCDStatusRepository;
+	
+	@Autowired
+	private WatchdogServiceModVerIdLookupRepository watchdogModVerIdLookupRepository;
+	
+	@Autowired
+	private ServiceRepository serviceRepo;
+	
+	@Value("${mso.asdc.config.components.componentNames}")
+	private String[] componentNames;
+	   
+	public String getOverallDistributionStatus(String distributionId) throws Exception {
+		LOGGER.debug("Entered getOverallDistributionStatus method for distrubutionId: " + distributionId);
+		
+		String status = null;
+		try {
+			WatchdogDistributionStatus watchdogDistributionStatus = watchdogDistributionStatusRepository.findOne(distributionId);
+			if(watchdogDistributionStatus == null){
+				watchdogDistributionStatus = new WatchdogDistributionStatus();
+				watchdogDistributionStatus.setDistributionId(distributionId);
+				watchdogDistributionStatusRepository.save(watchdogDistributionStatus);
+			}
+			String distributionStatus = watchdogDistributionStatus.getDistributionIdStatus();
+			
+			if(DistributionStatus.TIMEOUT.name().equalsIgnoreCase(distributionStatus)) {
+				LOGGER.debug("Ignoring to update WatchdogDistributionStatus as distributionId: " + distributionId + " status is set to: " + distributionStatus);
+				return DistributionStatus.TIMEOUT.name();
+			} else {
+				List<WatchdogComponentDistributionStatus> results = watchdogCDStatusRepository.findByDistributionId(distributionId);
+				LOGGER.debug("Executed RequestDB getWatchdogComponentDistributionStatus for distrubutionId: " + distributionId);
+		
+				//*************************************************************************************************************************************************
+				//**** Compare config values verse DB watchdog component names to see if every component has reported status before returning final result back to ASDC
+				//**************************************************************************************************************************************************
+				
+				List<WatchdogComponentDistributionStatus> cdStatuses = watchdogCDStatusRepository.findByDistributionId(distributionId);
+				
+				boolean allComponentsComplete = true;
+		      
+		       for(String name : componentNames ) {		                 
+		                
+		                boolean match = false;
+		                
+						for(WatchdogComponentDistributionStatus cdStatus: cdStatuses){							
+							if(name.equals(cdStatus.getComponentName())){
+								LOGGER.debug("Found componentName " + name + " in the WatchDog Component DB");
+								match = true;
+								break;
+							}
+						}						
+						if(!match){
+							LOGGER.debug(name + " has not be updated in the the WatchDog Component DB yet, so ending the loop");
+							allComponentsComplete = false;
+							break;
+						}
+		            }
+		         
+				
+				if(allComponentsComplete) {				
+					LOGGER.debug("Components Size matched with the WatchdogComponentDistributionStatus results.");
+					
+					 for(WatchdogComponentDistributionStatus componentDist : results) {
+						 String componentDistributionStatus = componentDist.getComponentDistributionStatus();
+						 LOGGER.debug("Component status: " + componentDistributionStatus + " on componentName: " + componentDist.getComponentName());
+						 if(componentDistributionStatus.equalsIgnoreCase("COMPONENT_DONE_ERROR")) {
+							 status = DistributionStatus.FAILURE.name();
+							 break;
+						 } else if(componentDistributionStatus.equalsIgnoreCase("COMPONENT_DONE_OK")) {
+							 status = DistributionStatus.SUCCESS.name();
+						 } else {
+							 throw new Exception("Invalid Component distribution status: " + componentDistributionStatus);
+						 }
+					 }
+					 
+					 LOGGER.debug("Updating overall DistributionStatus to: " + status + " for distributionId: " + distributionId);
+					 
+					 watchdogDistributionStatus.setDistributionIdStatus(status);
+					 watchdogDistributionStatusRepository.save(watchdogDistributionStatus);
+				} else {
+					LOGGER.debug("Components Size Didn't match with the WatchdogComponentDistributionStatus results.");
+					status = DistributionStatus.INCOMPLETE.name();
+					return status;
+				}
+			}
+		}catch (Exception e) {
+			LOGGER.debug("Exception occurred on getOverallDistributionStatus : " + e.getMessage());
+			LOGGER.error(e);
+			throw new Exception(e);
+		}		
+		LOGGER.debug("Exiting getOverallDistributionStatus method in WatchdogDistribution");
+		return status;
+	}
+	
+	public void executePatchAAI(String distributionId, String serviceModelInvariantUUID, String distributionStatus) throws Exception {
+		LOGGER.debug("Entered executePatchAAI method with distrubutionId: " + distributionId + " and distributionStatus: " + distributionStatus);
+		
+		try {
+			WatchdogServiceModVerIdLookup lookup = watchdogModVerIdLookupRepository.findOneByDistributionId(distributionId);
+			String serviceModelVersionId = "";
+			
+			if(lookup != null) {
+				serviceModelVersionId = lookup.getServiceModelVersionId();
+			}
+			
+			LOGGER.debug("Executed RequestDB getWatchdogServiceModVerIdLookup with distributionId: " + distributionId + " and serviceModelVersionId: " + serviceModelVersionId);
+			LOGGER.debug("ASDC Notification ServiceModelInvariantUUID : " + serviceModelInvariantUUID);
+			
+			if(serviceModelInvariantUUID == null || "".equals(serviceModelVersionId)) {
+				String error = "No Service found with serviceModelInvariantUUID: " + serviceModelInvariantUUID;
+				LOGGER.debug(error);
+				throw new Exception(error);
+			}
+			
+			AAIResourceUri aaiUri = AAIUriFactory.createResourceUri(AAIObjectType.MODEL_VER, serviceModelInvariantUUID, serviceModelVersionId);
+			aaiUri.depth(Depth.ZERO); //Do not return relationships if any
+			LOGGER.debug("Target A&AI Resource URI: " + aaiUri.build().toString());
+			
+			Map<String, String> payload = new HashMap<>();
+			payload.put("distribution-status", distributionStatus);
+			getAaiClient().update(aaiUri, payload);
+			
+			LOGGER.debug("A&AI UPDATE MODEL Version is success!");
+		} catch (Exception e) {
+			LOGGER.debug("Exception occurred on executePatchAAI : " + e.getMessage());
+			LOGGER.error(e);
+			throw new Exception(e);
+		}
+	}
+
+	public AAIResourcesClient getAaiClient() {
+		if(aaiClient == null) {
+			aaiClient = new AAIResourcesClient();
+		}
+		return aaiClient;
+	}
+
+	public void setAaiClient(AAIResourcesClient aaiClient) {
+		this.aaiClient = aaiClient;
+	}
+}
diff --git a/asdc-controller/src/main/java/org/onap/so/asdc/util/ASDCNotificationLogging.java b/asdc-controller/src/main/java/org/onap/so/asdc/util/ASDCNotificationLogging.java
new file mode 100644
index 0000000000..ef5b889d09
--- /dev/null
+++ b/asdc-controller/src/main/java/org/onap/so/asdc/util/ASDCNotificationLogging.java
@@ -0,0 +1,779 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.so.asdc.util;
+
+
+import java.util.List;
+import java.util.Map;
+
+import org.onap.sdc.api.notification.IArtifactInfo;
+import org.onap.sdc.api.notification.INotificationData;
+import org.onap.sdc.api.notification.IResourceInstance;
+import org.onap.sdc.tosca.parser.api.ISdcCsarHelper;
+import org.onap.sdc.tosca.parser.impl.SdcPropertyNames;
+import org.onap.sdc.tosca.parser.impl.SdcTypes;
+import org.onap.sdc.toscaparser.api.Group;
+import org.onap.sdc.toscaparser.api.NodeTemplate;
+import org.onap.sdc.toscaparser.api.elements.Metadata;
+import org.onap.so.asdc.installer.IVfModuleData;
+import org.onap.so.asdc.installer.ToscaResourceStructure;
+
+public class ASDCNotificationLogging {
+
+	public static String dumpASDCNotification(INotificationData asdcNotification) {
+
+		if (asdcNotification == null) {
+			return "NULL";
+		}
+        return "ASDC Notification:" + System.lineSeparator() +
+            "DistributionID:" + testNull(asdcNotification.getDistributionID()) + System.lineSeparator() +
+            "ServiceName:" + testNull(asdcNotification.getServiceName()) + System.lineSeparator() +
+            "ServiceVersion:" + testNull(asdcNotification.getServiceVersion()) + System.lineSeparator() +
+            "ServiceUUID:" + testNull(asdcNotification.getServiceUUID()) + System.lineSeparator() +
+            "ServiceInvariantUUID:" + testNull(asdcNotification.getServiceInvariantUUID()) + System.lineSeparator() +
+            "ServiceDescription:" + testNull(asdcNotification.getServiceDescription()) + System.lineSeparator() +
+            "Service Artifacts List:" + System.lineSeparator() + testNull(dumpArtifactInfoList(asdcNotification.getServiceArtifacts())) + System.lineSeparator() +
+            "Resource Instances List:" + System.lineSeparator() + testNull(dumpASDCResourcesList(asdcNotification)) + System.lineSeparator();
+	}
+
+	public static String dumpCSARNotification(INotificationData asdcNotification, ToscaResourceStructure toscaResourceStructure) {
+		
+		if (asdcNotification == null) {
+			return "NULL";
+		}
+		
+
+		StringBuilder buffer = new StringBuilder("CSAR Notification:");
+		buffer.append(System.lineSeparator());
+		buffer.append(System.lineSeparator());
+		
+		
+		ISdcCsarHelper csarHelper = toscaResourceStructure.getSdcCsarHelper();
+
+	
+		buffer.append("Service Level Properties:");
+		buffer.append(System.lineSeparator());
+		buffer.append("Name:");
+		buffer.append(testNull(csarHelper.getServiceMetadata().getValue(SdcPropertyNames.PROPERTY_NAME_NAME)));
+		buffer.append(System.lineSeparator());
+		buffer.append("Description:");
+		buffer.append(testNull(csarHelper.getServiceMetadata().getValue(SdcPropertyNames.PROPERTY_NAME_DESCRIPTION)));
+		buffer.append(System.lineSeparator());
+		buffer.append("Model UUID:");
+		buffer.append(testNull(csarHelper.getServiceMetadata().getValue(SdcPropertyNames.PROPERTY_NAME_UUID)));
+		buffer.append(System.lineSeparator());
+		buffer.append("Model Version:");
+		buffer.append(testNull(csarHelper.getServiceMetadata().getValue(SdcPropertyNames.PROPERTY_NAME_VERSION)));
+		buffer.append(System.lineSeparator());
+		buffer.append("Model InvariantUuid:");
+		buffer.append(testNull(csarHelper.getServiceMetadata().getValue(SdcPropertyNames.PROPERTY_NAME_INVARIANTUUID)));
+		buffer.append(System.lineSeparator());
+		buffer.append("Service Type:");
+		buffer.append(csarHelper.getServiceMetadata().getValue("serviceType"));
+		buffer.append(System.lineSeparator());
+		buffer.append("Service Role:");
+		buffer.append(csarHelper.getServiceMetadata().getValue("serviceRole"));
+		buffer.append(System.lineSeparator());
+		buffer.append("WorkLoad Context:");
+		buffer.append(asdcNotification.getWorkloadContext());
+		buffer.append(System.lineSeparator());
+		buffer.append("Environment Context:");
+		buffer.append(csarHelper.getServiceMetadata().getValue("environmentContext"));
+		
+		
+		List<NodeTemplate> serviceProxyResourceList = toscaResourceStructure.getSdcCsarHelper().getServiceNodeTemplateBySdcType(SdcTypes.SERVICE_PROXY);
+		
+		if(serviceProxyResourceList != null){
+			
+		for (NodeTemplate serviceProxyNodeTemplate :  serviceProxyResourceList) {
+			
+			buffer.append(System.lineSeparator());
+			buffer.append(System.lineSeparator());
+			buffer.append("Service Proxy Properties:");
+			buffer.append(System.lineSeparator());
+	   		buffer.append("Model Name:");
+    		buffer.append(serviceProxyNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_NAME));
+    		buffer.append(System.lineSeparator());
+    		buffer.append("Model UUID:");
+    		buffer.append(serviceProxyNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_UUID));		
+    		buffer.append(System.lineSeparator());
+       		buffer.append("Description:");
+    		buffer.append(serviceProxyNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_DESCRIPTION));
+    		buffer.append(System.lineSeparator());
+       		buffer.append("Version:");
+    		buffer.append(serviceProxyNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_VERSION));
+    		buffer.append(System.lineSeparator());
+      		buffer.append("InvariantUuid:");
+    		buffer.append(serviceProxyNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_INVARIANTUUID));
+    		buffer.append(System.lineSeparator());
+    		
+    		buffer.append(System.lineSeparator());
+    		buffer.append(System.lineSeparator());
+    		buffer.append("Service Proxy Customization Properties:");
+    		buffer.append(System.lineSeparator());
+    		
+       		buffer.append("Model Customization UUID:");
+    		buffer.append(serviceProxyNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_CUSTOMIZATIONUUID));
+    		buffer.append(System.lineSeparator());
+    		buffer.append("Model Instance Name:");
+    		buffer.append(serviceProxyNodeTemplate.getName());		
+    		buffer.append(System.lineSeparator());
+       		buffer.append("Tosca Node Type:");
+    		buffer.append(serviceProxyNodeTemplate.getType());
+    		buffer.append(System.lineSeparator());
+       		buffer.append("Version:");
+    		buffer.append(serviceProxyNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_VERSION));
+    		buffer.append(System.lineSeparator());
+      		buffer.append("InvariantUuid:");
+    		buffer.append(serviceProxyNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_INVARIANTUUID));
+    		buffer.append(System.lineSeparator());
+			
+		}
+		}
+		
+		List<NodeTemplate> configurationNodeTemplatesList = toscaResourceStructure.getSdcCsarHelper().getServiceNodeTemplateBySdcType(SdcTypes.CONFIGURATION);
+		
+		if(configurationNodeTemplatesList != null){
+		for (NodeTemplate configNodeTemplate :  configurationNodeTemplatesList) {
+			
+			buffer.append(System.lineSeparator());
+			buffer.append(System.lineSeparator());
+			buffer.append("Configuration Properties:");
+			buffer.append(System.lineSeparator());
+			
+	   		buffer.append("Model Name:");
+    		buffer.append(configNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_NAME));
+    		buffer.append(System.lineSeparator());
+    		buffer.append("Model UUID:");
+    		buffer.append(configNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_UUID));		
+    		buffer.append(System.lineSeparator());
+       		buffer.append("Description:");
+    		buffer.append(configNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_DESCRIPTION));
+    		buffer.append(System.lineSeparator());
+       		buffer.append("Version:");
+    		buffer.append(configNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_VERSION));
+    		buffer.append(System.lineSeparator());
+      		buffer.append("InvariantUuid:");
+    		buffer.append(configNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_INVARIANTUUID));
+    		buffer.append(System.lineSeparator());
+      		buffer.append("Tosca Node Type:");
+    		buffer.append(configNodeTemplate.getType());
+    		
+    		buffer.append(System.lineSeparator());
+    		buffer.append(System.lineSeparator());
+    		buffer.append("Configuration Customization Properties:");
+    		buffer.append(System.lineSeparator());
+    		
+       		buffer.append("Model Customization UUID:");
+    		buffer.append(configNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_CUSTOMIZATIONUUID));
+    		buffer.append(System.lineSeparator());
+    		buffer.append("Model Instance Name:");
+    		buffer.append(configNodeTemplate.getName());		
+    		buffer.append(System.lineSeparator());
+      		buffer.append("NFFunction:");
+      		buffer.append(toscaResourceStructure.getSdcCsarHelper().getNodeTemplatePropertyLeafValue(configNodeTemplate, SdcPropertyNames.PROPERTY_NAME_NFFUNCTION));
+    		buffer.append(System.lineSeparator());
+      		buffer.append("NFRole:");
+      		buffer.append(toscaResourceStructure.getSdcCsarHelper().getNodeTemplatePropertyLeafValue(configNodeTemplate, SdcPropertyNames.PROPERTY_NAME_NFROLE));
+    		buffer.append(System.lineSeparator());
+      		buffer.append("NFType:");
+      		buffer.append(toscaResourceStructure.getSdcCsarHelper().getNodeTemplatePropertyLeafValue(configNodeTemplate, SdcPropertyNames.PROPERTY_NAME_NFTYPE));
+    		buffer.append(System.lineSeparator());
+			
+		}
+		}
+		
+		buffer.append(System.lineSeparator());
+		buffer.append(System.lineSeparator());
+		buffer.append("VNF Level Properties:");
+		buffer.append(System.lineSeparator());
+		
+        List<NodeTemplate> vfNodeTemplatesList = toscaResourceStructure.getSdcCsarHelper().getServiceVfList();
+        for (NodeTemplate vfNodeTemplate :  vfNodeTemplatesList) {
+        	
+    		buffer.append("Model Name:");
+    		buffer.append(testNull(vfNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_NAME)));
+    		buffer.append(System.lineSeparator());
+       		buffer.append("Description:");
+    		buffer.append(testNull(vfNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_DESCRIPTION)));
+    		buffer.append(System.lineSeparator());
+       		buffer.append("Version:");
+    		buffer.append(testNull(vfNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_VERSION)));
+    		buffer.append(System.lineSeparator());
+      		buffer.append("Type:");
+    		buffer.append(testNull(vfNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_TYPE)));
+    		buffer.append(System.lineSeparator());
+      		buffer.append("InvariantUuid:");
+    		buffer.append(testNull(vfNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_INVARIANTUUID)));
+    		buffer.append(System.lineSeparator());
+      		buffer.append("Max Instances:");
+    		buffer.append(vfNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_MAXINSTANCES));
+    		buffer.append(System.lineSeparator());
+      		buffer.append("Min Instances:");
+    		buffer.append(vfNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_MININSTANCES));
+    		buffer.append(System.lineSeparator());
+    		
+    		buffer.append(System.lineSeparator());
+    		buffer.append("VNF Customization Properties:");
+    		buffer.append(System.lineSeparator());
+    		
+      		buffer.append("Customization UUID:");
+    		buffer.append(testNull(vfNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_CUSTOMIZATIONUUID)));
+    		buffer.append(System.lineSeparator());
+      		buffer.append("NFFunction:");
+      		buffer.append(toscaResourceStructure.getSdcCsarHelper().getNodeTemplatePropertyLeafValue(vfNodeTemplate, SdcPropertyNames.PROPERTY_NAME_NFFUNCTION));
+    		buffer.append(System.lineSeparator());
+      		buffer.append("NFCode:");
+      		buffer.append(toscaResourceStructure.getSdcCsarHelper().getNodeTemplatePropertyLeafValue(vfNodeTemplate, "nf_naming_code"));
+    		buffer.append(System.lineSeparator());
+      		buffer.append("NFRole:");
+      		buffer.append(toscaResourceStructure.getSdcCsarHelper().getNodeTemplatePropertyLeafValue(vfNodeTemplate, SdcPropertyNames.PROPERTY_NAME_NFROLE));
+    		buffer.append(System.lineSeparator());
+      		buffer.append("NFType:");
+      		buffer.append(toscaResourceStructure.getSdcCsarHelper().getNodeTemplatePropertyLeafValue(vfNodeTemplate, SdcPropertyNames.PROPERTY_NAME_NFTYPE));
+    		buffer.append(System.lineSeparator());
+    		buffer.append("MultiStageDesign:");
+     		buffer.append(toscaResourceStructure.getSdcCsarHelper().getNodeTemplatePropertyLeafValue(vfNodeTemplate, "multi_stage_design"));
+    		buffer.append(System.lineSeparator());
+     		   		
+     		List<Group> groupList = toscaResourceStructure.getSdcCsarHelper().getGroupsOfOriginOfNodeTemplateByToscaGroupType(vfNodeTemplate, "org.openecomp.groups.VfcInstanceGroup");
+     		
+     		if(groupList != null){
+     			for (Group group : groupList) { 	
+     				Metadata instanceMetadata = group.getMetadata();
+     				
+     	    		buffer.append(System.lineSeparator());
+     	    		buffer.append("VNFC Instance Group Properties:");
+     	    		buffer.append(System.lineSeparator());
+     					
+     		   		buffer.append("Model Name:");
+     	    		buffer.append(instanceMetadata.getValue(SdcPropertyNames.PROPERTY_NAME_NAME));
+     	    		buffer.append(System.lineSeparator());
+     	       		buffer.append("Version:");
+     	    		buffer.append(instanceMetadata.getValue(SdcPropertyNames.PROPERTY_NAME_VERSION));
+     	    		buffer.append(System.lineSeparator());
+     	      		buffer.append("Type:");
+     	    		buffer.append(vfNodeTemplate.getType());
+     	    		buffer.append(System.lineSeparator());
+     	      		buffer.append("InvariantUuid:");
+     	    		buffer.append(instanceMetadata.getValue(SdcPropertyNames.PROPERTY_NAME_INVARIANTUUID));
+     	    		buffer.append(System.lineSeparator());     				
+     			}
+     			
+     		}
+     		
+     		
+    		
+    		buffer.append(System.lineSeparator());
+    		buffer.append("VF Module Properties:");
+    		buffer.append(System.lineSeparator());
+    		List<Group> vfGroups = toscaResourceStructure.getSdcCsarHelper().getVfModulesByVf(testNull(vfNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_CUSTOMIZATIONUUID)));
+    		
+    		for(Group group : vfGroups){
+        		
+    			Metadata vfMetadata = group.getMetadata();
+    			
+          		buffer.append("ModelInvariantUuid:");
+        		buffer.append(testNull(toscaResourceStructure.getSdcCsarHelper().getMetadataPropertyValue(vfMetadata, SdcPropertyNames.PROPERTY_NAME_VFMODULEMODELINVARIANTUUID)));
+        		buffer.append(System.lineSeparator());
+         		buffer.append("ModelName:");
+        		buffer.append(testNull(toscaResourceStructure.getSdcCsarHelper().getMetadataPropertyValue(vfMetadata, SdcPropertyNames.PROPERTY_NAME_VFMODULEMODELNAME)));
+        		buffer.append(System.lineSeparator()); 
+         		buffer.append("ModelUuid:");
+        		buffer.append(testNull(toscaResourceStructure.getSdcCsarHelper().getMetadataPropertyValue(vfMetadata, SdcPropertyNames.PROPERTY_NAME_VFMODULEMODELUUID)));
+        		buffer.append(System.lineSeparator());
+         		buffer.append("ModelVersion:");
+        		buffer.append(testNull(toscaResourceStructure.getSdcCsarHelper().getMetadataPropertyValue(vfMetadata, SdcPropertyNames.PROPERTY_NAME_VFMODULEMODELVERSION)));
+        		buffer.append(System.lineSeparator()); 
+         		buffer.append("Description:");
+        		buffer.append(testNull(toscaResourceStructure.getSdcCsarHelper().getMetadataPropertyValue(vfMetadata, SdcPropertyNames.PROPERTY_NAME_DESCRIPTION)));
+        		buffer.append(System.lineSeparator());     
+    		}
+  
+        }
+        
+		
+		List<NodeTemplate> nodeTemplatesVLList = toscaResourceStructure.getSdcCsarHelper().getServiceVlList();
+					
+    	if(nodeTemplatesVLList != null){
+    		
+    		buffer.append(System.lineSeparator());
+    		buffer.append("NETWORK Level Properties:");
+    		buffer.append(System.lineSeparator());
+    		
+    		for(NodeTemplate vlNode : nodeTemplatesVLList){
+			
+    			buffer.append("Model Name:");
+    			buffer.append(testNull(vlNode.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_NAME)));
+    			buffer.append(System.lineSeparator()); 
+    			buffer.append("Model InvariantUuid:");
+    			buffer.append(testNull(vlNode.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_INVARIANTUUID)));
+    			buffer.append(System.lineSeparator());   
+    			buffer.append("Model UUID:");
+    			buffer.append(testNull(vlNode.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_UUID)));
+    			buffer.append(System.lineSeparator()); 
+    			buffer.append("Model Version:");
+    			buffer.append(testNull(vlNode.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_VERSION)));
+    			buffer.append(System.lineSeparator());   
+    			buffer.append("AIC Max Version:");
+    			buffer.append(testNull(vlNode.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_MAXINSTANCES)));
+    			buffer.append(System.lineSeparator()); 
+       			buffer.append("AIC Min Version:");
+    			buffer.append(testNull(vlNode.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_MININSTANCES)));
+    			buffer.append(System.lineSeparator());  
+       			buffer.append("Tosca Node Type:");
+    			buffer.append(testNull(vlNode.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_TYPE)));
+    			buffer.append(System.lineSeparator());  
+       			buffer.append("Description:");
+    			buffer.append(testNull(vlNode.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_DESCRIPTION)));
+    			buffer.append(System.lineSeparator());  
+    		
+    		}
+    			
+    	}
+    	
+  		buffer.append(System.lineSeparator());
+		buffer.append("Network Collection Resource Properties:");
+		buffer.append(System.lineSeparator());
+		
+	List<NodeTemplate> networkCollectionList = toscaResourceStructure.getSdcCsarHelper().getServiceNodeTemplateBySdcType(SdcTypes.CR);
+		
+		if (networkCollectionList != null) {
+			for (NodeTemplate crNode : networkCollectionList) {	
+		   		buffer.append("Model Name:");
+	    		buffer.append(crNode.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_NAME));
+	    		buffer.append(System.lineSeparator());
+	    		buffer.append("Model UUID:");
+	    		buffer.append(crNode.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_UUID));		
+	    		buffer.append(System.lineSeparator());
+	      		buffer.append("InvariantUuid:");
+	    		buffer.append(crNode.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_INVARIANTUUID));
+	    		buffer.append(System.lineSeparator());
+	       		buffer.append("Description:");
+	    		buffer.append(crNode.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_DESCRIPTION));
+	    		buffer.append(System.lineSeparator());
+	       		buffer.append("Version:");
+	    		buffer.append(crNode.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_VERSION));	
+	    		buffer.append(System.lineSeparator());
+	      		buffer.append("Tosca Node Type:");
+	    		buffer.append(crNode.getType());
+	    		buffer.append(System.lineSeparator());
+	    		buffer.append("CR Function:");
+	    		buffer.append(toscaResourceStructure.getSdcCsarHelper().getNodeTemplatePropertyLeafValue(crNode, "cr_function"));	
+	    		buffer.append(System.lineSeparator());
+	    		buffer.append("CR Role:");
+	    		buffer.append(toscaResourceStructure.getSdcCsarHelper().getNodeTemplatePropertyLeafValue(crNode, "cr_role"));	
+	    		buffer.append(System.lineSeparator());
+	    		buffer.append("CR Type:");
+	    		buffer.append(toscaResourceStructure.getSdcCsarHelper().getNodeTemplatePropertyLeafValue(crNode, "cr_type"));	
+	    		buffer.append(System.lineSeparator());
+	    		
+	    		List<NodeTemplate> vlNodeList = toscaResourceStructure.getSdcCsarHelper().getNodeTemplateBySdcType(crNode, SdcTypes.VL);
+	    			    		
+	    		for(NodeTemplate vlNodeTemplate : vlNodeList){
+	    			
+	    			Metadata vlMetadata = vlNodeTemplate.getMetaData();
+	    			
+    		  		buffer.append(System.lineSeparator());
+    				buffer.append("Network CR VL Properties:");
+    				buffer.append(System.lineSeparator());
+    				
+    		   		buffer.append("Model Name:");
+    	    		buffer.append(vlMetadata.getValue(SdcPropertyNames.PROPERTY_NAME_NAME));
+    	    		buffer.append(System.lineSeparator());
+    	    		buffer.append("Model UUID:");
+    	    		buffer.append(vlMetadata.getValue(SdcPropertyNames.PROPERTY_NAME_UUID));		
+    	    		buffer.append(System.lineSeparator());
+    	      		buffer.append("InvariantUuid:");
+    	    		buffer.append(vlMetadata.getValue(SdcPropertyNames.PROPERTY_NAME_INVARIANTUUID));
+    	    		buffer.append(System.lineSeparator());
+    	       		buffer.append("Version:");
+    	       		buffer.append(vlMetadata.getValue(SdcPropertyNames.PROPERTY_NAME_VERSION));	
+    	       		buffer.append(System.lineSeparator());
+      	       		buffer.append("AIC Max Version:");
+    	       		buffer.append(vlMetadata.getValue(SdcPropertyNames.PROPERTY_NAME_MAXINSTANCES));
+    	       		buffer.append(System.lineSeparator());
+     	       		buffer.append("Description:");
+    	       		buffer.append(vlMetadata.getValue(SdcPropertyNames.PROPERTY_NAME_DESCRIPTION));	
+    	       		buffer.append(System.lineSeparator());
+    	      		buffer.append("Tosca Node Type:");
+    	    		buffer.append(vlNodeTemplate.getType());	    
+    	    		buffer.append(System.lineSeparator());	
+	    			
+	    		}
+	    		
+	    		List<Group> groupList = toscaResourceStructure.getSdcCsarHelper().getGroupsOfOriginOfNodeTemplateByToscaGroupType(crNode, "org.openecomp.groups.NetworkCollection");	
+	    		
+	    		if(groupList != null){
+	    			for (Group group : groupList) { 
+	    				Metadata instanceMetadata = group.getMetadata();
+	    		  		buffer.append(System.lineSeparator());
+	    				buffer.append("Network Instance Group Properties:");
+	    				buffer.append(System.lineSeparator());
+	    				
+	    		   		buffer.append("Model Name:");
+	    	    		buffer.append(instanceMetadata.getValue(SdcPropertyNames.PROPERTY_NAME_NAME));
+	    	    		buffer.append(System.lineSeparator());
+	    	    		buffer.append("Model UUID:");
+	    	    		buffer.append(instanceMetadata.getValue(SdcPropertyNames.PROPERTY_NAME_UUID));		
+	    	    		buffer.append(System.lineSeparator());
+	    	      		buffer.append("InvariantUuid:");
+	    	    		buffer.append(instanceMetadata.getValue(SdcPropertyNames.PROPERTY_NAME_INVARIANTUUID));
+	    	    		buffer.append(System.lineSeparator());
+	    	       		buffer.append("Version:");
+	    	       		buffer.append(instanceMetadata.getValue(SdcPropertyNames.PROPERTY_NAME_VERSION));	
+	    	    		buffer.append(System.lineSeparator());	
+	    			}
+	    		
+	    		}
+	    		
+		  		buffer.append(System.lineSeparator());
+				buffer.append("Network Collection Customization Properties:");
+				buffer.append(System.lineSeparator());
+				
+	       		buffer.append("Model Customization UUID:");
+	    		buffer.append(crNode.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_CUSTOMIZATIONUUID));
+	    		buffer.append(System.lineSeparator());
+	    		buffer.append("Model Instance Name:");
+	    		buffer.append(crNode.getName());		
+	    		buffer.append(System.lineSeparator());
+	      		buffer.append("Network Scope:");
+	      		buffer.append(toscaResourceStructure.getSdcCsarHelper().getNodeTemplatePropertyLeafValue(crNode, SdcPropertyNames.PROPERTY_NAME_NETWORKSCOPE));
+	    		buffer.append(System.lineSeparator());
+	      		buffer.append("Network Role:");
+	      		buffer.append(toscaResourceStructure.getSdcCsarHelper().getNodeTemplatePropertyLeafValue(crNode, SdcPropertyNames.PROPERTY_NAME_NETWORKROLE));
+	    		buffer.append(System.lineSeparator());
+	      		buffer.append("Network Type:");
+	      		buffer.append(toscaResourceStructure.getSdcCsarHelper().getNodeTemplatePropertyLeafValue(crNode, SdcPropertyNames.PROPERTY_NAME_NETWORKTYPE));
+	    		buffer.append(System.lineSeparator());
+	      		buffer.append("Network Technology:");
+	      		buffer.append(toscaResourceStructure.getSdcCsarHelper().getNodeTemplatePropertyLeafValue(crNode, SdcPropertyNames.PROPERTY_NAME_NETWORKTECHNOLOGY));
+	    		buffer.append(System.lineSeparator());
+	
+			}
+		}
+    	
+        List<NodeTemplate> allottedResourceList = toscaResourceStructure.getSdcCsarHelper().getAllottedResources();
+    	
+    		if(allottedResourceList != null){
+    			
+    			buffer.append(System.lineSeparator());
+    			buffer.append("Allotted Resource Properties:");
+    			buffer.append(System.lineSeparator());
+    		
+    			for(NodeTemplate allottedNode : allottedResourceList){
+    				
+           			buffer.append("Model Name:");
+        			buffer.append(testNull(allottedNode.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_NAME)));
+        			buffer.append(System.lineSeparator());
+           			buffer.append("Model Name:");
+        			buffer.append(testNull(allottedNode.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_NAME)));
+        			buffer.append(System.lineSeparator()); 
+           			buffer.append("Model InvariantUuid:");
+        			buffer.append(testNull(allottedNode.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_INVARIANTUUID)));
+        			buffer.append(System.lineSeparator());  
+           			buffer.append("Model Version:");
+        			buffer.append(testNull(allottedNode.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_VERSION)));
+        			buffer.append(System.lineSeparator()); 
+           			buffer.append("Model UUID:");
+        			buffer.append(testNull(allottedNode.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_UUID)));
+        			buffer.append(System.lineSeparator());
+        			buffer.append("Model Subcategory:");
+        			buffer.append(allottedNode.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_SUBCATEGORY));
+					buffer.append(System.lineSeparator());
+					buffer.append("Model Description:");
+					buffer.append(allottedNode.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_DESCRIPTION));
+					buffer.append(System.lineSeparator());
+        			
+    				
+        			buffer.append("Allotted Resource Customization Properties:");
+        			buffer.append(System.lineSeparator());
+        		
+           			buffer.append("Model Cutomization UUID:");
+        			buffer.append(testNull(allottedNode.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_CUSTOMIZATIONUUID)));
+            		buffer.append(System.lineSeparator());
+              		buffer.append("NFFunction:");
+              		buffer.append(toscaResourceStructure.getSdcCsarHelper().getNodeTemplatePropertyLeafValue(allottedNode, SdcPropertyNames.PROPERTY_NAME_NFFUNCTION));
+            		buffer.append(System.lineSeparator());
+              		buffer.append("NFCode:");
+              		buffer.append(toscaResourceStructure.getSdcCsarHelper().getNodeTemplatePropertyLeafValue(allottedNode, "nf_naming_code"));
+            		buffer.append(System.lineSeparator());
+              		buffer.append("NFRole:");
+              		buffer.append(toscaResourceStructure.getSdcCsarHelper().getNodeTemplatePropertyLeafValue(allottedNode, SdcPropertyNames.PROPERTY_NAME_NFROLE));
+            		buffer.append(System.lineSeparator());
+              		buffer.append("NFType:");
+              		buffer.append(toscaResourceStructure.getSdcCsarHelper().getNodeTemplatePropertyLeafValue(allottedNode, SdcPropertyNames.PROPERTY_NAME_NFTYPE));
+            		buffer.append(System.lineSeparator());      
+    				
+				
+    			}
+    		}
+		
+		
+		return buffer.toString();
+	}
+	
+	public static String dumpVfModuleMetaDataList(List<IVfModuleData> moduleMetaDataList) {
+		if (moduleMetaDataList == null ) {
+			return null;
+		}
+
+		StringBuilder buffer = new StringBuilder("VfModuleMetaData List:");
+		buffer.append(System.lineSeparator());
+
+		buffer.append("{");
+
+		for (IVfModuleData moduleMetaData:moduleMetaDataList) {
+			buffer.append(System.lineSeparator());
+			buffer.append(testNull(dumpVfModuleMetaData(moduleMetaData)));
+			buffer.append(System.lineSeparator());
+			buffer.append(",");
+
+		}
+		buffer.replace(buffer.length()-1,buffer.length(), System.lineSeparator());
+		buffer.append("}");
+		buffer.append(System.lineSeparator());
+
+		return buffer.toString();
+	}
+
+	private static String dumpVfModuleMetaData(IVfModuleData moduleMetaData) {
+
+		if (moduleMetaData == null ) {
+			return "NULL";
+		}
+
+		StringBuilder stringBuilder = new StringBuilder("VfModuleMetaData:");
+		stringBuilder.append(System.lineSeparator());
+
+		stringBuilder.append("VfModuleModelName:");
+		stringBuilder.append(testNull(moduleMetaData.getVfModuleModelName()));
+		stringBuilder.append(System.lineSeparator());
+
+		stringBuilder.append("VfModuleModelVersion:");
+		stringBuilder.append(testNull(moduleMetaData.getVfModuleModelVersion()));
+		stringBuilder.append(System.lineSeparator());
+
+		stringBuilder.append("VfModuleModelUUID:");
+		stringBuilder.append(testNull(moduleMetaData.getVfModuleModelUUID()));
+		stringBuilder.append(System.lineSeparator());
+
+		stringBuilder.append("VfModuleModelInvariantUUID:");
+		stringBuilder.append(testNull(moduleMetaData.getVfModuleModelInvariantUUID()));
+		stringBuilder.append(System.lineSeparator());
+
+		stringBuilder.append("VfModuleModelDescription:");
+		stringBuilder.append(testNull(moduleMetaData.getVfModuleModelDescription()));
+		stringBuilder.append(System.lineSeparator());
+
+		stringBuilder.append("Artifacts UUID List:");
+
+		if (moduleMetaData.getArtifacts() != null) {
+			stringBuilder.append("{");
+
+			for (String artifactUUID:moduleMetaData.getArtifacts()) {
+				stringBuilder.append(System.lineSeparator());
+				stringBuilder.append(testNull(artifactUUID));
+				stringBuilder.append(System.lineSeparator());
+				stringBuilder.append(",");
+			}
+			stringBuilder.replace(stringBuilder.length()-1,stringBuilder.length(), System.lineSeparator());
+			stringBuilder.append("}");
+			stringBuilder.append(System.lineSeparator());
+		} else {
+			stringBuilder.append("NULL");
+		}
+
+		if (moduleMetaData.getProperties() != null) {
+			Map<String, String> vfModuleMap = moduleMetaData.getProperties();
+			stringBuilder.append("Properties List:");
+			stringBuilder.append("{");
+
+			for (Map.Entry<String, String> entry : vfModuleMap.entrySet()) {
+				stringBuilder.append(System.lineSeparator());
+				stringBuilder.append("  ").append(entry.getKey()).append(" : ").append(entry.getValue());
+			}
+			stringBuilder.replace(stringBuilder.length()-1,stringBuilder.length(), System.lineSeparator());
+			stringBuilder.append("}");
+			stringBuilder.append(System.lineSeparator());
+		} else {
+			stringBuilder.append("NULL");
+		}
+
+
+		stringBuilder.append(System.lineSeparator());
+
+		stringBuilder.append("isBase:");
+		stringBuilder.append(moduleMetaData.isBase());
+		stringBuilder.append(System.lineSeparator());
+
+		return stringBuilder.toString();
+	}
+
+	private static String testNull(Object object) {
+		if (object == null) {
+			return "NULL";
+		} else if (object instanceof Integer) {
+			return object.toString();
+		} else if (object instanceof String) {
+			return (String)object;
+		} else {
+			return "Type not recognized";
+		}
+	}
+
+	private static String dumpASDCResourcesList(INotificationData asdcNotification) {
+		if (asdcNotification == null || asdcNotification.getResources() == null) {
+			return null;
+		}
+
+		StringBuilder buffer = new StringBuilder();
+		buffer.append("{");
+
+		for (IResourceInstance resourceInstanceElem:asdcNotification.getResources()) {
+			buffer.append(System.lineSeparator());
+			buffer.append(testNull(dumpASDCResourceInstance(resourceInstanceElem)));
+			buffer.append(System.lineSeparator());
+			buffer.append(",");
+		}
+		buffer.replace(buffer.length()-1,buffer.length(), System.lineSeparator());
+		buffer.append("}");
+		buffer.append(System.lineSeparator());
+
+		return buffer.toString();
+
+	}
+
+	private static String dumpASDCResourceInstance(IResourceInstance resourceInstance) {
+
+		if (resourceInstance == null) {
+			return null;
+		}
+
+        return "Resource Instance Info:" + System.lineSeparator() +
+            "ResourceInstanceName:" + testNull(resourceInstance.getResourceInstanceName()) + System.lineSeparator() +
+            "ResourceCustomizationUUID:" + testNull(resourceInstance.getResourceCustomizationUUID()) + System.lineSeparator() +
+            "ResourceInvariantUUID:" + testNull(resourceInstance.getResourceInvariantUUID()) + System.lineSeparator() +
+            "ResourceName:" + testNull(resourceInstance.getResourceName()) + System.lineSeparator() +
+            "ResourceType:" + testNull(resourceInstance.getResourceType()) + System.lineSeparator() +
+            "ResourceUUID:" + testNull(resourceInstance.getResourceUUID()) + System.lineSeparator() +
+            "ResourceVersion:" + testNull(resourceInstance.getResourceVersion()) + System.lineSeparator() +
+            "Category:" + testNull(resourceInstance.getCategory()) + System.lineSeparator() +
+            "SubCategory:" + testNull(resourceInstance.getSubcategory()) + System.lineSeparator() +
+            "Resource Artifacts List:" + System.lineSeparator() + testNull(dumpArtifactInfoList(resourceInstance.getArtifacts())) + System.lineSeparator();
+	}
+
+
+	private static String dumpArtifactInfoList(List<IArtifactInfo> artifactsList) {
+
+		if (artifactsList == null || artifactsList.isEmpty()) {
+			return null;
+		}
+
+		StringBuilder buffer = new StringBuilder();
+		buffer.append("{");
+		for (IArtifactInfo artifactInfoElem:artifactsList) {
+			buffer.append(System.lineSeparator());
+			buffer.append(testNull(dumpASDCArtifactInfo(artifactInfoElem)));
+			buffer.append(System.lineSeparator());
+			buffer.append(",");
+
+		}
+		buffer.replace(buffer.length()-1,buffer.length(), System.lineSeparator());
+		buffer.append("}");
+		buffer.append(System.lineSeparator());
+
+		return buffer.toString();
+	}
+
+	private static String dumpASDCArtifactInfo(IArtifactInfo artifactInfo) {
+
+		if (artifactInfo == null) {
+			return null;
+		}
+
+		StringBuilder buffer = new StringBuilder("Service Artifacts Info:");
+		buffer.append(System.lineSeparator());
+
+		buffer.append("ArtifactName:");
+		buffer.append(testNull(artifactInfo.getArtifactName()));
+		buffer.append(System.lineSeparator());
+
+		buffer.append("ArtifactVersion:");
+		buffer.append(testNull(artifactInfo.getArtifactVersion()));
+		buffer.append(System.lineSeparator());
+
+		buffer.append("ArtifactType:");
+		buffer.append(testNull(artifactInfo.getArtifactType()));
+		buffer.append(System.lineSeparator());
+
+		buffer.append("ArtifactDescription:");
+		buffer.append(testNull(artifactInfo.getArtifactDescription()));
+		buffer.append(System.lineSeparator());
+
+		buffer.append("ArtifactTimeout:");
+		buffer.append(testNull(artifactInfo.getArtifactTimeout()));
+		buffer.append(System.lineSeparator());
+
+		buffer.append("ArtifactURL:");
+		buffer.append(testNull(artifactInfo.getArtifactURL()));
+		buffer.append(System.lineSeparator());
+
+		buffer.append("ArtifactUUID:");
+		buffer.append(testNull(artifactInfo.getArtifactUUID()));
+		buffer.append(System.lineSeparator());
+
+		buffer.append("ArtifactChecksum:");
+		buffer.append(testNull(artifactInfo.getArtifactChecksum()));
+		buffer.append(System.lineSeparator());
+
+		buffer.append("GeneratedArtifact:");
+		buffer.append("{");
+		buffer.append(testNull(dumpASDCArtifactInfo(artifactInfo.getGeneratedArtifact())));
+		buffer.append(System.lineSeparator());
+		buffer.append("}");
+		buffer.append(System.lineSeparator());
+
+		buffer.append("RelatedArtifacts:");
+
+
+		if (artifactInfo.getRelatedArtifacts() != null) {
+			buffer.append("{");
+			buffer.append(System.lineSeparator());
+			for (IArtifactInfo artifactInfoElem:artifactInfo.getRelatedArtifacts()) {
+
+				buffer.append(testNull(dumpASDCArtifactInfo(artifactInfoElem)));
+				buffer.append(System.lineSeparator());
+				buffer.append(",");
+
+			}
+			buffer.replace(buffer.length()-1,buffer.length(), System.lineSeparator());
+			buffer.append("}");
+			buffer.append(System.lineSeparator());
+		} else {
+			buffer.append("NULL");
+		}
+
+		buffer.append(System.lineSeparator());
+
+		return buffer.toString();
+	}
+}
diff --git a/asdc-controller/src/main/java/org/onap/so/asdc/util/NotificationLogging.java b/asdc-controller/src/main/java/org/onap/so/asdc/util/NotificationLogging.java
new file mode 100644
index 0000000000..965f8b7d49
--- /dev/null
+++ b/asdc-controller/src/main/java/org/onap/so/asdc/util/NotificationLogging.java
@@ -0,0 +1,169 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017 Huawei Technologies Co., Ltd. All rights reserved.
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+
+package org.onap.so.asdc.util;
+
+
+
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.lang.reflect.Proxy;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.onap.so.logger.MsoLogger;
+import org.onap.sdc.api.notification.INotificationData;
+
+
+public class NotificationLogging implements InvocationHandler {
+	
+	private static Map<Object, List<Method>> objectMethodsToLog = new HashMap<>();
+
+	protected static final MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.ASDC, NotificationLogging.class);
+	
+	private static InvocationHandler handler = (arg0, arg1, arg2) -> {
+			List<Method> methods = objectMethodsToLog.get(arg0);
+			if ((methods == null) || (methods.isEmpty())) {
+				// Do nothing for now...
+				return null;
+			}
+			methods.add(arg1);
+			return arg1.invoke(arg0, arg2);
+	};
+	
+	public static InvocationHandler getHandler() {
+		return handler;
+	}
+	
+	/**
+	 * 
+	 */
+	private NotificationLogging() {}
+	
+	private static final String[] GETTER_PREFIXES = { "get", "is" };
+	
+	public static String logNotification(INotificationData iNotif) {
+		if (iNotif == null) {
+			return "NULL";
+		}
+
+		Class<? extends INotificationData> clazz = iNotif.getClass();
+		
+		Method[] declaredMethods = clazz.getDeclaredMethods();
+		
+		if (declaredMethods == null || declaredMethods.length == 0) {
+			return "EMPTY"; // No declared methods in this class !!!
+		}
+		
+		StringBuilder buffer = new StringBuilder("ASDC Notification:");
+		buffer.append(System.lineSeparator());
+		
+		for (Method m : declaredMethods) {
+			if ((m != null) && isGetter(m)) {
+				for (String prefix : GETTER_PREFIXES) {
+					if (m.getName().startsWith(prefix)) {
+						buffer.append(m.getName().substring(prefix.length()));
+						break;
+					}
+				}
+				try {
+					buffer.append(testNull(m.invoke(iNotif, (Object[])null)));
+				} catch (IllegalAccessException | IllegalArgumentException
+						| InvocationTargetException e) {
+					LOGGER.debug("Exception :"+e);
+					buffer.append("UNREADABLE");
+				}
+				buffer.append(System.lineSeparator());
+			}
+		}
+		
+		return buffer.toString();
+	}
+	
+	private static boolean isGetter(Method method) {
+
+		// Must start with a valid (and known) prefix
+		boolean prefixFound = false;
+		for (String prefix : GETTER_PREFIXES) {
+			if (method.getName().startsWith(prefix)) {
+				prefixFound = true;
+				break;
+			}
+		}
+		if (!prefixFound) {
+			return false;
+		}
+
+		// Must not take any input arguments
+		if (method.getParameterTypes().length != 0) {
+			return false;  
+		}
+		
+		// Must not have return type 'void'
+		if (void.class.equals(method.getReturnType())) {
+			return false;
+		}
+		
+		// Must be public
+		if (!Modifier.isPublic(method.getModifiers())) {
+			return false;
+		}
+		
+		return true;
+	}
+	
+	private static String testNull(Object object) {
+		if (object == null) {
+			return "NULL";
+		} else if (object instanceof Integer) {
+			return object.toString();
+		} else if (object instanceof String) {
+			return (String) object;
+		} else {
+			return "Type not recognized";
+		}
+	}
+	
+	private static void registerForLog(INotificationData objectToLog) {
+		INotificationData proxy = (INotificationData) Proxy.newProxyInstance(
+				INotificationData.class.getClassLoader(),
+				new Class[] { INotificationData.class },
+				NotificationLogging.getHandler());
+		objectMethodsToLog.put(proxy, new ArrayList<>());
+	}
+	
+	private static <T> void methodToLog(T methodCall) {
+		//
+	}
+	
+	@Override
+	public Object invoke(Object proxy, Method method, Object[] args)
+			throws Throwable {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+}
diff --git a/asdc-controller/src/main/java/org/onap/so/asdc/util/ToLog.java b/asdc-controller/src/main/java/org/onap/so/asdc/util/ToLog.java
new file mode 100644
index 0000000000..1f67b9cd91
--- /dev/null
+++ b/asdc-controller/src/main/java/org/onap/so/asdc/util/ToLog.java
@@ -0,0 +1,29 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+
+package org.onap.so.asdc.util;
+
+
+
+
+public @interface ToLog {
+
+}
diff --git a/asdc-controller/src/main/java/org/onap/so/asdc/util/YamlEditor.java b/asdc-controller/src/main/java/org/onap/so/asdc/util/YamlEditor.java
new file mode 100644
index 0000000000..fdeddf1f68
--- /dev/null
+++ b/asdc-controller/src/main/java/org/onap/so/asdc/util/YamlEditor.java
@@ -0,0 +1,176 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.so.asdc.util;
+
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+import org.yaml.snakeyaml.Yaml;
+
+import org.onap.so.db.catalog.beans.HeatTemplateParam;
+
+public class YamlEditor {
+
+    private static final String REFER_PATTERN = "file:///";
+    private Map <String, Object> yml;
+    private Yaml yaml = new Yaml ();
+
+    public YamlEditor () {
+
+    }
+
+    public YamlEditor (byte[] body) {
+        init (body);
+    }
+
+    @SuppressWarnings("unchecked")
+    private synchronized void init (byte[] body) {
+        InputStream input = new ByteArrayInputStream (body);
+        yml = (Map <String, Object>) yaml.load (input);
+    }
+
+    public synchronized List <String> getYamlNestedFileResourceTypeList () {
+        List <String> typeList = new ArrayList<>();
+
+        @SuppressWarnings("unchecked")
+        Map <String, Object> resourceMap = (Map <String, Object>) yml.get ("resources");
+        Iterator <Entry <String, Object>> it = resourceMap.entrySet ().iterator ();
+        while (it.hasNext ()) {
+            Map.Entry <String, Object> pair = it.next ();
+            @SuppressWarnings("unchecked")
+            Map <String, String> resourceEntry = (Map <String, String>) pair.getValue ();
+            String type = resourceEntry.get ("type");
+
+            if (type.contains (REFER_PATTERN)) {
+                typeList.add (type);
+            }
+            it.remove (); // avoids a ConcurrentModificationException
+        }
+        return typeList;
+    }
+    
+    public synchronized List <String> getYamlResourceTypeList () {
+        List <String> typeList = new ArrayList<>();
+
+        @SuppressWarnings("unchecked")
+        Map <String, Object> resourceMap = (Map <String, Object>) yml.get ("resources");
+        for (Entry<String, Object> pair : resourceMap.entrySet()) {
+            @SuppressWarnings("unchecked")
+            Map<String, String> resourceEntry = (Map<String, String>) pair.getValue();
+            typeList.add(resourceEntry.get("type"));
+        }
+        return typeList;
+    }    
+
+    // Generate the parameter list based on the Heat Template
+    // Based on the email from Ella Kvetny:
+    // Within Heat Template, under parameters catalog, it might indicate the default value of the parameter
+    // If default value exist, the parameter is not mandatory, otherwise its value should be set
+    public synchronized Set <HeatTemplateParam> getParameterList (String artifactUUID) {
+        Set <HeatTemplateParam> paramSet = new HashSet<>();
+        @SuppressWarnings("unchecked")
+        Map <String, Object> resourceMap = (Map <String, Object>) yml.get ("parameters");
+
+        for (Entry<String, Object> stringObjectEntry : resourceMap.entrySet()) {
+            HeatTemplateParam param = new HeatTemplateParam();
+            Entry<String, Object> pair = stringObjectEntry;
+            @SuppressWarnings("unchecked")
+            Map<String, String> resourceEntry = (Map<String, String>) pair.getValue();
+
+            param.setParamName(pair.getKey());
+            // System.out.println(pair.getKey()+":"+type);
+            if (resourceEntry.containsKey("default")) {
+                param.setRequired(false);
+            } else {
+                param.setRequired(true);
+            }
+            // Now set the type
+            String value = resourceEntry.get("type");
+            param.setParamType(value);
+
+            param.setHeatTemplateArtifactUuid(artifactUUID);
+
+            paramSet.add(param);
+
+        }
+        return paramSet;
+
+    }
+
+    public synchronized void addParameterList (Set <HeatTemplateParam> heatSet) {
+
+        @SuppressWarnings("unchecked")
+        Map <String, Object> resourceMap = (Map <String, Object>) yml.get ("parameters");
+        if (resourceMap == null) {
+            resourceMap = new LinkedHashMap<>();
+            this.yml.put ("parameters", resourceMap);
+        }
+        for (HeatTemplateParam heatParam : heatSet) {
+            Map <String, Object> paramInfo = new HashMap<>();
+            paramInfo.put ("type", heatParam.getParamType ());
+
+            resourceMap.put (heatParam.getParamName (), paramInfo);
+        }
+
+        // this.yml.put("parameters", resourceMap);
+
+    }
+
+    public boolean isParentTemplate (String templateBody) {
+        return templateBody.contains (REFER_PATTERN);
+    }
+
+    public boolean verifyTemplate () {
+        // Verify whether the heat template is for Vnf Resource
+        // We don't support other template installation yet
+
+        return true;
+    }
+
+    public String encode (Map <String, Object> content) {
+        return yaml.dump (content);
+    }
+
+    public synchronized String encode () {
+        return this.yaml.dump (this.yml);
+    }
+
+    /**
+     * This method return the YAml file as a string.
+     * 
+     */
+    @Override
+    public String toString () {
+
+        return encode ();
+    }
+
+}