[AAI-3] Remove dependency on SDC

Change-Id: Iacdf8fb0dabdfe396f508dec3755ef1a2ea0210e
Signed-off-by: Blimkie, Steven (sb787e) <steven.blimkie@amdocs.com>

7 files changed, 1400 insertions, 1282 deletions

diff --git a/src/main/java/org/openecomp/modelloader/config/ModelLoaderConfig.java b/src/main/java/org/openecomp/modelloader/config/ModelLoaderConfig.java
index 407b015..107010d 100644
--- a/src/main/java/org/openecomp/modelloader/config/ModelLoaderConfig.java
+++ b/src/main/java/org/openecomp/modelloader/config/ModelLoaderConfig.java
@@ -1,232 +1,232 @@
-/**

- * ============LICENSE_START=======================================================

- * Model Loader

- * ================================================================================

- * Copyright © 2017 AT&T Intellectual Property.

- * Copyright © 2017 Amdocs

- * 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=========================================================

- *

- * ECOMP and OpenECOMP are trademarks

- * and service marks of AT&T Intellectual Property.

- */

-package org.openecomp.modelloader.config;

-

-import org.eclipse.jetty.util.security.Password;

-import org.openecomp.sdc.api.consumer.IConfiguration;

-

-import java.util.ArrayList;

-import java.util.List;

-import java.util.Properties;

-

-public class ModelLoaderConfig implements IConfiguration {

-	

-  // Configuration file structure

-  public static final String PREFIX_MODEL_LOADER_CONFIG = "ml";

-  public static final String PREFIX_DISTRIBUTION_CLIENT = 

-      PREFIX_MODEL_LOADER_CONFIG + ".distribution.";

-  public static final String PREFIX_AAI = PREFIX_MODEL_LOADER_CONFIG + ".aai.";

-  public static final String PREFIX_DEBUG = PREFIX_MODEL_LOADER_CONFIG + ".debug.";

-

-  // Configuration file properties

-  protected static final String PROP_ML_DISTRIBUTION_ACTIVE_SERVER_TLS_AUTH = 

-      PREFIX_DISTRIBUTION_CLIENT + "ACTIVE_SERVER_TLS_AUTH";

-  protected static final String PROP_ML_DISTRIBUTION_ASDC_ADDRESS = PREFIX_DISTRIBUTION_CLIENT

-      + "ASDC_ADDRESS";

-  protected static final String PROP_ML_DISTRIBUTION_CONSUMER_GROUP = PREFIX_DISTRIBUTION_CLIENT

-      + "CONSUMER_GROUP";

-  protected static final String PROP_ML_DISTRIBUTION_CONSUMER_ID = PREFIX_DISTRIBUTION_CLIENT

-      + "CONSUMER_ID";

-  protected static final String PROP_ML_DISTRIBUTION_ENVIRONMENT_NAME = PREFIX_DISTRIBUTION_CLIENT

-      + "ENVIRONMENT_NAME";

-  protected static final String PROP_ML_DISTRIBUTION_KEYSTORE_PASSWORD = PREFIX_DISTRIBUTION_CLIENT

-      + "KEYSTORE_PASSWORD";

-  protected static final String PROP_ML_DISTRIBUTION_KEYSTORE_FILE = PREFIX_DISTRIBUTION_CLIENT

-      + "KEYSTORE_FILE";

-  protected static final String PROP_ML_DISTRIBUTION_PASSWORD = PREFIX_DISTRIBUTION_CLIENT

-      + "PASSWORD";

-  protected static final String PROP_ML_DISTRIBUTION_POLLING_INTERVAL = PREFIX_DISTRIBUTION_CLIENT

-      + "POLLING_INTERVAL";

-  protected static final String PROP_ML_DISTRIBUTION_POLLING_TIMEOUT = PREFIX_DISTRIBUTION_CLIENT

-      + "POLLING_TIMEOUT";

-  protected static final String PROP_ML_DISTRIBUTION_USER = PREFIX_DISTRIBUTION_CLIENT + "USER";

-  protected static final String PROP_ML_DISTRIBUTION_ARTIFACT_TYPES = PREFIX_DISTRIBUTION_CLIENT

-      + "ARTIFACT_TYPES";

-

-  protected static final String PROP_AAI_BASE_URL = PREFIX_AAI + "BASE_URL";

-  protected static final String PROP_AAI_KEYSTORE_FILE = PREFIX_AAI + "KEYSTORE_FILE";

-  protected static final String PROP_AAI_KEYSTORE_PASSWORD = PREFIX_AAI + "KEYSTORE_PASSWORD";

-  protected static final String PROP_AAI_MODEL_RESOURCE_URL = PREFIX_AAI + "MODEL_URL";

-  protected static final String PROP_AAI_NAMED_QUERY_RESOURCE_URL = PREFIX_AAI + "NAMED_QUERY_URL";

-  protected static final String PROP_AAI_VNF_IMAGE_RESOURCE_URL = PREFIX_AAI + "VNF_IMAGE_URL";

-  protected static final String PROP_AAI_AUTHENTICATION_USER = PREFIX_AAI + "AUTH_USER";

-  protected static final String PROP_AAI_AUTHENTICATION_PASSWORD = PREFIX_AAI + "AUTH_PASSWORD";

-

-  protected static final String PROP_DEBUG_INGEST_SIMULATOR = PREFIX_DEBUG + "INGEST_SIMULATOR";

-

-  private Properties modelLoaderProperties = null;

-

-  private String certLocation = ".";

-

-  private List<String> artifactTypes = null;

-

-  /**

-   * This is the class constructor.

-   * 

-   * @param modelLoaderProperties properties needed to be configured for the model loader

-   * @param certLocation location of the certificate

-   */

-  public ModelLoaderConfig(Properties modelLoaderProperties, String certLocation) {

-    this.modelLoaderProperties = modelLoaderProperties;

-    this.certLocation = certLocation;

-

-    // Get list of artifacts

-    artifactTypes = new ArrayList<String>();

-    if (modelLoaderProperties.getProperty(PROP_ML_DISTRIBUTION_ARTIFACT_TYPES) != null) {

-      String[] artTypeList = modelLoaderProperties.getProperty(PROP_ML_DISTRIBUTION_ARTIFACT_TYPES)

-          .split(",");

-      for (String artType : artTypeList) {

-        artifactTypes.add(artType);

-      }

-    }

-  }

-

-  @Override

-  public boolean activateServerTLSAuth() {

-    String value = modelLoaderProperties.getProperty(PROP_ML_DISTRIBUTION_ACTIVE_SERVER_TLS_AUTH);

-    return value == null ? false : Boolean.parseBoolean(value);

-  }

-

-  @Override

-  public String getAsdcAddress() {

-    return modelLoaderProperties.getProperty(PROP_ML_DISTRIBUTION_ASDC_ADDRESS);

-  }

-

-  @Override

-  public String getConsumerGroup() {

-    return modelLoaderProperties.getProperty(PROP_ML_DISTRIBUTION_CONSUMER_GROUP);

-  }

-

-  @Override

-  public String getConsumerID() {

-    return modelLoaderProperties.getProperty(PROP_ML_DISTRIBUTION_CONSUMER_ID);

-  }

-

-  @Override

-  public String getEnvironmentName() {

-    return modelLoaderProperties.getProperty(PROP_ML_DISTRIBUTION_ENVIRONMENT_NAME);

-  }

-

-  @Override

-  public String getKeyStorePassword() {

-    return Password

-        .deobfuscate(modelLoaderProperties.getProperty(PROP_ML_DISTRIBUTION_KEYSTORE_PASSWORD));

-  }

-

-  @Override

-  public String getKeyStorePath() {

-    return certLocation + modelLoaderProperties.getProperty(PROP_ML_DISTRIBUTION_KEYSTORE_FILE);

-  }

-

-  @Override

-  public String getPassword() {

-    return Password.deobfuscate(modelLoaderProperties.getProperty(PROP_ML_DISTRIBUTION_PASSWORD));

-  }

-

-  @Override

-  public int getPollingInterval() {

-    return Integer

-        .parseInt(modelLoaderProperties.getProperty(PROP_ML_DISTRIBUTION_POLLING_INTERVAL));

-  }

-

-  @Override

-  public int getPollingTimeout() {

-    return Integer

-        .parseInt(modelLoaderProperties.getProperty(PROP_ML_DISTRIBUTION_POLLING_TIMEOUT));

-  }

-

-  @Override

-  public List<String> getRelevantArtifactTypes() {

-    return artifactTypes;

-  }

-

-  @Override

-  public String getUser() {

-    return modelLoaderProperties.getProperty(PROP_ML_DISTRIBUTION_USER);

-  }

-

-  public String getAaiKeyStorePath() {

-    return certLocation + "/" + modelLoaderProperties.getProperty(PROP_AAI_KEYSTORE_FILE);

-  }

-

-  public String getAaiKeyStorePassword() {

-    return Password.deobfuscate(modelLoaderProperties.getProperty(PROP_AAI_KEYSTORE_PASSWORD));

-  }

-

-  public String getAaiBaseUrl() {

-    return modelLoaderProperties.getProperty(PROP_AAI_BASE_URL);

-  }

-

-  public String getAaiModelUrl() {

-    return modelLoaderProperties.getProperty(PROP_AAI_MODEL_RESOURCE_URL);

-  }

-

-  public String getAaiNamedQueryUrl() {

-    return modelLoaderProperties.getProperty(PROP_AAI_NAMED_QUERY_RESOURCE_URL);

-  }

-

-  public String getAaiVnfImageUrl() {

-    return modelLoaderProperties.getProperty(PROP_AAI_VNF_IMAGE_RESOURCE_URL);

-  }

-

-  public String getAaiAuthenticationUser() {

-    return modelLoaderProperties.getProperty(PROP_AAI_AUTHENTICATION_USER);

-  }

-

-  /**

-   * @return password for AAI authentication that has been reverse-engineered

-   *         from its obfuscated form.

-   */

-  public String getAaiAuthenticationPassword() {

-    String password = Password

-        .deobfuscate(modelLoaderProperties.getProperty(PROP_AAI_AUTHENTICATION_PASSWORD));

-

-    if ((password != null) && (password.equals(""))) {

-      return null;

-    }

-

-    return password;

-  }

-

-  /**

-   * @return a boolean value indicating whether the simulator is enabled.

-   */

-  public boolean getIngestSimulatorEnabled() {

-    String propValue = modelLoaderProperties.getProperty(PROP_DEBUG_INGEST_SIMULATOR);

-

-    if (propValue == null) {

-      return false;

-    }

-

-    if (propValue.compareToIgnoreCase("enabled") == 0) {

-      return true;

-    }

-

-    return false;

-  }

-

-  public boolean isFilterInEmptyResources() {

-	  return false;

-  }

-

-}

+/**
+ * ============LICENSE_START=======================================================
+ * Model Loader
+ * ================================================================================
+ * Copyright © 2017 AT&T Intellectual Property.
+ * Copyright © 2017 Amdocs
+ * 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=========================================================
+ *
+ * ECOMP and OpenECOMP are trademarks
+ * and service marks of AT&T Intellectual Property.
+ */
+package org.openecomp.modelloader.config;
+
+import org.eclipse.jetty.util.security.Password;
+import org.openecomp.sdc.api.consumer.IConfiguration;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+
+public class ModelLoaderConfig implements IConfiguration {
+	
+  // Configuration file structure
+  public static final String PREFIX_MODEL_LOADER_CONFIG = "ml";
+  public static final String PREFIX_DISTRIBUTION_CLIENT = 
+      PREFIX_MODEL_LOADER_CONFIG + ".distribution.";
+  public static final String PREFIX_AAI = PREFIX_MODEL_LOADER_CONFIG + ".aai.";
+  public static final String PREFIX_DEBUG = PREFIX_MODEL_LOADER_CONFIG + ".debug.";
+
+  // Configuration file properties
+  protected static final String PROP_ML_DISTRIBUTION_ACTIVE_SERVER_TLS_AUTH = 
+      PREFIX_DISTRIBUTION_CLIENT + "ACTIVE_SERVER_TLS_AUTH";
+  protected static final String PROP_ML_DISTRIBUTION_ASDC_ADDRESS = PREFIX_DISTRIBUTION_CLIENT
+      + "ASDC_ADDRESS";
+  protected static final String PROP_ML_DISTRIBUTION_CONSUMER_GROUP = PREFIX_DISTRIBUTION_CLIENT
+      + "CONSUMER_GROUP";
+  protected static final String PROP_ML_DISTRIBUTION_CONSUMER_ID = PREFIX_DISTRIBUTION_CLIENT
+      + "CONSUMER_ID";
+  protected static final String PROP_ML_DISTRIBUTION_ENVIRONMENT_NAME = PREFIX_DISTRIBUTION_CLIENT
+      + "ENVIRONMENT_NAME";
+  protected static final String PROP_ML_DISTRIBUTION_KEYSTORE_PASSWORD = PREFIX_DISTRIBUTION_CLIENT
+      + "KEYSTORE_PASSWORD";
+  protected static final String PROP_ML_DISTRIBUTION_KEYSTORE_FILE = PREFIX_DISTRIBUTION_CLIENT
+      + "KEYSTORE_FILE";
+  protected static final String PROP_ML_DISTRIBUTION_PASSWORD = PREFIX_DISTRIBUTION_CLIENT
+      + "PASSWORD";
+  protected static final String PROP_ML_DISTRIBUTION_POLLING_INTERVAL = PREFIX_DISTRIBUTION_CLIENT
+      + "POLLING_INTERVAL";
+  protected static final String PROP_ML_DISTRIBUTION_POLLING_TIMEOUT = PREFIX_DISTRIBUTION_CLIENT
+      + "POLLING_TIMEOUT";
+  protected static final String PROP_ML_DISTRIBUTION_USER = PREFIX_DISTRIBUTION_CLIENT + "USER";
+  protected static final String PROP_ML_DISTRIBUTION_ARTIFACT_TYPES = PREFIX_DISTRIBUTION_CLIENT
+      + "ARTIFACT_TYPES";
+
+  protected static final String PROP_AAI_BASE_URL = PREFIX_AAI + "BASE_URL";
+  protected static final String PROP_AAI_KEYSTORE_FILE = PREFIX_AAI + "KEYSTORE_FILE";
+  protected static final String PROP_AAI_KEYSTORE_PASSWORD = PREFIX_AAI + "KEYSTORE_PASSWORD";
+  protected static final String PROP_AAI_MODEL_RESOURCE_URL = PREFIX_AAI + "MODEL_URL";
+  protected static final String PROP_AAI_NAMED_QUERY_RESOURCE_URL = PREFIX_AAI + "NAMED_QUERY_URL";
+  protected static final String PROP_AAI_VNF_IMAGE_RESOURCE_URL = PREFIX_AAI + "VNF_IMAGE_URL";
+  protected static final String PROP_AAI_AUTHENTICATION_USER = PREFIX_AAI + "AUTH_USER";
+  protected static final String PROP_AAI_AUTHENTICATION_PASSWORD = PREFIX_AAI + "AUTH_PASSWORD";
+
+  protected static final String PROP_DEBUG_INGEST_SIMULATOR = PREFIX_DEBUG + "INGEST_SIMULATOR";
+
+  private Properties modelLoaderProperties = null;
+
+  private String certLocation = ".";
+
+  private List<String> artifactTypes = null;
+
+  /**
+   * This is the class constructor.
+   * 
+   * @param modelLoaderProperties properties needed to be configured for the model loader
+   * @param certLocation location of the certificate
+   */
+  public ModelLoaderConfig(Properties modelLoaderProperties, String certLocation) {
+    this.modelLoaderProperties = modelLoaderProperties;
+    this.certLocation = certLocation;
+
+    // Get list of artifacts
+    artifactTypes = new ArrayList<String>();
+    if (modelLoaderProperties.getProperty(PROP_ML_DISTRIBUTION_ARTIFACT_TYPES) != null) {
+      String[] artTypeList = modelLoaderProperties.getProperty(PROP_ML_DISTRIBUTION_ARTIFACT_TYPES)
+          .split(",");
+      for (String artType : artTypeList) {
+        artifactTypes.add(artType);
+      }
+    }
+  }
+
+  @Override
+  public boolean activateServerTLSAuth() {
+    String value = modelLoaderProperties.getProperty(PROP_ML_DISTRIBUTION_ACTIVE_SERVER_TLS_AUTH);
+    return value == null ? false : Boolean.parseBoolean(value);
+  }
+
+  @Override
+  public String getAsdcAddress() {
+    return modelLoaderProperties.getProperty(PROP_ML_DISTRIBUTION_ASDC_ADDRESS);
+  }
+
+  @Override
+  public String getConsumerGroup() {
+    return modelLoaderProperties.getProperty(PROP_ML_DISTRIBUTION_CONSUMER_GROUP);
+  }
+
+  @Override
+  public String getConsumerID() {
+    return modelLoaderProperties.getProperty(PROP_ML_DISTRIBUTION_CONSUMER_ID);
+  }
+
+  @Override
+  public String getEnvironmentName() {
+    return modelLoaderProperties.getProperty(PROP_ML_DISTRIBUTION_ENVIRONMENT_NAME);
+  }
+
+  @Override
+  public String getKeyStorePassword() {
+    return Password
+        .deobfuscate(modelLoaderProperties.getProperty(PROP_ML_DISTRIBUTION_KEYSTORE_PASSWORD));
+  }
+
+  @Override
+  public String getKeyStorePath() {
+    return certLocation + modelLoaderProperties.getProperty(PROP_ML_DISTRIBUTION_KEYSTORE_FILE);
+  }
+
+  @Override
+  public String getPassword() {
+    return Password.deobfuscate(modelLoaderProperties.getProperty(PROP_ML_DISTRIBUTION_PASSWORD));
+  }
+
+  @Override
+  public int getPollingInterval() {
+    return Integer
+        .parseInt(modelLoaderProperties.getProperty(PROP_ML_DISTRIBUTION_POLLING_INTERVAL));
+  }
+
+  @Override
+  public int getPollingTimeout() {
+    return Integer
+        .parseInt(modelLoaderProperties.getProperty(PROP_ML_DISTRIBUTION_POLLING_TIMEOUT));
+  }
+
+  @Override
+  public List<String> getRelevantArtifactTypes() {
+    return artifactTypes;
+  }
+
+  @Override
+  public String getUser() {
+    return modelLoaderProperties.getProperty(PROP_ML_DISTRIBUTION_USER);
+  }
+
+  public String getAaiKeyStorePath() {
+    return certLocation + "/" + modelLoaderProperties.getProperty(PROP_AAI_KEYSTORE_FILE);
+  }
+
+  public String getAaiKeyStorePassword() {
+    return Password.deobfuscate(modelLoaderProperties.getProperty(PROP_AAI_KEYSTORE_PASSWORD));
+  }
+
+  public String getAaiBaseUrl() {
+    return modelLoaderProperties.getProperty(PROP_AAI_BASE_URL);
+  }
+
+  public String getAaiModelUrl(String version) {
+    return modelLoaderProperties.getProperty(PROP_AAI_MODEL_RESOURCE_URL).replace("v*", version);
+  }
+
+  public String getAaiNamedQueryUrl(String version) {
+    return modelLoaderProperties.getProperty(PROP_AAI_NAMED_QUERY_RESOURCE_URL).replace("v*", version);
+  }
+
+  public String getAaiVnfImageUrl() {
+    return modelLoaderProperties.getProperty(PROP_AAI_VNF_IMAGE_RESOURCE_URL);
+  }
+
+  public String getAaiAuthenticationUser() {
+    return modelLoaderProperties.getProperty(PROP_AAI_AUTHENTICATION_USER);
+  }
+
+  /**
+   * @return password for AAI authentication that has been reverse-engineered
+   *         from its obfuscated form.
+   */
+  public String getAaiAuthenticationPassword() {
+    String password = Password
+        .deobfuscate(modelLoaderProperties.getProperty(PROP_AAI_AUTHENTICATION_PASSWORD));
+
+    if ((password != null) && (password.equals(""))) {
+      return null;
+    }
+
+    return password;
+  }
+
+  /**
+   * @return a boolean value indicating whether the simulator is enabled.
+   */
+  public boolean getIngestSimulatorEnabled() {
+    String propValue = modelLoaderProperties.getProperty(PROP_DEBUG_INGEST_SIMULATOR);
+
+    if (propValue == null) {
+      return false;
+    }
+
+    if (propValue.compareToIgnoreCase("enabled") == 0) {
+      return true;
+    }
+
+    return false;
+  }
+
+  public boolean isFilterInEmptyResources() {
+	  return false;
+  }
+
+}
diff --git a/src/main/java/org/openecomp/modelloader/entity/model/ModelArtifact.java b/src/main/java/org/openecomp/modelloader/entity/model/ModelArtifact.java
index 14749e5..432e442 100644
--- a/src/main/java/org/openecomp/modelloader/entity/model/ModelArtifact.java
+++ b/src/main/java/org/openecomp/modelloader/entity/model/ModelArtifact.java
@@ -1,134 +1,141 @@
-/**

- * ============LICENSE_START=======================================================

- * Model Loader

- * ================================================================================

- * Copyright © 2017 AT&T Intellectual Property.

- * Copyright © 2017 Amdocs

- * 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=========================================================

- *

- * ECOMP and OpenECOMP are trademarks

- * and service marks of AT&T Intellectual Property.

- */

-package org.openecomp.modelloader.entity.model;

-

-import org.openecomp.modelloader.entity.Artifact;

-import org.w3c.dom.Node;

-

-import java.util.HashSet;

-import java.util.Set;

-

-public class ModelArtifact extends Artifact {

-

-	String modelVerId;

-	String modelInvariantId;

-	String nameVersionId;

-	String modelModelVerCombinedKey;

-	String modelVerModelVersionId;

-	String modelModelInvariantId;

-	String modelNamespace;

-	Set<String> referencedModelIds = new HashSet<String>(); 

-	Node modelVer;

-	boolean isV9Artifact = true;

-	

-	public boolean isV9Artifact() {

-		return isV9Artifact;

-	}

-	

-	public void setV9Artifact(boolean isV9Artifact) {

-		this.isV9Artifact = isV9Artifact;

-	}

-

-	public String getModelVerModelVersionId() {

-		return modelVerModelVersionId;

-	}

-	

-	public void setModelVerModelVersionId(String modelVerModelVersionId) {

-		this.modelVerModelVersionId = modelVerModelVersionId;

-	}

-	

-	public String getModelModelInvariantId() {

-		return modelModelInvariantId;

-	}

-	

-	public void setModelModelInvariantId(String modelModelInvariantId) {

-		this.modelModelInvariantId = modelModelInvariantId;

-	}

-	

-	public String getNameVersionId() {

-		return nameVersionId;

-	}

-

-	public void setNameVersionId(String nameVersionId) {

-		this.nameVersionId = nameVersionId;

-	}

-	

-	public String getModelNamespace() {

-		return modelNamespace;

-	}

-	

-	public void setModelNamespace(String modelNamespace) {

-		this.modelNamespace = modelNamespace;

-	}

-

-	public Set<String> getDependentModelIds() {

-		return referencedModelIds;

-	}

-

-	public void addDependentModelId(String dependentModelId) {

-		this.referencedModelIds.add(dependentModelId);

-	}

-

-	@Override

-	public String toString() {

-		StringBuilder sb = new StringBuilder();

-		sb.append("ModelInvariantId=" + modelInvariantId + "(" + getType().toString() + ") ==> ");

-		for (String dep : referencedModelIds) {

-			sb.append(dep + "  ");

-		}

-

-		return sb.toString();

-	}

-

-	public String getModelVerId() {

-		return modelVerId;

-	}

-	

-	public void setModelVerId(String modelVerId) {

-		this.modelVerId = modelVerId;

-	}

-	

-	public String getModelInvariantId() {

-		return modelInvariantId;

-	}

-	

-	public void setModelInvariantId(String modelInvariantId) {

-		this.modelInvariantId = modelInvariantId;

-	}

-	

-	public Node getModelVer() {

-		return modelVer;

-	}

-	

-	public void setModelVer(Node modelVer) {

-		this.modelVer = modelVer;

-	}

-	

-	public String getModelModelVerCombinedKey() {

-		return getModelInvariantId() + "|" + getModelVerId();

-	}

-	

-	public void setModelModelVerCombinedKey(String modelModelVerCombinedKey) {

-		this.modelModelVerCombinedKey = getModelInvariantId() + "|" + getModelVerId();

-	}

-}

+/**
+ * ============LICENSE_START=======================================================
+ * Model Loader
+ * ================================================================================
+ * Copyright © 2017 AT&T Intellectual Property.
+ * Copyright © 2017 Amdocs
+ * 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=========================================================
+ *
+ * ECOMP and OpenECOMP are trademarks
+ * and service marks of AT&T Intellectual Property.
+ */
+package org.openecomp.modelloader.entity.model;
+
+import org.openecomp.modelloader.entity.Artifact;
+import org.w3c.dom.Node;
+
+import java.util.HashSet;
+import java.util.Set;
+
+public class ModelArtifact extends Artifact {
+
+	String modelVerId;
+	String modelInvariantId;
+	String nameVersionId;
+	String modelVerModelVersionId;
+	String modelModelInvariantId;
+	String modelNamespace;
+	String modelNamespaceVersion;
+	Set<String> referencedModelIds = new HashSet<String>(); 
+	Node modelVer;
+	boolean isV9Artifact = true;
+	
+	public boolean isV9Artifact() {
+		return isV9Artifact;
+	}
+	
+	public void setV9Artifact(boolean isV9Artifact) {
+		this.isV9Artifact = isV9Artifact;
+	}
+
+	public String getModelVerModelVersionId() {
+		return modelVerModelVersionId;
+	}
+	
+	public void setModelVerModelVersionId(String modelVerModelVersionId) {
+		this.modelVerModelVersionId = modelVerModelVersionId;
+	}
+	
+	public String getModelModelInvariantId() {
+		return modelModelInvariantId;
+	}
+	
+	public void setModelModelInvariantId(String modelModelInvariantId) {
+		this.modelModelInvariantId = modelModelInvariantId;
+	}
+	
+	public String getNameVersionId() {
+		return nameVersionId;
+	}
+
+	public void setNameVersionId(String nameVersionId) {
+		this.nameVersionId = nameVersionId;
+	}
+	
+	public String getModelNamespace() {
+		return modelNamespace;
+	}
+	
+	public void setModelNamespace(String modelNamespace) {
+		this.modelNamespace = modelNamespace;
+		
+		// Get the version from the namespace (in format 'http://org.openecomp.aai.inventory/v9')
+		String[] parts = modelNamespace.split("/");
+		modelNamespaceVersion = parts[parts.length-1].trim();
+	}
+	
+	public String getModelNamespaceVersion() {
+	  return modelNamespaceVersion;
+	}
+
+	public Set<String> getDependentModelIds() {
+		return referencedModelIds;
+	}
+
+	public void addDependentModelId(String dependentModelId) {
+		this.referencedModelIds.add(dependentModelId);
+	}
+
+	@Override
+	public String toString() {
+		StringBuilder sb = new StringBuilder();
+		sb.append("ModelInvariantId=" + modelInvariantId + "(" + getType().toString() + ") ==> ");
+		for (String dep : referencedModelIds) {
+			sb.append(dep + "  ");
+		}
+
+		return sb.toString();
+	}
+
+	public String getModelVerId() {
+		return modelVerId;
+	}
+	
+	public void setModelVerId(String modelVerId) {
+		this.modelVerId = modelVerId;
+	}
+	
+	public String getModelInvariantId() {
+		return modelInvariantId;
+	}
+	
+	public void setModelInvariantId(String modelInvariantId) {
+		this.modelInvariantId = modelInvariantId;
+	}
+	
+	public Node getModelVer() {
+		return modelVer;
+	}
+	
+	public void setModelVer(Node modelVer) {
+		this.modelVer = modelVer;
+	}
+	
+	public String getModelModelVerCombinedKey() {
+	  if ( (getModelInvariantId() == null) && (getModelVerId() == null) ) {
+	    return getNameVersionId();
+	  }
+		return getModelInvariantId() + "|" + getModelVerId();
+	}
+}
diff --git a/src/main/java/org/openecomp/modelloader/entity/model/ModelArtifactHandler.java b/src/main/java/org/openecomp/modelloader/entity/model/ModelArtifactHandler.java
index ce6d986..6f9f64f 100644
--- a/src/main/java/org/openecomp/modelloader/entity/model/ModelArtifactHandler.java
+++ b/src/main/java/org/openecomp/modelloader/entity/model/ModelArtifactHandler.java
@@ -1,228 +1,228 @@
-/**

- * ============LICENSE_START=======================================================

- * Model Loader

- * ================================================================================

- * Copyright © 2017 AT&T Intellectual Property.

- * Copyright © 2017 Amdocs

- * 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=========================================================

- *

- * ECOMP and OpenECOMP are trademarks

- * and service marks of AT&T Intellectual Property.

- */

-package org.openecomp.modelloader.entity.model;

-

-import com.sun.jersey.api.client.ClientResponse;

-

-import org.openecomp.cl.api.Logger;

-import org.openecomp.cl.eelf.LoggerFactory;

-import org.openecomp.modelloader.config.ModelLoaderConfig;

-import org.openecomp.modelloader.entity.Artifact;

-import org.openecomp.modelloader.entity.ArtifactHandler;

-import org.openecomp.modelloader.entity.ArtifactType;

-import org.openecomp.modelloader.restclient.AaiRestClient;

-import org.openecomp.modelloader.service.ModelLoaderMsgs;

-

-import org.w3c.dom.Node;

-

-import java.io.StringWriter;

-import java.util.ArrayList;

-import java.util.List;

-

-import javax.ws.rs.core.Response;

-import javax.xml.transform.OutputKeys;

-import javax.xml.transform.Transformer;

-import javax.xml.transform.TransformerException;

-import javax.xml.transform.TransformerFactory;

-import javax.xml.transform.dom.DOMSource;

-import javax.xml.transform.stream.StreamResult;

-

-

-public class ModelArtifactHandler extends ArtifactHandler {

-

-  private static final String AAI_MODEL_VER = "/model-vers/model-ver";

-  private static Logger logger = LoggerFactory.getInstance().getLogger(ArtifactHandler.class.getName());

-

-

-  public ModelArtifactHandler(ModelLoaderConfig config) {

-    super(config);

-  }

-

-  @Override

-  public boolean pushArtifacts(List<Artifact> artifacts, String distributionID) {

-    ModelSorter modelSorter = new ModelSorter();

-    List<Artifact> sortedModelArtifacts = modelSorter.sort(artifacts);

-

-    // Push the ordered list of model artifacts to A&AI.  If one fails, we need to roll back

-    // the changes.

-    List<ModelArtifact> completedModels = new ArrayList<ModelArtifact>();

-    AaiRestClient aaiClient = new AaiRestClient(config);

-

-    for (Artifact art : sortedModelArtifacts) {

-      ModelArtifact model = (ModelArtifact)art;

-

-      boolean version = model.isV9Artifact();

-      //Non - V9 version for models

-      if(version == false){

-        ClientResponse getResponse = aaiClient.getResource(getModelVerURL(model), distributionID, AaiRestClient.MimeType.XML);

-        if ( (getResponse == null) || (getResponse.getStatus() != Response.Status.OK.getStatusCode()) ) {

-          logger.error(ModelLoaderMsgs.DISTRIBUTION_EVENT_ERROR, " Artifact format not valid for " + 

-              model.getType().toString() + "- model-invariant-id[model-id]: " + 

-              model.getModelInvariantId() + " and model-version-id[model-name-version-id]: "+ 

-              model.getModelVerId()+ " . Rolling back distribution.");

-          return false;

-        }

-        else{

-          completedModels.add(model);

-          logger.info(ModelLoaderMsgs.DISTRIBUTION_EVENT, model.getType().toString() + 

-              " " + model.getModelInvariantId() + " successfully ingested.");

-        }

-      }

-      else

-      {

-        ClientResponse getResponse  = aaiClient.getResource(getURL(model), distributionID, AaiRestClient.MimeType.XML);

-        if ( (getResponse == null) || (getResponse.getStatus() != Response.Status.OK.getStatusCode()) ) {

-          // Only attempt the PUT if the model doesn't already exist

-          ClientResponse putResponse = aaiClient.putResource(getURL(model), model.getPayload(), distributionID, AaiRestClient.MimeType.XML);

-          if ( (putResponse != null) && (putResponse.getStatus() == Response.Status.CREATED.getStatusCode()) ) {

-            completedModels.add(model);

-            logger.info(ModelLoaderMsgs.DISTRIBUTION_EVENT, model.getType().toString() + 

-                " " + model.getModelInvariantId() + " successfully ingested.");

-          }

-          else {

-            logger.error(ModelLoaderMsgs.DISTRIBUTION_EVENT_ERROR, "Ingestion failed for " + 

-                model.getType().toString() + " " + model.getModelInvariantId() + ". Rolling back distribution.");

-

-            for (ModelArtifact modelToDelete : completedModels) {

-              // Best effort to delete.  Nothing we can do in the event this fails.

-              aaiClient.getAndDeleteResource(getURL(modelToDelete), distributionID);

-            }

-

-            return false;

-          }

-        }

-        else {

-          logger.info(ModelLoaderMsgs.DISTRIBUTION_EVENT, model.getType().toString() + " " + model.getModelInvariantId() + 

-              " already exists.  Skipping ingestion.");

-          getResponse  = aaiClient.getResource(getModelVerURL(model), distributionID, AaiRestClient.MimeType.XML);

-          if ( (getResponse == null) || (getResponse.getStatus() != Response.Status.OK.getStatusCode()) ) {

-            // Only attempt the PUT if the model-ver doesn't already exist

-            ClientResponse putResponse = null;

-

-            try {

-              putResponse = aaiClient.putResource(getModelVerURL(model), nodeToString(model.getModelVer()), distributionID, AaiRestClient.MimeType.XML);

-            } catch (TransformerException e) {

-              // TODO Auto-generated catch block

-              e.printStackTrace();

-            }

-            if ( (putResponse != null) && (putResponse.getStatus() == Response.Status.CREATED.getStatusCode()) ) {

-              completedModels.add(model);

-              logger.info(ModelLoaderMsgs.DISTRIBUTION_EVENT, model.getType().toString() + " " + 

-                  model.getNameVersionId() + " successfully ingested.");

-            }

-            else {

-              logger.error(ModelLoaderMsgs.DISTRIBUTION_EVENT_ERROR, "Ingestion failed for " + 

-                  model.getType().toString() + " " + model.getNameVersionId() + ". Rolling back distribution.");

-

-              for (ModelArtifact modelToDelete : completedModels) {

-                // Best effort to delete.  Nothing we can do in the event this fails.

-                aaiClient.getAndDeleteResource(getModelVerURL(modelToDelete), distributionID);

-              }

-

-              return false;

-            }

-          }

-          else {

-            logger.info(ModelLoaderMsgs.DISTRIBUTION_EVENT, model.getType().toString() + " " + 

-                model.getModelInvariantId() + " already exists.  Skipping ingestion.");

-          }

-        }

-      }

-    }

-

-    return true;

-  }

-

-

-  private String nodeToString(Node node) throws TransformerException {

-    StringWriter sw = new StringWriter();

-    Transformer t = TransformerFactory.newInstance().newTransformer();

-    t.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes");

-    t.transform(new DOMSource(node), new StreamResult(sw));

-    System.out.println(sw.toString());

-    return sw.toString();

-  }

-

-  private String getURL(ModelArtifact model) {

-    String baseURL = config.getAaiBaseUrl().trim();

-    String subURL = null;

-    if (model.getType().equals(ArtifactType.MODEL)) {

-      subURL = config.getAaiModelUrl().trim();

-    }

-    else {

-      subURL = config.getAaiNamedQueryUrl().trim();

-    }

-

-    if ( (!baseURL.endsWith("/")) && (!subURL.startsWith("/")) ) {

-      baseURL = baseURL + "/";

-    }

-

-    if ( baseURL.endsWith("/") && subURL.startsWith("/") ) {

-      baseURL = baseURL.substring(0, baseURL.length()-1);

-    }

-

-    if (!subURL.endsWith("/")) {

-      subURL = subURL + "/";

-    }

-

-    String url = baseURL + subURL + model.getModelInvariantId();

-    return url;

-  }

-

-  private String getModelVerURL(ModelArtifact model) {

-    String baseURL = config.getAaiBaseUrl().trim();

-    String subURL = null;

-    if (model.getType().equals(ArtifactType.MODEL)) {

-      subURL = config.getAaiModelUrl().trim() + model.getModelInvariantId() + AAI_MODEL_VER;

-    }

-    else {

-      subURL = config.getAaiNamedQueryUrl().trim();

-    }

-

-    if ( (!baseURL.endsWith("/")) && (!subURL.startsWith("/")) ) {

-      baseURL = baseURL + "/";

-    }

-

-    if ( baseURL.endsWith("/") && subURL.startsWith("/") ) {

-      baseURL = baseURL.substring(0, baseURL.length()-1);

-    }

-

-    if (!subURL.endsWith("/")) {

-      subURL = subURL + "/";

-    }

-

-    String url = baseURL + subURL + model.getModelVerId();

-    System.out.println(url);

-    return url;

-  }

-

-  // This method is used for the test REST interface to load models without an ASDC

-  public void loadModelTest(byte[] payload) {

-    List<Artifact> modelArtifacts = new ArrayList<Artifact>();

-    ModelArtifactParser parser = new ModelArtifactParser();

-    modelArtifacts.addAll(parser.parse(payload, "Test-Artifact"));

-    ModelSorter modelSorter = new ModelSorter();

-    List<Artifact> sortedModelArtifacts = modelSorter.sort(modelArtifacts);

-    pushArtifacts(sortedModelArtifacts, "Test-Distribution");

-  }

-}

+/**
+ * ============LICENSE_START=======================================================
+ * Model Loader
+ * ================================================================================
+ * Copyright © 2017 AT&T Intellectual Property.
+ * Copyright © 2017 Amdocs
+ * 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=========================================================
+ *
+ * ECOMP and OpenECOMP are trademarks
+ * and service marks of AT&T Intellectual Property.
+ */
+package org.openecomp.modelloader.entity.model;
+
+import com.sun.jersey.api.client.ClientResponse;
+
+import org.openecomp.cl.api.Logger;
+import org.openecomp.cl.eelf.LoggerFactory;
+import org.openecomp.modelloader.config.ModelLoaderConfig;
+import org.openecomp.modelloader.entity.Artifact;
+import org.openecomp.modelloader.entity.ArtifactHandler;
+import org.openecomp.modelloader.entity.ArtifactType;
+import org.openecomp.modelloader.restclient.AaiRestClient;
+import org.openecomp.modelloader.service.ModelLoaderMsgs;
+
+import org.w3c.dom.Node;
+
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.ws.rs.core.Response;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+
+
+public class ModelArtifactHandler extends ArtifactHandler {
+
+  private static final String AAI_MODEL_VER = "/model-vers/model-ver";
+  private static Logger logger = LoggerFactory.getInstance().getLogger(ArtifactHandler.class.getName());
+
+
+  public ModelArtifactHandler(ModelLoaderConfig config) {
+    super(config);
+  }
+
+  @Override
+  public boolean pushArtifacts(List<Artifact> artifacts, String distributionID) {
+    ModelSorter modelSorter = new ModelSorter();
+    List<Artifact> sortedModelArtifacts = modelSorter.sort(artifacts);
+
+    // Push the ordered list of model artifacts to A&AI.  If one fails, we need to roll back
+    // the changes.
+    List<ModelArtifact> completedModels = new ArrayList<ModelArtifact>();
+    AaiRestClient aaiClient = new AaiRestClient(config);
+
+    for (Artifact art : sortedModelArtifacts) {
+      ModelArtifact model = (ModelArtifact)art;
+
+      boolean version = model.isV9Artifact();
+      //Non - V9 version for models
+      if(version == false){
+        ClientResponse getResponse = aaiClient.getResource(getModelVerURL(model), distributionID, AaiRestClient.MimeType.XML);
+        if ( (getResponse == null) || (getResponse.getStatus() != Response.Status.OK.getStatusCode()) ) {
+          logger.error(ModelLoaderMsgs.DISTRIBUTION_EVENT_ERROR, " Artifact format not valid for " + 
+              model.getType().toString() + "- model-invariant-id[model-id]: " + 
+              model.getModelInvariantId() + " and model-version-id[model-name-version-id]: "+ 
+              model.getModelVerId()+ " . Rolling back distribution.");
+          return false;
+        }
+        else{
+          completedModels.add(model);
+          logger.info(ModelLoaderMsgs.DISTRIBUTION_EVENT, model.getType().toString() + 
+              " " + model.getModelInvariantId() + " successfully ingested.");
+        }
+      }
+      else
+      {
+        ClientResponse getResponse  = aaiClient.getResource(getURL(model), distributionID, AaiRestClient.MimeType.XML);
+        if ( (getResponse == null) || (getResponse.getStatus() != Response.Status.OK.getStatusCode()) ) {
+          // Only attempt the PUT if the model doesn't already exist
+          ClientResponse putResponse = aaiClient.putResource(getURL(model), model.getPayload(), distributionID, AaiRestClient.MimeType.XML);
+          if ( (putResponse != null) && (putResponse.getStatus() == Response.Status.CREATED.getStatusCode()) ) {
+            completedModels.add(model);
+            logger.info(ModelLoaderMsgs.DISTRIBUTION_EVENT, model.getType().toString() + 
+                " " + model.getModelInvariantId() + " successfully ingested.");
+          }
+          else {
+            logger.error(ModelLoaderMsgs.DISTRIBUTION_EVENT_ERROR, "Ingestion failed for " + 
+                model.getType().toString() + " " + model.getModelInvariantId() + ". Rolling back distribution.");
+
+            for (ModelArtifact modelToDelete : completedModels) {
+              // Best effort to delete.  Nothing we can do in the event this fails.
+              aaiClient.getAndDeleteResource(getURL(modelToDelete), distributionID);
+            }
+
+            return false;
+          }
+        }
+        else {
+          logger.info(ModelLoaderMsgs.DISTRIBUTION_EVENT, model.getType().toString() + " " + model.getModelInvariantId() + 
+              " already exists.  Skipping ingestion.");
+          getResponse  = aaiClient.getResource(getModelVerURL(model), distributionID, AaiRestClient.MimeType.XML);
+          if ( (getResponse == null) || (getResponse.getStatus() != Response.Status.OK.getStatusCode()) ) {
+            // Only attempt the PUT if the model-ver doesn't already exist
+            ClientResponse putResponse = null;
+
+            try {
+              putResponse = aaiClient.putResource(getModelVerURL(model), nodeToString(model.getModelVer()), distributionID, AaiRestClient.MimeType.XML);
+            } catch (TransformerException e) {
+              // TODO Auto-generated catch block
+              e.printStackTrace();
+            }
+            if ( (putResponse != null) && (putResponse.getStatus() == Response.Status.CREATED.getStatusCode()) ) {
+              completedModels.add(model);
+              logger.info(ModelLoaderMsgs.DISTRIBUTION_EVENT, model.getType().toString() + " " + 
+                  model.getNameVersionId() + " successfully ingested.");
+            }
+            else {
+              logger.error(ModelLoaderMsgs.DISTRIBUTION_EVENT_ERROR, "Ingestion failed for " + 
+                  model.getType().toString() + " " + model.getNameVersionId() + ". Rolling back distribution.");
+
+              for (ModelArtifact modelToDelete : completedModels) {
+                // Best effort to delete.  Nothing we can do in the event this fails.
+                aaiClient.getAndDeleteResource(getModelVerURL(modelToDelete), distributionID);
+              }
+
+              return false;
+            }
+          }
+          else {
+            logger.info(ModelLoaderMsgs.DISTRIBUTION_EVENT, model.getType().toString() + " " + 
+                model.getModelInvariantId() + " already exists.  Skipping ingestion.");
+          }
+        }
+      }
+    }
+
+    return true;
+  }
+
+
+  private String nodeToString(Node node) throws TransformerException {
+    StringWriter sw = new StringWriter();
+    Transformer t = TransformerFactory.newInstance().newTransformer();
+    t.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes");
+    t.transform(new DOMSource(node), new StreamResult(sw));
+    System.out.println(sw.toString());
+    return sw.toString();
+  }
+
+  private String getURL(ModelArtifact model) {
+    String baseURL = config.getAaiBaseUrl().trim();
+    String subURL = null;
+    if (model.getType().equals(ArtifactType.MODEL)) {
+      subURL = config.getAaiModelUrl(model.getModelNamespaceVersion()).trim();
+    }
+    else {
+      subURL = config.getAaiNamedQueryUrl(model.getModelNamespaceVersion()).trim();
+    }
+
+    if ( (!baseURL.endsWith("/")) && (!subURL.startsWith("/")) ) {
+      baseURL = baseURL + "/";
+    }
+
+    if ( baseURL.endsWith("/") && subURL.startsWith("/") ) {
+      baseURL = baseURL.substring(0, baseURL.length()-1);
+    }
+
+    if (!subURL.endsWith("/")) {
+      subURL = subURL + "/";
+    }
+
+    String url = baseURL + subURL + model.getModelInvariantId();
+    return url;
+  }
+
+  private String getModelVerURL(ModelArtifact model) {
+    String baseURL = config.getAaiBaseUrl().trim();
+    String subURL = null;
+    if (model.getType().equals(ArtifactType.MODEL)) {
+      subURL = config.getAaiModelUrl(model.getModelNamespaceVersion()).trim() + model.getModelInvariantId() + AAI_MODEL_VER;
+    }
+    else {
+      subURL = config.getAaiNamedQueryUrl(model.getModelNamespaceVersion()).trim();
+    }
+
+    if ( (!baseURL.endsWith("/")) && (!subURL.startsWith("/")) ) {
+      baseURL = baseURL + "/";
+    }
+
+    if ( baseURL.endsWith("/") && subURL.startsWith("/") ) {
+      baseURL = baseURL.substring(0, baseURL.length()-1);
+    }
+
+    if (!subURL.endsWith("/")) {
+      subURL = subURL + "/";
+    }
+
+    String url = baseURL + subURL + model.getModelVerId();
+    System.out.println(url);
+    return url;
+  }
+
+  // This method is used for the test REST interface to load models without an ASDC
+  public void loadModelTest(byte[] payload) {
+    List<Artifact> modelArtifacts = new ArrayList<Artifact>();
+    ModelArtifactParser parser = new ModelArtifactParser();
+    modelArtifacts.addAll(parser.parse(payload, "Test-Artifact"));
+    ModelSorter modelSorter = new ModelSorter();
+    List<Artifact> sortedModelArtifacts = modelSorter.sort(modelArtifacts);
+    pushArtifacts(sortedModelArtifacts, "Test-Distribution");
+  }
+}
diff --git a/src/main/java/org/openecomp/modelloader/entity/model/ModelArtifactParser.java b/src/main/java/org/openecomp/modelloader/entity/model/ModelArtifactParser.java
index de27924..1bd77c8 100644
--- a/src/main/java/org/openecomp/modelloader/entity/model/ModelArtifactParser.java
+++ b/src/main/java/org/openecomp/modelloader/entity/model/ModelArtifactParser.java
@@ -1,265 +1,264 @@
-/**

- * ============LICENSE_START=======================================================

- * Model Loader

- * ================================================================================

- * Copyright © 2017 AT&T Intellectual Property.

- * Copyright © 2017 Amdocs

- * 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=========================================================

- *

- * ECOMP and OpenECOMP are trademarks

- * and service marks of AT&T Intellectual Property.

- */

-package org.openecomp.modelloader.entity.model;

-

-import org.openecomp.cl.api.Logger;

-import org.openecomp.cl.eelf.LoggerFactory;

-import org.openecomp.modelloader.entity.Artifact;

-import org.openecomp.modelloader.entity.ArtifactType;

-import org.openecomp.modelloader.service.ModelLoaderMsgs;

-import org.openecomp.modelloader.util.JsonXmlConverter;

-

-import org.w3c.dom.Document;

-import org.w3c.dom.Element;

-import org.w3c.dom.Node;

-import org.w3c.dom.NodeList;

-import org.xml.sax.InputSource;

-

-import java.io.StringReader;

-import java.io.StringWriter;

-import java.util.ArrayList;

-import java.util.List;

-

-import javax.xml.XMLConstants;

-import javax.xml.parsers.DocumentBuilder;

-import javax.xml.parsers.DocumentBuilderFactory;

-import javax.xml.transform.OutputKeys;

-import javax.xml.transform.Transformer;

-import javax.xml.transform.TransformerException;

-import javax.xml.transform.TransformerFactory;

-import javax.xml.transform.dom.DOMSource;

-import javax.xml.transform.stream.StreamResult;

-

-

-public class ModelArtifactParser {

-

-	private static String MODELS_ELEMENT = "models";

-	private static String MODEL_ELEMENT = "model";

-	private static String NAMED_QUERIES_ELEMENT = "named-queries";

-	private static String NAMED_QUERY_ELEMENT = "named-query";

-	private static String MODEL_NAME_VERSION_ID = "model-name-version-id";

-	private static String MODEL_VER = "model-ver";

-	private static String MODEL_VERSION_ID = "model-version-id";

-	private static String MODEL_INVARIANT_ID = "model-invariant-id";

-	private static String NAMED_QUERY_VERSION_ID = "named-query-uuid";

-	private static String RELATIONSHIP_DATA = "relationship-data";

-	private static String RELATIONSHIP_KEY = "relationship-key";

-	private static String RELATIONSHIP_VALUE = "relationship-value";

-	private static String MODEL_ELEMENT_RELATIONSHIP_KEY = "model.model-invariant-id";

-	private static String MODEL_VER_ELEMENT_RELATIONSHIP_KEY = "model-ver.model-version-id";

-	

-	private  static Logger logger = LoggerFactory.getInstance().getLogger(ModelArtifactParser.class.getName());

-	

-	public List<Artifact> parse(byte[] artifactPayload, String artifactName) {

-	  String payload = new String(artifactPayload);

-	  List<Artifact> modelList = new ArrayList<Artifact>();

-

-	  try {

-	    // Artifact could be JSON or XML

-	    if (JsonXmlConverter.isValidJson(payload)) {

-	      payload = JsonXmlConverter.convertJsonToXml(payload);

-	    }

-

-	    DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();

-	    DocumentBuilder builder = factory.newDocumentBuilder();

-	    InputSource is = new InputSource(new StringReader(payload));

-	    Document doc = builder.parse(is);

-

-	    if ( (doc.getDocumentElement().getNodeName().equalsIgnoreCase(MODEL_ELEMENT)) || 

-	        (doc.getDocumentElement().getNodeName().equalsIgnoreCase(NAMED_QUERY_ELEMENT)) ) {

-

-	      ModelArtifact model = parseModel(doc.getDocumentElement(), payload);

-

-	      if (model != null) {

-	        if ( ArtifactType.MODEL.equals(model.getType())) {

-	          logger.info( ModelLoaderMsgs.DISTRIBUTION_EVENT, "Model parsed =====>>>> "

-	              + "Model-invariant-Id: "+ model.getModelInvariantId()

-	              + " Model-Version-Id: "+ model.getModelVerId());

-	        }

-	        modelList.add(model);

-	      }

-	      else {

-	        logger.error(ModelLoaderMsgs.ARTIFACT_PARSE_ERROR, "Unable to parse artifact " + artifactName);

-	        return null;

-	      }

-	    }

-	    else if ( (doc.getDocumentElement().getNodeName().equalsIgnoreCase(MODELS_ELEMENT)) ||

-	        (doc.getDocumentElement().getNodeName().equalsIgnoreCase(NAMED_QUERIES_ELEMENT)) ) {

-	      // The complete set of models/named-queries were contained in this artifact

-	      NodeList nodeList = doc.getDocumentElement().getChildNodes();

-	      for (int i = 0; i < nodeList.getLength(); i++) {

-	        Node childNode = nodeList.item(i);

-	        if ( (childNode.getNodeName().equalsIgnoreCase(MODEL_ELEMENT)) || 

-	            (childNode.getNodeName().equalsIgnoreCase(NAMED_QUERY_ELEMENT)) ) {

-	          String modelPayload = nodeToString(childNode);

-	          ModelArtifact model = parseModel(childNode, modelPayload);

-	          if (model != null) {

-	            modelList.add(model);

-	          }

-	          else {

-	            logger.error(ModelLoaderMsgs.ARTIFACT_PARSE_ERROR, "Unable to parse artifact " + artifactName);

-	            modelList.clear();

-	            break;

-	          }

-	        }

-	      }

-	    }

-	  }

-	  catch (Exception ex) {

-	    logger.error(ModelLoaderMsgs.ARTIFACT_PARSE_ERROR, "Unable to parse artifact " + artifactName + ": " + ex.getLocalizedMessage());

-	  }

-

-	  return modelList;

-	}

-

-	private void printDetails(Node modelVer) throws TransformerException {

-	  logger.info(ModelLoaderMsgs.DISTRIBUTION_EVENT, nodeToString(modelVer));

-	}

-

-	private ModelArtifact parseModel(Node modelNode, String payload) {

-	  ModelArtifact model = new ModelArtifact();

-	  model.setPayload(payload);

-

-	  if (modelNode.getNodeName().equalsIgnoreCase(MODEL_ELEMENT)) {

-	    //compare with Model-ver

-	    model.setType(ArtifactType.MODEL);

-	  }

-	  else {

-	    model.setType(ArtifactType.NAMED_QUERY);

-	  }

-

-	  Element e = (Element)modelNode;

-	  model.setModelNamespace(e.getAttribute("xmlns"));

-

-	  parseNode(modelNode, model);

-

-	  if (model.getModelInvariantId() == null  && model.getNameVersionId() == null) {

-	    return null;

-	  }

-

-	  return model;

-	}

-

-	private void parseNode(Node node, ModelArtifact model) {

-

-	  if(node.getNodeName().equalsIgnoreCase(MODEL_NAME_VERSION_ID)){

-	    model.setModelVerId(node.getTextContent().trim());

-	    model.setV9Artifact(false);

-	  }

-	  else if(node.getNodeName().equalsIgnoreCase("model-id")){

-	    model.setModelInvariantId(node.getTextContent().trim());

-	    model.setV9Artifact(false);

-	  }

-

-	  else if (node.getNodeName().equalsIgnoreCase(MODEL_INVARIANT_ID)) {

-	    model.setModelInvariantId(node.getTextContent().trim());

-	  }

-	  else if (node.getNodeName().equalsIgnoreCase(MODEL_VERSION_ID)) {

-	    model.setModelVerId(node.getTextContent().trim());

-	    //Change to Model Invariant Id

-	  }

-	  else if (node.getNodeName().equalsIgnoreCase(NAMED_QUERY_VERSION_ID)) {

-	    model.setNameVersionId(node.getTextContent().trim());

-	  }

-	  else if (node.getNodeName().equalsIgnoreCase(RELATIONSHIP_DATA)) {

-	    parseRelationshipNode(node, model);

-	    if(model.getModelModelInvariantId()!=null && model.getModelVerModelVersionId()!=null && !model.getModelModelInvariantId().isEmpty() && !model.getModelVerModelVersionId().isEmpty()){

-	      model.addDependentModelId(model.getModelModelInvariantId() + "|" + model.getModelVerModelVersionId());

-	      model.setModelModelInvariantId("");

-	      model.setModelVerModelVersionId("");

-	    }

-	  }

-	  else {

-

-	    if (node.getNodeName().equalsIgnoreCase(MODEL_VER)) {

-	      model.setModelVer(node);

-	      if ( (model.getModelNamespace() != null) && (!model.getModelNamespace().isEmpty()) ) {

-	        Element e = (Element) node;

-	        e.setAttributeNS(XMLConstants.XMLNS_ATTRIBUTE_NS_URI, "xmlns", model.getModelNamespace());

-	        System.out.println("Setting NS: " + e.getAttribute("xmlns"));

-	      }

-	    }

-

-	    NodeList nodeList = node.getChildNodes();

-

-	    for (int i = 0; i < nodeList.getLength(); i++) {

-	      Node childNode = nodeList.item(i); 

-	      parseNode(childNode, model);

-	    }

-	  }

-	}

-

-	private void parseRelationshipNode(Node node, ModelArtifact model) {

-

-	  //invariant-id comes before model-version-id .. create a list of values

-	  String key = null;

-	  String value = null;

-	  String modelVersionIdKey=null;

-	  String modelInvariantIdIdKey=null;

-	  String modelVersionIdValue=null;

-	  String modelInvariantIdIdValue=null;

-

-	  NodeList nodeList = node.getChildNodes();

-	  for (int i = 0; i < nodeList.getLength(); i++) {

-	    Node childNode = nodeList.item(i);

-

-

-	    if (childNode.getNodeName().equalsIgnoreCase(RELATIONSHIP_KEY)) {

-	      key = childNode.getTextContent().trim();

-	      if(key.equalsIgnoreCase(MODEL_VER_ELEMENT_RELATIONSHIP_KEY)){

-	        modelVersionIdKey = key;

-	      }

-	      else if(key.equalsIgnoreCase(MODEL_ELEMENT_RELATIONSHIP_KEY)){

-	        modelInvariantIdIdKey = key;

-	      }

-	    }

-	    else if (childNode.getNodeName().equalsIgnoreCase(RELATIONSHIP_VALUE)) {

-	      value = childNode.getTextContent().trim();

-	      if(modelVersionIdKey!=null){

-	        modelVersionIdValue = value;

-	        model.setModelVerModelVersionId(modelVersionIdValue);

-	      }

-	      else if(modelInvariantIdIdKey!=null){

-	        modelInvariantIdIdValue = value;

-	        model.setModelModelInvariantId(modelInvariantIdIdValue);

-	      } 

-

-	    }

-	  }

-

-	  if ( (key != null) && (key.equalsIgnoreCase(MODEL_ELEMENT_RELATIONSHIP_KEY )) && 

-	      (model.isV9Artifact == false ||ArtifactType.NAMED_QUERY.equals(model.getType())) ) {

-	    if (value != null) {

-	      model.addDependentModelId(value);

-	    }

-	  }

-	}

-

-	private String nodeToString(Node node) throws TransformerException {

-	  StringWriter sw = new StringWriter();

-	  Transformer t = TransformerFactory.newInstance().newTransformer();

-	  t.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes");

-	  t.transform(new DOMSource(node), new StreamResult(sw));

-	  return sw.toString();

-	}

-}

+/**
+ * ============LICENSE_START=======================================================
+ * Model Loader
+ * ================================================================================
+ * Copyright © 2017 AT&T Intellectual Property.
+ * Copyright © 2017 Amdocs
+ * 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=========================================================
+ *
+ * ECOMP and OpenECOMP are trademarks
+ * and service marks of AT&T Intellectual Property.
+ */
+package org.openecomp.modelloader.entity.model;
+
+import org.openecomp.cl.api.Logger;
+import org.openecomp.cl.eelf.LoggerFactory;
+import org.openecomp.modelloader.entity.Artifact;
+import org.openecomp.modelloader.entity.ArtifactType;
+import org.openecomp.modelloader.service.ModelLoaderMsgs;
+import org.openecomp.modelloader.util.JsonXmlConverter;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.InputSource;
+
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.XMLConstants;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+
+
+public class ModelArtifactParser {
+
+	private static String MODELS_ELEMENT = "models";
+	private static String MODEL_ELEMENT = "model";
+	private static String NAMED_QUERIES_ELEMENT = "named-queries";
+	private static String NAMED_QUERY_ELEMENT = "named-query";
+	private static String MODEL_NAME_VERSION_ID = "model-name-version-id";
+	private static String MODEL_VER = "model-ver";
+	private static String MODEL_VERSION_ID = "model-version-id";
+	private static String MODEL_INVARIANT_ID = "model-invariant-id";
+	private static String NAMED_QUERY_VERSION_ID = "named-query-uuid";
+	private static String RELATIONSHIP_DATA = "relationship-data";
+	private static String RELATIONSHIP_KEY = "relationship-key";
+	private static String RELATIONSHIP_VALUE = "relationship-value";
+	private static String MODEL_ELEMENT_RELATIONSHIP_KEY = "model.model-invariant-id";
+	private static String MODEL_VER_ELEMENT_RELATIONSHIP_KEY = "model-ver.model-version-id";
+	
+	private  static Logger logger = LoggerFactory.getInstance().getLogger(ModelArtifactParser.class.getName());
+	
+	public List<Artifact> parse(byte[] artifactPayload, String artifactName) {
+	  String payload = new String(artifactPayload);
+	  List<Artifact> modelList = new ArrayList<Artifact>();
+
+	  try {
+	    // Artifact could be JSON or XML
+	    if (JsonXmlConverter.isValidJson(payload)) {
+	      payload = JsonXmlConverter.convertJsonToXml(payload);
+	    }
+
+	    DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+	    DocumentBuilder builder = factory.newDocumentBuilder();
+	    InputSource is = new InputSource(new StringReader(payload));
+	    Document doc = builder.parse(is);
+
+	    if ( (doc.getDocumentElement().getNodeName().equalsIgnoreCase(MODEL_ELEMENT)) || 
+	        (doc.getDocumentElement().getNodeName().equalsIgnoreCase(NAMED_QUERY_ELEMENT)) ) {
+
+	      ModelArtifact model = parseModel(doc.getDocumentElement(), payload);
+
+	      if (model != null) {
+	        if ( ArtifactType.MODEL.equals(model.getType())) {
+	          logger.info( ModelLoaderMsgs.DISTRIBUTION_EVENT, "Model parsed =====>>>> "
+	              + "Model-invariant-Id: "+ model.getModelInvariantId()
+	              + " Model-Version-Id: "+ model.getModelVerId());
+	        }
+	        modelList.add(model);
+	      }
+	      else {
+	        logger.error(ModelLoaderMsgs.ARTIFACT_PARSE_ERROR, "Unable to parse artifact " + artifactName);
+	        return null;
+	      }
+	    }
+	    else if ( (doc.getDocumentElement().getNodeName().equalsIgnoreCase(MODELS_ELEMENT)) ||
+	        (doc.getDocumentElement().getNodeName().equalsIgnoreCase(NAMED_QUERIES_ELEMENT)) ) {
+	      // The complete set of models/named-queries were contained in this artifact
+	      NodeList nodeList = doc.getDocumentElement().getChildNodes();
+	      for (int i = 0; i < nodeList.getLength(); i++) {
+	        Node childNode = nodeList.item(i);
+	        if ( (childNode.getNodeName().equalsIgnoreCase(MODEL_ELEMENT)) || 
+	            (childNode.getNodeName().equalsIgnoreCase(NAMED_QUERY_ELEMENT)) ) {
+	          String modelPayload = nodeToString(childNode);
+	          ModelArtifact model = parseModel(childNode, modelPayload);
+	          if (model != null) {
+	            modelList.add(model);
+	          }
+	          else {
+	            logger.error(ModelLoaderMsgs.ARTIFACT_PARSE_ERROR, "Unable to parse artifact " + artifactName);
+	            modelList.clear();
+	            break;
+	          }
+	        }
+	      }
+	    }
+	  }
+	  catch (Exception ex) {
+	    logger.error(ModelLoaderMsgs.ARTIFACT_PARSE_ERROR, "Unable to parse artifact " + artifactName + ": " + ex.getLocalizedMessage());
+	  }
+
+	  return modelList;
+	}
+
+	private void printDetails(Node modelVer) throws TransformerException {
+	  logger.info(ModelLoaderMsgs.DISTRIBUTION_EVENT, nodeToString(modelVer));
+	}
+
+	private ModelArtifact parseModel(Node modelNode, String payload) {
+	  ModelArtifact model = new ModelArtifact();
+	  model.setPayload(payload);
+
+	  if (modelNode.getNodeName().equalsIgnoreCase(MODEL_ELEMENT)) {
+	    //compare with Model-ver
+	    model.setType(ArtifactType.MODEL);
+	  }
+	  else {
+	    model.setType(ArtifactType.NAMED_QUERY);
+	  }
+
+	  Element e = (Element)modelNode;
+	  model.setModelNamespace(e.getAttribute("xmlns"));
+
+	  parseNode(modelNode, model);
+
+	  if (model.getModelInvariantId() == null  && model.getNameVersionId() == null) {
+	    return null;
+	  }
+
+	  return model;
+	}
+
+	private void parseNode(Node node, ModelArtifact model) {
+
+	  if(node.getNodeName().equalsIgnoreCase(MODEL_NAME_VERSION_ID)){
+	    model.setModelVerId(node.getTextContent().trim());
+	    model.setV9Artifact(false);
+	  }
+	  else if(node.getNodeName().equalsIgnoreCase("model-id")){
+	    model.setModelInvariantId(node.getTextContent().trim());
+	    model.setV9Artifact(false);
+	  }
+
+	  else if (node.getNodeName().equalsIgnoreCase(MODEL_INVARIANT_ID)) {
+	    model.setModelInvariantId(node.getTextContent().trim());
+	  }
+	  else if (node.getNodeName().equalsIgnoreCase(MODEL_VERSION_ID)) {
+	    model.setModelVerId(node.getTextContent().trim());
+	    //Change to Model Invariant Id
+	  }
+	  else if (node.getNodeName().equalsIgnoreCase(NAMED_QUERY_VERSION_ID)) {
+	    model.setNameVersionId(node.getTextContent().trim());
+	  }
+	  else if (node.getNodeName().equalsIgnoreCase(RELATIONSHIP_DATA)) {
+	    parseRelationshipNode(node, model);
+	    if(model.getModelModelInvariantId()!=null && model.getModelVerModelVersionId()!=null && !model.getModelModelInvariantId().isEmpty() && !model.getModelVerModelVersionId().isEmpty()){
+	      model.addDependentModelId(model.getModelModelInvariantId() + "|" + model.getModelVerModelVersionId());
+	      model.setModelModelInvariantId("");
+	      model.setModelVerModelVersionId("");
+	    }
+	  }
+	  else {
+
+	    if (node.getNodeName().equalsIgnoreCase(MODEL_VER)) {
+	      model.setModelVer(node);
+	      if ( (model.getModelNamespace() != null) && (!model.getModelNamespace().isEmpty()) ) {
+	        Element e = (Element) node;
+	        e.setAttributeNS(XMLConstants.XMLNS_ATTRIBUTE_NS_URI, "xmlns", model.getModelNamespace());
+	      }
+	    }
+
+	    NodeList nodeList = node.getChildNodes();
+
+	    for (int i = 0; i < nodeList.getLength(); i++) {
+	      Node childNode = nodeList.item(i); 
+	      parseNode(childNode, model);
+	    }
+	  }
+	}
+
+	private void parseRelationshipNode(Node node, ModelArtifact model) {
+
+	  //invariant-id comes before model-version-id .. create a list of values
+	  String key = null;
+	  String value = null;
+	  String modelVersionIdKey=null;
+	  String modelInvariantIdIdKey=null;
+	  String modelVersionIdValue=null;
+	  String modelInvariantIdIdValue=null;
+
+	  NodeList nodeList = node.getChildNodes();
+	  for (int i = 0; i < nodeList.getLength(); i++) {
+	    Node childNode = nodeList.item(i);
+
+
+	    if (childNode.getNodeName().equalsIgnoreCase(RELATIONSHIP_KEY)) {
+	      key = childNode.getTextContent().trim();
+	      if(key.equalsIgnoreCase(MODEL_VER_ELEMENT_RELATIONSHIP_KEY)){
+	        modelVersionIdKey = key;
+	      }
+	      else if(key.equalsIgnoreCase(MODEL_ELEMENT_RELATIONSHIP_KEY)){
+	        modelInvariantIdIdKey = key;
+	      }
+	    }
+	    else if (childNode.getNodeName().equalsIgnoreCase(RELATIONSHIP_VALUE)) {
+	      value = childNode.getTextContent().trim();
+	      if(modelVersionIdKey!=null){
+	        modelVersionIdValue = value;
+	        model.setModelVerModelVersionId(modelVersionIdValue);
+	      }
+	      else if(modelInvariantIdIdKey!=null){
+	        modelInvariantIdIdValue = value;
+	        model.setModelModelInvariantId(modelInvariantIdIdValue);
+	      } 
+
+	    }
+	  }
+
+	  if ( (key != null) && (key.equalsIgnoreCase(MODEL_ELEMENT_RELATIONSHIP_KEY )) && 
+	      (model.isV9Artifact == false ||ArtifactType.NAMED_QUERY.equals(model.getType())) ) {
+	    if (value != null) {
+	      model.addDependentModelId(value);
+	    }
+	  }
+	}
+
+	private String nodeToString(Node node) throws TransformerException {
+	  StringWriter sw = new StringWriter();
+	  Transformer t = TransformerFactory.newInstance().newTransformer();
+	  t.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes");
+	  t.transform(new DOMSource(node), new StreamResult(sw));
+	  return sw.toString();
+	}
+}
diff --git a/src/main/java/org/openecomp/modelloader/entity/model/ModelSorter.java b/src/main/java/org/openecomp/modelloader/entity/model/ModelSorter.java
index 79f1c29..7f99414 100644
--- a/src/main/java/org/openecomp/modelloader/entity/model/ModelSorter.java
+++ b/src/main/java/org/openecomp/modelloader/entity/model/ModelSorter.java
@@ -1,235 +1,253 @@
-/**

- * ============LICENSE_START=======================================================

- * Model Loader

- * ================================================================================

- * Copyright © 2017 AT&T Intellectual Property.

- * Copyright © 2017 Amdocs

- * 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=========================================================

- *

- * ECOMP and OpenECOMP are trademarks

- * and service marks of AT&T Intellectual Property.

- */

-package org.openecomp.modelloader.entity.model;

-

-import jline.internal.Log;

-

-import org.openecomp.modelloader.entity.Artifact;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.HashMap;

-import java.util.HashSet;

-import java.util.Iterator;

-import java.util.List;

-

-/**

- * Utility class to sort the given Models according to their dependencies.

- * Example: Given a list of Models [A, B, C] where B depends on A, and A depends

- * on C, the sorted result will be [C, A, B]

- */

-public class ModelSorter {

-

-  /**

-   * Wraps a Model object to form dependencies other Models using Edges.

-   */

-  static class Node {

-    private final ModelArtifact model;

-    private final HashSet<Edge> inEdges;

-    private final HashSet<Edge> outEdges;

-

-    public Node(ModelArtifact model) {

-      this.model = model;

-      inEdges = new HashSet<Edge>();

-      outEdges = new HashSet<Edge>();

-    }

-

-    public Node addEdge(Node node) {

-      Edge edge = new Edge(this, node);

-      outEdges.add(edge);

-      node.inEdges.add(edge);

-      return this;

-    }

-

-    @Override

-    public String toString() {

-      return model.getModelInvariantId();

-    }

-

-    @Override

-    public boolean equals(Object other) {

-      ModelArtifact otherModel = ((Node) other).model;

-      return this.model.getModelInvariantId().equals(otherModel.getModelInvariantId());

-    }

-

-    @Override

-    public int hashCode() {

-      return this.model.getModelInvariantId().hashCode();

-

-    }

-  }

-

-  /**

-   * Represents a dependency between two Nodes.

-   */

-  static class Edge {

-    public final Node from;

-    public final Node to;

-

-    public Edge(Node from, Node to) {

-      this.from = from;

-      this.to = to;

-    }

-

-    @Override

-    public boolean equals(Object obj) {

-      Edge edge = (Edge) obj;

-      return edge.from == from && edge.to == to;

-    }

-  }

-

-  /**

-   * Returns the list of models sorted by order of dependency.

-   * 

-   * @param originalList

-   *          the list that needs to be sorted

-   * @return a list of sorted models

-   */

-  public List<Artifact> sort(List<Artifact> originalList) {

-

-    if (originalList.size() <= 1) {

-      return originalList;

-    }

-

-    Collection<Node> nodes = createNodes(originalList);

-    Collection<Node> sortedNodes = sortNodes(nodes);

-

-    List<Artifact> sortedModelsList = new ArrayList<Artifact>(sortedNodes.size());

-    for (Node node : sortedNodes) {

-      sortedModelsList.add(node.model);

-    }

-

-    return sortedModelsList;

-  }

-

-  /**

-   * Create nodes from the list of models and their dependencies.

-   * 

-   * @param models

-   *          what the nodes creation is based upon

-   * @return Collection of Node objects

-   */

-  private Collection<Node> createNodes(Collection<Artifact> models) {

-

-    // load list of models into a map, so we can later replace referenceIds with

-    // real Models

-    HashMap<String, ModelArtifact> versionIdToModelMap = new HashMap<String, ModelArtifact>();

-    for (Artifact art : models) {

-      ModelArtifact ma = (ModelArtifact) art;

-      versionIdToModelMap.put(ma.getModelModelVerCombinedKey(), ma);

-    }

-

-    HashMap<String, Node> nodes = new HashMap<String, Node>();

-    // create a node for each model and its referenced models

-    for (Artifact art : models) {

-      ModelArtifact model = (ModelArtifact) art;

-

-      // node might have been created by another model referencing it

-      Node node = nodes.get(model.getModelModelVerCombinedKey());

-

-      if (null == node) {

-        node = new Node(model);

-        nodes.put(model.getModelModelVerCombinedKey(), node);

-      }

-

-      for (String referencedModelId : model.getDependentModelIds()) {

-        // node might have been created by another model referencing it

-        Node referencedNode = nodes.get(referencedModelId);

-

-        if (null == referencedNode) {

-          // create node

-          ModelArtifact referencedModel = versionIdToModelMap.get(referencedModelId);

-          if (referencedModel == null) {

-            Log.debug("ignoring " + referencedModelId);

-            continue; // referenced model not supplied, no need to sort it

-          }

-          referencedNode = new Node(referencedModel);

-          nodes.put(referencedModelId, referencedNode);

-        }

-        referencedNode.addEdge(node);

-      }

-    }

-

-    return nodes.values();

-  }

-

-  /**

-   * Sorts the given Nodes by order of dependency.

-   * 

-   * @param originalList

-   *          the collection of nodes to be sorted

-   * @return a sorted collection of the given nodes

-   */

-  private Collection<Node> sortNodes(Collection<Node> unsortedNodes) {

-

-    // L <- Empty list that will contain the sorted elements

-    ArrayList<Node> nodeList = new ArrayList<Node>();

-

-    // S <- Set of all nodes with no incoming edges

-    HashSet<Node> nodeSet = new HashSet<Node>();

-    for (Node unsortedNode : unsortedNodes) {

-      if (unsortedNode.inEdges.size() == 0) {

-        nodeSet.add(unsortedNode);

-      }

-    }

-

-    // while S is non-empty do

-    while (!nodeSet.isEmpty()) {

-      // remove a node n from S

-      Node node = nodeSet.iterator().next();

-      nodeSet.remove(node);

-

-      // insert n into L

-      nodeList.add(node);

-

-      // for each node m with an edge e from n to m do

-      for (Iterator<Edge> it = node.outEdges.iterator(); it.hasNext();) {

-        // remove edge e from the graph

-        Edge edge = it.next();

-        Node to = edge.to;

-        it.remove();// Remove edge from n

-        to.inEdges.remove(edge);// Remove edge from m

-

-        // if m has no other incoming edges then insert m into S

-        if (to.inEdges.isEmpty()) {

-          nodeSet.add(to);

-        }

-      }

-    }

-    // Check to see if all edges are removed

-    boolean cycle = false;

-    for (Node node : unsortedNodes) {

-      if (!node.inEdges.isEmpty()) {

-        cycle = true;

-        break;

-      }

-    }

-    if (cycle) {

-      throw new RuntimeException(

-          "Circular dependency present between models, topological sort not possible");

-    }

-

-    return nodeList;

-  }

-

-}

+/**
+ * ============LICENSE_START=======================================================
+ * Model Loader
+ * ================================================================================
+ * Copyright © 2017 AT&T Intellectual Property.
+ * Copyright © 2017 Amdocs
+ * 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=========================================================
+ *
+ * ECOMP and OpenECOMP are trademarks
+ * and service marks of AT&T Intellectual Property.
+ */
+package org.openecomp.modelloader.entity.model;
+
+import jline.internal.Log;
+
+import org.openecomp.modelloader.entity.Artifact;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+
+/**
+ * Utility class to sort the given Models according to their dependencies.
+ * Example: Given a list of Models [A, B, C] where B depends on A, and A depends
+ * on C, the sorted result will be [C, A, B]
+ */
+public class ModelSorter {
+
+  /**
+   * Wraps a Model object to form dependencies other Models using Edges.
+   */
+  static class Node {
+    private final ModelArtifact model;
+    private final HashSet<Edge> inEdges;
+    private final HashSet<Edge> outEdges;
+
+    public Node(ModelArtifact model) {
+      this.model = model;
+      inEdges = new HashSet<Edge>();
+      outEdges = new HashSet<Edge>();
+    }
+
+    public Node addEdge(Node node) {
+      Edge edge = new Edge(this, node);
+      outEdges.add(edge);
+      node.inEdges.add(edge);
+      return this;
+    }
+
+    @Override
+    public String toString() {
+      if (model.getModelInvariantId() == null) {
+        return model.getNameVersionId();
+      }
+      
+      return model.getModelInvariantId();
+    }
+
+    @Override
+    public boolean equals(Object other) {
+      ModelArtifact otherModel = ((Node) other).model;
+      String modelId1 = this.model.getModelInvariantId();
+      if (modelId1 == null) {
+        modelId1 = this.model.getNameVersionId();
+      }
+      
+      String modelId2 = otherModel.getModelInvariantId();
+      if (modelId2 == null) {
+        modelId2 = otherModel.getNameVersionId();
+      }
+      
+      return modelId1.equals(modelId2);
+    }
+
+    @Override
+    public int hashCode() {
+      if (this.model.getModelInvariantId() == null) {
+        return this.model.getNameVersionId().hashCode();
+      }
+      
+      return this.model.getModelInvariantId().hashCode();
+    }
+  }
+
+  /**
+   * Represents a dependency between two Nodes.
+   */
+  static class Edge {
+    public final Node from;
+    public final Node to;
+
+    public Edge(Node from, Node to) {
+      this.from = from;
+      this.to = to;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+      Edge edge = (Edge) obj;
+      return edge.from == from && edge.to == to;
+    }
+  }
+
+  /**
+   * Returns the list of models sorted by order of dependency.
+   * 
+   * @param originalList
+   *          the list that needs to be sorted
+   * @return a list of sorted models
+   */
+  public List<Artifact> sort(List<Artifact> originalList) {
+
+    if (originalList.size() <= 1) {
+      return originalList;
+    }
+
+    Collection<Node> nodes = createNodes(originalList);
+    Collection<Node> sortedNodes = sortNodes(nodes);
+    
+    List<Artifact> sortedModelsList = new ArrayList<Artifact>(sortedNodes.size());
+    for (Node node : sortedNodes) {
+      sortedModelsList.add(node.model);
+    }
+
+    return sortedModelsList;
+  }
+
+  /**
+   * Create nodes from the list of models and their dependencies.
+   * 
+   * @param models
+   *          what the nodes creation is based upon
+   * @return Collection of Node objects
+   */
+  private Collection<Node> createNodes(Collection<Artifact> models) {
+
+    // load list of models into a map, so we can later replace referenceIds with
+    // real Models
+    HashMap<String, ModelArtifact> versionIdToModelMap = new HashMap<String, ModelArtifact>();
+    for (Artifact art : models) {
+      ModelArtifact ma = (ModelArtifact) art;
+      versionIdToModelMap.put(ma.getModelModelVerCombinedKey(), ma);
+    }
+
+    HashMap<String, Node> nodes = new HashMap<String, Node>();
+    // create a node for each model and its referenced models
+    for (Artifact art : models) {
+
+      ModelArtifact model = (ModelArtifact) art;
+      
+      // node might have been created by another model referencing it
+      Node node = nodes.get(model.getModelModelVerCombinedKey());
+
+      if (null == node) {
+        node = new Node(model);
+        nodes.put(model.getModelModelVerCombinedKey(), node);
+      }
+
+      for (String referencedModelId : model.getDependentModelIds()) {
+        // node might have been created by another model referencing it
+        Node referencedNode = nodes.get(referencedModelId);
+
+        if (null == referencedNode) {
+          // create node
+          ModelArtifact referencedModel = versionIdToModelMap.get(referencedModelId);
+          if (referencedModel == null) {
+            Log.debug("ignoring " + referencedModelId);
+            continue; // referenced model not supplied, no need to sort it
+          }
+          referencedNode = new Node(referencedModel);
+          nodes.put(referencedModelId, referencedNode);
+        }
+        referencedNode.addEdge(node);
+      }
+    }
+
+    return nodes.values();
+  }
+
+  /**
+   * Sorts the given Nodes by order of dependency.
+   * 
+   * @param originalList
+   *          the collection of nodes to be sorted
+   * @return a sorted collection of the given nodes
+   */
+  private Collection<Node> sortNodes(Collection<Node> unsortedNodes) {
+    // L <- Empty list that will contain the sorted elements
+    ArrayList<Node> nodeList = new ArrayList<Node>();
+
+    // S <- Set of all nodes with no incoming edges
+    HashSet<Node> nodeSet = new HashSet<Node>();
+    for (Node unsortedNode : unsortedNodes) {
+      if (unsortedNode.inEdges.size() == 0) {
+        nodeSet.add(unsortedNode);
+      }
+    }
+
+    // while S is non-empty do
+    while (!nodeSet.isEmpty()) {
+      // remove a node n from S
+      Node node = nodeSet.iterator().next();
+      nodeSet.remove(node);
+
+      // insert n into L
+      nodeList.add(node);
+
+      // for each node m with an edge e from n to m do
+      for (Iterator<Edge> it = node.outEdges.iterator(); it.hasNext();) {
+        // remove edge e from the graph
+        Edge edge = it.next();
+        Node to = edge.to;
+        it.remove();// Remove edge from n
+        to.inEdges.remove(edge);// Remove edge from m
+
+        // if m has no other incoming edges then insert m into S
+        if (to.inEdges.isEmpty()) {
+          nodeSet.add(to);
+        }
+      }
+    }
+    // Check to see if all edges are removed
+    boolean cycle = false;
+    for (Node node : unsortedNodes) {
+      if (!node.inEdges.isEmpty()) {
+        cycle = true;
+        break;
+      }
+    }
+    if (cycle) {
+      throw new RuntimeException(
+          "Circular dependency present between models, topological sort not possible");
+    }
+
+    return nodeList;
+  }
+
+
+}
diff --git a/src/main/java/org/openecomp/modelloader/service/ModelLoaderService.java b/src/main/java/org/openecomp/modelloader/service/ModelLoaderService.java
index 118cd18..aeaa6f4 100644
--- a/src/main/java/org/openecomp/modelloader/service/ModelLoaderService.java
+++ b/src/main/java/org/openecomp/modelloader/service/ModelLoaderService.java
@@ -1,188 +1,203 @@
-/**

- * ============LICENSE_START=======================================================

- * Model Loader

- * ================================================================================

- * Copyright © 2017 AT&T Intellectual Property.

- * Copyright © 2017 Amdocs

- * 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=========================================================

- *

- * ECOMP and OpenECOMP are trademarks

- * and service marks of AT&T Intellectual Property.

- */

-package org.openecomp.modelloader.service;

-

-import org.openecomp.sdc.api.IDistributionClient;

-import org.openecomp.sdc.api.results.IDistributionClientResult;

-import org.openecomp.sdc.impl.DistributionClientFactory;

-import org.openecomp.sdc.utils.DistributionActionResultEnum;

-

-import org.openecomp.cl.api.Logger;

-import org.openecomp.cl.eelf.LoggerFactory;

-import org.openecomp.modelloader.config.ModelLoaderConfig;

-import org.openecomp.modelloader.entity.model.ModelArtifactHandler;

-import org.openecomp.modelloader.notification.EventCallback;

-

-import java.io.FileInputStream;

-import java.io.IOException;

-import java.util.Properties;

-

-import javax.annotation.PreDestroy;

-import javax.servlet.http.HttpServletRequest;

-import javax.ws.rs.core.Response;

-

-/**

- * Service class in charge of managing the negotiating model loading

- * capabilities between AAI and an ASDC.

- */

-public class ModelLoaderService implements ModelLoaderInterface {

-	

-	protected static final String FILESEP = (System.getProperty("file.separator") == null) ? "/"

-            : System.getProperty("file.separator");

-

-	protected static final String CONFIG_DIR = System.getProperty("CONFIG_HOME") + FILESEP;

-	protected static final String CONFIG_AUTH_LOCATION = CONFIG_DIR + "auth" + FILESEP;

-	protected static final String CONFIG_FILE = CONFIG_DIR + "model-loader.properties";

-

-	private IDistributionClient client;

-	private ModelLoaderConfig config;

-

-	static Logger logger = LoggerFactory.getInstance().getLogger(ModelLoaderService.class.getName());

-

-	/**

-	 * Responsible for loading configuration files and calling initialization.

-	 */

-	public ModelLoaderService() {

-		start();

-	}

-

-	protected void start() {

-		// Load model loader system configuration

-		logger.info(ModelLoaderMsgs.LOADING_CONFIGURATION);

-		Properties configProperties = new Properties();

-		try {

-			configProperties.load(new FileInputStream(CONFIG_FILE));

-		} catch (IOException e) {

-			String errorMsg = "Failed to load configuration: " + e.getMessage();

-			logger.error(ModelLoaderMsgs.ASDC_CONNECTION_ERROR, errorMsg);

-			shutdown();

-		}

-

-		config = new ModelLoaderConfig(configProperties, CONFIG_AUTH_LOCATION);

-		init();

-	}

-

-	@Override

-	public void finalize() {

-		preShutdownOperations();

-	}

-	

-	/**

-	 * Responsible for stopping the connection to the distribution client before

-	 * the resource is destroyed.

-	 */

-	protected void preShutdownOperations() {

-		logger.info(ModelLoaderMsgs.STOPPING_CLIENT);

-		if (client != null) {

-			client.stop();

-		}

-	}

-

-	/**

-	 * Responsible for loading configuration files, initializing model

-	 * distribution clients, and starting them.

-	 */

-	protected void init() {

-		// Initialize distribution client

-		logger.debug(ModelLoaderMsgs.INITIALIZING, "Initializing distribution client...");

-		client = DistributionClientFactory.createDistributionClient();

-		IDistributionClientResult initResult = client.init(config, new EventCallback(client, config));

-		if (initResult.getDistributionActionResult() != DistributionActionResultEnum.SUCCESS) {

-			String errorMsg = "Failed to initialize distribution client: "

-					+ initResult.getDistributionMessageResult();

-			logger.error(ModelLoaderMsgs.ASDC_CONNECTION_ERROR, errorMsg);

-			shutdown();

-		}

-

-		// Start distribution client

-		logger.debug(ModelLoaderMsgs.INITIALIZING, "Starting distribution client...");

-		IDistributionClientResult startResult = client.start();

-		if (startResult.getDistributionActionResult() != DistributionActionResultEnum.SUCCESS) {

-			String errorMsg = "Failed to start distribution client: "

-					+ startResult.getDistributionMessageResult();

-			logger.error(ModelLoaderMsgs.ASDC_CONNECTION_ERROR, errorMsg);

-			shutdown();

-		}

-

-		logger.debug(ModelLoaderMsgs.INITIALIZING,

-				"Succcessfully loaded service: " + this.getClass().getSimpleName());

-	}

-

-	/**

-	 * Shut down the process.

-	 */

-	private void shutdown() {

-		preShutdownOperations();

-

-		// TODO: Find a better way to shut down the model loader.

-		try {

-			// Give logs time to write to file

-			Thread.sleep(2000);

-		} catch (InterruptedException e) {

-			// Nothing we can do at this point

-		}

-

-		Runtime.getRuntime().halt(1);

-	}

-

-	/** (non-Javadoc)

-	 * @see org.openecomp.modelloader.service.ModelLoaderInterface#loadModel(java.lang.String)

-	 */

-	@Override

-	public Response loadModel(String modelid) {

-		Response response = Response.ok("{\"model_loaded\":\"" + modelid + "\"}").build();

-

-		return response;

-	}

-

-	/** (non-Javadoc)

-	 * @see org.openecomp.modelloader.service.ModelLoaderInterface#saveModel(java.lang.String, java.lang.String)

-	 */

-	@Override

-	public Response saveModel(String modelid, String modelname) {

-		Response response = Response.ok("{\"model_saved\":\"" + modelid + "-" + modelname + "\"}")

-				.build();

-

-		return response;

-	}

-

-	@Override

-	public Response ingestModel(String modelid, HttpServletRequest req, String payload)

-			throws IOException {

-		Response response;

-

-		if (config.getIngestSimulatorEnabled()) {

-			logger.info(ModelLoaderMsgs.DISTRIBUTION_EVENT, "Received test artifact");

-

-			ModelArtifactHandler handler = new ModelArtifactHandler(config);

-			handler.loadModelTest(payload.getBytes());

-

-			response = Response.ok().build();

-		} else {

-			logger.debug("Simulation interface disabled");

-			response = Response.serverError().build();

-		}

-

-		return response;

-	}

-}

+/**
+ * ============LICENSE_START=======================================================
+ * Model Loader
+ * ================================================================================
+ * Copyright © 2017 AT&T Intellectual Property.
+ * Copyright © 2017 Amdocs
+ * 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=========================================================
+ *
+ * ECOMP and OpenECOMP are trademarks
+ * and service marks of AT&T Intellectual Property.
+ */
+package org.openecomp.modelloader.service;
+
+import org.openecomp.sdc.api.IDistributionClient;
+import org.openecomp.sdc.api.results.IDistributionClientResult;
+import org.openecomp.sdc.impl.DistributionClientFactory;
+import org.openecomp.sdc.utils.DistributionActionResultEnum;
+
+import org.openecomp.cl.api.Logger;
+import org.openecomp.cl.eelf.LoggerFactory;
+import org.openecomp.modelloader.config.ModelLoaderConfig;
+import org.openecomp.modelloader.entity.model.ModelArtifactHandler;
+import org.openecomp.modelloader.notification.EventCallback;
+
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.util.Date;
+import java.util.Properties;
+import java.util.Timer;
+import java.util.TimerTask;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.core.Response;
+
+/**
+ * Service class in charge of managing the negotiating model loading
+ * capabilities between AAI and an ASDC.
+ */
+public class ModelLoaderService implements ModelLoaderInterface {
+
+  protected static final String FILESEP = (System.getProperty("file.separator") == null) ? "/"
+      : System.getProperty("file.separator");
+
+  protected static final String CONFIG_DIR = System.getProperty("CONFIG_HOME") + FILESEP;
+  protected static final String CONFIG_AUTH_LOCATION = CONFIG_DIR + "auth" + FILESEP;
+  protected static final String CONFIG_FILE = CONFIG_DIR + "model-loader.properties";
+
+  private IDistributionClient client;
+  private ModelLoaderConfig config;
+  private Timer timer = null;
+
+  static Logger logger = LoggerFactory.getInstance().getLogger(ModelLoaderService.class.getName());
+
+  /**
+   * Responsible for loading configuration files and calling initialization.
+   */
+  public ModelLoaderService() {
+    start();
+  }
+
+  protected void start() {
+    // Load model loader system configuration
+    logger.info(ModelLoaderMsgs.LOADING_CONFIGURATION);
+    Properties configProperties = new Properties();
+    try {
+      configProperties.load(new FileInputStream(CONFIG_FILE));
+    } catch (IOException e) {
+      String errorMsg = "Failed to load configuration: " + e.getMessage();
+      logger.error(ModelLoaderMsgs.ASDC_CONNECTION_ERROR, errorMsg);
+      shutdown();
+    }
+
+    config = new ModelLoaderConfig(configProperties, CONFIG_AUTH_LOCATION);
+    init();
+  }
+
+  @Override
+  public void finalize() {
+    preShutdownOperations();
+  }
+
+  /**
+   * Responsible for stopping the connection to the distribution client before
+   * the resource is destroyed.
+   */
+  protected void preShutdownOperations() {
+    logger.info(ModelLoaderMsgs.STOPPING_CLIENT);
+    if (client != null) {
+      client.stop();
+    }
+  }
+
+  /**
+   * Responsible for loading configuration files, initializing model
+   * distribution clients, and starting them.
+   */
+  protected void init() {
+    // Initialize distribution client
+    logger.debug(ModelLoaderMsgs.INITIALIZING, "Initializing distribution client...");
+    client = DistributionClientFactory.createDistributionClient();
+    EventCallback callback = new EventCallback(client, config);
+
+    IDistributionClientResult initResult = client.init(config, callback);
+
+    if (initResult.getDistributionActionResult() != DistributionActionResultEnum.SUCCESS) {
+      String errorMsg = "Failed to initialize distribution client: "
+          + initResult.getDistributionMessageResult();
+      logger.error(ModelLoaderMsgs.ASDC_CONNECTION_ERROR, errorMsg);
+
+      // Kick off a timer to retry the SDC connection
+      timer = new Timer();
+      TimerTask task = new SdcConnectionJob(client, config, callback, timer);
+      timer.schedule(task, new Date(), 60000);
+    }
+    else {
+      // Start distribution client
+      logger.debug(ModelLoaderMsgs.INITIALIZING, "Starting distribution client...");
+      IDistributionClientResult startResult = client.start();
+      if (startResult.getDistributionActionResult() != DistributionActionResultEnum.SUCCESS) {
+        String errorMsg = "Failed to start distribution client: "
+            + startResult.getDistributionMessageResult();
+        logger.error(ModelLoaderMsgs.ASDC_CONNECTION_ERROR, errorMsg);
+
+        // Kick off a timer to retry the SDC connection
+        timer = new Timer();
+        TimerTask task = new SdcConnectionJob(client, config, callback, timer);
+        timer.schedule(task, new Date(), 60000);
+      }
+      else {
+        logger.info(ModelLoaderMsgs.INITIALIZING, "Connection to SDC established");
+      }
+    }
+  }
+
+  /**
+   * Shut down the process.
+   */
+  private void shutdown() {
+    preShutdownOperations();
+
+    // TODO: Find a better way to shut down the model loader.
+    try {
+      // Give logs time to write to file
+      Thread.sleep(2000);
+    } catch (InterruptedException e) {
+      // Nothing we can do at this point
+    }
+
+    Runtime.getRuntime().halt(1);
+  }
+
+  /** (non-Javadoc)
+   * @see org.openecomp.modelloader.service.ModelLoaderInterface#loadModel(java.lang.String)
+   */
+  @Override
+  public Response loadModel(String modelid) {
+    Response response = Response.ok("{\"model_loaded\":\"" + modelid + "\"}").build();
+
+    return response;
+  }
+
+  /** (non-Javadoc)
+   * @see org.openecomp.modelloader.service.ModelLoaderInterface#saveModel(java.lang.String, java.lang.String)
+   */
+  @Override
+  public Response saveModel(String modelid, String modelname) {
+    Response response = Response.ok("{\"model_saved\":\"" + modelid + "-" + modelname + "\"}")
+        .build();
+
+    return response;
+  }
+
+  @Override
+  public Response ingestModel(String modelid, HttpServletRequest req, String payload)
+      throws IOException {
+    Response response;
+
+    if (config.getIngestSimulatorEnabled()) {
+      logger.info(ModelLoaderMsgs.DISTRIBUTION_EVENT, "Received test artifact");
+
+      ModelArtifactHandler handler = new ModelArtifactHandler(config);
+      handler.loadModelTest(payload.getBytes());
+
+      response = Response.ok().build();
+    } else {
+      logger.debug("Simulation interface disabled");
+      response = Response.serverError().build();
+    }
+
+    return response;
+  }
+}
diff --git a/src/main/java/org/openecomp/modelloader/service/SdcConnectionJob.java b/src/main/java/org/openecomp/modelloader/service/SdcConnectionJob.java
new file mode 100644
index 0000000..bb3741c
--- /dev/null
+++ b/src/main/java/org/openecomp/modelloader/service/SdcConnectionJob.java
@@ -0,0 +1,79 @@
+/**
+ * ============LICENSE_START=======================================================
+ * Model Loader
+ * ================================================================================
+ * Copyright © 2017 AT&T Intellectual Property.
+ * Copyright © 2017 Amdocs
+ * 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=========================================================
+ *
+ * ECOMP and OpenECOMP are trademarks
+ * and service marks of AT&T Intellectual Property.
+ */
+package org.openecomp.modelloader.service;
+
+import java.util.Date;
+import java.util.Timer;
+import java.util.TimerTask;
+
+import org.openecomp.cl.api.Logger;
+import org.openecomp.cl.eelf.LoggerFactory;
+import org.openecomp.modelloader.config.ModelLoaderConfig;
+import org.openecomp.modelloader.notification.EventCallback;
+import org.openecomp.sdc.api.IDistributionClient;
+import org.openecomp.sdc.api.results.IDistributionClientResult;
+import org.openecomp.sdc.utils.DistributionActionResultEnum;
+
+public class SdcConnectionJob extends TimerTask {
+  static Logger logger = LoggerFactory.getInstance().getLogger(SdcConnectionJob.class.getName());
+
+  private IDistributionClient client;
+  private ModelLoaderConfig config;
+  private EventCallback callback; 
+  private Timer timer;
+
+  public SdcConnectionJob(IDistributionClient client, 
+      ModelLoaderConfig config, 
+      EventCallback callback, 
+      Timer timer) {
+    this.client = client;
+    this.timer = timer;
+    this.callback = callback;
+    this.config = config;
+  }
+
+  @Override
+  public void run() {
+
+    IDistributionClientResult initResult = client.init(config, callback);
+
+    if (initResult.getDistributionActionResult() != DistributionActionResultEnum.SUCCESS) {
+      String errorMsg = "Failed to initialize distribution client: "
+          + initResult.getDistributionMessageResult();
+      logger.error(ModelLoaderMsgs.ASDC_CONNECTION_ERROR, errorMsg);
+      return;
+    }
+
+    IDistributionClientResult startResult = client.start();
+    if (startResult.getDistributionActionResult() != DistributionActionResultEnum.SUCCESS) {
+      String errorMsg = "Failed to start distribution client: "
+          + startResult.getDistributionMessageResult();
+      logger.error(ModelLoaderMsgs.ASDC_CONNECTION_ERROR, errorMsg);
+      return;
+    }
+
+    // Success.  Cancel the timer job
+    timer.cancel();
+    logger.info(ModelLoaderMsgs.INITIALIZING, "Connection to SDC established");
+  }
+}