Merge "Update schema ingest library call schema service"

96 files changed, 9623 insertions, 1078 deletions

diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/config/ConfigConfiguration.java b/aai-schema-ingest/src/main/java/org/onap/aai/config/ConfigConfiguration.java
new file mode 100644
index 00000000..9f28cf8f
--- /dev/null
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/config/ConfigConfiguration.java
@@ -0,0 +1,46 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Modifications Copyright © 2018 IBM.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.aai.config;
+
+import org.onap.aai.setup.SchemaLocationsBean;
+import org.onap.aai.setup.SchemaVersions;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
+
+@Configuration
+@ConditionalOnProperty(prefix = "schema.translator.list", value = "config", matchIfMissing = true)
+@PropertySource(value = "classpath:schema-ingest.properties", ignoreResourceNotFound = true)
+@PropertySource(value = "file:${schema.ingest.file}", ignoreResourceNotFound = true)
+public class ConfigConfiguration {
+
+    @Bean(name = "schemaVersions")
+    public SchemaVersions schemaVersions() {
+        return new SchemaVersions();
+    }
+
+    @Bean(name = "schemaLocationsBean")
+    public SchemaLocationsBean schemaLocationsBean() {
+        return new SchemaLocationsBean();
+    }
+}
diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/config/EdgesConfiguration.java b/aai-schema-ingest/src/main/java/org/onap/aai/config/EdgesConfiguration.java
new file mode 100644
index 00000000..e492d213
--- /dev/null
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/config/EdgesConfiguration.java
@@ -0,0 +1,77 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Modifications Copyright © 2018 IBM.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.aai.config;
+
+import org.onap.aai.edges.EdgeIngestor;
+import org.onap.aai.setup.SchemaVersions;
+import org.onap.aai.setup.Translator;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+import org.springframework.context.annotation.PropertySource;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+@Import({SchemaServiceConfiguration.class, ConfigConfiguration.class, TranslatorConfiguration.class})
+@PropertySource(value = "classpath:schema-ingest.properties", ignoreResourceNotFound = true)
+@PropertySource(value = "file:${schema.ingest.file}", ignoreResourceNotFound = true)
+@Configuration
+public class EdgesConfiguration {
+
+    private static final String CONFIG_TRANSLATOR = "config";
+    private static final String SCHEMA_SERVICE_TRANSLATOR = "schema-service";
+
+    @Autowired(required = false)
+    SchemaServiceConfiguration schemaConfiguration;
+
+    @Autowired(required = false)
+    ConfigConfiguration configConfiguration;
+
+    @Autowired(required = false)
+    TranslatorConfiguration translatorConfiguration;
+
+    @Value("${schema.translator.list}")
+    private String[] translatorArray;
+
+    public Set<Translator> translators() {
+        Set<Translator> translators = new HashSet<>();
+
+        List<String> translatorList = Arrays.asList(translatorArray);
+        if (translatorList.contains(SCHEMA_SERVICE_TRANSLATOR)) {
+            translators.add(schemaConfiguration.schemaServiceTranslator());
+        } else {
+            translators.add(translatorConfiguration.configTranslator);
+        }
+        return translators;
+    }
+
+    @Bean(name = "edgeIngestor")
+    public EdgeIngestor edgeIngestor() {
+        return new EdgeIngestor(translators());
+    }
+
+}
diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/config/NodesConfiguration.java b/aai-schema-ingest/src/main/java/org/onap/aai/config/NodesConfiguration.java
new file mode 100644
index 00000000..94bc6da5
--- /dev/null
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/config/NodesConfiguration.java
@@ -0,0 +1,82 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Modifications Copyright © 2018 IBM.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.aai.config;
+
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
+import org.onap.aai.nodes.NodeIngestor;
+import org.onap.aai.setup.SchemaVersions;
+import org.onap.aai.setup.Translator;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+import org.springframework.context.annotation.PropertySource;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+@Import({SchemaServiceConfiguration.class, ConfigConfiguration.class, TranslatorConfiguration.class})
+@PropertySource(value = "classpath:schema-ingest.properties", ignoreResourceNotFound = true)
+@PropertySource(value = "file:${schema.ingest.file}", ignoreResourceNotFound = true)
+@Configuration
+public class NodesConfiguration {
+
+    private static final String CONFIG_TRANSLATOR = "config";
+    private static final String SCHEMA_SERVICE_TRANSLATOR = "schema-service";
+    private static final EELFLogger LOGGER = EELFManager.getInstance().getLogger(NodesConfiguration.class);
+
+    @Autowired(required = false)
+    SchemaServiceConfiguration schemaConfiguration;
+
+    @Autowired(required = false)
+    ConfigConfiguration configConfiguration;
+
+    @Autowired(required = false)
+    TranslatorConfiguration translatorConfiguration;
+
+    @Value("${schema.translator.list}")
+    private String[] translatorArray;
+
+    public Set<Translator> translators() {
+        Set<Translator> translators = new HashSet<>();
+
+        List<String> translatorList = Arrays.asList(translatorArray);
+        if (translatorList.contains(SCHEMA_SERVICE_TRANSLATOR)) {
+            LOGGER.info("Translator is SchemaServiceTranslator");
+            translators.add(schemaConfiguration.schemaServiceTranslator());
+        } else {
+            LOGGER.info("Translator is SchemaServiceTranslator");
+            translators.add(translatorConfiguration.configTranslator);
+        }
+        return translators;
+    }
+
+    @Bean(name = "nodeIngestor")
+    public NodeIngestor nodeIngestor() {
+        return new NodeIngestor(translators());
+    }
+
+}
diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/config/RestConfiguration.java b/aai-schema-ingest/src/main/java/org/onap/aai/config/RestConfiguration.java
new file mode 100644
index 00000000..0a3dbf5e
--- /dev/null
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/config/RestConfiguration.java
@@ -0,0 +1,82 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Modifications Copyright © 2018 IBM.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.aai.config;
+
+import org.onap.aai.restclient.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
+
+@Configuration
+@ConditionalOnExpression("'${schema.translator.list}'.contains('schema-service')")
+@PropertySource(value = "classpath:schema-ingest.properties", ignoreResourceNotFound = true)
+@PropertySource(value = "file:${schema.ingest.file}", ignoreResourceNotFound = true)
+public class RestConfiguration {
+
+    private static final String TWO_WAY_SSL = "two-way-ssl";
+    private static final String ONE_WAY_SSL = "one-way-ssl";
+    private static final String NO_AUTH = "no-auth";
+
+    @Value("${schema.service.client:two-way-ssl}")
+    private String schemaServiceClient;
+
+    @Autowired
+    private RestClient restClient;
+
+    @Bean
+    public RestClientFactory restClientFactory() {
+
+        return new RestClientFactory() {
+            @Override
+            public RestClient getRestClient(String clientType) {
+                return restClient;
+
+            }
+        };
+    }
+
+    /*
+    In the below cases bean name and method names are different because all of them qualify as restClient
+     */
+    @Bean(name="restClient")
+    @ConditionalOnProperty(name = "schema.service.client", havingValue = "two-way-ssl", matchIfMissing = true)
+    public RestClient getSchemaServiceTwoWayClient() {
+        return new SchemaServiceRestClient();
+    }
+
+    @Bean(name="restClient")
+    @ConditionalOnProperty(name = "schema.service.client", havingValue = "no-auth")
+    public RestClient getSchemaServiceNoAuthClient() {
+        return new SchemaServiceNoAuthClient();
+    }
+
+    @Bean(name="restClient")
+    @ConditionalOnProperty(name = "schema.service.client", havingValue = "one-way-ssl")
+    public RestClient getSchemaServiceOneWayClient() {
+        return new SchemaServiceOneWayClient();
+    }
+
+}
diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/config/SchemaServiceConfiguration.java b/aai-schema-ingest/src/main/java/org/onap/aai/config/SchemaServiceConfiguration.java
new file mode 100644
index 00000000..81ef02a8
--- /dev/null
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/config/SchemaServiceConfiguration.java
@@ -0,0 +1,54 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Modifications Copyright © 2018 IBM.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.aai.config;
+
+import org.onap.aai.setup.SchemaServiceTranslator;
+import org.onap.aai.setup.SchemaVersions;
+import org.onap.aai.setup.SchemaVersionsBean;
+import org.onap.aai.setup.Translator;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
+
+@Configuration
+@ConditionalOnExpression("'${schema.translator.list}'.contains('schema-service')")
+@PropertySource(value = "classpath:schema-ingest.properties", ignoreResourceNotFound = true)
+@PropertySource(value = "file:${schema.ingest.file}", ignoreResourceNotFound = true)
+public class SchemaServiceConfiguration {
+
+    @Bean(name = "schemaVersionsBean")
+    public SchemaVersionsBean schemaVersionsBean() {
+        return new SchemaVersionsBean();
+    }
+
+    @Bean(name = "schemaVersions")
+    public SchemaVersions schemaVersions() {
+        return schemaVersionsBean().getSchemaVersions();
+    }
+
+    @Bean(name = "schemaServiceTranslator")
+    public Translator schemaServiceTranslator() {
+        return new SchemaServiceTranslator(schemaVersions());
+    }
+
+}
diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/config/TranslatorConfiguration.java b/aai-schema-ingest/src/main/java/org/onap/aai/config/TranslatorConfiguration.java
new file mode 100644
index 00000000..941e03d9
--- /dev/null
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/config/TranslatorConfiguration.java
@@ -0,0 +1,36 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Modifications Copyright © 2018 IBM.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.aai.config;
+
+import org.onap.aai.setup.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@ConditionalOnProperty(prefix = "schema.translator.list", value = "config", matchIfMissing = true)
+public class TranslatorConfiguration {
+    //TODO check if you can put dependsOn to reduce number of config files
+    @Autowired(required = false)
+    ConfigTranslator configTranslator;
+
+}
diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/edges/EdgeIngestor.java b/aai-schema-ingest/src/main/java/org/onap/aai/edges/EdgeIngestor.java
index c2c58d5f..71225340 100644
--- a/aai-schema-ingest/src/main/java/org/onap/aai/edges/EdgeIngestor.java
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/edges/EdgeIngestor.java
@@ -20,37 +20,37 @@
 
 package org.onap.aai.edges;
 
-import java.util.*;
-import java.util.Map.Entry;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-
-import com.google.common.cache.Cache;
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
+import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.Multimap;
+import com.jayway.jsonpath.Criteria;
+import com.jayway.jsonpath.DocumentContext;
+import com.jayway.jsonpath.Filter;
 import org.apache.tinkerpop.gremlin.structure.Direction;
 import org.onap.aai.edges.enums.DirectionNotation;
 import org.onap.aai.edges.enums.EdgeField;
 import org.onap.aai.edges.enums.EdgeType;
 import org.onap.aai.edges.exceptions.AmbiguousRuleChoiceException;
 import org.onap.aai.edges.exceptions.EdgeRuleNotFoundException;
-import org.onap.aai.setup.ConfigTranslator;
 import org.onap.aai.setup.SchemaVersion;
 import org.onap.aai.setup.SchemaVersions;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.onap.aai.setup.Translator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import com.google.common.collect.ArrayListMultimap;
-import com.google.common.collect.Multimap;
-import com.jayway.jsonpath.Criteria;
-import com.jayway.jsonpath.DocumentContext;
-import com.jayway.jsonpath.Filter;
-import static com.jayway.jsonpath.Filter.filter;
+import javax.annotation.PostConstruct;
+import java.io.IOException;
+import java.util.*;
+import java.util.Map.Entry;
+import java.util.concurrent.ExecutionException;
+import java.util.stream.Collectors;
+
 import static com.jayway.jsonpath.Criteria.where;
+import static com.jayway.jsonpath.Filter.filter;
 
 /**
  * EdgeIngestor - ingests A&AI edge rule schema files per given config, serves that edge rule
@@ -58,34 +58,73 @@ import static com.jayway.jsonpath.Criteria.where;
  */
 @Component
 public class EdgeIngestor {
+    private static final EELFLogger LOGGER = EELFManager.getInstance().getLogger(EdgeIngestor.class);
+    private Map<SchemaVersion, List<DocumentContext>> versionJsonFilesMap;
+    private static final String READ_START = "$.rules.[?]";
+    private static final String READ_ALL_START = "$.rules.*";
+    private SchemaVersions schemaVersions;
 
-    private static final Logger LOG = LoggerFactory.getLogger(EdgeIngestor.class);
+    Map<SchemaVersion, List<String>> filesToIngest;
 
-    private Map<SchemaVersion, List<DocumentContext>> versionJsonFilesMap;
-	private static final String READ_START = "$.rules.[?]";
-	private static final String READ_ALL_START = "$.rules.*";
+    private Set<String> multipleLabelKeys;
 
-	private SchemaVersions schemaVersions;
+    private LoadingCache<SchemaFilter,Multimap<String,EdgeRule>> cacheFilterStore;
 
-	private Set<String> multipleLabelKeys;
+    private LoadingCache<String, String[]> cousinLabelStore;
 
-    private final LoadingCache<SchemaFilter,Multimap<String,EdgeRule>> cacheFilterStore;
+    private Set<Translator> translators;
 
-    private final LoadingCache<String, String[]> cousinLabelStore;
+    @Autowired
+    public EdgeIngestor(Set<Translator> translatorSet) {
+        LOGGER.debug("Local Schema files will be fetched");
+        this.translators = translatorSet;
+    }
+
+    @PostConstruct
+    public void initialize() {
+
+       for (Translator translator : translators) {
+            try {
+                LOGGER.debug("Processing the translator");
+                translateAll(translator);
+
+            } catch (Exception e) {
+                LOGGER.debug("Error while Processing the translator" + e.getMessage());
+                continue;
+            }
+        }
+        if (versionJsonFilesMap.isEmpty() || schemaVersions==null ) {
+            throw new ExceptionInInitializerError();
+        }
+    }
+
+    public void translateAll(Translator translator) {
+        /*
+        Use SchemaVersions from the Translator
+         */
+        this.schemaVersions = translator.getSchemaVersions();
+        List<SchemaVersion> schemaVersionList = this.schemaVersions.getVersions();
+        List<String> jsonPayloads = null;
+        JsonIngestor ji = new JsonIngestor();
+        Map<SchemaVersion, List<String>> edgeRulesToIngest = new HashMap<>();         // Obtain a map of schema versions to a list of strings. One List per key
+
+        // Add to the map the JSON file per version.
+        for (SchemaVersion version : schemaVersionList) {
+            LOGGER.debug("Version being processed" + version);
+            // If the flag is set to not use the local files, obtain the Json from the service.
+            try {
+                jsonPayloads = translator.getJsonPayload(version);     // need to change this - need to receive the json files.
+            } catch (IOException e) {
+                LOGGER.info("Exception in retrieving the JSON Payload"+e.getMessage());
+            }
+            if (jsonPayloads == null || jsonPayloads.isEmpty()) {
+                continue;
+            }
+            LOGGER.debug("Retrieved json from SchemaService");
+            edgeRulesToIngest.put(version, jsonPayloads);
+        }
+        versionJsonFilesMap = ji.ingestContent(edgeRulesToIngest);
 
-	//-----ingest-----//
-	/**
-	 * Instantiates the EdgeIngestor bean.
-	 *
-	 * @param translator - ConfigTranslator autowired in by Spring framework which
-	 * contains the configuration information needed to ingest the desired files.
-	 */
-	@Autowired
-	public EdgeIngestor(ConfigTranslator translator, SchemaVersions schemaVersions) {
-		Map<SchemaVersion, List<String>> filesToIngest = translator.getEdgeFiles();
-		JsonIngestor ji = new JsonIngestor();
-		this.schemaVersions = schemaVersions;
-		versionJsonFilesMap = ji.ingest(filesToIngest);
         this.cacheFilterStore = CacheBuilder.newBuilder()
             .maximumSize(2000)
             .build(
@@ -107,27 +146,27 @@ public class EdgeIngestor {
                     }
                 }
             );
-	}
-
-	//-----methods for getting rule info-----//
+    }
 
-	/**
-	 * Gets list of all edge rules defined in the latest version's schema
-	 *
-	 * @return Multimap<String, EdgeRule> of node names keys to the EdgeRules associated with those types
-	 * 		where the key takes the form of
-	 * 			{alphabetically first nodetype}|{alphabetically second nodetype}. Map will be empty if
-	 * 		no rules are found.
-	 * 		ex: buildAlphabetizedKey("l-interface", "logical-link") -> "l-interface|logical-link"
-	 * 			buildAlphabetizedKey("logical-link", "l-interface") -> "l-interface|logical-link"
-	 *
-	 * 	This is alphabetical order to normalize the keys, as sometimes there will be multiple
-	 * 	rules for a pair of node types but the from/to value in the json is flipped for some of them.
-	 * @throws EdgeRuleNotFoundException if none found
-	 */
-	public Multimap<String, EdgeRule> getAllCurrentRules() throws EdgeRuleNotFoundException {
-		return getAllRules(schemaVersions.getDefaultVersion());
-	}
+//	//-----methods for getting rule info-----//
+//
+    /**
+     * Gets list of all edge rules defined in the latest version's schema
+     *
+     * @return Multimap<String, EdgeRule> of node names keys to the EdgeRules associated with those types
+     * 		where the key takes the form of
+     * 			{alphabetically first nodetype}|{alphabetically second nodetype}. Map will be empty if
+     * 		no rules are found.
+     * 		ex: buildAlphabetizedKey("l-interface", "logical-link") -> "l-interface|logical-link"
+     * 			buildAlphabetizedKey("logical-link", "l-interface") -> "l-interface|logical-link"
+     *
+     * 	This is alphabetical order to normalize the keys, as sometimes there will be multiple
+     * 	rules for a pair of node types but the from/to value in the json is flipped for some of them.
+     * @throws EdgeRuleNotFoundException if none found
+     */
+    public Multimap<String, EdgeRule> getAllCurrentRules() throws EdgeRuleNotFoundException {
+        return getAllRules(schemaVersions.getDefaultVersion());
+    }
 
     /**
      * Retrieves all the nodes that contain multiple edge labels
@@ -137,81 +176,83 @@ public class EdgeIngestor {
      * @return  a set containing a list of strings where each string is
      *          concatenated by a pipe (|) character such as aNodeType|bNodeType
      */
-	public Set<String> getMultipleLabelKeys(){
+    public Set<String> getMultipleLabelKeys(){
 
-	    if(multipleLabelKeys == null){
+        if(multipleLabelKeys == null){
             multipleLabelKeys = new HashSet<>();
             try {
                 final Multimap<String, EdgeRule> edges = this.getAllCurrentRules();
                 if(edges == null || edges.isEmpty()){
-                    LOG.warn("Unable to find any edge rules for the latest version");
+                    LOGGER.warn("Unable to find any edge rules for the latest version");
+                    return multipleLabelKeys;
                 }
-                edges.keySet().forEach((key) -> {
+                edges.keySet().forEach(key -> {
                     Collection<EdgeRule> rules = edges.get(key);
                     if(rules.size() > 1){
                         multipleLabelKeys.add(key);
                     }
                 });
             } catch (EdgeRuleNotFoundException e) {
-                LOG.info("For the latest schema version, unable to find any edges with multiple keys");
+                LOGGER.info("For the latest schema version, unable to find any edges with multiple keys");
             }
         }
 
         return multipleLabelKeys;
     }
-	/**
-	 * Gets list of all edge rules defined in the given version's schema
-	 *
-	 * @return Multimap<String, EdgeRule> of node names keys to the EdgeRules associated with those types
-	 * 		where the key takes the form of
-	 * 			{alphabetically first nodetype}|{alphabetically second nodetype}. Map will be empty if
-	 * 		no rules are found.
-	 * 		ex: buildAlphabetizedKey("l-interface", "logical-link") -> "l-interface|logical-link"
-	 * 			buildAlphabetizedKey("logical-link", "l-interface") -> "l-interface|logical-link"
-	 *
-	 * 	This is alphabetical order to normalize the keys, as sometimes there will be multiple
-	 * 	rules for a pair of node types but the from/to value in the json is flipped for some of them.
-	 * @throws EdgeRuleNotFoundException if none found
-	 */
-	public Multimap<String, EdgeRule> getAllRules(SchemaVersion v) throws EdgeRuleNotFoundException {
-		Multimap<String, EdgeRule> found = extractRules(null, v);
-		if (found.isEmpty()) {
-			throw new EdgeRuleNotFoundException("No rules found for version " + v.toString() + ".");
-		} else {
-			return found;
-		}
-	}
+    /**
+     * Gets list of all edge rules defined in the given version's schema
+     *
+     * @return Multimap<String, EdgeRule> of node names keys to the EdgeRules associated with those types
+     * 		where the key takes the form of
+     * 			{alphabetically first nodetype}|{alphabetically second nodetype}. Map will be empty if
+     * 		no rules are found.
+     * 		ex: buildAlphabetizedKey("l-interface", "logical-link") -> "l-interface|logical-link"
+     * 			buildAlphabetizedKey("logical-link", "l-interface") -> "l-interface|logical-link"
+     *
+     * 	This is alphabetical order to normalize the keys, as sometimes there will be multiple
+     * 	rules for a pair of node types but the from/to value in the json is flipped for some of them.
+     * @throws EdgeRuleNotFoundException if none found
+     */
+    public Multimap<String, EdgeRule> getAllRules(SchemaVersion v) throws EdgeRuleNotFoundException {
+        Multimap<String, EdgeRule> found = extractRules(null, v);
+        if (found.isEmpty()) {
+            throw new EdgeRuleNotFoundException("No rules found for version " + v.toString() + ".");
+        } else {
+            return found;
+        }
+    }
 
-	/**
-	 * Finds the rules (if any) matching the given query criteria. If none, the returned Multimap
-	 * will be empty.
-	 *
-	 * @param q - EdgeRuleQuery with filter criteria set
-	 *
-	 * @return Multimap<String, EdgeRule> of node names keys to the EdgeRules where the key takes the form of
-	 * 			{alphabetically first nodetype}|{alphabetically second nodetype}. Map will be empty if
-	 * 			no rules are found.
-	 * 		ex: buildAlphabetizedKey("l-interface", "logical-link") -> "l-interface|logical-link"
-	 * 			buildAlphabetizedKey("logical-link", "l-interface") -> "l-interface|logical-link"
-	 *
-	 * 	This is alphabetical order to normalize the keys, as sometimes there will be multiple
-	 * 	rules for a pair of node types but the from/to value in the json is flipped for some of them.
-	 * @throws EdgeRuleNotFoundException if none found
-	 */
-	public Multimap<String, EdgeRule> getRules(EdgeRuleQuery q) throws EdgeRuleNotFoundException {
-		Multimap<String, EdgeRule> found = null;
-	    if(q.getVersion().isPresent()){
-			found = extractRules(q.getFilter(), q.getVersion().get());
-		} else {
-	    	found = extractRules(q.getFilter(), schemaVersions.getDefaultVersion());
-		}
-		if (found.isEmpty()) {
-			throw new EdgeRuleNotFoundException("No rules found for " + q.toString());
-		} else {
-			Multimap<String, EdgeRule> copy = ArrayListMultimap.create();
-			found.entries().stream().forEach((entry) -> {
-			    EdgeRule rule = new EdgeRule(entry.getValue());
-			    if(!q.getFromType().equals(rule.getFrom())){
+    /**
+     * Finds the rules (if any) matching the given query criteria. If none, the returned Multimap
+     * will be empty.
+     *
+     * @param q - EdgeRuleQuery with filter criteria set
+     *
+     * @return Multimap<String, EdgeRule> of node names keys to the EdgeRules where the key takes the form of
+     * 			{alphabetically first nodetype}|{alphabetically second nodetype}. Map will be empty if
+     * 			no rules are found.
+     * 		ex: buildAlphabetizedKey("l-interface", "logical-link") -> "l-interface|logical-link"
+     * 			buildAlphabetizedKey("logical-link", "l-interface") -> "l-interface|logical-link"
+     *
+     * 	This is alphabetical order to normalize the keys, as sometimes there will be multiple
+     * 	rules for a pair of node types but the from/to value in the json is flipped for some of them.
+     * @throws EdgeRuleNotFoundException if none found
+     */
+
+    public Multimap<String, EdgeRule> getRules(EdgeRuleQuery q) throws EdgeRuleNotFoundException {
+        Multimap<String, EdgeRule> found = null;
+        if(q.getVersion().isPresent()){
+            found = extractRules(q.getFilter(), q.getVersion().get());
+        } else {
+            found = extractRules(q.getFilter(), schemaVersions.getDefaultVersion());
+        }
+        if (found.isEmpty()) {
+            throw new EdgeRuleNotFoundException("No rules found for " + q.toString());
+        } else {
+            Multimap<String, EdgeRule> copy = ArrayListMultimap.create();
+            found.entries().stream().forEach((entry) -> {
+                EdgeRule rule = new EdgeRule(entry.getValue());
+                if (!q.getFromType().equals(rule.getFrom())) {
                     /* To maintain backwards compatibility with old EdgeRules API,
                      * where the direction of the returned EdgeRule would be
                      * flipped (if necessary) to match the directionality of
@@ -220,296 +261,293 @@ public class EdgeIngestor {
                      * if the user asked (A,B) the direction would be OUT,
                      * if they asked (B,A), it would be IN to match.
                      */
-			        rule.flipDirection();
+                    rule.flipDirection();
                 }
-			    copy.put(entry.getKey(), rule);
+                copy.put(entry.getKey(), rule);
             });
 
-			return copy;
-		}
-	}
-
-	/**
-	 * Gets the rule satisfying the given filter criteria. If there are more than one
-	 * that match, return the default rule. If there is no clear default to return, or
-	 * no rules match at all, error.
-	 *
-	 * @param q - EdgeRuleQuery with filter criteria set
-	 * @return EdgeRule satisfying given criteria
-	 * @throws EdgeRuleNotFoundException if none found that match
-	 * @throws AmbiguousRuleChoiceException if multiple match but no way to choice one from them
-	 * 			Specifically, if multiple node type pairs come back (ie bar|foo and asdf|foo,
-	 * 					no way to know which is appropriate over the others),
-	 * 			or if there is a mix of Tree and Cousin edges because again there is no way to
-	 * 					know which is "defaulter" than the other.
-	 * 			The default property only clarifies among multiple cousin edges of the same node pair,
-	 * 				ex: which l-interface|logical-link rule to default to.
-	 */
-	public EdgeRule getRule(EdgeRuleQuery q) throws EdgeRuleNotFoundException, AmbiguousRuleChoiceException {
-		Multimap<String, EdgeRule> found = null;
-		if(q.getVersion().isPresent()){
-			found = extractRules(q.getFilter(), q.getVersion().get());
-		} else {
-			found = extractRules(q.getFilter(), schemaVersions.getDefaultVersion());
-		}
-
-		if (found.isEmpty()) {
-			throw new EdgeRuleNotFoundException("No rule found for " + q.toString() + ".");
-		}
-
-		EdgeRule rule = null;
-		if (found.keys().size() == 1) { //only one found, cool we're done
-			for (Entry<String, EdgeRule> e : found.entries()) {
-				rule = e.getValue();
-			}
-		} else {
-			rule = getDefaultRule(found);
-		}
+            return copy;
+        }
+    }
 
 
-		if (rule == null) { //should never get here though
-			throw new EdgeRuleNotFoundException("No rule found for " + q.toString() + ".");
-		} else {
-            rule = new EdgeRule(rule);
-			if (!q.getFromType().equals(rule.getFrom())) {
-				/* To maintain backwards compatibility with old EdgeRules API,
-				 * where the direction of the returned EdgeRule would be
-				 * flipped (if necessary) to match the directionality of
-				 * the input params.
-				 * ie, If the rule is from=A,to=B,direction=OUT,
-				 * if the user asked (A,B) the direction would be OUT,
-				 * if they asked (B,A), it would be IN to match.
-				 */
-				rule.flipDirection();
-			}
-			return rule;
-		}
-	}
 
+    /**
+     * Gets the rule satisfying the given filter criteria. If there are more than one
+     * that match, return the default rule. If there is no clear default to return, or
+     * no rules match at all, error.
+     *
+     * @param q - EdgeRuleQuery with filter criteria set
+     * @return EdgeRule satisfying given criteria
+     * @throws EdgeRuleNotFoundException if none found that match
+     * @throws AmbiguousRuleChoiceException if multiple match but no way to choice one from them
+     * 			Specifically, if multiple node type pairs come back (ie bar|foo and asdf|foo,
+     * 					no way to know which is appropriate over the others),
+     * 			or if there is a mix of Tree and Cousin edges because again there is no way to
+     * 					know which is "defaulter" than the other.
+     * 			The default property only clarifies among multiple cousin edges of the same node pair,
+     * 				ex: which l-interface|logical-link rule to default to.
+     */
+    public EdgeRule getRule(EdgeRuleQuery q) throws EdgeRuleNotFoundException, AmbiguousRuleChoiceException {
+        Multimap<String, EdgeRule> found = null;
+        if(q.getVersion().isPresent()){
+            found = extractRules(q.getFilter(), q.getVersion().get());
+        } else {
+            found = extractRules(q.getFilter(), schemaVersions.getDefaultVersion());
+        }
 
+        if (found.isEmpty()) {
+            throw new EdgeRuleNotFoundException("No rule found for " + q.toString() + ".");
+        }
 
-	private EdgeRule getDefaultRule(Multimap<String, EdgeRule> found) throws AmbiguousRuleChoiceException {
-		if (found.keySet().size() > 1) { //ie multiple node pairs (a|c and b|c not just all a|c) case
-			StringBuilder sb = new StringBuilder();
-			for (String k : found.keySet()) {
-				sb.append(k).append(" ");
-			}
-			throw new AmbiguousRuleChoiceException("No way to select single rule from these pairs: " + sb.toString() + ".");
-		}
+        EdgeRule rule = null;
+        if (found.keys().size() == 1) { //only one found, cool we're done
+            for (Entry<String, EdgeRule> e : found.entries()) {
+                rule = e.getValue();
+            }
+        } else {
+            rule = getDefaultRule(found);
+        }
 
-		int defaultCount = 0;
-		EdgeRule defRule = null;
-		for (Entry<String, EdgeRule> e : found.entries()) {
-			EdgeRule rule = e.getValue();
-			if (rule.isDefault()) {
-				defaultCount++;
-				defRule = rule;
-			}
-		}
-		if (defaultCount > 1) {
-			throw new AmbiguousRuleChoiceException("Multiple defaults found.");
-		} else if (defaultCount == 0) {
-			throw new AmbiguousRuleChoiceException("No default found.");
-		}
+        if (rule == null) { //should never get here though
+            throw new EdgeRuleNotFoundException("No rule found for " + q.toString() + ".");
+        } else {
+            rule = new EdgeRule(rule);
+            if (!q.getFromType().equals(rule.getFrom())) {
+                /* To maintain backwards compatibility with old EdgeRules API,
+                 * where the direction of the returned EdgeRule would be
+                 * flipped (if necessary) to match the directionality of
+                 * the input params.
+                 * ie, If the rule is from=A,to=B,direction=OUT,
+                 * if the user asked (A,B) the direction would be OUT,
+                 * if they asked (B,A), it would be IN to match.
+                 */
+                rule.flipDirection();
+            }
+            return rule;
+        }
+    }
 
-		return defRule;
-	}
+    private EdgeRule getDefaultRule(Multimap<String, EdgeRule> found) throws AmbiguousRuleChoiceException {
+        if (found.keySet().size() > 1) { //ie multiple node pairs (a|c and b|c not just all a|c) case
+            StringBuilder sb = new StringBuilder();
+            for (String k : found.keySet()) {
+                sb.append(k).append(" ");
+            }
+            throw new AmbiguousRuleChoiceException("No way to select single rule from these pairs: " + sb.toString() + ".");
+        }
 
-	/**
-	 * Checks if there exists any rule that satisfies the given filter criteria.
-	 *
-	 * @param q - EdgeRuleQuery with filter criteria set
-	 * @return boolean
-	 */
-	public boolean hasRule(EdgeRuleQuery q) {
-	    if(q.getVersion().isPresent()){
-			return !extractRules(q.getFilter(), q.getVersion().get()).isEmpty();
-		} else {
-	    	return !extractRules(q.getFilter(), schemaVersions.getDefaultVersion()).isEmpty();
-		}
-	}
+        int defaultCount = 0;
+        EdgeRule defRule = null;
+        for (Entry<String, EdgeRule> e : found.entries()) {
+            EdgeRule rule = e.getValue();
+            if (rule.isDefault()) {
+                defaultCount++;
+                defRule = rule;
+            }
+        }
+        if (defaultCount > 1) {
+            throw new AmbiguousRuleChoiceException("Multiple defaults found.");
+        } else if (defaultCount == 0) {
+            throw new AmbiguousRuleChoiceException("No default found.");
+        }
 
-	/**
-	 * Gets all cousin rules for the given node type in the latest schema version.
-	 *
-	 * @param nodeType
-	 * @return Multimap<String, EdgeRule> of node names keys to the EdgeRules where the key takes the form of
-	 * 			{alphabetically first nodetype}|{alphabetically second nodetype}. Map will be empty if
-	 * 			no rules are found.
-	 * 		ex: buildAlphabetizedKey("l-interface", "logical-link") -> "l-interface|logical-link"
-	 * 			buildAlphabetizedKey("logical-link", "l-interface") -> "l-interface|logical-link"
-	 *
-	 * 	This is alphabetical order to normalize the keys, as sometimes there will be multiple
-	 * 	rules for a pair of node types but the from/to value in the json is flipped for some of them.
-	 */
-	public Multimap<String, EdgeRule> getCousinRules(String nodeType) {
-		return getCousinRules(nodeType, schemaVersions.getDefaultVersion()); //default to latest
-	}
+        return defRule;
+    }
+    /**
+     * Checks if there exists any rule that satisfies the given filter criteria.
+     *
+     * @param q - EdgeRuleQuery with filter criteria set
+     * @return boolean
+     */
+    public boolean hasRule(EdgeRuleQuery q) {
+        if(q.getVersion().isPresent()){
+            return !extractRules(q.getFilter(), q.getVersion().get()).isEmpty();
+        } else {
+            return !extractRules(q.getFilter(), schemaVersions.getDefaultVersion()).isEmpty();
+        }
+    }
 
+    /**
+     * Gets all cousin rules for the given node type in the latest schema version.
+     *
+     * @param nodeType
+     * @return Multimap<String, EdgeRule> of node names keys to the EdgeRules where the key takes the form of
+     * 			{alphabetically first nodetype}|{alphabetically second nodetype}. Map will be empty if
+     * 			no rules are found.
+     * 		ex: buildAlphabetizedKey("l-interface", "logical-link") -> "l-interface|logical-link"
+     * 			buildAlphabetizedKey("logical-link", "l-interface") -> "l-interface|logical-link"
+     *
+     * 	This is alphabetical order to normalize the keys, as sometimes there will be multiple
+     * 	rules for a pair of node types but the from/to value in the json is flipped for some of them.
+     */
+    public Multimap<String, EdgeRule> getCousinRules(String nodeType) {
+        return getCousinRules(nodeType, schemaVersions.getDefaultVersion()); //default to latest
+    }
 
-	public String[] retrieveCousinLabels(String nodeType){
+    public String[] retrieveCousinLabels(String nodeType){
 
-	    Multimap<String, EdgeRule> cousinRules = getCousinRules(nodeType);
-	    String[] cousinLabels = new String[cousinRules.size()];
+        Multimap<String, EdgeRule> cousinRules = getCousinRules(nodeType);
+        String[] cousinLabels = new String[cousinRules.size()];
 
-	    return cousinRules.entries()
-                .stream()
-                .map((entry) -> entry.getValue().getLabel())
-                .collect(Collectors.toList())
-                .toArray(cousinLabels);
+        return cousinRules.entries()
+            .stream()
+            .map(entry -> entry.getValue().getLabel())
+            .collect(Collectors.toList())
+            .toArray(cousinLabels);
     }
 
     public String[] retrieveCachedCousinLabels(String nodeType) throws ExecutionException {
-	    return cousinLabelStore.get(nodeType);
+        return cousinLabelStore.get(nodeType);
     }
 
-	/**
-	 * Gets all cousin rules for the given node type in the given schema version.
-	 *
-	 * @param nodeType
-	 * @param v - the version of the edge rules to query
-	 * @return Multimap<String, EdgeRule> of node names keys to the EdgeRules where the key takes the form of
-	 * 			{alphabetically first nodetype}|{alphabetically second nodetype}. Map will be empty if
-	 * 			no rules are found.
-	 * 		ex: buildAlphabetizedKey("l-interface", "logical-link") -> "l-interface|logical-link"
-	 * 			buildAlphabetizedKey("logical-link", "l-interface") -> "l-interface|logical-link"
-	 *
-	 * 	This is alphabetical order to normalize the keys, as sometimes there will be multiple
-	 * 	rules for a pair of node types but the from/to value in the json is flipped for some of them.
-	 */
-	public Multimap<String, EdgeRule> getCousinRules(String nodeType, SchemaVersion v) {
-		return extractRules(new EdgeRuleQuery.Builder(nodeType).edgeType(EdgeType.COUSIN).build().getFilter(), v);
-	}
+    /**
+     * Gets all cousin rules for the given node type in the given schema version.
+     *
+     * @param nodeType
+     * @param v - the version of the edge rules to query
+     * @return Multimap<String, EdgeRule> of node names keys to the EdgeRules where the key takes the form of
+     * 			{alphabetically first nodetype}|{alphabetically second nodetype}. Map will be empty if
+     * 			no rules are found.
+     * 		ex: buildAlphabetizedKey("l-interface", "logical-link") -> "l-interface|logical-link"
+     * 			buildAlphabetizedKey("logical-link", "l-interface") -> "l-interface|logical-link"
+     *
+     * 	This is alphabetical order to normalize the keys, as sometimes there will be multiple
+     * 	rules for a pair of node types but the from/to value in the json is flipped for some of them.
+     */
+    public Multimap<String, EdgeRule> getCousinRules(String nodeType, SchemaVersion v) {
+        return extractRules(new EdgeRuleQuery.Builder(nodeType).edgeType(EdgeType.COUSIN).build().getFilter(), v);
+    }
 
-	/**
-	 * Returns if the given node type has any cousin relationships in the current version.
-	 * @param nodeType
-	 * @return boolean
-	 */
-	public boolean hasCousinRule(String nodeType) {
-		return hasCousinRule(nodeType, schemaVersions.getDefaultVersion());
-	}
+    /**
+     * Returns if the given node type has any cousin relationships in the current version.
+     * @param nodeType
+     * @return boolean
+     */
+    public boolean hasCousinRule(String nodeType) {
+        return hasCousinRule(nodeType, schemaVersions.getDefaultVersion());
+    }
 
-	/**
-	 * Returns if the given node type has any cousin relationships in the given version.
-	 * @param nodeType
-	 * @return boolean
-	 */
-	public boolean hasCousinRule(String nodeType, SchemaVersion v) {
-		return !getCousinRules(nodeType, v).isEmpty();
-	}
+    /**
+     * Returns if the given node type has any cousin relationships in the given version.
+     * @param nodeType
+     * @return boolean
+     */
+    public boolean hasCousinRule(String nodeType, SchemaVersion v) {
+        return !getCousinRules(nodeType, v).isEmpty();
+    }
 
-	/**
-	 * Gets all rules where "{given nodeType} contains {otherType}" in the latest schema version.
-	 *
-	 * @param nodeType - node type that is the container in the returned relationships
-	 * @return Multimap<String, EdgeRule> of node names keys to the EdgeRules where the key takes the form of
-	 * 			{alphabetically first nodetype}|{alphabetically second nodetype}. Map will be empty if
-	 * 			no rules are found.
-	 * 		ex: buildAlphabetizedKey("l-interface", "logical-link") -> "l-interface|logical-link"
-	 * 			buildAlphabetizedKey("logical-link", "l-interface") -> "l-interface|logical-link"
-	 *
-	 * 	This is alphabetical order to normalize the keys, as sometimes there will be multiple
-	 * 	rules for a pair of node types but the from/to value in the json is flipped for some of them.
-	 */
-	public Multimap<String, EdgeRule> getChildRules(String nodeType) {
-		return getChildRules(nodeType, schemaVersions.getDefaultVersion());
-	}
+    /**
+     * Gets all rules where "{given nodeType} contains {otherType}" in the latest schema version.
+     *
+     * @param nodeType - node type that is the container in the returned relationships
+     * @return Multimap<String, EdgeRule> of node names keys to the EdgeRules where the key takes the form of
+     * 			{alphabetically first nodetype}|{alphabetically second nodetype}. Map will be empty if
+     * 			no rules are found.
+     * 		ex: buildAlphabetizedKey("l-interface", "logical-link") -> "l-interface|logical-link"
+     * 			buildAlphabetizedKey("logical-link", "l-interface") -> "l-interface|logical-link"
+     *
+     * 	This is alphabetical order to normalize the keys, as sometimes there will be multiple
+     * 	rules for a pair of node types but the from/to value in the json is flipped for some of them.
+     */
+    public Multimap<String, EdgeRule> getChildRules(String nodeType) {
+        return getChildRules(nodeType, schemaVersions.getDefaultVersion());
+    }
 
-	/**
-	 * Gets all rules where "{given nodeType} contains {otherType}" in the given schema version.
-	 *
-	 * @param nodeType - node type that is the container in the returned relationships
-	 * @return Multimap<String, EdgeRule> of node names keys to the EdgeRules where the key takes the form of
-	 * 			{alphabetically first nodetype}|{alphabetically second nodetype}. Map will be empty if
-	 * 			no rules are found.
-	 * 		ex: buildAlphabetizedKey("l-interface", "logical-link") -> "l-interface|logical-link"
-	 * 			buildAlphabetizedKey("logical-link", "l-interface") -> "l-interface|logical-link"
-	 *
-	 * 	This is alphabetical order to normalize the keys, as sometimes there will be multiple
-	 * 	rules for a pair of node types but the from/to value in the json is flipped for some of them.
-	 */
-	public Multimap<String, EdgeRule> getChildRules(String nodeType, SchemaVersion v) {
-		Filter from = assembleFilterSegments(where(EdgeField.FROM.toString()).is(nodeType), getSameDirectionContainmentCriteria());
-		Filter to = assembleFilterSegments(where(EdgeField.TO.toString()).is(nodeType), getOppositeDirectionContainmentCriteria());
-		Filter total = from.or(to);
+    /**
+     * Gets all rules where "{given nodeType} contains {otherType}" in the given schema version.
+     *
+     * @param nodeType - node type that is the container in the returned relationships
+     * @return Multimap<String, EdgeRule> of node names keys to the EdgeRules where the key takes the form of
+     * 			{alphabetically first nodetype}|{alphabetically second nodetype}. Map will be empty if
+     * 			no rules are found.
+     * 		ex: buildAlphabetizedKey("l-interface", "logical-link") -> "l-interface|logical-link"
+     * 			buildAlphabetizedKey("logical-link", "l-interface") -> "l-interface|logical-link"
+     *
+     * 	This is alphabetical order to normalize the keys, as sometimes there will be multiple
+     * 	rules for a pair of node types but the from/to value in the json is flipped for some of them.
+     */
+    public Multimap<String, EdgeRule> getChildRules(String nodeType, SchemaVersion v) {
+        Filter from = assembleFilterSegments(where(EdgeField.FROM.toString()).is(nodeType), getSameDirectionContainmentCriteria());
+        Filter to = assembleFilterSegments(where(EdgeField.TO.toString()).is(nodeType), getOppositeDirectionContainmentCriteria());
+        Filter total = from.or(to);
 
-		return extractRules(total, v);
-	}
+        return extractRules(total, v);
+    }
 
-	/**
-	 * Returns if the given node type has any child relationships (ie it contains another node type) in the current version.
-	 * @param nodeType
-	 * @return boolean
-	 */
-	public boolean hasChildRule(String nodeType) {
-		return hasChildRule(nodeType, schemaVersions.getDefaultVersion());
-	}
+    /**
+     * Returns if the given node type has any child relationships (ie it contains another node type) in the current version.
+     * @param nodeType
+     * @return boolean
+     */
+    public boolean hasChildRule(String nodeType) {
+        return hasChildRule(nodeType, schemaVersions.getDefaultVersion());
+    }
 
-	/**
-	 * Returns if the given node type has any child relationships (ie it contains another node type) in the given version.
-	 * @param nodeType
-	 * @return boolean
-	 */
-	public boolean hasChildRule(String nodeType, SchemaVersion v) {
-		return !getChildRules(nodeType, v).isEmpty();
-	}
+    /**
+     * Returns if the given node type has any child relationships (ie it contains another node type) in the given version.
+     * @param nodeType
+     * @return boolean
+     */
+    public boolean hasChildRule(String nodeType, SchemaVersion v) {
+        return !getChildRules(nodeType, v).isEmpty();
+    }
 
-	/**
-	 * Gets all rules where "{given nodeType} is contained by {otherType}" in the latest schema version.
-	 *
-	 * @param nodeType - node type that is the containee in the returned relationships
-	 * @return Multimap<String, EdgeRule> of node names keys to the EdgeRules where the key takes the form of
-	 * 			{alphabetically first nodetype}|{alphabetically second nodetype}. Map will be empty if
-	 * 			no rules are found.
-	 * 		ex: buildAlphabetizedKey("l-interface", "logical-link") -> "l-interface|logical-link"
-	 * 			buildAlphabetizedKey("logical-link", "l-interface") -> "l-interface|logical-link"
-	 *
-	 * 	This is alphabetical order to normalize the keys, as sometimes there will be multiple
-	 * 	rules for a pair of node types but the from/to value in the json is flipped for some of them.
-	 */
-	public Multimap<String, EdgeRule> getParentRules(String nodeType) {
-		return getParentRules(nodeType, schemaVersions.getDefaultVersion());
-	}
+    /**
+     * Gets all rules where "{given nodeType} is contained by {otherType}" in the latest schema version.
+     *
+     * @param nodeType - node type that is the containee in the returned relationships
+     * @return Multimap<String, EdgeRule> of node names keys to the EdgeRules where the key takes the form of
+     * 			{alphabetically first nodetype}|{alphabetically second nodetype}. Map will be empty if
+     * 			no rules are found.
+     * 		ex: buildAlphabetizedKey("l-interface", "logical-link") -> "l-interface|logical-link"
+     * 			buildAlphabetizedKey("logical-link", "l-interface") -> "l-interface|logical-link"
+     *
+     * 	This is alphabetical order to normalize the keys, as sometimes there will be multiple
+     * 	rules for a pair of node types but the from/to value in the json is flipped for some of them.
+     */
+    public Multimap<String, EdgeRule> getParentRules(String nodeType) {
+        return getParentRules(nodeType, schemaVersions.getDefaultVersion());
+    }
 
-	/**
-	 * Gets all rules where "{given nodeType} is contained by {otherType}" in the given schema version.
-	 *
-	 * @param nodeType - node type that is the containee in the returned relationships
-	 * @return Multimap<String, EdgeRule> of node names keys to the EdgeRules where the key takes the form of
-	 * 			{alphabetically first nodetype}|{alphabetically second nodetype}. Map will be empty if
-	 * 			no rules are found.
-	 * 		ex: buildAlphabetizedKey("l-interface", "logical-link") -> "l-interface|logical-link"
-	 * 			buildAlphabetizedKey("logical-link", "l-interface") -> "l-interface|logical-link"
-	 *
-	 * 	This is alphabetical order to normalize the keys, as sometimes there will be multiple
-	 * 	rules for a pair of node types but the from/to value in the json is flipped for some of them.
-	 */
-	public Multimap<String, EdgeRule> getParentRules(String nodeType, SchemaVersion v) {
-		Filter from = assembleFilterSegments(where(EdgeField.FROM.toString()).is(nodeType), getOppositeDirectionContainmentCriteria());
-		Filter to = assembleFilterSegments(where(EdgeField.TO.toString()).is(nodeType), getSameDirectionContainmentCriteria());
-		Filter total = from.or(to);
+    /**
+     * Gets all rules where "{given nodeType} is contained by {otherType}" in the given schema version.
+     *
+     * @param nodeType - node type that is the containee in the returned relationships
+     * @return Multimap<String, EdgeRule> of node names keys to the EdgeRules where the key takes the form of
+     * 			{alphabetically first nodetype}|{alphabetically second nodetype}. Map will be empty if
+     * 			no rules are found.
+     * 		ex: buildAlphabetizedKey("l-interface", "logical-link") -> "l-interface|logical-link"
+     * 			buildAlphabetizedKey("logical-link", "l-interface") -> "l-interface|logical-link"
+     *
+     * 	This is alphabetical order to normalize the keys, as sometimes there will be multiple
+     * 	rules for a pair of node types but the from/to value in the json is flipped for some of them.
+     */
+    public Multimap<String, EdgeRule> getParentRules(String nodeType, SchemaVersion v) {
+        Filter from = assembleFilterSegments(where(EdgeField.FROM.toString()).is(nodeType), getOppositeDirectionContainmentCriteria());
+        Filter to = assembleFilterSegments(where(EdgeField.TO.toString()).is(nodeType), getSameDirectionContainmentCriteria());
+        Filter total = from.or(to);
 
-		return extractRules(total, v);
-	}
+        return extractRules(total, v);
+    }
 
-	/**
-	 * Returns if the given node type has any parent relationships (ie it is contained by another node type) in the current version.
-	 * @param nodeType
-	 * @return boolean
-	 */
-	public boolean hasParentRule(String nodeType) {
-		return hasParentRule(nodeType, schemaVersions.getDefaultVersion());
-	}
+    /**
+     * Returns if the given node type has any parent relationships (ie it is contained by another node type) in the current version.
+     * @param nodeType
+     * @return boolean
+     */
+    public boolean hasParentRule(String nodeType) {
+        return hasParentRule(nodeType, schemaVersions.getDefaultVersion());
+    }
 
-	/**
-	 * Returns if the given node type has any parent relationships (ie it is contained by another node type) in the given version.
-	 * @param nodeType
-	 * @return boolean
-	 */
-	public boolean hasParentRule(String nodeType, SchemaVersion v) {
-		return !getParentRules(nodeType, v).isEmpty();
-	}
+    /**
+     * Returns if the given node type has any parent relationships (ie it is contained by another node type) in the given version.
+     * @param nodeType
+     * @return boolean
+     */
+    public boolean hasParentRule(String nodeType, SchemaVersion v) {
+        return !getParentRules(nodeType, v).isEmpty();
+    }
 
 	/**
 	 * Applies the given filter to the DocumentContext(s) for the given version to extract
@@ -527,17 +565,17 @@ public class EdgeIngestor {
 	 * 	This is alphabetical order to normalize the keys, as sometimes there will be multiple
 	 * 	rules for a pair of node types but the from/to value in the json is flipped for some of them.
 	 */
-	private Multimap<String, EdgeRule> extractRules(Filter filter, SchemaVersion v) {
-	    SchemaFilter schemaFilter = new SchemaFilter(filter, v);
+    private Multimap<String, EdgeRule> extractRules(Filter filter, SchemaVersion v) {
+        SchemaFilter schemaFilter = new SchemaFilter(filter, v);
         try {
             return cacheFilterStore.get(schemaFilter);
         } catch (ExecutionException e) {
-            LOG.info("Encountered exception during the retrieval of the rules");
+            LOGGER.info("Encountered exception during the retrieval of the rules");
             return ArrayListMultimap.create();
         }
     }
 
-	public Multimap<String, EdgeRule> extractRules(SchemaFilter schemaFilter){
+    public Multimap<String, EdgeRule> extractRules(SchemaFilter schemaFilter){
         List<Map<String, String>> foundRules = new ArrayList<>();
         List<DocumentContext> docs = versionJsonFilesMap.get(schemaFilter.getSchemaVersion());
         if (docs != null) {
diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/edges/EdgeRule.java b/aai-schema-ingest/src/main/java/org/onap/aai/edges/EdgeRule.java
index f914f6cb..f8f8caca 100644
--- a/aai-schema-ingest/src/main/java/org/onap/aai/edges/EdgeRule.java
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/edges/EdgeRule.java
@@ -20,13 +20,8 @@
 package org.onap.aai.edges;
 
 import org.apache.tinkerpop.gremlin.structure.Direction;
-import org.onap.aai.edges.enums.AAIDirection;
-import org.onap.aai.edges.enums.DirectionNotation;
-import org.onap.aai.edges.enums.EdgeField;
-import org.onap.aai.edges.enums.EdgeProperty;
-import org.onap.aai.edges.enums.MultiplicityRule;
+import org.onap.aai.edges.enums.*;
 
-import java.util.Collections;
 import java.util.EnumMap;
 import java.util.HashMap;
 import java.util.Map;
@@ -45,52 +40,52 @@ public class EdgeRule {
 	private String description;
 	private boolean isPrivateEdge = false;
 
-    /**
+	/**
 	 * Instantiates a new edge rule.
-	 *
+	 * 
 	 * @param fieldVals - Map<String, String> where first string is
-	 * 					an EdgeField value and second string is the
+	 * 					an EdgeField value and second string is the 
 	 * 					value of that field
 	 */
 	public EdgeRule(Map<String, String> fieldVals) {
 		edgeFields = new EnumMap<>(EdgeProperty.class);
-
+		
 		from = fieldVals.get(EdgeField.FROM.toString());
 		to = fieldVals.get(EdgeField.TO.toString());
 		label = fieldVals.get(EdgeField.LABEL.toString());
 		direction = Direction.valueOf(fieldVals.get(EdgeField.DIRECTION.toString()));
 		multiplicityRule = MultiplicityRule.getValue(fieldVals.get(EdgeField.MULTIPLICITY.toString()));
 		isPrivateEdge = Boolean.valueOf(fieldVals.getOrDefault(EdgeField.PRIVATE.toString(), "false"));
-		for (EdgeProperty prop : EdgeProperty.values()) {
+
+        for (EdgeProperty prop : EdgeProperty.values()) {
 			String rawVal = fieldVals.get(prop.toString());
 			edgeFields.put(prop, convertNotation(direction, rawVal));
 		}
-
+		
 		isDefaultEdge = Boolean.valueOf(fieldVals.get(EdgeField.DEFAULT.toString()));
-
-		description = fieldVals.get(EdgeField.DESCRIPTION.toString());
+        description = fieldVals.get(EdgeField.DESCRIPTION.toString());
 		if (description == null) { //bc description is optional and not in v12 and earlier
 			description = "";
 		}
 	}
 
-	// Copy Constructor
-	public EdgeRule(EdgeRule edgeRule){
-	    this.from = edgeRule.from;
-	    this.to   = edgeRule.to;
-	    this.label = edgeRule.label;
-	    this.direction = Direction.valueOf(edgeRule.direction.toString());
-	    this.multiplicityRule = MultiplicityRule.valueOf(edgeRule.multiplicityRule.toString());
+    // Copy Constructor
+    public EdgeRule(EdgeRule edgeRule){
+        this.from = edgeRule.from;
+        this.to   = edgeRule.to;
+        this.label = edgeRule.label;
+        this.direction = Direction.valueOf(edgeRule.direction.toString());
+        this.multiplicityRule = MultiplicityRule.valueOf(edgeRule.multiplicityRule.toString());
         this.edgeFields = new HashMap<>(edgeRule.edgeFields);
-	    this.isDefaultEdge    = edgeRule.isDefaultEdge;
-	    this.description = edgeRule.description;
-	    this.isPrivateEdge = edgeRule.isPrivateEdge;
+        this.isDefaultEdge    = edgeRule.isDefaultEdge;
+        this.description = edgeRule.description;
+        this.isPrivateEdge = edgeRule.isPrivateEdge;
     }
 
 	/**
 	 * Converts whatever string was in the json for an edge property value into
 	 * the appropriate AAIDirection
-	 *
+	 * 
 	 * @param Direction dir - the edge direction
 	 * @param String rawVal - property value from the json, may be
 	 * 			IN, OUT, BOTH, NONE, ${direction}, or !${direction}
@@ -107,7 +102,7 @@ public class EdgeRule {
 		} else if (AAIDirection.IN.toString().equalsIgnoreCase(rawVal)) {
 			return AAIDirection.IN;
 		}
-
+		
 		DirectionNotation rawDN = DirectionNotation.getValue(rawVal);
 		if (DirectionNotation.DIRECTION.equals(rawDN)) {
 			return AAIDirection.getValue(dir);
@@ -115,7 +110,7 @@ public class EdgeRule {
 			return AAIDirection.getValue(dir.opposite());
 		}
 	}
-
+	
 	/**
 	 * Gets the name of the node type in the "from" field
 	 * @return String nodetype
@@ -140,7 +135,7 @@ public class EdgeRule {
 	public String getLabel() {
 		return label;
 	}
-
+	
 	/**
 	 * Gets the multiplicity rule.
 	 *
@@ -149,7 +144,7 @@ public class EdgeRule {
 	public MultiplicityRule getMultiplicityRule() {
 		return multiplicityRule;
 	}
-
+	
 	/**
 	 * Gets the edge direction
 	 *
@@ -158,7 +153,7 @@ public class EdgeRule {
 	public Direction getDirection() {
 		return direction;
 	}
-
+	
 	/**
 	 * Gets the value of contains-other-v
 	 *
@@ -167,7 +162,7 @@ public class EdgeRule {
 	public String getContains() {
 		return edgeFields.get(EdgeProperty.CONTAINS).toString();
 	}
-
+	
 	/**
 	 * Gets the value of delete-other-v
 	 *
@@ -176,10 +171,10 @@ public class EdgeRule {
 	public String getDeleteOtherV() {
 		return edgeFields.get(EdgeProperty.DELETE_OTHER_V).toString();
 	}
-
+	
 	/**
 	 * Gets the value of the prevent-delete property
-	 *
+	 * 
 	 * @return String prevent-delete property value
 	 */
 	public String getPreventDelete() {
@@ -188,13 +183,13 @@ public class EdgeRule {
 
 	/**
 	 * Returns if this rule is a default or not
-	 *
+	 * 
 	 * @return boolean
 	 */
 	public boolean isDefault() {
 		return isDefaultEdge;
 	}
-
+	
 	/**
 	 * Gets the description on the edge rule (if there is one)
 	 * @return String description
@@ -202,7 +197,7 @@ public class EdgeRule {
 	public String getDescription() {
 		return this.description;
 	}
-
+	
 	/**
 	 * Flips the direction value
 	 * IN -> OUT
diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/edges/EdgeRuleQuery.java b/aai-schema-ingest/src/main/java/org/onap/aai/edges/EdgeRuleQuery.java
index 58c8c546..d6fec83d 100644
--- a/aai-schema-ingest/src/main/java/org/onap/aai/edges/EdgeRuleQuery.java
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/edges/EdgeRuleQuery.java
@@ -170,7 +170,7 @@ public class EdgeRuleQuery {
         List<Predicate> criteriaFromTo = new ArrayList<>();
         //Special logic to allow for A to B case only
         if(("FromOnly").equals(builder.getSecondNodeType())) {
-                criteriaFromTo.add(buildToFromPart(builder.getFirstNodeType(), null));
+            criteriaFromTo.add(buildToFromPart(builder.getFirstNodeType(), null));
         } else {
             criteriaFromTo.add(buildToFromPart(builder.getFirstNodeType(), builder.getSecondNodeType()));
         }
@@ -245,16 +245,16 @@ public class EdgeRuleQuery {
     }
         
     private Predicate addDirection(AAIDirection direction) {
-            if (direction == AAIDirection.OUT) {
-                return where(EdgeField.DIRECTION.toString()).in(AAIDirection.OUT.toString(), AAIDirection.BOTH.toString());
-            } else if (direction == AAIDirection.IN) {
-                return where(EdgeField.DIRECTION.toString()).in(AAIDirection.IN.toString(), AAIDirection.BOTH.toString());
-            } else if (direction == AAIDirection.BOTH) {
-                return where(EdgeField.DIRECTION.toString()).is(AAIDirection.BOTH.toString());
-            } else if (direction == AAIDirection.NONE) {
-                return where(EdgeField.DIRECTION.toString()).is(AAIDirection.NONE.toString());
-            }
+        if (direction == AAIDirection.OUT) {
+            return where(EdgeField.DIRECTION.toString()).in(AAIDirection.OUT.toString(), AAIDirection.BOTH.toString());
+        } else if (direction == AAIDirection.IN) {
+            return where(EdgeField.DIRECTION.toString()).in(AAIDirection.IN.toString(), AAIDirection.BOTH.toString());
+        } else if (direction == AAIDirection.BOTH) {
+            return where(EdgeField.DIRECTION.toString()).is(AAIDirection.BOTH.toString());
+        } else if (direction == AAIDirection.NONE) {
             return where(EdgeField.DIRECTION.toString()).is(AAIDirection.NONE.toString());
+        }
+        return where(EdgeField.DIRECTION.toString()).is(AAIDirection.NONE.toString());
     }
     
     /**
@@ -345,4 +345,3 @@ public class EdgeRuleQuery {
 
 }
 
-
diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/edges/JsonIngestor.java b/aai-schema-ingest/src/main/java/org/onap/aai/edges/JsonIngestor.java
index 16562756..713103a0 100644
--- a/aai-schema-ingest/src/main/java/org/onap/aai/edges/JsonIngestor.java
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/edges/JsonIngestor.java
@@ -1,4 +1,4 @@
-/** 
+/**
  * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
@@ -20,64 +20,85 @@
 
 package org.onap.aai.edges;
 
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
+import com.jayway.jsonpath.DocumentContext;
+import com.jayway.jsonpath.JsonPath;
+import org.onap.aai.setup.SchemaVersion;
+
 import java.io.BufferedReader;
 import java.io.FileReader;
 import java.io.IOException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.Map.Entry;
 
-import org.onap.aai.setup.SchemaVersion;
-
-import com.jayway.jsonpath.DocumentContext;
-import com.jayway.jsonpath.JsonPath;
-
 /**
  * JsonIngestor produces DocumentContexts from json files
  */
 public class JsonIngestor {
-	
-	/**
-	 * Reads in given json files to queryable DocumentContexts.
-	 * 
-	 * @param filesToIngest - map of filenames to ingest
-	 * 			per Version
-	 * @return Map<SchemaVersion, List<DocumentContext>> - map of DocumentContexts per Version
-	 */
-	public Map<SchemaVersion, List<DocumentContext>> ingest(Map<SchemaVersion, List<String>> filesToIngest) {
-		Map<SchemaVersion, List<DocumentContext>> result = new HashMap<>();
-		
-		for (Entry<SchemaVersion, List<String>> verFiles : filesToIngest.entrySet()) {
-			SchemaVersion v = verFiles.getKey();
-			List<String> files = verFiles.getValue();
-			
-			List<DocumentContext> docs = new ArrayList<>();
-			
-			for (String rulesFilename : files) {
-				String fileContents = readInJsonFile(rulesFilename);
-				docs.add(JsonPath.parse(fileContents));
-			}
-			result.put(v, docs);
-		}
-		
-		return result;
-	}
-	
-	/**
-	 * Reads the json file at the given filename into an in-memory String.
-	 * 
-	 * @param rulesFilename - json file to be read (must include path to the file)
-	 * @return String json contents of the given file
-	 */
-	private String readInJsonFile(String rulesFilename) {
-		StringBuilder sb = new StringBuilder();
-		try(BufferedReader br = new BufferedReader(new FileReader(rulesFilename))) {
-			String line;
-			while ((line = br.readLine()) != null) {
-				sb.append(line);
-			}
-		} catch (IOException e) {
-			throw new ExceptionInInitializerError(e);
-		}
-		return sb.toString();
-	}
+	private static final EELFLogger LOGGER = EELFManager.getInstance().getLogger(JsonIngestor.class);
+    
+    /**
+     * Reads in given json files to queryable DocumentContexts.
+     *
+     * @param filesToIngest - map of filenames to ingest
+     * 			per Version
+     * @return Map<SchemaVersion, List<DocumentContext>> - map of DocumentContexts per Version
+     */
+    public Map<SchemaVersion, List<DocumentContext>> ingest(Map<SchemaVersion, List<String>> filesToIngest) {
+        Map<SchemaVersion, List<DocumentContext>> result = new HashMap<>();
+
+        for (Entry<SchemaVersion, List<String>> verFiles : filesToIngest.entrySet()) {
+            SchemaVersion v = verFiles.getKey();
+            List<String> files = verFiles.getValue();
+
+            List<DocumentContext> docs = new ArrayList<>();
+            for (String rulesFilename : files) {
+                String fileContents = readInJsonFile(rulesFilename);
+                docs.add(JsonPath.parse(fileContents));
+            }
+            result.put(v, docs);
+        }
+
+        return result;
+    }
+
+    public Map<SchemaVersion, List<DocumentContext>> ingestContent(Map<SchemaVersion, List<String>> filesToIngest) {
+        Map<SchemaVersion, List<DocumentContext>> result = new HashMap<>();
+
+        for (Entry<SchemaVersion, List<String>> verFiles : filesToIngest.entrySet()) {
+            SchemaVersion v = verFiles.getKey();
+            List<String> files = verFiles.getValue();
+
+            List<DocumentContext> docs = new ArrayList<>();
+            for (String jsonPayload : files) {
+                docs.add(JsonPath.parse(jsonPayload));
+            }
+            result.put(v, docs);
+        }
+        return result;
+    }
+
+    /**
+     * Reads the json file at the given filename into an in-memory String.
+     *
+     * @param rulesFilename - json file to be read (must include path to the file)
+     * @return String json contents of the given file
+     */
+    public String readInJsonFile(String rulesFilename) {
+        StringBuilder sb = new StringBuilder();
+        try(BufferedReader br = new BufferedReader(new FileReader(rulesFilename))) {
+            String line;
+            while ((line = br.readLine()) != null) {
+                sb.append(line);
+            }
+        } catch (IOException e) {
+            LOGGER.warn("Exception in file"+e.getMessage());
+            throw new ExceptionInInitializerError(e);
+        }
+        return sb.toString();
+    }
 }
diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/edges/exceptions/AmbiguousRuleChoiceException.java b/aai-schema-ingest/src/main/java/org/onap/aai/edges/exceptions/AmbiguousRuleChoiceException.java
index 3ddced9a..da79d9c7 100644
--- a/aai-schema-ingest/src/main/java/org/onap/aai/edges/exceptions/AmbiguousRuleChoiceException.java
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/edges/exceptions/AmbiguousRuleChoiceException.java
@@ -1,4 +1,4 @@
-/**
+/** 
  * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
@@ -25,7 +25,7 @@ public class AmbiguousRuleChoiceException extends Exception {
 		super(msg);
 	}
 
-	public AmbiguousRuleChoiceException(Throwable throwable){
-	    super(throwable);
+    public AmbiguousRuleChoiceException(Throwable throwable){
+        super(throwable);
     }
 }
diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/edges/exceptions/EdgeRuleNotFoundException.java b/aai-schema-ingest/src/main/java/org/onap/aai/edges/exceptions/EdgeRuleNotFoundException.java
index de022bc5..f9b9b643 100644
--- a/aai-schema-ingest/src/main/java/org/onap/aai/edges/exceptions/EdgeRuleNotFoundException.java
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/edges/exceptions/EdgeRuleNotFoundException.java
@@ -1,4 +1,4 @@
-/**
+/** 
  * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
@@ -25,7 +25,7 @@ public class EdgeRuleNotFoundException extends Exception {
 		super(msg);
 	}
 
-	public EdgeRuleNotFoundException(Throwable throwable){
-	    super(throwable);
+    public EdgeRuleNotFoundException(Throwable throwable){
+        super(throwable);
     }
 }
diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/nodes/NodeIngestor.java b/aai-schema-ingest/src/main/java/org/onap/aai/nodes/NodeIngestor.java
index 95232386..1945a1ef 100644
--- a/aai-schema-ingest/src/main/java/org/onap/aai/nodes/NodeIngestor.java
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/nodes/NodeIngestor.java
@@ -2,13 +2,15 @@
  * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
- * Copyright © 2017-18 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Modifications Copyright © 2018 IBM.
  * ================================================================================
  * 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
+ *    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,
@@ -20,210 +22,256 @@
 
 package org.onap.aai.nodes;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.*;
-import java.io.ByteArrayInputStream;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import javax.xml.XMLConstants;
-import javax.xml.bind.JAXBException;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
+import com.google.common.base.CaseFormat;
 import org.eclipse.persistence.jaxb.JAXBContextProperties;
 import org.eclipse.persistence.jaxb.dynamic.DynamicJAXBContext;
 import org.eclipse.persistence.jaxb.dynamic.DynamicJAXBContextFactory;
-
 import org.onap.aai.setup.ConfigTranslator;
 import org.onap.aai.setup.SchemaVersion;
+import org.onap.aai.setup.SchemaVersions;
+import org.onap.aai.setup.Translator;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.PropertySource;
 import org.springframework.stereotype.Component;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 import org.xml.sax.SAXException;
 
-import com.google.common.base.CaseFormat;
+import javax.annotation.PostConstruct;
+import javax.xml.XMLConstants;
+import javax.xml.bind.JAXBException;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import java.io.*;
+import java.nio.charset.StandardCharsets;
+import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 @Component
-/**
- * NodeIngestor - ingests A&AI OXM files per given config, serves DynamicJAXBContext per version
+/*
+  NodeIngestor - ingests A&AI OXM files per given config, serves DynamicJAXBContext per version
  */
+@PropertySource(value = "classpath:schema-ingest.properties", ignoreResourceNotFound=true)
+@PropertySource(value = "file:${schema.ingest.file}", ignoreResourceNotFound=true)
 public class NodeIngestor {
 
+    private static final EELFLogger LOGGER = EELFManager.getInstance().getLogger(NodeIngestor.class);
+    private static final Pattern classNamePattern = Pattern.compile("\\.(v\\d+)\\.");
+    Map<SchemaVersion, List<String>> filesToIngest;
+    private Map<SchemaVersion, DynamicJAXBContext> versionContextMap = new TreeMap<>();
+    private Map<SchemaVersion, Set<String>> typesPerVersion = new TreeMap<>();
+    private Map<SchemaVersion, Document> schemaPerVersion = new TreeMap<>();
+    private String localSchema;
+    private SchemaVersions schemaVersions;
+    private Set<Translator> translators;
+    
+    //TODO : See if you can get rid of InputStream resets
+     /**
+     * Instantiates the NodeIngestor bean.
+     *
+     * @param  - ConfigTranslator autowired in by Spring framework which
+     * contains the configuration information needed to ingest the desired files.
+     */
 
-	private Map<SchemaVersion, DynamicJAXBContext> versionContextMap = new TreeMap<>();
-	private Map<SchemaVersion, Set<String>> typesPerVersion = new TreeMap<>();
-	private Map<SchemaVersion, Document> schemaPerVersion = new TreeMap<>();
-	private static final Pattern classNamePattern = Pattern.compile("\\.(v\\d+)\\.");
-
-	private ConfigTranslator translator;
-
-
-	@Autowired
-	/**
-	 * Instantiates the NodeIngestor bean.
-	 *
-	 * @param translator - ConfigTranslator autowired in by Spring framework which
-	 * contains the configuration information needed to ingest the desired files.
-	 */
-	public NodeIngestor(ConfigTranslator translator) {
-		this.translator = translator;
-		Map<SchemaVersion, List<String>> filesToIngest = translator.getNodeFiles();
-
-		try {
-			for (Entry<SchemaVersion, List<String>> verFiles : filesToIngest.entrySet()) {
-				SchemaVersion v = verFiles.getKey();
-				List<String> files = verFiles.getValue();
-				final DynamicJAXBContext ctx = ingest(files);
-				versionContextMap.put(v, ctx);
-				typesPerVersion.put(v, getAllNodeTypes(files));
-				schemaPerVersion.put(v, createCombinedSchema(files, v));
-			}
-		} catch (JAXBException | ParserConfigurationException | SAXException | IOException e) {
-			throw new ExceptionInInitializerError(e);
-		}
-	}
-
-	/**
-	 * Ingests the given OXM files into DynamicJAXBContext
-	 *
-	 * @param files - List<String> of full filenames (ie including the path) to be ingested
-	 *
-	 * @return DynamicJAXBContext including schema information from all given files
-	 *
-	 * @throws FileNotFoundException if an OXM file can't be found
-	 * @throws JAXBException if there's an error creating the DynamicJAXBContext
-	 */
-	private DynamicJAXBContext ingest(List<String> files) throws FileNotFoundException, JAXBException {
-		List<InputStream> streams = new ArrayList<>();
-
-		for (String name : files) {
-			streams.add(new FileInputStream(new File(name)));
-		}
-
-		Map<String, Object> properties = new HashMap<>();
-		properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, streams);
-		return DynamicJAXBContextFactory.createContextFromOXM(this.getClass().getClassLoader(), properties);
-	}
-
-
-
-	private Set<String> getAllNodeTypes(List<String> files) throws ParserConfigurationException, SAXException, IOException {
-		Set<String> types = new HashSet<>();
-		final DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();
-		docFactory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
-		final DocumentBuilder docBuilder = docFactory.newDocumentBuilder();
-
-		ArrayList<Node> javaTypes = new ArrayList<Node>();
-		for (String file : files) {
-			InputStream inputStream = new FileInputStream(file);
-
-			final Document doc = docBuilder.parse(inputStream);
-			final NodeList list = doc.getElementsByTagName("java-type");
-
-			for (int i = 0; i < list.getLength(); i++) {
-				String type = list.item(i).getAttributes().getNamedItem("name").getNodeValue();
-				javaTypes.add(list.item(i));
-				types.add(CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_HYPHEN, type));
-			}
-		}
-
-		return types;
-	}
-	
-	private Document createCombinedSchema(List<String> files,SchemaVersion v) throws ParserConfigurationException, SAXException, IOException {
-		final DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();
-		docFactory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
-		final DocumentBuilder docBuilder = docFactory.newDocumentBuilder();
-		DocumentBuilder masterDocBuilder = docFactory.newDocumentBuilder();
-		Document combinedDoc = masterDocBuilder.parse(getShell(v));
-		NodeList masterList = combinedDoc.getElementsByTagName("java-types");
-		Node javaTypesContainer = masterList.getLength() == 0 ? combinedDoc.getDocumentElement() : masterList.item(0);
-		for (String file : files) {
-			InputStream inputStream = new FileInputStream(file);
-			
-			final Document doc = docBuilder.parse(inputStream);
-			final NodeList list = doc.getElementsByTagName("java-type");
-			for (int i = 0; i < list.getLength(); i++) {
-				Node copy = combinedDoc.importNode(list.item(i),true);
-				javaTypesContainer.appendChild(copy);
-			}
-		}		
-		return combinedDoc;
-	}
-
-	/**
-	 * Gets the DynamicJAXBContext for the given version
-	 *
-	 * @param v
-	 * @return DynamicJAXBContext
-	 */
-	public DynamicJAXBContext getContextForVersion(SchemaVersion v) {
-		return versionContextMap.get(v);
-	}
-
-	/**
-	 * Determines if the given version contains the given node type
-	 *
-	 * @param nodeType - node type to check, must be in lower hyphen form (ie "type-name")
-	 * @param v - schema version to check against
-	 * @return
-	 */
-	public boolean hasNodeType(String nodeType, SchemaVersion v) {
-		return typesPerVersion.get(v).contains(nodeType);
-	}
-
-	public Set<String> getObjectsInVersion(SchemaVersion v){
-		return typesPerVersion.get(v);
-	}
-	/**
-	 * Determines if the given version contains the given node type
-	 * 
-	 * @param String nodeType - node type to check, must be in lower hyphen form (ie "type-name")
-	 * @param v
-	 * @return
-	 */
-	public Document getSchema(SchemaVersion v) {
-		return schemaPerVersion.get(v);
-	}
-	
-	private InputStream getShell(SchemaVersion v) {
-		String source = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + 
-				"<xml-bindings xmlns=\"http://www.eclipse.org/eclipselink/xsds/persistence/oxm\" package-name=\"inventory.aai.onap.org."+v.toString().toLowerCase()+"\" xml-mapping-metadata-complete=\"true\">\n" + 
-				"	<xml-schema element-form-default=\"QUALIFIED\">\n" + 
-				"		<xml-ns namespace-uri=\"http://org.onap.aai.inventory/"+v.toString().toLowerCase()+"\" />\n" + 
-				"	</xml-schema>\n" + 
-				"	<java-types>\n" + 
-				"	</java-types>\\n" + 
-				"</xml-bindings>";
-//		source.rep.replace("v11", v.toString());
-		return new ByteArrayInputStream(source.getBytes(StandardCharsets.UTF_8));
-	}
-		
-
-	public SchemaVersion getVersionFromClassName (String classname) {
-		Matcher m = classNamePattern.matcher(classname);
-		String version = null;
-		if (m.find()) {
-			version = m.group(1);
-			return new SchemaVersion(version);
-		} else {
-		    return translator.getSchemaVersions().getDefaultVersion();
-		}
-	}
-}
+     @Autowired
+    public NodeIngestor(Set<Translator> translatorSet) {
+        LOGGER.debug("Local Schema files will be fetched");
+        this.translators = translatorSet;
+    }
 
+    @PostConstruct
+    public void initialize() {
+
+        for (Translator translator : translators) {
+            try {
+                LOGGER.debug("Processing the translator");
+                translateAll(translator);
+
+            } catch (Exception e) {
+                LOGGER.info("Error while Processing the translator" + e.getMessage());
+                continue;
+            }
+        }
+        if (versionContextMap.isEmpty() || schemaPerVersion.isEmpty() || typesPerVersion.isEmpty()) {
+            throw new ExceptionInInitializerError();
+        }
+    }
+
+    private void translateAll(Translator translator) throws ExceptionInInitializerError {
+        if (translator instanceof ConfigTranslator) {
+            this.localSchema = "true";
+        }
+
+	    Boolean retrieveLocalSchema = Boolean.parseBoolean(this.localSchema);
+        /*
+         * Set this to default schemaVersion
+         */
+        this.schemaVersions = translator.getSchemaVersions();
+        List<SchemaVersion> schemaVersionList = translator.getSchemaVersions().getVersions();
+
+        try {
+            for (SchemaVersion version : schemaVersionList) {
+                LOGGER.debug("Version being processed" + version);
+                List<InputStream> inputStreams = retrieveOXM(version, translator);
+                LOGGER.debug("Retrieved OXMs from SchemaService");
+                /*
+                IOUtils.copy and copy the inputstream
+                */
+                if (inputStreams.isEmpty()) {
+                    continue;
+                }
+
+                final DynamicJAXBContext ctx = ingest(inputStreams);
+                versionContextMap.put(version, ctx);
+                typesPerVersion.put(version, getAllNodeTypes(inputStreams));
+                schemaPerVersion.put(version, createCombinedSchema(inputStreams, version, retrieveLocalSchema));
+            }
+        } catch (JAXBException | ParserConfigurationException | SAXException | IOException e) {
+            throw new ExceptionInInitializerError(e);
+        }
+    }
+
+    /**
+     * Ingests the given OXM files into DynamicJAXBContext
+     *
+     * @param inputStreams - inputStrean of oxms from SchemaService to be ingested
+     *
+     * @return DynamicJAXBContext including schema information from all given files
+     *
+     * @throws JAXBException if there's an error creating the DynamicJAXBContext
+     */
+    private DynamicJAXBContext ingest(List<InputStream> inputStreams) throws JAXBException {
+        Map<String, Object> properties = new HashMap<>();
+        properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, inputStreams);
+        LOGGER.debug("Ingested the InputStream");
+        return DynamicJAXBContextFactory.createContextFromOXM(this.getClass().getClassLoader(), properties);
+    }
+
+    private Set<String> getAllNodeTypes(List<InputStream> inputStreams) throws ParserConfigurationException, SAXException, IOException {
+        //Reset the InputStream to reset the offset to inital position
+        Set<String> types = new HashSet<>();
+        final DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();
+        docFactory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
+        final DocumentBuilder docBuilder = docFactory.newDocumentBuilder();
+
+        for (InputStream inputStream : inputStreams) {
+            //TODO Change this
+            inputStream.reset();
+            final Document doc = docBuilder.parse(inputStream);
+            final NodeList list = doc.getElementsByTagName("java-type");
+
+            for (int i = 0; i < list.getLength(); i++) {
+                String type = list.item(i).getAttributes().getNamedItem("name").getNodeValue();
+                types.add(CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_HYPHEN, type));
+            }
+        }
+
+        LOGGER.debug("Types size" + types.size());
+        return types;
+    }
+
+    private Document createCombinedSchema(List<InputStream> inputStreams, SchemaVersion version, boolean localSchema) throws ParserConfigurationException, SAXException, IOException {
+        if (localSchema) {
+            return createCombinedSchema(inputStreams, version);
+        }
+
+        InputStream inputStream = inputStreams.get(0);
+        inputStream.reset();
+        final DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();
+        docFactory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
+        DocumentBuilder masterDocBuilder = docFactory.newDocumentBuilder();
+        return masterDocBuilder.parse(inputStream);
+    }
+
+    private Document createCombinedSchema(List<InputStream> inputStreams, SchemaVersion version) throws ParserConfigurationException, SAXException, IOException {
+        final DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();
+        docFactory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
+        final DocumentBuilder docBuilder = docFactory.newDocumentBuilder();
+        DocumentBuilder masterDocBuilder = docFactory.newDocumentBuilder();
+        Document combinedDoc = masterDocBuilder.parse(getShell(version));
+        NodeList masterList = combinedDoc.getElementsByTagName("java-types");
+        Node javaTypesContainer = masterList.getLength() == 0 ? combinedDoc.getDocumentElement() : masterList.item(0);
+
+        for (InputStream inputStream : inputStreams) {
+            inputStream.reset();
+            final Document doc = docBuilder.parse(inputStream);
+            final NodeList list = doc.getElementsByTagName("java-type");
+            for (int i = 0; i < list.getLength(); i++) {
+                Node copy = combinedDoc.importNode(list.item(i), true);
+                javaTypesContainer.appendChild(copy);
+            }
+        }
+        return combinedDoc;
+    }
+
+    /**
+     * Gets the DynamicJAXBContext for the given version
+     *
+     * @param v - schema version to retrieve the context
+     * @return DynamicJAXBContext
+     */
+    public DynamicJAXBContext getContextForVersion(SchemaVersion v) {
+        return versionContextMap.get(v);
+    }
+
+    /**
+     * Determines if the given version contains the given node type
+     *
+     * @param nodeType - node type to check, must be in lower hyphen form (ie "type-name")
+     * @param v - schema version to check against
+     * @return boolean
+     */
+    public boolean hasNodeType(String nodeType, SchemaVersion v) {
+        return typesPerVersion.get(v).contains(nodeType);
+    }
+
+    public Set<String> getObjectsInVersion(SchemaVersion v) {
+        return typesPerVersion.get(v);
+    }
+
+    /**
+     * Determines if the given version contains the given node type
+     *
+     * @param v - Schemaversion to retrieve the schema
+     * @return Document
+     */
+    public Document getSchema(SchemaVersion v) {
+        return schemaPerVersion.get(v);
+    }
+
+
+    public SchemaVersion getVersionFromClassName(String classname) {
+        Matcher m = classNamePattern.matcher(classname);
+        if (m.find()) {
+            String version = m.group(1);
+            return new SchemaVersion(version);
+        } else {
+            return this.schemaVersions.getDefaultVersion();
+        }
+    }
+
+    private List<InputStream> retrieveOXM(SchemaVersion version, Translator translator) throws IOException {
+	    /*
+	    Call Schema MS to get versions using RestTemplate or Local
+	     */
+        return translator.getVersionNodeStream(version);
+
+    }
+
+    private InputStream getShell(SchemaVersion v) {
+        String source = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
+            "<xml-bindings xmlns=\"http://www.eclipse.org/eclipselink/xsds/persistence/oxm\" package-name=\"inventory.aai.onap.org." + v.toString().toLowerCase() + "\" xml-mapping-metadata-complete=\"true\">\n" +
+            "	<xml-schema element-form-default=\"QUALIFIED\">\n" +
+            "		<xml-ns namespace-uri=\"http://org.onap.aai.inventory/" + v.toString().toLowerCase() + "\" />\n" +
+            "	</xml-schema>\n" +
+            "	<java-types>\n" +
+            "	</java-types>\n" +
+            "</xml-bindings>";
+        return new ByteArrayInputStream(source.getBytes(StandardCharsets.UTF_8));
+    }
+}
diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/restclient/SchemaServiceNoAuthClient.java b/aai-schema-ingest/src/main/java/org/onap/aai/restclient/SchemaServiceNoAuthClient.java
new file mode 100644
index 00000000..07f522b4
--- /dev/null
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/restclient/SchemaServiceNoAuthClient.java
@@ -0,0 +1,75 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2018-19 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.aai.restclient;
+
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.stereotype.Component;
+import org.springframework.util.MultiValueMap;
+
+import javax.annotation.PostConstruct;
+import java.util.Collections;
+import java.util.Map;
+import java.util.UUID;
+
+@Component(value="no-auth-service-rest-client")
+public class SchemaServiceNoAuthClient extends NoAuthRestClient{
+
+	private static EELFLogger logger = EELFManager.getInstance().getLogger(SchemaServiceNoAuthClient.class);
+
+	@Value("${schema.service.base.url}")
+	private String baseUrl;
+
+    @PostConstruct
+    public void init () throws Exception {
+        super.init();
+    }
+
+	@Override
+	public String getBaseUrl() {
+       return baseUrl;
+	}
+
+    @Override
+	public MultiValueMap<String, String> getHeaders(Map<String, String> headers) {
+		HttpHeaders httpHeaders = new HttpHeaders();
+
+        String defaultAccept = headers.getOrDefault(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON.toString());
+        String defaultContentType = headers.getOrDefault(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON.toString());
+
+        if(headers.isEmpty()){
+            httpHeaders.setAccept(Collections.singletonList(MediaType.parseMediaType(defaultAccept)));
+            httpHeaders.setContentType(MediaType.parseMediaType(defaultContentType));
+        }
+
+		httpHeaders.add("X-FromAppId", appName);
+		httpHeaders.add("X-TransactionId", UUID.randomUUID().toString());
+        headers.forEach(httpHeaders::add);
+		return httpHeaders;
+	}
+
+	@Override
+	public EELFLogger getLogger() {
+		return logger;
+	}
+}
diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/restclient/SchemaServiceOneWayClient.java b/aai-schema-ingest/src/main/java/org/onap/aai/restclient/SchemaServiceOneWayClient.java
new file mode 100644
index 00000000..3aa3b1da
--- /dev/null
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/restclient/SchemaServiceOneWayClient.java
@@ -0,0 +1,87 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2018-19 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.aai.restclient;
+
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.stereotype.Component;
+import org.springframework.util.MultiValueMap;
+
+import javax.annotation.PostConstruct;
+import java.util.Collections;
+import java.util.Map;
+import java.util.UUID;
+
+@Component(value="schema-service-one-way-rest-client")
+public class SchemaServiceOneWayClient extends OneWaySSLRestClient{
+
+	private static EELFLogger logger = EELFManager.getInstance().getLogger(SchemaServiceOneWayClient.class);
+
+    @Value("${schema.service.base.url}")
+    private String baseUrl;
+
+    @Value("${schema.service.ssl.trust-store}")
+    private String truststorePath;
+
+    @Value("${schema.service.ssl.trust-store-password}")
+    private String truststorePassword;
+
+    @Override
+    public String getBaseUrl() {
+        return baseUrl;
+    }
+
+    @Override
+    protected String getTruststorePath() {
+        return truststorePath;
+    }
+
+    @Override
+    protected char[] getTruststorePassword() {
+        return truststorePassword.toCharArray();
+    }
+
+    @Override
+	public MultiValueMap<String, String> getHeaders(Map<String, String> headers) {
+		HttpHeaders httpHeaders = new HttpHeaders();
+
+        String defaultAccept = headers.getOrDefault(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON.toString());
+        String defaultContentType = headers.getOrDefault(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON.toString());
+
+        if(headers.isEmpty()){
+            httpHeaders.setAccept(Collections.singletonList(MediaType.parseMediaType(defaultAccept)));
+            httpHeaders.setContentType(MediaType.parseMediaType(defaultContentType));
+        }
+
+		httpHeaders.add("X-FromAppId", appName);
+		httpHeaders.add("X-TransactionId", UUID.randomUUID().toString());
+        httpHeaders.add("X-TransactionId", appName);
+		headers.forEach(httpHeaders::add);
+		return httpHeaders;
+	}
+
+	@Override
+	public EELFLogger getLogger() {
+		return logger;
+	}
+}
diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/restclient/SchemaServiceRestClient.java b/aai-schema-ingest/src/main/java/org/onap/aai/restclient/SchemaServiceRestClient.java
new file mode 100644
index 00000000..db1a50b5
--- /dev/null
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/restclient/SchemaServiceRestClient.java
@@ -0,0 +1,102 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Modifications Copyright © 2018 IBM.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.aai.restclient;
+
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.stereotype.Component;
+import org.springframework.util.MultiValueMap;
+
+import java.util.Collections;
+import java.util.Map;
+import java.util.UUID;
+
+@Component(value = "schema-service-rest-client")
+public class SchemaServiceRestClient extends TwoWaySSLRestClient {
+    private static EELFLogger logger = EELFManager.getInstance().getLogger(SchemaServiceRestClient.class);
+
+    @Value("${schema.service.base.url}")
+    private String baseUrl;
+
+    @Value("${schema.service.ssl.key-store}")
+    private String keystorePath;
+
+    @Value("${schema.service.ssl.trust-store}")
+    private String truststorePath;
+
+    @Value("${schema.service.ssl.key-store-password}")
+    private String keystorePassword;
+
+    @Value("${schema.service.ssl.trust-store-password}")
+    private String truststorePassword;
+
+    @Override
+    public String getBaseUrl() {
+       return baseUrl;
+    }
+
+    @Override
+    protected String getKeystorePath() {
+        return keystorePath;
+    }
+
+    @Override
+    protected String getTruststorePath() {
+        return truststorePath;
+    }
+
+    @Override
+    protected char[] getKeystorePassword() {
+        return keystorePassword.toCharArray();
+    }
+
+    @Override
+    protected char[] getTruststorePassword() {
+        return truststorePassword.toCharArray();
+    }
+
+    @Override
+    public MultiValueMap<String, String> getHeaders(Map<String, String> headers) {
+        HttpHeaders httpHeaders = new HttpHeaders();
+
+        String defaultAccept = headers.getOrDefault(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON.toString());
+        String defaultContentType = headers.getOrDefault(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON.toString());
+
+        if (headers.isEmpty()) {
+            httpHeaders.setAccept(Collections.singletonList(MediaType.parseMediaType(defaultAccept)));
+            httpHeaders.setContentType(MediaType.parseMediaType(defaultContentType));
+        }
+
+        httpHeaders.add("X-FromAppId", appName);
+        httpHeaders.add("X-TransactionId", UUID.randomUUID().toString());
+        headers.forEach(httpHeaders::add);
+        return httpHeaders;
+    }
+
+    @Override
+    public EELFLogger getLogger() {
+        return logger;
+    }
+}
diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/setup/AAIConfigTranslator.java b/aai-schema-ingest/src/main/java/org/onap/aai/setup/AAIConfigTranslator.java
index 2cb0c99b..899a520d 100644
--- a/aai-schema-ingest/src/main/java/org/onap/aai/setup/AAIConfigTranslator.java
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/setup/AAIConfigTranslator.java
@@ -20,7 +20,10 @@
 package org.onap.aai.setup;
 
 import java.io.File;
-import java.util.*;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -43,7 +46,7 @@ public class AAIConfigTranslator extends ConfigTranslator {
 	 */
 	@Override
 	public Map<SchemaVersion, List<String>> getNodeFiles() {
-		
+
 		Map<SchemaVersion, List<String>> files = new TreeMap<>();
 		for (SchemaVersion v : schemaVersions.getVersions()) {
 			List<String> container = getVersionNodeFiles(v);
@@ -55,7 +58,6 @@ public class AAIConfigTranslator extends ConfigTranslator {
 	
 
 	private List<String> getVersionNodeFiles(SchemaVersion v) {
-
 	    return getVersionFiles(
 	    	bean.getNodeDirectory(),
 			v,
@@ -99,7 +101,6 @@ public class AAIConfigTranslator extends ConfigTranslator {
 
 		List<String> container;
 		final String directoryName = startDirectory + FILESEP + schemaVersion.toString() + FILESEP;
-
 		container = Arrays.stream(new File(directoryName).listFiles())
 				.map(File::getName)
 				.filter(name -> inclusionPattern.get().anyMatch(name::matches))
diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/setup/ConfigTranslator.java b/aai-schema-ingest/src/main/java/org/onap/aai/setup/ConfigTranslator.java
index ccbe7065..4e6a6bdf 100644
--- a/aai-schema-ingest/src/main/java/org/onap/aai/setup/ConfigTranslator.java
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/setup/ConfigTranslator.java
@@ -20,25 +20,35 @@
 
 package org.onap.aai.setup;
 
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
+import org.apache.commons.io.IOUtils;
+import org.onap.aai.edges.JsonIngestor;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.io.*;
+import java.nio.charset.Charset;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.springframework.beans.factory.annotation.Autowired;
-
 /**
  * Converts the contents of the schema config file
  * (which lists which schema files to be loaded) to
  * the format the Ingestors can work with.
  * 
  */
-public abstract class ConfigTranslator {
+public abstract class ConfigTranslator extends Translator{
+	private static final EELFLogger LOGGER = EELFManager.getInstance().getLogger(ConfigTranslator.class);
+    
 	protected SchemaLocationsBean bean;
-	protected SchemaVersions schemaVersions;
+
 	
 	@Autowired
 	public ConfigTranslator(SchemaLocationsBean schemaLocationbean, SchemaVersions schemaVersions) {
+	    super(schemaVersions);
 		this.bean = schemaLocationbean;
-		this.schemaVersions = schemaVersions;
+
 	}
 	
 	/**
@@ -49,6 +59,49 @@ public abstract class ConfigTranslator {
 	 * ingested for that version
 	 */
 	public abstract Map<SchemaVersion, List<String>> getNodeFiles();
+
+    public List<InputStream> getVersionNodeStream(SchemaVersion version) {
+
+        Map<SchemaVersion, List<String>> filesToIngest = getNodeFiles();
+        List<InputStream> streams = new ArrayList<>();
+
+        if(!filesToIngest.containsKey(version)) {
+            return streams;
+        }
+        List<String> versionFiles = filesToIngest.get(version);
+
+        for (String name : versionFiles) {
+            try {
+                InputStream stream = new FileInputStream(new File(name));
+                String value = IOUtils.toString(stream, Charset.defaultCharset());
+                InputStream bis =(IOUtils.toInputStream(value, Charset.defaultCharset()));
+                streams.add(bis);
+            } catch (FileNotFoundException e) {
+            	//TODO This may have to be cascaded
+                LOGGER.warn("File Not Found"+e.getMessage());
+            } catch (IOException e) {
+            	 LOGGER.warn("IOException while reading files"+e.getMessage());
+            }
+        }
+        return streams;
+    }
+
+    @Override
+    public List<String> getJsonPayload(SchemaVersion version) {
+        Map<SchemaVersion, List<String>> filesToIngest = getEdgeFiles();
+        List<String> jsonPayloads = new ArrayList<>();
+        if(!filesToIngest.containsKey(version)) {
+            return jsonPayloads;
+        }
+        List<String> versionFiles = filesToIngest.get(version);
+        JsonIngestor ji = new JsonIngestor();
+        for (String rulesFilename : versionFiles) {
+            jsonPayloads.add(ji.readInJsonFile(rulesFilename));
+
+        }
+
+        return jsonPayloads;
+    }
 	
 	/**
 	 * Translates the contents of the schema config file
@@ -59,7 +112,4 @@ public abstract class ConfigTranslator {
 	 */
 	public abstract Map<SchemaVersion, List<String>> getEdgeFiles();
 
-	public SchemaVersions getSchemaVersions(){
-		return schemaVersions;
-	}
 }
diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/setup/SchemaLocationsBean.java b/aai-schema-ingest/src/main/java/org/onap/aai/setup/SchemaLocationsBean.java
index e3cd7236..9e740a8c 100644
--- a/aai-schema-ingest/src/main/java/org/onap/aai/setup/SchemaLocationsBean.java
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/setup/SchemaLocationsBean.java
@@ -26,7 +26,6 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
 
-import java.util.Collections;
 import java.util.List;
 
 @Configuration
diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/setup/SchemaServiceTranslator.java b/aai-schema-ingest/src/main/java/org/onap/aai/setup/SchemaServiceTranslator.java
new file mode 100644
index 00000000..21082fa1
--- /dev/null
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/setup/SchemaServiceTranslator.java
@@ -0,0 +1,105 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.aai.setup;
+
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
+import org.onap.aai.restclient.RestClient;
+import org.onap.aai.restclient.RestClientFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.io.Resource;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+
+import javax.ws.rs.HttpMethod;
+import java.io.*;
+import java.util.*;
+
+/**
+ * <b>AAIConfigTranslator</b> is responsible for looking at the schema files and
+ * edge files based on the available versions Also has the ability to exclude
+ * them based on the node.exclusion.pattern
+ */
+public class SchemaServiceTranslator extends Translator {
+
+	private static final EELFLogger LOGGER = EELFManager.getInstance().getLogger(SchemaServiceTranslator.class);
+
+	private static final String SchemaServiceClientType = "schema.service";
+
+	@Value("${schema.service.nodes.endpoint}")
+	private String nodeSchemaUri;
+
+	@Value("${schema.service.edges.endpoint}")
+	private String edgeSchemaUri;
+
+	@Autowired
+	private RestClientFactory restClientFactory;
+
+	public SchemaServiceTranslator(SchemaVersions schemaVersions) {
+		super(schemaVersions);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.onap.aai.setup.ConfigTranslator#getNodeFiles()
+	 */
+
+	@Override
+	public List<InputStream> getVersionNodeStream(SchemaVersion version) throws IOException {
+
+		List<InputStream> inputStreams = new ArrayList<>();
+		String content = "";
+		String uri = nodeSchemaUri + version.toString();
+		Map<String, String> headersMap = new HashMap<>();
+
+		headersMap.put(HttpHeaders.ACCEPT, MediaType.APPLICATION_XML.toString());
+        headersMap.put(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_XML.toString());
+ 		RestClient restClient = restClientFactory.getRestClient(SchemaServiceClientType);
+ 		ResponseEntity<Resource> schemaResponse = restClient.getGetResource(content, uri,
+				headersMap);
+		LOGGER.debug("SchemaResponse Status code" + schemaResponse.getStatusCode());
+		inputStreams.add(schemaResponse.getBody().getInputStream());
+		return inputStreams;
+	}
+
+	@Override
+	public List<String> getJsonPayload(SchemaVersion version) throws IOException {
+		/*
+		 * Call Schema MS to get versions using RestTemplate
+		 */
+		List<String> inputStreams = new ArrayList<>();
+		String content = "";
+		String uri = edgeSchemaUri + version.toString();
+		Map<String, String> headersMap = new HashMap<>();
+
+		RestClient restClient = restClientFactory.getRestClient(SchemaServiceClientType);
+
+        ResponseEntity<String> schemaResponse = restClient.getGetRequest(content, uri,
+				headersMap);
+		LOGGER.debug("SchemaResponse Status code" + schemaResponse.getStatusCode());
+		inputStreams.add(schemaResponse.getBody());
+		return inputStreams;
+
+	}
+
+}
diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/setup/SchemaServiceVersions.java b/aai-schema-ingest/src/main/java/org/onap/aai/setup/SchemaServiceVersions.java
new file mode 100644
index 00000000..6594f232
--- /dev/null
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/setup/SchemaServiceVersions.java
@@ -0,0 +1,48 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-18 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.aai.setup;
+
+import javax.annotation.PostConstruct;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class SchemaServiceVersions extends SchemaVersions {
+    private List<String> versions;
+    private String edgeVersion;
+    private String defaultVersion;
+    private String depthVersion;
+    private String appRootVersion;
+    private String relatedLinkVersion;
+    private String namespaceChangeVersion;
+
+
+    @PostConstruct
+    public void initializeFromSchemaService() {
+        versionsValue = versions.stream().map(SchemaVersion::new).collect(Collectors.toList());
+        edgeLabelVersionValue = new SchemaVersion(edgeVersion);
+        defaultVersionValue = new SchemaVersion(defaultVersion);
+        depthVersionValue = new SchemaVersion(depthVersion);
+        appRootVersionValue = new SchemaVersion(appRootVersion);
+        relatedLinkVersionValue = new SchemaVersion(relatedLinkVersion);
+        namespaceChangeVersionValue = new SchemaVersion(namespaceChangeVersion);
+        this.validate();
+    }
+
+}
diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/setup/SchemaVersion.java b/aai-schema-ingest/src/main/java/org/onap/aai/setup/SchemaVersion.java
index c744c5a3..a1a40e69 100644
--- a/aai-schema-ingest/src/main/java/org/onap/aai/setup/SchemaVersion.java
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/setup/SchemaVersion.java
@@ -21,7 +21,6 @@ package org.onap.aai.setup;
 
 import org.onap.aai.validation.AAISchemaValidationException;
 
-import java.util.Comparator;
 import java.util.regex.Pattern;
 
 public class SchemaVersion implements Comparable<SchemaVersion> {
@@ -31,7 +30,6 @@ public class SchemaVersion implements Comparable<SchemaVersion> {
     private final String value;
 
     public SchemaVersion(String value){
-
         if(!VERSION_PATTERN.matcher(value).matches()){
             throw new AAISchemaValidationException("Invalid Schema Version " + value + ", value doesn't match the expected regex: " + VERSION_PATTERN);
         }
diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/setup/SchemaVersions.java b/aai-schema-ingest/src/main/java/org/onap/aai/setup/SchemaVersions.java
index 2205b14b..028ebdeb 100644
--- a/aai-schema-ingest/src/main/java/org/onap/aai/setup/SchemaVersions.java
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/setup/SchemaVersions.java
@@ -2,13 +2,13 @@
  * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
- * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-18 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   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,
@@ -25,7 +25,6 @@ import org.springframework.context.annotation.PropertySource;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.PostConstruct;
-import javax.xml.validation.Schema;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -36,124 +35,99 @@ public class SchemaVersions {
 
     @Value("#{'${schema.version.list}'.split(',')}")
     private List<String> apiVersions;
-
     @Value("${schema.version.api.default}")
     private String defaultApiVersion;
-
     @Value("${schema.version.edge.label.start}")
     private String edgeLabelStartVersion;
-
     @Value("${schema.version.depth.start}")
     private String depthStartVersion;
-
     @Value("${schema.version.app.root.start}")
     private String appRootStartVersion;
-
     @Value("${schema.version.related.link.start}")
     private String relatedLinkStartVersion;
-
     @Value("${schema.version.namespace.change.start}")
-    private String namespaceChangeStartVersion;
 
-    private List<SchemaVersion> versions;
-
-    private SchemaVersion edgeLabelVersion;
-    private SchemaVersion defaultVersion;
-    private SchemaVersion depthVersion;
-    private SchemaVersion appRootVersion;
-    private SchemaVersion relatedLinkVersion;
-    private SchemaVersion namespaceChangeVersion;
+    protected String namespaceChangeStartVersion;
+    protected List<SchemaVersion> versionsValue;
+    protected SchemaVersion edgeLabelVersionValue;
+    protected SchemaVersion defaultVersionValue;
+    protected SchemaVersion depthVersionValue;
+    protected SchemaVersion appRootVersionValue;
+    protected SchemaVersion relatedLinkVersionValue;
+    protected SchemaVersion namespaceChangeVersionValue;
 
     @PostConstruct
     public void initialize() {
-        versions = apiVersions.stream().map(SchemaVersion::new).collect(Collectors.toList());
-
-        edgeLabelVersion       = new SchemaVersion(edgeLabelStartVersion);
-        defaultVersion         = new SchemaVersion(defaultApiVersion);
-        depthVersion           = new SchemaVersion(depthStartVersion);
-        appRootVersion         = new SchemaVersion(appRootStartVersion);
-        relatedLinkVersion     = new SchemaVersion(relatedLinkStartVersion);
-        namespaceChangeVersion = new SchemaVersion(namespaceChangeStartVersion);
-
-        if (!versions.contains(edgeLabelVersion)) {
-            throw new AAISchemaValidationException(
-                    "Invalid, edge label version is not in the api versions list"
+        versionsValue = apiVersions.stream().map(SchemaVersion::new).collect(Collectors.toList());
+        edgeLabelVersionValue = new SchemaVersion(edgeLabelStartVersion);
+        defaultVersionValue = new SchemaVersion(defaultApiVersion);
+        depthVersionValue = new SchemaVersion(depthStartVersion);
+        appRootVersionValue = new SchemaVersion(appRootStartVersion);
+        relatedLinkVersionValue = new SchemaVersion(relatedLinkStartVersion);
+        namespaceChangeVersionValue = new SchemaVersion(namespaceChangeStartVersion);
+        this.validate();
+    }
+
+
+    protected void validate() {
+    	String errorMessage = "Invalid, edge label version is not in the api versions list"
                     + ", please check schema.version.list and ensure that the"
-                    + " schema.version.edge.label.start is in that list"
-            );
+                    + " schema.version.edge.label.start is in that list";
+        if (!versionsValue.contains(edgeLabelVersionValue)) {
+            throw new AAISchemaValidationException(errorMessage);
         }
 
-        if (!versions.contains(defaultVersion)) {
-            throw new AAISchemaValidationException(
-                    "Invalid, default version is not in the api versions list"
-                            + ", please check schema.version.list and ensure that the"
-                            + " schema.version.api.default is in that list"
-            );
+        if (!versionsValue.contains(defaultVersionValue)) {
+            throw new AAISchemaValidationException(errorMessage);
         }
 
-        if (!versions.contains(depthVersion)) {
-            throw new AAISchemaValidationException(
-                    "Invalid, depth version is not in the api versions list"
-                            + ", please check schema.version.list and ensure that the"
-                            + " schema.version.depth.start is in that list"
-            );
+        if (!versionsValue.contains(depthVersionValue)) {
+            throw new AAISchemaValidationException(errorMessage);
         }
 
-        if(!versions.contains(appRootVersion)){
-            throw new AAISchemaValidationException(
-                    "Invalid, app root version is not in the api versions list"
-                            + ", please check schema.version.list and ensure that the"
-                            + " schema.version.app.root.start is in that list"
-            );
+        if (!versionsValue.contains(appRootVersionValue)) {
+            throw new AAISchemaValidationException(errorMessage);
         }
 
-        if(!versions.contains(relatedLinkVersion)){
-            throw new AAISchemaValidationException(
-                    "Invalid, related link version is not in the api versions list"
-                            + ", please check schema.version.list and ensure that the"
-                            + " schema.version.related.link.start is in that list"
-            );
+        if (!versionsValue.contains(relatedLinkVersionValue)) {
+            throw new AAISchemaValidationException(errorMessage);
         }
 
-        if(!versions.contains(namespaceChangeVersion)){
-            throw new AAISchemaValidationException(
-                    "Invalid, namespace change start version is not in the api versions list"
-                            + ", please check schema.version.list and ensure that the"
-                            + " schema.version.related.link.start is in that list"
-            );
+        if (!versionsValue.contains(namespaceChangeVersionValue)) {
+            throw new AAISchemaValidationException(errorMessage);
         }
     }
-
+    
     public List<SchemaVersion> getVersions() {
-        return versions;
+        return versionsValue;
     }
 
     public SchemaVersion getEdgeLabelVersion() {
-        return edgeLabelVersion;
+        return edgeLabelVersionValue;
     }
 
     public SchemaVersion getDefaultVersion() {
-        return defaultVersion;
+        return defaultVersionValue;
     }
 
     public SchemaVersion getDepthVersion() {
-        return depthVersion;
+        return depthVersionValue;
     }
 
-    public SchemaVersion getAppRootVersion(){
-        return appRootVersion;
+    public SchemaVersion getAppRootVersion() {
+        return appRootVersionValue;
     }
 
-    public SchemaVersion getRelatedLinkVersion(){
-        return relatedLinkVersion;
+    public SchemaVersion getRelatedLinkVersion() {
+        return relatedLinkVersionValue;
     }
 
     public SchemaVersion getNamespaceChangeVersion() {
-        return namespaceChangeVersion;
+        return namespaceChangeVersionValue;
     }
 
     public void setNamespaceChangeVersion(SchemaVersion namespaceChangeVersion) {
-        this.namespaceChangeVersion = namespaceChangeVersion;
+        this.namespaceChangeVersionValue = namespaceChangeVersion;
     }
 
 }
diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/setup/SchemaVersionsBean.java b/aai-schema-ingest/src/main/java/org/onap/aai/setup/SchemaVersionsBean.java
new file mode 100644
index 00000000..119669d3
--- /dev/null
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/setup/SchemaVersionsBean.java
@@ -0,0 +1,83 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-18 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.aai.setup;
+
+import com.google.gson.FieldNamingPolicy;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import org.onap.aai.restclient.RestClient;
+import org.onap.aai.restclient.RestClientFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.ResponseEntity;
+
+import javax.annotation.PostConstruct;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class SchemaVersionsBean {
+
+    private String SCHEMA_SERVICE = "schema-service";
+    private SchemaServiceVersions schemaVersions;
+
+    @Value("${schema.service.versions.endpoint}")
+    private String versionsUri;
+
+    @Autowired
+    private RestClientFactory restClientFactory;
+
+    @PostConstruct
+    public void initialize() {
+        //Call SchemaService to get versions
+        retrieveAllSchemaVersions();
+    }
+
+    public void retrieveAllSchemaVersions() {
+	    /*
+	    Call Schema MS to get versions using RestTemplate
+	     */
+        String content = "";
+        Map<String, String> headersMap = new HashMap<>();
+        RestClient restClient = restClientFactory
+            .getRestClient(SCHEMA_SERVICE);
+
+        ResponseEntity<String> schemaResponse = restClient.getGetRequest( content, versionsUri, headersMap);
+        Gson gson = new GsonBuilder()
+            .setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_DASHES)
+            .create();
+        schemaVersions = gson.fromJson(schemaResponse.getBody(), SchemaServiceVersions.class);
+        schemaVersions.initializeFromSchemaService();
+
+    }
+
+    public SchemaServiceVersions getSchemaVersions() {
+        return schemaVersions;
+    }
+
+    public void setSchemaVersions(SchemaServiceVersions schemaVersions) {
+        this.schemaVersions = schemaVersions;
+    }
+
+    public List<SchemaVersion> getVersions() {
+        return getSchemaVersions().getVersions();
+    }
+
+}
diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/setup/Translator.java b/aai-schema-ingest/src/main/java/org/onap/aai/setup/Translator.java
new file mode 100644
index 00000000..09062e1c
--- /dev/null
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/setup/Translator.java
@@ -0,0 +1,67 @@
+/** 
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-18 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.aai.setup;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.io.*;
+import java.util.List;
+/**
+ * Converts the contents of the schema config file
+ * (which lists which schema files to be loaded) to
+ * the format the Ingestors can work with.
+ * 
+ */
+public abstract class Translator {
+
+	protected SchemaVersions schemaVersions;
+
+	public Translator(SchemaVersions schemaVersions) {
+		this.schemaVersions = schemaVersions;
+	}
+	
+	/**
+	 * Translates the contents of the schema config file
+	 * into the input for the NodeIngestor
+	 * 
+	 * @return Map of Version to the list of (string) filenames to be 
+	 * ingested for that version
+	 */
+
+
+    public abstract List<InputStream> getVersionNodeStream(SchemaVersion version) throws IOException;
+
+    public abstract List<String>
+    getJsonPayload(SchemaVersion version) throws IOException;
+
+	/**
+	 * Translates the contents of the schema config file
+	 * into the input for the EdgeIngestor
+	 * 
+	 * @return Map of Version to the List of (String) filenames to be 
+	 * ingested for that version
+	 */
+
+
+	public SchemaVersions getSchemaVersions(){
+        return this.schemaVersions;
+	}
+}
diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/validation/DefaultVersionValidationModule.java b/aai-schema-ingest/src/main/java/org/onap/aai/validation/DefaultVersionValidationModule.java
index 7eae7508..36176587 100644
--- a/aai-schema-ingest/src/main/java/org/onap/aai/validation/DefaultVersionValidationModule.java
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/validation/DefaultVersionValidationModule.java
@@ -38,39 +38,41 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class DefaultVersionValidationModule implements VersionValidationModule {
-	private ConfigTranslator config;
-	
+
+    private ConfigTranslator config;
+
 	@Autowired
 	public DefaultVersionValidationModule(ConfigTranslator config) {
-		this.config = config;
+
+	    this.config = config;
 	}
 
 	/* (non-Javadoc)
 	 * @see org.onap.aai.validation.VersionValidationModule#validate(org.onap.aai.setup.ConfigTranslator)
 	 */
-	@Override
-	public String validate() {
-		Map<SchemaVersion, List<String>> nodeConfig = config.getNodeFiles();
-		Map<SchemaVersion, List<String>> edgeConfig = config.getEdgeFiles();
-		
-		StringBuilder missingVers = new StringBuilder().append("Missing schema for the following versions: ");
-		boolean isMissing = false;
-		for (SchemaVersion v : config.getSchemaVersions().getVersions()) {
-			if (nodeConfig.get(v) == null) {
-				isMissing = true;
-				missingVers.append(v.toString()).append(" has no OXM configured. ");
-			}
-			if (edgeConfig.get(v) == null) {
-				isMissing = true;
-				missingVers.append(v.toString()).append(" has no edge rules configured. ");
-			}
-		}
-		
-		if (isMissing) {
-			return missingVers.toString();
-		} else {
-			return "";
-		}
-	}
+    @Override
+    public String validate() {
+        Map<SchemaVersion, List<String>> nodeConfig = config.getNodeFiles();
+        Map<SchemaVersion, List<String>> edgeConfig = config.getEdgeFiles();
+
+        StringBuilder missingVers = new StringBuilder().append("Missing schema for the following versions: ");
+        boolean isMissing = false;
+        for (SchemaVersion v : config.getSchemaVersions().getVersions()) {
+            if (nodeConfig.get(v) == null) {
+                isMissing = true;
+                missingVers.append(v.toString()).append(" has no OXM configured. ");
+            }
+            if (edgeConfig.get(v) == null) {
+                isMissing = true;
+                missingVers.append(v.toString()).append(" has no edge rules configured. ");
+            }
+        }
+
+        if (isMissing) {
+            return missingVers.toString();
+        } else {
+            return "";
+        }
+    }
 
 }
diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/validation/edges/CousinDefaultingValidationModule.java b/aai-schema-ingest/src/main/java/org/onap/aai/validation/edges/CousinDefaultingValidationModule.java
index 05b79753..d4ab7aeb 100644
--- a/aai-schema-ingest/src/main/java/org/onap/aai/validation/edges/CousinDefaultingValidationModule.java
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/validation/edges/CousinDefaultingValidationModule.java
@@ -20,18 +20,13 @@
 
 package org.onap.aai.validation.edges;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
+import com.jayway.jsonpath.DocumentContext;
 import org.onap.aai.edges.EdgeRuleQuery;
 import org.onap.aai.edges.EdgeRuleQuery.Builder;
 import org.onap.aai.edges.enums.EdgeField;
 import org.onap.aai.edges.enums.EdgeType;
 
-import com.jayway.jsonpath.DocumentContext;
+import java.util.*;
 
 /**
  * Validates that in the collection of cousin rules between a given node type pair,
diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/validation/edges/DefaultEdgeFieldsValidationModule.java b/aai-schema-ingest/src/main/java/org/onap/aai/validation/edges/DefaultEdgeFieldsValidationModule.java
index 01e9e296..9a7288b0 100644
--- a/aai-schema-ingest/src/main/java/org/onap/aai/validation/edges/DefaultEdgeFieldsValidationModule.java
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/validation/edges/DefaultEdgeFieldsValidationModule.java
@@ -23,12 +23,11 @@
  */
 package org.onap.aai.validation.edges;
 
+import org.onap.aai.edges.enums.EdgeField;
+
 import java.util.EnumSet;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.Set;
-
-import org.onap.aai.edges.enums.EdgeField;
 
 /**
  * Default core A&AI edge field validation
diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/validation/edges/EdgeRuleValidator.java b/aai-schema-ingest/src/main/java/org/onap/aai/validation/edges/EdgeRuleValidator.java
index 309d8945..38dcbb7e 100644
--- a/aai-schema-ingest/src/main/java/org/onap/aai/validation/edges/EdgeRuleValidator.java
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/validation/edges/EdgeRuleValidator.java
@@ -20,22 +20,18 @@
 
 package org.onap.aai.validation.edges;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
+import com.jayway.jsonpath.DocumentContext;
 import org.onap.aai.edges.JsonIngestor;
 import org.onap.aai.edges.TypeAlphabetizer;
 import org.onap.aai.edges.enums.EdgeField;
+
 import org.onap.aai.setup.ConfigTranslator;
 import org.onap.aai.setup.SchemaVersion;
 import org.onap.aai.validation.SchemaErrorStrategy;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import com.jayway.jsonpath.DocumentContext;
+import java.util.*;
 
 /**
  * Runs all validations against the ingested schema
@@ -49,21 +45,22 @@ public class EdgeRuleValidator {
 	protected final SingleContainmentValidationModule containsValidator;
 	protected final CousinDefaultingValidationModule defaultsValidator;
 	protected final NodeTypesValidationModule typeValidator;
-	
-	@Autowired
-	public EdgeRuleValidator(ConfigTranslator config, SchemaErrorStrategy strat,
-			EdgeFieldsValidationModule fieldValidator, UniqueLabelValidationModule labelValidator, 
-			SingleContainmentValidationModule containsValidator, CousinDefaultingValidationModule defaultsValidator, 
-			NodeTypesValidationModule typeValidator) {
-		this.versionJsonFilesMap = new JsonIngestor().ingest(config.getEdgeFiles());
-		this.strat = strat;
-		this.fieldValidator = fieldValidator;
-		this.labelValidator = labelValidator;
-		this.containsValidator = containsValidator;
-		this.defaultsValidator = defaultsValidator;
-		this.typeValidator = typeValidator;
-	}
-	
+
+    @Autowired
+    public EdgeRuleValidator(ConfigTranslator config, SchemaErrorStrategy strat,
+                             EdgeFieldsValidationModule fieldValidator, UniqueLabelValidationModule labelValidator,
+                             SingleContainmentValidationModule containsValidator, CousinDefaultingValidationModule defaultsValidator,
+                             NodeTypesValidationModule typeValidator) {
+        //TODO - Need to change this to use files/schemaservice
+        this.versionJsonFilesMap = new JsonIngestor().ingest(config.getEdgeFiles());
+        this.strat = strat;
+        this.fieldValidator = fieldValidator;
+        this.labelValidator = labelValidator;
+        this.containsValidator = containsValidator;
+        this.defaultsValidator = defaultsValidator;
+        this.typeValidator = typeValidator;
+    }
+
 	public boolean validate() {
 		
 		for (Map.Entry<SchemaVersion, List<DocumentContext>> verEntry : versionJsonFilesMap.entrySet()) {
diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/validation/edges/NodeTypesValidationModule.java b/aai-schema-ingest/src/main/java/org/onap/aai/validation/edges/NodeTypesValidationModule.java
index b4ed3782..e8c45063 100644
--- a/aai-schema-ingest/src/main/java/org/onap/aai/validation/edges/NodeTypesValidationModule.java
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/validation/edges/NodeTypesValidationModule.java
@@ -20,15 +20,16 @@
 
 package org.onap.aai.validation.edges;
 
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
 
 import org.onap.aai.nodes.NodeIngestor;
 import org.onap.aai.setup.SchemaVersion;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+
 /**
  * Validates that the node types appearing in the edge rules are valid
  * against the ingested OXM.
diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/validation/edges/SingleContainmentValidationModule.java b/aai-schema-ingest/src/main/java/org/onap/aai/validation/edges/SingleContainmentValidationModule.java
index 4586ccce..ad2cffeb 100644
--- a/aai-schema-ingest/src/main/java/org/onap/aai/validation/edges/SingleContainmentValidationModule.java
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/validation/edges/SingleContainmentValidationModule.java
@@ -20,14 +20,13 @@
 
 package org.onap.aai.validation.edges;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
+import com.jayway.jsonpath.DocumentContext;
 import org.onap.aai.edges.EdgeRuleQuery;
 import org.onap.aai.edges.enums.EdgeType;
 
-import com.jayway.jsonpath.DocumentContext;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
 /**
  * Validates that the given node type pair has at most one containment relationship
diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/validation/edges/UniqueLabelValidationModule.java b/aai-schema-ingest/src/main/java/org/onap/aai/validation/edges/UniqueLabelValidationModule.java
index 103baaba..35d74667 100644
--- a/aai-schema-ingest/src/main/java/org/onap/aai/validation/edges/UniqueLabelValidationModule.java
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/validation/edges/UniqueLabelValidationModule.java
@@ -20,17 +20,12 @@
 
 package org.onap.aai.validation.edges;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
+import com.jayway.jsonpath.DocumentContext;
 import org.onap.aai.edges.EdgeRuleQuery;
 import org.onap.aai.edges.EdgeRuleQuery.Builder;
 import org.onap.aai.edges.enums.EdgeField;
 
-import com.jayway.jsonpath.DocumentContext;
+import java.util.*;
 
 /**
  * Applies label validation rules
diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/validation/nodes/NodeValidator.java b/aai-schema-ingest/src/main/java/org/onap/aai/validation/nodes/NodeValidator.java
index 27a69f9b..38b3a70c 100644
--- a/aai-schema-ingest/src/main/java/org/onap/aai/validation/nodes/NodeValidator.java
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/validation/nodes/NodeValidator.java
@@ -31,13 +31,14 @@ import org.springframework.stereotype.Component;
 
 @Component
 public class NodeValidator {
-	private ConfigTranslator translator;
+
+    private ConfigTranslator translator;
 	private SchemaErrorStrategy strat;
 	private DuplicateNodeDefinitionValidationModule dupChecker;
 
 	@Autowired
-	public NodeValidator(ConfigTranslator translator, SchemaErrorStrategy strategy, DuplicateNodeDefinitionValidationModule dupChecker) {
-		this.translator = translator;
+	public NodeValidator( ConfigTranslator translator, SchemaErrorStrategy strategy, DuplicateNodeDefinitionValidationModule dupChecker) {
+        this.translator = translator;
 		this.strat = strategy;
 		this.dupChecker = dupChecker;
 	}
diff --git a/aai-schema-ingest/src/test/java/org/onap/aai/edges/EdgeIngestorLocalTest.java b/aai-schema-ingest/src/test/java/org/onap/aai/edges/EdgeIngestorLocalTest.java
new file mode 100644
index 00000000..3ed7bb79
--- /dev/null
+++ b/aai-schema-ingest/src/test/java/org/onap/aai/edges/EdgeIngestorLocalTest.java
@@ -0,0 +1,369 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-18 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.aai.edges;
+
+import com.google.common.collect.Multimap;
+import org.apache.tinkerpop.gremlin.structure.Direction;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.junit.runner.RunWith;
+import org.onap.aai.restclient.MockProvider;
+import org.onap.aai.config.EdgesConfiguration;
+import org.onap.aai.edges.enums.AAIDirection;
+import org.onap.aai.edges.enums.MultiplicityRule;
+import org.onap.aai.edges.exceptions.AmbiguousRuleChoiceException;
+import org.onap.aai.edges.exceptions.EdgeRuleNotFoundException;
+import org.onap.aai.setup.SchemaLocationsBean;
+import org.onap.aai.setup.SchemaVersion;
+import org.onap.aai.testutils.TestUtilConfigTranslator;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import java.util.Collection;
+
+import static org.junit.Assert.*;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = { EdgesConfiguration.class, TestUtilConfigTranslator.class})
+@TestPropertySource(properties = { "schema.ingest.file = src/test/resources/forWiringTests/schema-ingest-wiring-test-local.properties" })
+
+@DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_CLASS)
+//@TestPropertySource(locations = "/schema-service-rest.properties" )
+@SpringBootTest
+public class EdgeIngestorLocalTest {
+    @Autowired
+    EdgeIngestor edgeIngestor;
+
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
+
+    @Test
+    public void getRulesTest1() throws EdgeRuleNotFoundException {
+        EdgeRuleQuery q = new EdgeRuleQuery.Builder("foo").build();
+        Multimap<String, EdgeRule> results = edgeIngestor.getRules(q);
+        assertTrue(results.size() == 5);
+        assertTrue(results.containsKey("bar|foo"));
+
+        assertTrue(2 == results.get("bar|foo").size());
+        boolean seenLabel1 = false;
+        boolean seenLabel2 = false;
+        for(EdgeRule r : results.get("bar|foo")) {
+            if ("eats".equals(r.getLabel())) {
+                seenLabel1 = true;
+            }
+            if ("eatz".equals(r.getLabel())) {
+                seenLabel2 = true;
+            }
+        }
+        assertTrue(seenLabel1 && seenLabel2);
+
+        assertTrue(results.containsKey("baz|foo"));
+        assertTrue(results.containsKey("foo|quux"));
+        assertTrue(results.containsKey("dog|foo"));
+    }
+
+    @Test
+    public void getRulesTest2() throws EdgeRuleNotFoundException {
+        EdgeRuleQuery q = new EdgeRuleQuery.Builder("dog", "puppy").build();
+        Multimap<String, EdgeRule> results = edgeIngestor.getRules(q);
+        assertTrue(results.size() == 1);
+        assertTrue(results.containsKey("dog|puppy"));
+        Collection<EdgeRule> cr = results.get("dog|puppy");
+        for (EdgeRule r : cr) {
+            assertTrue("dog".equals(r.getFrom()));
+            assertTrue("puppy".equals(r.getTo()));
+            assertTrue("caresFor".equals(r.getLabel()));
+            assertTrue(Direction.OUT.equals(r.getDirection()));
+            assertTrue("One2Many".equalsIgnoreCase(r.getMultiplicityRule().toString()));
+            assertTrue("NONE".equals(r.getContains()));
+            assertTrue("OUT".equals(r.getDeleteOtherV()));
+            assertTrue("NONE".equals(r.getPreventDelete()));
+            assertTrue(r.isDefault());
+        }
+    }
+
+    @Test
+    public void getRulesFlippedTypesTest() throws EdgeRuleNotFoundException {
+        EdgeRuleQuery q = new EdgeRuleQuery.Builder("l-interface", "logical-link").version(new SchemaVersion("v11")).build();
+        Multimap<String, EdgeRule> results = edgeIngestor.getRules(q);
+        assertTrue(results.size() == 3);
+        for (EdgeRule r : results.get("l-interface|logical-link")) {
+            if ("org.onap.relationships.inventory.Source".equals(r.getLabel()) ||
+                "org.onap.relationships.inventory.Destination".equals(r.getLabel())) {
+                //these are defined with from=logical-link, to=l-interface, so they must be flipped
+                assertTrue(Direction.IN.equals(r.getDirection()));
+            } else if ("tosca.relationships.network.LinksTo".equals(r.getLabel())) {
+                //this is defined with from=l-interface, to=logical-link, so it shouldn't be flipped
+                assertTrue(Direction.OUT.equals(r.getDirection()));
+            } else {
+                fail("how did you get here");
+            }
+        }
+    }
+
+    @Test
+    public void fromToSameFlipTests() throws EdgeRuleNotFoundException, AmbiguousRuleChoiceException {
+        //getRules, setting from and to
+        EdgeRuleQuery q = new EdgeRuleQuery.Builder("bloop","bloop").version(new SchemaVersion("v11")).build();
+        Multimap<String, EdgeRule> results = edgeIngestor.getRules(q);
+        assertTrue(results.size() == 1);
+        for (EdgeRule r : results.get("bloop|bloop")) {
+            assertTrue(Direction.IN.equals(r.getDirection()));
+        }
+
+        //getRule, setting just from
+        EdgeRuleQuery q2 = new EdgeRuleQuery.Builder("bloop").version(new SchemaVersion("v11")).build();
+        assertTrue(Direction.IN.equals(edgeIngestor.getRule(q2).getDirection()));
+
+        //getChildRules
+        Multimap<String, EdgeRule> child = edgeIngestor.getChildRules("bloop", new SchemaVersion("v11"));
+        assertTrue(child.size() == 1);
+        for (EdgeRule r : child.get("bloop|bloop")) {
+            assertTrue(Direction.IN.equals(r.getDirection()));
+        }
+    }
+
+    @Test
+    public void getRulesTest3() throws EdgeRuleNotFoundException {
+        EdgeRuleQuery q = new EdgeRuleQuery.Builder("l-interface").version(new SchemaVersion("v11")).build();
+        Multimap<String, EdgeRule> results = edgeIngestor.getRules(q);
+        assertTrue(results.size() == 4);
+        assertTrue(results.containsKey("lag-interface|l-interface"));
+        assertTrue(results.containsKey("l-interface|logical-link"));
+        assertTrue(results.get("l-interface|logical-link").size() == 3);
+    }
+
+    @Test
+    public void getRulesNoneFound() throws EdgeRuleNotFoundException {
+        thrown.expect(EdgeRuleNotFoundException.class);
+        thrown.expectMessage("No rules found for");
+        EdgeRuleQuery q = new EdgeRuleQuery.Builder("l-interface").build();
+        edgeIngestor.getRules(q);
+    }
+
+    @Test
+    public void getRuleSimpleTest() throws EdgeRuleNotFoundException, AmbiguousRuleChoiceException {
+        EdgeRuleQuery q = new EdgeRuleQuery.Builder("parent", "notation").build();
+        EdgeRule result = edgeIngestor.getRule(q);
+        assertTrue("parent".equals(result.getFrom()));
+        assertTrue("notation".equals(result.getTo()));
+        assertTrue("has".equals(result.getLabel()));
+        assertTrue(Direction.OUT.equals(result.getDirection()));
+        assertTrue(MultiplicityRule.MANY2MANY.equals(result.getMultiplicityRule()));
+        assertTrue(AAIDirection.OUT.toString().equals(result.getContains()));
+        assertTrue(AAIDirection.NONE.toString().equals(result.getDeleteOtherV()));
+        assertTrue(AAIDirection.NONE.toString().equals(result.getPreventDelete()));
+        assertTrue("parent contains notation".equals(result.getDescription()));
+    }
+
+    @Test
+    public void getRuleFlippedTypesTest() throws EdgeRuleNotFoundException, AmbiguousRuleChoiceException {
+        EdgeRuleQuery q = new EdgeRuleQuery.Builder("notation", "parent").build();
+        EdgeRule result = edgeIngestor.getRule(q);
+        assertTrue("parent".equals(result.getFrom()));
+        assertTrue("notation".equals(result.getTo()));
+        assertTrue("has".equals(result.getLabel()));
+        //direction flipped to match input order per old EdgeRules.java API
+        assertTrue(Direction.IN.equals(result.getDirection()));
+        assertTrue(MultiplicityRule.MANY2MANY.equals(result.getMultiplicityRule()));
+        assertTrue(AAIDirection.OUT.toString().equals(result.getContains()));
+        assertTrue(AAIDirection.NONE.toString().equals(result.getDeleteOtherV()));
+        assertTrue(AAIDirection.NONE.toString().equals(result.getPreventDelete()));
+        assertTrue("parent contains notation".equals(result.getDescription()));
+    }
+
+//    @Test
+//    public void getRuleWithDefaultTest() throws EdgeRuleNotFoundException, AmbiguousRuleChoiceException {
+//
+//        EdgeRuleQuery q = new EdgeRuleQuery.Builder("l-interface","logical-link").version(new SchemaVersion("v11")).build();
+//        EdgeRule res = edgeIngestor.getRule(q);
+//        assertTrue(res.isDefault());
+//        assertTrue("tosca.relationships.network.LinksTo".equals(res.getLabel()));
+//    }
+//
+//    @Test
+//    public void getRuleWithNonDefault() throws EdgeRuleNotFoundException, AmbiguousRuleChoiceException {
+//        EdgeRuleQuery q = new EdgeRuleQuery.Builder("l-interface","logical-link").label("org.onap.relationships.inventory.Source").version(new SchemaVersion("v11")).build();
+//        EdgeRule res = edgeIngestor.getRule(q);
+//        assertFalse(res.isDefault());
+//        assertTrue("org.onap.relationships.inventory.Source".equals(res.getLabel()));
+//    }
+
+    @Test
+    public void getRuleNoneFoundTest() throws EdgeRuleNotFoundException, AmbiguousRuleChoiceException {
+        thrown.expect(EdgeRuleNotFoundException.class);
+        thrown.expectMessage("No rule found for");
+        EdgeRuleQuery q = new EdgeRuleQuery.Builder("l-interface","nonexistent").build();
+        edgeIngestor.getRule(q);
+    }
+
+//    @Test
+//    public void getRuleTooManyPairsTest() throws EdgeRuleNotFoundException, AmbiguousRuleChoiceException {
+//        thrown.expect(AmbiguousRuleChoiceException.class);
+//        thrown.expectMessage("No way to select single rule from these pairs:");
+//        EdgeRuleQuery q = new EdgeRuleQuery.Builder("foo").build();
+//        edgeIngestor.getRule(q);
+//    }
+
+    @Test
+    public void getRuleAmbiguousDefaultTest() throws EdgeRuleNotFoundException, AmbiguousRuleChoiceException {
+        thrown.expect(AmbiguousRuleChoiceException.class);
+        thrown.expectMessage("Multiple defaults found.");
+        EdgeRuleQuery q = new EdgeRuleQuery.Builder("seed","plant").version(new SchemaVersion("v11")).build();
+        edgeIngestor.getRule(q);
+    }
+
+    @Test
+    public void getRuleNoDefaultTest() throws EdgeRuleNotFoundException, AmbiguousRuleChoiceException {
+        thrown.expect(AmbiguousRuleChoiceException.class);
+        thrown.expectMessage("No default found.");
+        EdgeRuleQuery q = new EdgeRuleQuery.Builder("apple", "orange").version(new SchemaVersion("v11")).build();
+        edgeIngestor.getRule(q);
+    }
+
+//    @Test
+//    public void hasRuleTest() {
+//        assertTrue(edgeIngestor.hasRule(new EdgeRuleQuery.Builder("l-interface").version(new SchemaVersion("v11")).build()));
+//        assertFalse(edgeIngestor.hasRule(new EdgeRuleQuery.Builder("l-interface").build()));
+//    }
+//
+//    @Test
+//    public void getCousinRulesTest() {
+//        Multimap<String, EdgeRule> results = edgeIngestor.getCousinRules("dog");
+//        assertTrue(results.size() == 2);
+//        assertTrue(results.containsKey("dog|puppy"));
+//        assertTrue(results.containsKey("dog|foo"));
+//    }
+
+    @Test
+    public void getCousinRulesWithVersionTest() {
+        Multimap<String, EdgeRule> results = edgeIngestor.getCousinRules("foo", new SchemaVersion("v10"));
+        assertTrue(results.size() == 2);
+        assertTrue(results.containsKey("bar|foo"));
+        assertTrue(results.get("bar|foo").size() == 2);
+    }
+
+    @Test
+    public void getCousinsNoneInVersionTest() {
+        Multimap<String, EdgeRule> results = edgeIngestor.getCousinRules("foo", new SchemaVersion("v11"));
+        assertTrue(results.isEmpty());
+    }
+
+//    @Test
+//    public void hasCousinTest() {
+//        assertTrue(edgeIngestor.hasCousinRule("foo"));
+//        assertTrue(edgeIngestor.hasCousinRule("foo", new SchemaVersion("v10")));
+//        assertFalse(edgeIngestor.hasCousinRule("parent"));
+//        assertFalse(edgeIngestor.hasCousinRule("foo", new SchemaVersion("v11")));
+//    }
+
+    @Test
+    public void getChildRulesTest() {
+        Multimap<String, EdgeRule> results = edgeIngestor.getChildRules("parent");
+        assertTrue(results.size() == 6);
+        assertTrue(results.containsKey("notation|parent"));
+        assertTrue(results.containsKey("not-notation|parent"));
+        assertTrue(results.containsKey("out-out|parent"));
+        assertTrue(results.containsKey("in-in|parent"));
+        assertTrue(results.containsKey("in-out|parent"));
+        assertTrue(results.containsKey("out-in|parent"));
+    }
+
+    @Test
+    public void getChildRulesWithVersionTest() {
+        Multimap<String, EdgeRule> results = edgeIngestor.getChildRules("foo", new SchemaVersion("v10"));
+        assertTrue(results.size() == 2);
+        assertTrue(results.containsKey("baz|foo"));
+        assertTrue(results.containsKey("foo|quux"));
+    }
+
+    @Test
+    public void getChildRulesNoneInVersionTest() {
+        Multimap<String, EdgeRule> results = edgeIngestor.getChildRules("foo", new SchemaVersion("v11"));
+        assertTrue(results.isEmpty());
+    }
+
+//    @Test
+//    public void hasChildTest() {
+//        assertTrue(edgeIngestor.hasChildRule("foo"));
+//        assertTrue(edgeIngestor.hasChildRule("foo", new SchemaVersion("v10")));
+//        assertFalse(edgeIngestor.hasChildRule("puppy"));
+//        assertFalse(edgeIngestor.hasChildRule("foo", new SchemaVersion("v11")));
+//    }
+
+    @Test
+    public void getParentRulesTest() {
+        Multimap<String, EdgeRule> results = edgeIngestor.getParentRules("parent");
+        assertTrue(results.size() == 6);
+        assertTrue(results.containsKey("grandparent1|parent"));
+        assertTrue(results.containsKey("grandparent2|parent"));
+        assertTrue(results.containsKey("grandparent3|parent"));
+        assertTrue(results.containsKey("grandparent4|parent"));
+        assertTrue(results.containsKey("grandparent5|parent"));
+        assertTrue(results.containsKey("grandparent6|parent"));
+    }
+
+    @Test
+    public void getParentRulesWithVersionTest() {
+        Multimap<String, EdgeRule> results = edgeIngestor.getParentRules("baz", new SchemaVersion("v10"));
+        assertTrue(results.size() == 1);
+        assertTrue(results.containsKey("baz|foo"));
+    }
+
+    @Test
+    public void getParentRulesNoneInVersionTest() {
+        Multimap<String, EdgeRule> results = edgeIngestor.getParentRules("baz", new SchemaVersion("v11"));
+        assertTrue(results.isEmpty());
+    }
+
+    @Test
+    public void hasParentTest() {
+        assertTrue(edgeIngestor.hasParentRule("parent"));
+        assertTrue(edgeIngestor.hasParentRule("quux", new SchemaVersion("v10")));
+        assertFalse(edgeIngestor.hasParentRule("puppy"));
+        assertFalse(edgeIngestor.hasParentRule("foo", new SchemaVersion("v11")));
+    }
+
+//    @Test
+//    public void getAllCurrentRulesTest() throws EdgeRuleNotFoundException {
+//        Multimap<String, EdgeRule> res = edgeIngestor.getAllCurrentRules();
+//        assertTrue(res.size() == 18);
+//    }
+
+    @Test
+    public void getAllRulesTest() throws EdgeRuleNotFoundException {
+        Multimap<String, EdgeRule> res = edgeIngestor.getAllRules(new SchemaVersion("v10"));
+        assertTrue(res.size() == 4);
+        assertTrue(res.containsKey("bar|foo"));
+        assertTrue(res.get("bar|foo").size() == 2);
+        assertTrue(res.containsKey("baz|foo"));
+        assertTrue(res.containsKey("foo|quux"));
+
+        thrown.expect(EdgeRuleNotFoundException.class);
+        thrown.expectMessage("No rules found for version v9.");
+        edgeIngestor.getAllRules(new SchemaVersion("v9"));
+    }
+}
diff --git a/aai-schema-ingest/src/test/java/org/onap/aai/edges/EdgeIngestorTest.java b/aai-schema-ingest/src/test/java/org/onap/aai/edges/EdgeIngestorTest.java
index 6292da71..ab83e196 100644
--- a/aai-schema-ingest/src/test/java/org/onap/aai/edges/EdgeIngestorTest.java
+++ b/aai-schema-ingest/src/test/java/org/onap/aai/edges/EdgeIngestorTest.java
@@ -1,4 +1,4 @@
-/** 
+/**
  * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
@@ -25,20 +25,22 @@ import static org.junit.Assert.*;
 import java.util.Collection;
 
 import org.apache.tinkerpop.gremlin.structure.Direction;
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
+import org.onap.aai.restclient.MockProvider;
+import org.onap.aai.restclient.MockRestClient;
+import org.onap.aai.config.EdgesConfiguration;
 import org.onap.aai.edges.enums.AAIDirection;
 import org.onap.aai.edges.enums.MultiplicityRule;
 import org.onap.aai.edges.exceptions.AmbiguousRuleChoiceException;
 import org.onap.aai.edges.exceptions.EdgeRuleNotFoundException;
-import org.onap.aai.setup.SchemaLocationsBean;
 import org.onap.aai.setup.SchemaVersion;
-import org.onap.aai.setup.SchemaVersions;
-import org.onap.aai.testutils.TestUtilConfigTranslator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -46,23 +48,29 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import com.google.common.collect.Multimap;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = {SchemaLocationsBean.class, SchemaVersions.class, TestUtilConfigTranslator.class, EdgeIngestor.class})
+@ContextConfiguration(classes = {MockProvider.class, EdgesConfiguration.class})
 @TestPropertySource(properties = { "schema.ingest.file = src/test/resources/forWiringTests/schema-ingest-wiring-test.properties" })
+
+@DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_CLASS)
 @SpringBootTest
 public class EdgeIngestorTest {
     @Autowired
-    EdgeIngestor ei;
-    
+    EdgeIngestor edgeIngestor;
+
     @Rule
     public ExpectedException thrown = ExpectedException.none();
-    
+
     @Test
     public void getRulesTest1() throws EdgeRuleNotFoundException {
         EdgeRuleQuery q = new EdgeRuleQuery.Builder("foo").build();
-        Multimap<String, EdgeRule> results = ei.getRules(q);
+        Multimap<String, EdgeRule> results = edgeIngestor.getRules(q);
+        System.out.println(results.size());
+        for (String key : results.keySet()) {
+            System.out.println(key);
+        }
         assertTrue(results.size() == 5);
         assertTrue(results.containsKey("bar|foo"));
-        
+
         assertTrue(2 == results.get("bar|foo").size());
         boolean seenLabel1 = false;
         boolean seenLabel2 = false;
@@ -75,16 +83,16 @@ public class EdgeIngestorTest {
             }
         }
         assertTrue(seenLabel1 && seenLabel2);
-        
+
         assertTrue(results.containsKey("baz|foo"));
         assertTrue(results.containsKey("foo|quux"));
         assertTrue(results.containsKey("dog|foo"));
     }
-    
+
     @Test
     public void getRulesTest2() throws EdgeRuleNotFoundException {
         EdgeRuleQuery q = new EdgeRuleQuery.Builder("dog", "puppy").build();
-        Multimap<String, EdgeRule> results = ei.getRules(q);
+        Multimap<String, EdgeRule> results = edgeIngestor.getRules(q);
         assertTrue(results.size() == 1);
         assertTrue(results.containsKey("dog|puppy"));
         Collection<EdgeRule> cr = results.get("dog|puppy");
@@ -100,11 +108,11 @@ public class EdgeIngestorTest {
             assertTrue(r.isDefault());
         }
     }
-    
+
     @Test
     public void getRulesFlippedTypesTest() throws EdgeRuleNotFoundException {
         EdgeRuleQuery q = new EdgeRuleQuery.Builder("l-interface", "logical-link").version(new SchemaVersion("v11")).build();
-        Multimap<String, EdgeRule> results = ei.getRules(q);
+        Multimap<String, EdgeRule> results = edgeIngestor.getRules(q);
         assertTrue(results.size() == 3);
         for (EdgeRule r : results.get("l-interface|logical-link")) {
             if ("org.onap.relationships.inventory.Source".equals(r.getLabel()) ||
@@ -119,51 +127,51 @@ public class EdgeIngestorTest {
             }
         }
     }
-    
+
     @Test
     public void fromToSameFlipTests() throws EdgeRuleNotFoundException, AmbiguousRuleChoiceException {
         //getRules, setting from and to
         EdgeRuleQuery q = new EdgeRuleQuery.Builder("bloop","bloop").version(new SchemaVersion("v11")).build();
-        Multimap<String, EdgeRule> results = ei.getRules(q);
+        Multimap<String, EdgeRule> results = edgeIngestor.getRules(q);
         assertTrue(results.size() == 1);
         for (EdgeRule r : results.get("bloop|bloop")) {
             assertTrue(Direction.IN.equals(r.getDirection()));
         }
-        
+
         //getRule, setting just from
         EdgeRuleQuery q2 = new EdgeRuleQuery.Builder("bloop").version(new SchemaVersion("v11")).build();
-        assertTrue(Direction.IN.equals(ei.getRule(q2).getDirection()));
-        
+        assertTrue(Direction.IN.equals(edgeIngestor.getRule(q2).getDirection()));
+
         //getChildRules
-        Multimap<String, EdgeRule> child = ei.getChildRules("bloop", new SchemaVersion("v11"));
+        Multimap<String, EdgeRule> child = edgeIngestor.getChildRules("bloop", new SchemaVersion("v11"));
         assertTrue(child.size() == 1);
         for (EdgeRule r : child.get("bloop|bloop")) {
             assertTrue(Direction.IN.equals(r.getDirection()));
         }
     }
-    
+
     @Test
     public void getRulesTest3() throws EdgeRuleNotFoundException {
         EdgeRuleQuery q = new EdgeRuleQuery.Builder("l-interface").version(new SchemaVersion("v11")).build();
-        Multimap<String, EdgeRule> results = ei.getRules(q);
+        Multimap<String, EdgeRule> results = edgeIngestor.getRules(q);
         assertTrue(results.size() == 4);
         assertTrue(results.containsKey("lag-interface|l-interface"));
         assertTrue(results.containsKey("l-interface|logical-link"));
         assertTrue(results.get("l-interface|logical-link").size() == 3);
     }
-    
+
     @Test
     public void getRulesNoneFound() throws EdgeRuleNotFoundException {
         thrown.expect(EdgeRuleNotFoundException.class);
         thrown.expectMessage("No rules found for");
-        EdgeRuleQuery q = new EdgeRuleQuery.Builder("l-interface").build();
-        ei.getRules(q);
+        EdgeRuleQuery q = new EdgeRuleQuery.Builder("bogus-value").build();
+        edgeIngestor.getRules(q);
     }
-    
+
     @Test
     public void getRuleSimpleTest() throws EdgeRuleNotFoundException, AmbiguousRuleChoiceException {
         EdgeRuleQuery q = new EdgeRuleQuery.Builder("parent", "notation").build();
-        EdgeRule result = ei.getRule(q);
+        EdgeRule result = edgeIngestor.getRule(q);
         assertTrue("parent".equals(result.getFrom()));
         assertTrue("notation".equals(result.getTo()));
         assertTrue("has".equals(result.getLabel()));
@@ -174,11 +182,30 @@ public class EdgeIngestorTest {
         assertTrue(AAIDirection.NONE.toString().equals(result.getPreventDelete()));
         assertTrue("parent contains notation".equals(result.getDescription()));
     }
-    
+//    @Test
+//    public void getRuleSimpleTest() throws EdgeRuleNotFoundException, AmbiguousRuleChoiceException {
+//        EdgeRuleQuery q = new EdgeRuleQuery.Builder("parent", "notation").build();
+//        Multimap<String, EdgeRule> results = edgeIngestor.getRules(q);
+//        assertTrue(results.size() == 1);
+//        //        EdgeRule result = edgeIngestor.getRule(q);
+//        for (EdgeRule result : results.get("parent|notation")) {
+//            assertTrue("parent".equals(result.getFrom()));
+//            assertTrue("notation".equals(result.getTo()));
+//            assertTrue("has".equals(result.getLabel()));
+//            assertTrue(Direction.OUT.equals(result.getDirection()));
+//            assertTrue(MultiplicityRule.MANY2MANY.equals(result.getMultiplicityRule()));
+//            assertTrue(AAIDirection.OUT.toString().equals(result.getContains()));
+//            assertTrue(AAIDirection.NONE.toString().equals(result.getDeleteOtherV()));
+//            assertTrue(AAIDirection.NONE.toString().equals(result.getPreventDelete()));
+//            assertTrue("parent contains notation".equals(result.getDescription()));
+//        }
+//    }
+
+
     @Test
     public void getRuleFlippedTypesTest() throws EdgeRuleNotFoundException, AmbiguousRuleChoiceException {
         EdgeRuleQuery q = new EdgeRuleQuery.Builder("notation", "parent").build();
-        EdgeRule result = ei.getRule(q);
+        EdgeRule result = edgeIngestor.getRule(q);
         assertTrue("parent".equals(result.getFrom()));
         assertTrue("notation".equals(result.getTo()));
         assertTrue("has".equals(result.getLabel()));
@@ -190,95 +217,97 @@ public class EdgeIngestorTest {
         assertTrue(AAIDirection.NONE.toString().equals(result.getPreventDelete()));
         assertTrue("parent contains notation".equals(result.getDescription()));
     }
-    
+
     @Test
     public void getRuleWithDefaultTest() throws EdgeRuleNotFoundException, AmbiguousRuleChoiceException {
 
         EdgeRuleQuery q = new EdgeRuleQuery.Builder("l-interface","logical-link").version(new SchemaVersion("v11")).build();
-        EdgeRule res = ei.getRule(q);
+        EdgeRule res = edgeIngestor.getRule(q);
         assertTrue(res.isDefault());
         assertTrue("tosca.relationships.network.LinksTo".equals(res.getLabel()));
     }
-    
+
     @Test
     public void getRuleWithNonDefault() throws EdgeRuleNotFoundException, AmbiguousRuleChoiceException {
         EdgeRuleQuery q = new EdgeRuleQuery.Builder("l-interface","logical-link").label("org.onap.relationships.inventory.Source").version(new SchemaVersion("v11")).build();
-        EdgeRule res = ei.getRule(q);
+        EdgeRule res = edgeIngestor.getRule(q);
         assertFalse(res.isDefault());
         assertTrue("org.onap.relationships.inventory.Source".equals(res.getLabel()));
     }
-    
+
     @Test
     public void getRuleNoneFoundTest() throws EdgeRuleNotFoundException, AmbiguousRuleChoiceException {
         thrown.expect(EdgeRuleNotFoundException.class);
         thrown.expectMessage("No rule found for");
         EdgeRuleQuery q = new EdgeRuleQuery.Builder("l-interface","nonexistent").build();
-        ei.getRule(q);
+        edgeIngestor.getRule(q);
     }
-    
+
     @Test
     public void getRuleTooManyPairsTest() throws EdgeRuleNotFoundException, AmbiguousRuleChoiceException {
         thrown.expect(AmbiguousRuleChoiceException.class);
         thrown.expectMessage("No way to select single rule from these pairs:");
         EdgeRuleQuery q = new EdgeRuleQuery.Builder("foo").build();
-        ei.getRule(q);
+        edgeIngestor.getRule(q);
     }
-    
+
     @Test
     public void getRuleAmbiguousDefaultTest() throws EdgeRuleNotFoundException, AmbiguousRuleChoiceException {
         thrown.expect(AmbiguousRuleChoiceException.class);
         thrown.expectMessage("Multiple defaults found.");
         EdgeRuleQuery q = new EdgeRuleQuery.Builder("seed","plant").version(new SchemaVersion("v11")).build();
-        ei.getRule(q);
+        edgeIngestor.getRule(q);
     }
-    
+
     @Test
     public void getRuleNoDefaultTest() throws EdgeRuleNotFoundException, AmbiguousRuleChoiceException {
         thrown.expect(AmbiguousRuleChoiceException.class);
         thrown.expectMessage("No default found.");
         EdgeRuleQuery q = new EdgeRuleQuery.Builder("apple", "orange").version(new SchemaVersion("v11")).build();
-        ei.getRule(q);
+        edgeIngestor.getRule(q);
     }
-    
+
     @Test
     public void hasRuleTest() {
-        assertTrue(ei.hasRule(new EdgeRuleQuery.Builder("l-interface").version(new SchemaVersion("v11")).build()));
-        assertFalse(ei.hasRule(new EdgeRuleQuery.Builder("l-interface").build()));
+        assertTrue(edgeIngestor.hasRule(new EdgeRuleQuery.Builder("l-interface").version(new SchemaVersion("v11")).build()));
+        assertFalse(edgeIngestor.hasRule(new EdgeRuleQuery.Builder("l-interface").version(new SchemaVersion("v10")).build()));
+        assertTrue(edgeIngestor.hasRule(new EdgeRuleQuery.Builder("l-interface").build()));
+//        assertFalse(edgeIngestor.hasRule(new EdgeRuleQuery.Builder("l-interface").build()));
     }
-    
+
     @Test
     public void getCousinRulesTest() {
-        Multimap<String, EdgeRule> results = ei.getCousinRules("dog");
+        Multimap<String, EdgeRule> results = edgeIngestor.getCousinRules("dog");
         assertTrue(results.size() == 2);
         assertTrue(results.containsKey("dog|puppy"));
         assertTrue(results.containsKey("dog|foo"));
     }
-    
+
     @Test
     public void getCousinRulesWithVersionTest() {
-        Multimap<String, EdgeRule> results = ei.getCousinRules("foo", new SchemaVersion("v10"));
+        Multimap<String, EdgeRule> results = edgeIngestor.getCousinRules("foo", new SchemaVersion("v10"));
         assertTrue(results.size() == 2);
         assertTrue(results.containsKey("bar|foo"));
         assertTrue(results.get("bar|foo").size() == 2);
     }
-    
+
     @Test
     public void getCousinsNoneInVersionTest() {
-        Multimap<String, EdgeRule> results = ei.getCousinRules("foo", new SchemaVersion("v11"));
+        Multimap<String, EdgeRule> results = edgeIngestor.getCousinRules("foo", new SchemaVersion("v11"));
         assertTrue(results.isEmpty());
     }
-    
+
     @Test
     public void hasCousinTest() {
-        assertTrue(ei.hasCousinRule("foo"));
-        assertTrue(ei.hasCousinRule("foo", new SchemaVersion("v10")));
-        assertFalse(ei.hasCousinRule("parent"));
-        assertFalse(ei.hasCousinRule("foo", new SchemaVersion("v11")));
+        assertTrue(edgeIngestor.hasCousinRule("foo"));
+        assertTrue(edgeIngestor.hasCousinRule("foo", new SchemaVersion("v10")));
+        assertFalse(edgeIngestor.hasCousinRule("parent"));
+        assertFalse(edgeIngestor.hasCousinRule("foo", new SchemaVersion("v11")));
     }
 
     @Test
     public void getChildRulesTest() {
-        Multimap<String, EdgeRule> results = ei.getChildRules("parent");
+        Multimap<String, EdgeRule> results = edgeIngestor.getChildRules("parent");
         assertTrue(results.size() == 6);
         assertTrue(results.containsKey("notation|parent"));
         assertTrue(results.containsKey("not-notation|parent"));
@@ -287,32 +316,32 @@ public class EdgeIngestorTest {
         assertTrue(results.containsKey("in-out|parent"));
         assertTrue(results.containsKey("out-in|parent"));
     }
-    
+
     @Test
     public void getChildRulesWithVersionTest() {
-        Multimap<String, EdgeRule> results = ei.getChildRules("foo", new SchemaVersion("v10"));
+        Multimap<String, EdgeRule> results = edgeIngestor.getChildRules("foo", new SchemaVersion("v10"));
         assertTrue(results.size() == 2);
         assertTrue(results.containsKey("baz|foo"));
         assertTrue(results.containsKey("foo|quux"));
     }
-    
+
     @Test
     public void getChildRulesNoneInVersionTest() {
-        Multimap<String, EdgeRule> results = ei.getChildRules("foo", new SchemaVersion("v11"));
+        Multimap<String, EdgeRule> results = edgeIngestor.getChildRules("foo", new SchemaVersion("v11"));
         assertTrue(results.isEmpty());
     }
-    
+
     @Test
     public void hasChildTest() {
-        assertTrue(ei.hasChildRule("foo"));
-        assertTrue(ei.hasChildRule("foo", new SchemaVersion("v10")));
-        assertFalse(ei.hasChildRule("puppy"));
-        assertFalse(ei.hasChildRule("foo", new SchemaVersion("v11")));
+        assertTrue(edgeIngestor.hasChildRule("foo"));
+        assertTrue(edgeIngestor.hasChildRule("foo", new SchemaVersion("v10")));
+        assertFalse(edgeIngestor.hasChildRule("puppy"));
+        assertFalse(edgeIngestor.hasChildRule("foo", new SchemaVersion("v11")));
     }
-    
+
     @Test
     public void getParentRulesTest() {
-        Multimap<String, EdgeRule> results = ei.getParentRules("parent");
+        Multimap<String, EdgeRule> results = edgeIngestor.getParentRules("parent");
         assertTrue(results.size() == 6);
         assertTrue(results.containsKey("grandparent1|parent"));
         assertTrue(results.containsKey("grandparent2|parent"));
@@ -321,45 +350,45 @@ public class EdgeIngestorTest {
         assertTrue(results.containsKey("grandparent5|parent"));
         assertTrue(results.containsKey("grandparent6|parent"));
     }
-    
+
     @Test
     public void getParentRulesWithVersionTest() {
-        Multimap<String, EdgeRule> results = ei.getParentRules("baz", new SchemaVersion("v10"));
+        Multimap<String, EdgeRule> results = edgeIngestor.getParentRules("baz", new SchemaVersion("v10"));
         assertTrue(results.size() == 1);
         assertTrue(results.containsKey("baz|foo"));
     }
-    
+
     @Test
     public void getParentRulesNoneInVersionTest() {
-        Multimap<String, EdgeRule> results = ei.getParentRules("baz", new SchemaVersion("v11"));
+        Multimap<String, EdgeRule> results = edgeIngestor.getParentRules("baz", new SchemaVersion("v11"));
         assertTrue(results.isEmpty());
     }
-    
+
     @Test
     public void hasParentTest() {
-        assertTrue(ei.hasParentRule("parent"));
-        assertTrue(ei.hasParentRule("quux", new SchemaVersion("v10")));
-        assertFalse(ei.hasParentRule("puppy"));
-        assertFalse(ei.hasParentRule("foo", new SchemaVersion("v11")));
+        assertTrue(edgeIngestor.hasParentRule("parent"));
+        assertTrue(edgeIngestor.hasParentRule("quux", new SchemaVersion("v10")));
+        assertFalse(edgeIngestor.hasParentRule("puppy"));
+        assertFalse(edgeIngestor.hasParentRule("foo", new SchemaVersion("v11")));
     }
-    
+
     @Test
     public void getAllCurrentRulesTest() throws EdgeRuleNotFoundException {
-        Multimap<String, EdgeRule> res = ei.getAllCurrentRules();
-        assertTrue(res.size() == 18);
+        Multimap<String, EdgeRule> res = edgeIngestor.getAllCurrentRules();
+        assertTrue(res.size() == 24);
     }
-    
+
     @Test
     public void getAllRulesTest() throws EdgeRuleNotFoundException {
-        Multimap<String, EdgeRule> res = ei.getAllRules(new SchemaVersion("v10"));
+        Multimap<String, EdgeRule> res = edgeIngestor.getAllRules(new SchemaVersion("v10"));
         assertTrue(res.size() == 4);
         assertTrue(res.containsKey("bar|foo"));
         assertTrue(res.get("bar|foo").size() == 2);
         assertTrue(res.containsKey("baz|foo"));
         assertTrue(res.containsKey("foo|quux"));
-        
+
         thrown.expect(EdgeRuleNotFoundException.class);
         thrown.expectMessage("No rules found for version v9.");
-        ei.getAllRules(new SchemaVersion("v9"));
+        edgeIngestor.getAllRules(new SchemaVersion("v9"));
     }
 }
diff --git a/aai-schema-ingest/src/test/java/org/onap/aai/edges/EdgeIngestorWiringTest.java b/aai-schema-ingest/src/test/java/org/onap/aai/edges/EdgeIngestorWiringTest.java
index cae3bf78..395c9cc7 100644
--- a/aai-schema-ingest/src/test/java/org/onap/aai/edges/EdgeIngestorWiringTest.java
+++ b/aai-schema-ingest/src/test/java/org/onap/aai/edges/EdgeIngestorWiringTest.java
@@ -22,12 +22,14 @@ package org.onap.aai.edges;
 
 import static org.junit.Assert.*;
 
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.onap.aai.config.EdgesConfiguration;
 import org.onap.aai.edges.exceptions.EdgeRuleNotFoundException;
-import org.onap.aai.setup.SchemaLocationsBean;
 import org.onap.aai.setup.SchemaVersion;
-import org.onap.aai.setup.SchemaVersions;
+import org.onap.aai.setup.SchemaVersionsBean;
+
 import org.onap.aai.testutils.ConfigTranslatorForWiringTest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -38,8 +40,8 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import com.google.common.collect.Multimap;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = {SchemaLocationsBean.class, SchemaVersions.class, ConfigTranslatorForWiringTest.class, EdgeIngestor.class})
-@TestPropertySource(properties = {"schema.ingest.file = src/test/resources/forWiringTests/schema-ingest-wiring-test.properties"})
+@ContextConfiguration(classes = {EdgesConfiguration.class, ConfigTranslatorForWiringTest.class})
+@TestPropertySource(properties = {"schema.ingest.file = src/test/resources/forWiringTests/schema-ingest-wiring-test-local.properties"})
 @SpringBootTest
 public class EdgeIngestorWiringTest {
     @Autowired
diff --git a/aai-schema-ingest/src/test/java/org/onap/aai/edges/EdgeRuleQueryTest.java b/aai-schema-ingest/src/test/java/org/onap/aai/edges/EdgeRuleQueryTest.java
index 856ebb70..27c8d6e1 100644
--- a/aai-schema-ingest/src/test/java/org/onap/aai/edges/EdgeRuleQueryTest.java
+++ b/aai-schema-ingest/src/test/java/org/onap/aai/edges/EdgeRuleQueryTest.java
@@ -33,6 +33,7 @@ import org.onap.aai.edges.enums.EdgeType;
 import com.jayway.jsonpath.DocumentContext;
 import com.jayway.jsonpath.JsonPath;
 
+
 public class EdgeRuleQueryTest {
     private DocumentContext testRules;
     private String readStart = "$.rules.[?]";
diff --git a/aai-schema-ingest/src/test/java/org/onap/aai/edges/JsonIngestorTest.java b/aai-schema-ingest/src/test/java/org/onap/aai/edges/JsonIngestorTest.java
index b718c0fd..4475b3f2 100644
--- a/aai-schema-ingest/src/test/java/org/onap/aai/edges/JsonIngestorTest.java
+++ b/aai-schema-ingest/src/test/java/org/onap/aai/edges/JsonIngestorTest.java
@@ -23,7 +23,6 @@ package org.onap.aai.edges;
 import static org.junit.Assert.*;
 
 import java.util.*;
-
 import org.junit.Test;
 import org.onap.aai.setup.SchemaVersion;
 
diff --git a/aai-schema-ingest/src/test/java/org/onap/aai/edges/TypeAlphabetizerTest.java b/aai-schema-ingest/src/test/java/org/onap/aai/edges/TypeAlphabetizerTest.java
index 4e3d61dd..3f49428f 100644
--- a/aai-schema-ingest/src/test/java/org/onap/aai/edges/TypeAlphabetizerTest.java
+++ b/aai-schema-ingest/src/test/java/org/onap/aai/edges/TypeAlphabetizerTest.java
@@ -21,7 +21,6 @@
 package org.onap.aai.edges;
 
 import static org.junit.Assert.*;
-
 import org.junit.Test;
 
 public class TypeAlphabetizerTest {
diff --git a/aai-schema-ingest/src/test/java/org/onap/aai/nodes/NodeIngestorLocalTest.java b/aai-schema-ingest/src/test/java/org/onap/aai/nodes/NodeIngestorLocalTest.java
new file mode 100644
index 00000000..cec3f9d8
--- /dev/null
+++ b/aai-schema-ingest/src/test/java/org/onap/aai/nodes/NodeIngestorLocalTest.java
@@ -0,0 +1,176 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-18 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.aai.nodes;
+
+import org.eclipse.persistence.dynamic.DynamicEntity;
+import org.eclipse.persistence.jaxb.dynamic.DynamicJAXBContext;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.junit.runner.RunWith;
+import org.onap.aai.restclient.MockProvider;
+import org.onap.aai.config.NodesConfiguration;
+import org.onap.aai.setup.SchemaVersion;
+import org.onap.aai.testutils.TestUtilConfigTranslator;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.w3c.dom.Document;
+
+import javax.xml.bind.SchemaOutputResolver;
+import javax.xml.transform.*;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+import java.io.*;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.*;
+
+@RunWith(SpringRunner.class)
+@TestPropertySource(properties = { "schema.ingest.file = src/test/resources/forWiringTests/schema-ingest-wiring-test-local-node.properties" })
+@ContextConfiguration(classes = {TestUtilConfigTranslator.class, NodesConfiguration.class})
+
+@DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_CLASS)
+
+@SpringBootTest
+public class NodeIngestorLocalTest {
+
+    //set thrown.expect to whatever a specific test needs
+    //this establishes a default of expecting no exceptions to be thrown
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
+    @Autowired
+    NodeIngestor nodeIngestor;
+
+    public static void printDocument(Document doc, OutputStream out) throws IOException, TransformerException {
+        TransformerFactory tf = TransformerFactory.newInstance();
+        Transformer transformer = tf.newTransformer();
+        transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "no");
+        transformer.setOutputProperty(OutputKeys.METHOD, "xml");
+        transformer.setOutputProperty(OutputKeys.INDENT, "yes");
+        transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8");
+        transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "4");
+
+        transformer.transform(new DOMSource(doc),
+            new StreamResult(new OutputStreamWriter(out, "UTF-8")));
+    }
+
+    @Test
+    public void testGetContextForVersion11() {
+        DynamicJAXBContext ctx10 = nodeIngestor.getContextForVersion(new SchemaVersion("v10"));
+
+        //should work bc Foo is valid in test_network_v10 schema
+        DynamicEntity foo10 = ctx10.newDynamicEntity("Foo");
+
+        foo10.set("fooId", "bar");
+        assertTrue("bar".equals(foo10.get("fooId")));
+
+        //should work bc Bar is valid in test_business_v10 schema
+        DynamicEntity bar10 = ctx10.newDynamicEntity("Bar");
+        bar10.set("barId", "bar2");
+        assertTrue("bar2".equals(bar10.get("barId")));
+        XSDOutputResolver outputResolver10 = new XSDOutputResolver();
+        ctx10.generateSchema(outputResolver10);
+
+        DynamicJAXBContext ctx11 = nodeIngestor.getContextForVersion(new SchemaVersion("v11"));
+
+        //should work bc Foo.quantity is valid in test_network_v11 schema
+        DynamicEntity foo11 = ctx11.newDynamicEntity("Foo");
+        foo11.set("quantity", "12");
+        assertTrue("12".equals(foo11.get("quantity")));
+
+        DynamicEntity quux11 = ctx11.newDynamicEntity("Quux");
+        quux11.set("qManagerName", "some guy");
+        assertTrue("some guy".equals(quux11.get("qManagerName")));
+        XSDOutputResolver outputResolver11 = new XSDOutputResolver();
+        ctx11.generateSchema(outputResolver11);
+
+
+        thrown.expect(IllegalArgumentException.class);
+        //should fail bc Quux not in v10 test schema
+        ctx10.newDynamicEntity("Quux");
+    }
+
+    @Test
+    public void testHasNodeType() {
+        assertTrue(nodeIngestor.hasNodeType("foo", new SchemaVersion("v11")));
+        assertTrue(nodeIngestor.hasNodeType("quux", new SchemaVersion("v11")));
+        assertFalse(nodeIngestor.hasNodeType("quux", new SchemaVersion("v10")));
+    }
+
+    @Test
+    public void testGetVersionFromClassName() {
+        assertEquals(nodeIngestor.getVersionFromClassName("inventory.aai.onap.org.v13.Evc"), new SchemaVersion("v13"));
+
+    }
+
+    @Test
+    public void testGetVersionFromClassNameNull() {
+        assertEquals(nodeIngestor.getVersionFromClassName("blah"), new SchemaVersion("v15"));
+
+    }
+
+    @Test
+    public void testGetObjectsInVersion() {
+        assertEquals(nodeIngestor.getObjectsInVersion(new SchemaVersion("v13")).size(), 148);
+
+    }
+
+    @Test
+    public void testCombinedSchema() throws TransformerException, IOException {
+        DynamicJAXBContext ctx13 = nodeIngestor.getContextForVersion(new SchemaVersion("v13"));
+        XSDOutputResolver outputResolver13 = new XSDOutputResolver();
+        ctx13.generateSchema(outputResolver13);
+        ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+        printDocument(nodeIngestor.getSchema(new SchemaVersion("v13")), buffer);
+        String content = new String(Files.readAllBytes(Paths.get("src/test/resources/forWiringTests/aai_oxm_v13.xml")));
+        content = content.replaceAll("\\s+", "");
+        String expected = buffer.toString().replaceAll("\\s+", "");
+
+        assertThat("OXM:\n" + expected, expected, is(content));
+    }
+
+    private class XSDOutputResolver extends SchemaOutputResolver {
+
+        @Override
+        public Result createOutput(String namespaceUri, String suggestedFileName)
+            throws IOException {
+
+            // create new file
+            // create stream result
+            File temp = File.createTempFile("schema", ".xsd");
+            StreamResult result = new StreamResult(temp);
+            System.out.println("Schema file: " + temp.getAbsolutePath());
+
+            // set system id
+            result.setSystemId(temp.toURI().toURL().toString());
+
+            // return result
+            return result;
+        }
+    }
+}
diff --git a/aai-schema-ingest/src/test/java/org/onap/aai/nodes/NodeIngestorTest.java b/aai-schema-ingest/src/test/java/org/onap/aai/nodes/NodeIngestorTest.java
index 2de5847e..ec529f9d 100644
--- a/aai-schema-ingest/src/test/java/org/onap/aai/nodes/NodeIngestorTest.java
+++ b/aai-schema-ingest/src/test/java/org/onap/aai/nodes/NodeIngestorTest.java
@@ -20,54 +20,45 @@
 
 package org.onap.aai.nodes;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.*;
-
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-
-import javax.xml.bind.SchemaOutputResolver;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Result;
-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;
-
 import org.eclipse.persistence.dynamic.DynamicEntity;
-import org.eclipse.persistence.jaxb.JAXBContext;
 import org.eclipse.persistence.jaxb.dynamic.DynamicJAXBContext;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
-import org.onap.aai.setup.SchemaLocationsBean;
+import org.onap.aai.restclient.MockProvider;
+import org.onap.aai.config.NodesConfiguration;
 import org.onap.aai.setup.SchemaVersion;
-import org.onap.aai.setup.SchemaVersions;
-import org.onap.aai.testutils.TestUtilConfigTranslator;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.w3c.dom.Document;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
+
+import javax.xml.bind.SchemaOutputResolver;
+import javax.xml.transform.*;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+import java.io.*;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.*;
+
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = {SchemaLocationsBean.class, SchemaVersions.class, TestUtilConfigTranslator.class, NodeIngestor.class})
-@TestPropertySource(properties = { "schema.ingest.file = src/test/resources/forWiringTests/schema-ingest-wiring-test.properties" })
+@TestPropertySource(properties = { "schema.ingest.file = src/test/resources/forWiringTests/schema-ingest-ss-wiring-test.properties" })
+
+@ContextConfiguration(classes = { MockProvider.class, NodesConfiguration.class})
+@DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_CLASS)
 @SpringBootTest
 public class NodeIngestorTest {
     @Autowired
-    NodeIngestor ni;
-    
+    NodeIngestor nodeIngestor;
+
     //set thrown.expect to whatever a specific test needs
     //this establishes a default of expecting no exceptions to be thrown
     @Rule
@@ -75,7 +66,7 @@ public class NodeIngestorTest {
     
     @Test
     public void testGetContextForVersion() {
-        DynamicJAXBContext ctx10 = ni.getContextForVersion(new SchemaVersion("v10"));
+        DynamicJAXBContext ctx10 = nodeIngestor.getContextForVersion(new SchemaVersion("v10"));
         
         //should work bc Foo is valid in test_network_v10 schema
         DynamicEntity foo10 = ctx10.newDynamicEntity("Foo");
@@ -90,7 +81,7 @@ public class NodeIngestorTest {
         XSDOutputResolver outputResolver10 = new XSDOutputResolver();
         ctx10.generateSchema(outputResolver10);
         
-        DynamicJAXBContext ctx11 = ni.getContextForVersion(new SchemaVersion("v11"));
+        DynamicJAXBContext ctx11 = nodeIngestor.getContextForVersion(new SchemaVersion("v11"));
         
         //should work bc Foo.quantity is valid in test_network_v11 schema
         DynamicEntity foo11 = ctx11.newDynamicEntity("Foo");
@@ -108,23 +99,47 @@ public class NodeIngestorTest {
         //should fail bc Quux not in v10 test schema
         ctx10.newDynamicEntity("Quux");
     }
-    
+
     @Test
     public void testHasNodeType() {
-        assertTrue(ni.hasNodeType("foo", new SchemaVersion("v11")));
-        assertTrue(ni.hasNodeType("quux", new SchemaVersion("v11")));
-        assertFalse(ni.hasNodeType("quux", new SchemaVersion("v10")));
+        //TODO remove for integration tests
+        assertTrue(nodeIngestor.hasNodeType("foo", new SchemaVersion("v11")));
+        assertTrue(nodeIngestor.hasNodeType("quux", new SchemaVersion("v11")));
+        assertFalse(nodeIngestor.hasNodeType("quux", new SchemaVersion("v10")));
+    }
+
+    @Test
+    public void testGetVersionFromClassName() {
+        assertEquals(nodeIngestor.getVersionFromClassName("inventory.aai.onap.org.v13.Evc"),new SchemaVersion("v13"));
+
+    }
+
+    @Test
+    public void testGetVersionFromClassNameNull() {
+        assertEquals(nodeIngestor.getVersionFromClassName("blah"), new SchemaVersion("v15"));
+
     }
+
+    @Test
+    public void testGetObjectsInVersion() {
+        assertEquals(nodeIngestor.getObjectsInVersion(new SchemaVersion("v13")).size(), 148);
+        //comment for IntegrationTest
+        //assertEquals(nodeIngestor.getObjectsInVersion(new SchemaVersion("v13")).size(), 229);
+
+    }
+    
     @Test
     public void testCombinedSchema() throws TransformerException, IOException {
-        DynamicJAXBContext ctx13 = ni.getContextForVersion(new SchemaVersion("v13"));
+        DynamicJAXBContext ctx13 = nodeIngestor.getContextForVersion(new SchemaVersion("v13"));
         XSDOutputResolver outputResolver13 = new XSDOutputResolver();
         ctx13.generateSchema(outputResolver13);
         ByteArrayOutputStream buffer = new ByteArrayOutputStream();
-        printDocument(ni.getSchema(new SchemaVersion("v13")),buffer);
+        printDocument(nodeIngestor.getSchema(new SchemaVersion("v13")),buffer);
         String content = new String(Files.readAllBytes(Paths.get("src/test/resources/forWiringTests/aai_oxm_v13.xml")));
         content = content.replaceAll("\\s+", "");
         String expected = buffer.toString().replaceAll("\\s+", "");
+
+
         assertThat("OXM:\n"+expected,expected, is(content));
     }
 
@@ -160,6 +175,7 @@ public class NodeIngestorTest {
               return result;
            }
     }
+
 }
 
 
diff --git a/aai-schema-ingest/src/test/java/org/onap/aai/nodes/NodeIngestorWiringTest.java b/aai-schema-ingest/src/test/java/org/onap/aai/nodes/NodeIngestorWiringTest.java
index a7987fa3..0aaa8802 100644
--- a/aai-schema-ingest/src/test/java/org/onap/aai/nodes/NodeIngestorWiringTest.java
+++ b/aai-schema-ingest/src/test/java/org/onap/aai/nodes/NodeIngestorWiringTest.java
@@ -24,11 +24,13 @@ import static org.junit.Assert.*;
 
 import org.eclipse.persistence.dynamic.DynamicEntity;
 import org.eclipse.persistence.jaxb.dynamic.DynamicJAXBContext;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.onap.aai.setup.SchemaLocationsBean;
+import org.onap.aai.config.NodesConfiguration;
 import org.onap.aai.setup.SchemaVersion;
-import org.onap.aai.setup.SchemaVersions;
+import org.onap.aai.setup.SchemaVersionsBean;
+
 import org.onap.aai.testutils.ConfigTranslatorForWiringTest;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
@@ -37,8 +39,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = {SchemaLocationsBean.class, SchemaVersions.class, ConfigTranslatorForWiringTest.class, NodeIngestor.class})
-@TestPropertySource(properties = {"schema.ingest.file = src/test/resources/forWiringTests/schema-ingest-wiring-test.properties"})
+@ContextConfiguration(classes = {ConfigTranslatorForWiringTest.class, NodesConfiguration.class})
+@TestPropertySource(properties = {"schema.ingest.file = src/test/resources/forWiringTests/schema-ingest-wiring-test-local-node.properties"})
 @SpringBootTest
 public class NodeIngestorWiringTest {
     @Autowired
diff --git a/aai-schema-ingest/src/test/java/org/onap/aai/restclient/MockProvider.java b/aai-schema-ingest/src/test/java/org/onap/aai/restclient/MockProvider.java
new file mode 100644
index 00000000..6f8b7367
--- /dev/null
+++ b/aai-schema-ingest/src/test/java/org/onap/aai/restclient/MockProvider.java
@@ -0,0 +1,58 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.aai.restclient;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
+
+@Configuration
+@PropertySource(value = "classpath:schema-ingest.properties", ignoreResourceNotFound=true)
+@PropertySource(value = "file:${schema.ingest.file}", ignoreResourceNotFound=true)
+public class MockProvider {
+
+    @Value("${mock.filename}")
+    private String fileName;
+
+    @Autowired
+    private RestClient restClient;
+
+    @Bean
+    public RestClientFactory restClientFactory() {
+
+        return new RestClientFactory() {
+            @Override
+            public RestClient getRestClient(String clientType) {
+                return restClient;
+
+            }
+        };
+    }
+
+    @Bean(name="restClient")
+    @ConditionalOnProperty(name = "schema.service.client", havingValue = "mock-no-auth")
+    public RestClient getSchemaServiceNoAuthClient() {
+        return new MockRestClient(fileName);
+    }
+}
+
diff --git a/aai-schema-ingest/src/test/java/org/onap/aai/restclient/MockRestClient.java b/aai-schema-ingest/src/test/java/org/onap/aai/restclient/MockRestClient.java
new file mode 100644
index 00000000..87e4bfe8
--- /dev/null
+++ b/aai-schema-ingest/src/test/java/org/onap/aai/restclient/MockRestClient.java
@@ -0,0 +1,295 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.aai.restclient;
+
+import com.att.eelf.configuration.EELFLogger;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import org.apache.commons.io.IOUtils;
+import org.springframework.core.io.Resource;
+import org.springframework.http.*;
+import org.springframework.stereotype.Component;
+import org.springframework.test.web.client.ExpectedCount;
+import org.springframework.test.web.client.MockRestServiceServer;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.RestTemplate;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.Assert.assertNotNull;
+import static org.springframework.test.web.client.match.MockRestRequestMatchers.*;
+import static org.springframework.test.web.client.response.MockRestResponseCreators.withStatus;
+
+@Component
+public class MockRestClient extends RestClient {
+
+private RestTemplate restTemplate;
+        private MockRestServiceServer mockRestServiceServer;
+
+    String fileName = "mockrequests";
+
+    public MockRestClient(String fileName) {
+        /*
+        List<MockRestServiceServer> mockedAAIRequests = new ArrayList<>(aaiRequests.size());
+         */
+        List<MockRestServiceServer> mockedAAIRequests = new ArrayList<>();
+
+        restTemplate = new RestTemplate();
+           /* MockRestServiceServer server       = MockRestServiceServer
+                .bindTo(restClientFactory.getRestClient(ClientType.SchemaService).getRestTemplate())
+                .build();
+            server.expect(MockRestRequestMatchers.requestTo(url))
+                .andRespond(withSuccess("{}", MediaType.APPLICATION_JSON));*/
+
+        // RestTemplateBuilder mockBuilder = mock(RestTemplateBuilder.class);
+        //when(mockBuilder.build()).thenReturn(restTemplate);
+
+        JsonObject payload = null;
+        try {
+            payload = getPayload(fileName + ".json");
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        JsonArray mockUris = payload.getAsJsonArray("mock-uri");
+
+
+        mockRestServiceServer = MockRestServiceServer.createServer(restTemplate);
+        String url = "https://localhost:8447/aai/v14";
+        /*mockRestServiceServer.expect(requestTo(url))
+            .andRespond(withSuccess("{}", MediaType.APPLICATION_JSON));*/
+
+
+        for (int i = 0; i < mockUris.size(); i++) {
+            String responseFile = mockUris.get(i).getAsJsonObject().get("response-file").getAsString();
+            String contentTypeValue = mockUris.get(i).getAsJsonObject().get("content").getAsString();
+
+
+            String uri = mockUris.get(i).getAsJsonObject().get("aai-uri").getAsString();
+
+            InputStream inputStream = getClass()
+                .getClassLoader()
+                .getResourceAsStream(responseFile);
+            String responseBody = null;
+            try {
+                responseBody = IOUtils.toString(inputStream, StandardCharsets.UTF_8);
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+
+
+            mockRestServiceServer.expect(ExpectedCount.manyTimes(), requestTo(url + uri))
+                .andExpect(method(HttpMethod.GET))
+                .andExpect(content().contentType(contentTypeValue))
+                .andRespond(withStatus(HttpStatus.OK).body(responseBody.toString()).contentType(MediaType.valueOf(contentTypeValue)));
+
+
+        }
+    }
+
+    public MockRestClient()  {
+
+         restTemplate = new RestTemplate();
+           /* MockRestServiceServer server       = MockRestServiceServer
+                .bindTo(restClientFactory.getRestClient(ClientType.SchemaService).getRestTemplate())
+                .build();
+            server.expect(MockRestRequestMatchers.requestTo(url))
+                .andRespond(withSuccess("{}", MediaType.APPLICATION_JSON));*/
+
+        // RestTemplateBuilder mockBuilder = mock(RestTemplateBuilder.class);
+        //when(mockBuilder.build()).thenReturn(restTemplate);
+
+        JsonObject payload = null;
+        try {
+            payload = getPayload( fileName + ".json");
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        JsonArray mockUris = payload.getAsJsonArray("mock-uri");
+
+
+
+        mockRestServiceServer       = MockRestServiceServer.createServer(restTemplate);
+        String url="https://localhost:8447/aai/v14";
+        /*mockRestServiceServer.expect(requestTo(url))
+            .andRespond(withSuccess("{}", MediaType.APPLICATION_JSON));*/
+
+
+
+
+        for (int i = 0; i < mockUris.size(); i++) {
+            String responseFile = mockUris.get(i).getAsJsonObject().get("response-file").getAsString();
+            String contentTypeValue = mockUris.get(i).getAsJsonObject().get("content").getAsString();
+
+
+            String uri = mockUris.get(i).getAsJsonObject().get("aai-uri").getAsString();
+
+            InputStream inputStream = getClass()
+                .getClassLoader()
+                .getResourceAsStream(responseFile);
+            String responseBody = null;
+            try {
+                responseBody = IOUtils.toString(inputStream, StandardCharsets.UTF_8);
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+
+
+            mockRestServiceServer.expect(ExpectedCount.manyTimes(), requestTo(url + uri))
+                .andExpect(method(HttpMethod.GET))
+                .andExpect(content().contentType(contentTypeValue))
+                .andRespond(withStatus(HttpStatus.OK).body(responseBody.toString()).contentType(MediaType.valueOf(contentTypeValue)));
+
+
+        }
+
+
+    }
+
+    public JsonObject  getTestDetails(String fileName) throws IOException {
+
+        JsonObject payload = getPayload(fileName );
+
+        return payload;
+    }
+
+    public JsonObject getPayload(String filename) throws IOException {
+        InputStream inputStream = getClass()
+            .getClassLoader()
+            .getResourceAsStream(filename);
+
+        //InputStream inputStream = new FileInputStream(filename);
+
+        String result = IOUtils.toString(inputStream, StandardCharsets.UTF_8);
+        String message = String.format("Unable to find the %s in src/test/resources", filename);
+        assertNotNull(message, inputStream);
+
+        JsonParser parser = new JsonParser();
+        JsonObject payload = parser.parse(result).getAsJsonObject();
+        return payload;
+    }
+
+    @Override
+        public ResponseEntity execute(String uri, HttpMethod method, Map<String,String> headers, String body) {
+
+            String url="https://localhost:8447/aai/v14/"+ uri;
+
+           /* MockRestServiceServer server       = MockRestServiceServer
+                .bindTo(restClientFactory.getRestClient(ClientType.SchemaService).getRestTemplate())
+                .build();
+            server.expect(MockRestRequestMatchers.requestTo(url))
+                .andRespond(withSuccess("{}", MediaType.APPLICATION_JSON));*/
+
+           // RestTemplateBuilder mockBuilder = mock(RestTemplateBuilder.class);
+            //when(mockBuilder.build()).thenReturn(restTemplate);
+
+        /*MockRestServiceServer server       = MockRestServiceServer.createServer(restTemplate);
+        server.expect(requestTo(url))
+            .andRespond(withSuccess("{}", MediaType.APPLICATION_JSON));
+            return new ResponseEntity("blah", HttpStatus.OK);
+        server.expect(ExpectedCount.manyTimes(), requestTo(Matchers.startsWith(aaiBaseUrl + aaiRequests.get(i).get("aai-uri").asText())))
+            .andExpect(method(HttpMethod.GET))
+            .andExpect(content().contentType(MediaType.APPLICATION_JSON))
+            .andRespond(withStatus(HttpStatus.OK).body(aaiResponses.get(i).toString()).contentType(MediaType.APPLICATION_JSON));*/
+
+
+        HttpHeaders headersMap = new HttpHeaders();
+
+        headersMap.setAccept(Collections.singletonList(MediaType.APPLICATION_JSON));
+        headersMap.setContentType(MediaType.APPLICATION_JSON);
+        headersMap.add("Real-Time", "true");
+        headersMap.add("X-FromAppId", "JUNIT");
+        headersMap.add("X-TransactionId", "JUNIT");
+
+        HttpEntity httpEntity = new HttpEntity(headers);
+
+        ResponseEntity responseEntity = restTemplate.exchange(url , HttpMethod.GET, httpEntity, String.class);
+
+       // mockRestServiceServer.verify();
+       return responseEntity;
+    }
+
+    @Override
+    public ResponseEntity executeResource(String uri, HttpMethod method, Map<String,String> headers, String body) {
+
+        String url="https://localhost:8447/aai/v14/"+ uri;
+
+           /* MockRestServiceServer server       = MockRestServiceServer
+                .bindTo(restClientFactory.getRestClient(ClientType.SchemaService).getRestTemplate())
+                .build();
+            server.expect(MockRestRequestMatchers.requestTo(url))
+                .andRespond(withSuccess("{}", MediaType.APPLICATION_JSON));*/
+
+        // RestTemplateBuilder mockBuilder = mock(RestTemplateBuilder.class);
+        //when(mockBuilder.build()).thenReturn(restTemplate);
+
+        /*MockRestServiceServer server       = MockRestServiceServer.createServer(restTemplate);
+        server.expect(requestTo(url))
+            .andRespond(withSuccess("{}", MediaType.APPLICATION_JSON));
+            return new ResponseEntity("blah", HttpStatus.OK);
+        server.expect(ExpectedCount.manyTimes(), requestTo(Matchers.startsWith(aaiBaseUrl + aaiRequests.get(i).get("aai-uri").asText())))
+            .andExpect(method(HttpMethod.GET))
+            .andExpect(content().contentType(MediaType.APPLICATION_JSON))
+            .andRespond(withStatus(HttpStatus.OK).body(aaiResponses.get(i).toString()).contentType(MediaType.APPLICATION_JSON));*/
+
+
+        HttpHeaders headersMap = new HttpHeaders();
+
+        headersMap.setAccept(Collections.singletonList(MediaType.APPLICATION_JSON));
+        headersMap.setContentType(MediaType.APPLICATION_JSON);
+        headersMap.add("Real-Time", "true");
+        headersMap.add("X-FromAppId", "JUNIT");
+        headersMap.add("X-TransactionId", "JUNIT");
+
+        HttpEntity httpEntity = new HttpEntity(headers);
+
+        ResponseEntity responseEntity = restTemplate.exchange(url , HttpMethod.GET, httpEntity, Resource.class);
+
+        // mockRestServiceServer.verify();
+        return responseEntity;
+    }
+
+    @Override
+    public RestTemplate getRestTemplate() {
+        RestTemplate restTemplate = null;
+        return restTemplate;
+    }
+
+    public  String getBaseUrl(){
+            return "";
+    }
+
+    protected  MultiValueMap<String,String> getHeaders(Map<String,String> headers){
+            return null;
+    }
+
+    protected  EELFLogger getLogger(){
+            return null;
+    }
+
+}
diff --git a/aai-schema-ingest/src/test/java/org/onap/aai/restclient/RestClientTest.java b/aai-schema-ingest/src/test/java/org/onap/aai/restclient/RestClientTest.java
new file mode 100644
index 00000000..4c3b0fcf
--- /dev/null
+++ b/aai-schema-ingest/src/test/java/org/onap/aai/restclient/RestClientTest.java
@@ -0,0 +1,24 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.aai.restclient;
+
+public class RestClientTest {
+
+}
diff --git a/aai-schema-ingest/src/test/java/org/onap/aai/restclient/SchemaRestClientTest.java b/aai-schema-ingest/src/test/java/org/onap/aai/restclient/SchemaRestClientTest.java
new file mode 100644
index 00000000..cd161dea
--- /dev/null
+++ b/aai-schema-ingest/src/test/java/org/onap/aai/restclient/SchemaRestClientTest.java
@@ -0,0 +1,67 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2018-19 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.aai.restclient;
+
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.onap.aai.restclient.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.ResponseEntity;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Ignore
+@RunWith(SpringJUnit4ClassRunner.class)
+@TestPropertySource(locations = "/schemaService/schema-service-rest.properties" )
+@ContextConfiguration(classes = {RestClientFactoryConfiguration.class, SchemaServiceRestClient.class, RestClientFactory.class, PropertyPasswordConfiguration.class})
+
+@SpringBootTest
+public class SchemaRestClientTest {
+
+    private String SCHEMA_SERVICE = "schema-service";
+    @Autowired
+    private RestClientFactory restClientFactory;
+
+    @Test
+    public void  testGetRequestToSchemaService() {
+        ResponseEntity aaiResponse;
+        RestClient restClient = null;
+
+            restClient = restClientFactory
+                .getRestClient(SCHEMA_SERVICE);
+
+        String uri = "";
+        Map<String, String> headersMap = new HashMap<>();
+        String content = "";
+        aaiResponse = restClient.execute(
+            uri,
+            HttpMethod.GET,
+            headersMap,
+            content);
+        System.out.println("Helo"+aaiResponse.getStatusCode());
+    }
+}
diff --git a/aai-schema-ingest/src/test/java/org/onap/aai/setup/ConfigTranslatorWiringTest.java b/aai-schema-ingest/src/test/java/org/onap/aai/setup/ConfigTranslatorWiringTest.java
index 03b40db5..565c99c8 100644
--- a/aai-schema-ingest/src/test/java/org/onap/aai/setup/ConfigTranslatorWiringTest.java
+++ b/aai-schema-ingest/src/test/java/org/onap/aai/setup/ConfigTranslatorWiringTest.java
@@ -20,11 +20,6 @@
 
 package org.onap.aai.setup;
 
-import static org.junit.Assert.*;
-
-import java.util.List;
-import java.util.Map;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.onap.aai.testutils.ConfigTranslatorForWiringTest;
@@ -34,9 +29,15 @@ import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = {SchemaLocationsBean.class, SchemaVersions.class, ConfigTranslatorForWiringTest.class})
-@TestPropertySource(properties = {"schema.ingest.file = src/test/resources/forWiringTests/schema-ingest-wiring-test.properties"})
+@TestPropertySource(properties = {"schema.ingest.file = src/test/resources/forWiringTests/schema-ingest-wiring-test-local.properties"})
 @SpringBootTest
 public class ConfigTranslatorWiringTest {
     @Autowired
diff --git a/aai-schema-ingest/src/test/java/org/onap/aai/setup/SchemaLocationsBeanDefaultInjectionTest.java b/aai-schema-ingest/src/test/java/org/onap/aai/setup/SchemaLocationsBeanDefaultInjectionTest.java
index b5fb0e19..45ed88fa 100644
--- a/aai-schema-ingest/src/test/java/org/onap/aai/setup/SchemaLocationsBeanDefaultInjectionTest.java
+++ b/aai-schema-ingest/src/test/java/org/onap/aai/setup/SchemaLocationsBeanDefaultInjectionTest.java
@@ -20,14 +20,15 @@
 
 package org.onap.aai.setup;
 
-import static org.junit.Assert.*;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = {SchemaLocationsBean.class})
 public class SchemaLocationsBeanDefaultInjectionTest {
diff --git a/aai-schema-ingest/src/test/java/org/onap/aai/setup/SchemaLocationsBeanEnvVarInjectionTest.java b/aai-schema-ingest/src/test/java/org/onap/aai/setup/SchemaLocationsBeanEnvVarInjectionTest.java
index 6ccc418a..886dfe02 100644
--- a/aai-schema-ingest/src/test/java/org/onap/aai/setup/SchemaLocationsBeanEnvVarInjectionTest.java
+++ b/aai-schema-ingest/src/test/java/org/onap/aai/setup/SchemaLocationsBeanEnvVarInjectionTest.java
@@ -20,8 +20,6 @@
 
 package org.onap.aai.setup;
 
-import static org.junit.Assert.*;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,6 +27,9 @@ import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = {SchemaLocationsBean.class})
 @TestPropertySource(properties = {"schema.ingest.file = src/test/resources/forWiringTests/schema-ingest2.properties"})
diff --git a/aai-schema-ingest/src/test/java/org/onap/aai/setup/SchemaLocationsBeanXMLSetterTest.java b/aai-schema-ingest/src/test/java/org/onap/aai/setup/SchemaLocationsBeanXMLSetterTest.java
index d72d3d3c..105cb1de 100644
--- a/aai-schema-ingest/src/test/java/org/onap/aai/setup/SchemaLocationsBeanXMLSetterTest.java
+++ b/aai-schema-ingest/src/test/java/org/onap/aai/setup/SchemaLocationsBeanXMLSetterTest.java
@@ -20,14 +20,15 @@
 
 package org.onap.aai.setup;
 
-import static org.junit.Assert.*;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = { "classpath:forWiringTests/testContext.xml"})
 public class SchemaLocationsBeanXMLSetterTest {
diff --git a/aai-schema-ingest/src/test/java/org/onap/aai/setup/SchemaLocationsBeanXMLSetterWithPropFileTest.java b/aai-schema-ingest/src/test/java/org/onap/aai/setup/SchemaLocationsBeanXMLSetterWithPropFileTest.java
index 5e49b4f0..a9b5d0c5 100644
--- a/aai-schema-ingest/src/test/java/org/onap/aai/setup/SchemaLocationsBeanXMLSetterWithPropFileTest.java
+++ b/aai-schema-ingest/src/test/java/org/onap/aai/setup/SchemaLocationsBeanXMLSetterWithPropFileTest.java
@@ -20,14 +20,15 @@
 
 package org.onap.aai.setup;
 
-import static org.junit.Assert.*;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = { "classpath:forWiringTests/testUsingPropFileContext.xml"})
 public class SchemaLocationsBeanXMLSetterWithPropFileTest {
diff --git a/aai-schema-ingest/src/test/java/org/onap/aai/setup/SchemaVersionsBeanTest.java b/aai-schema-ingest/src/test/java/org/onap/aai/setup/SchemaVersionsBeanTest.java
new file mode 100644
index 00000000..b1208d62
--- /dev/null
+++ b/aai-schema-ingest/src/test/java/org/onap/aai/setup/SchemaVersionsBeanTest.java
@@ -0,0 +1,87 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.aai.setup;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.junit.runner.RunWith;
+import org.onap.aai.restclient.MockProvider;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import java.io.IOException;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@TestPropertySource(properties = { "schema.ingest.file = src/test/resources/forWiringTests/schema-ingest-ss-wiring-test.properties" })
+@ContextConfiguration(classes = {MockProvider.class, SchemaVersionsBean.class})
+@SpringBootTest
+public class SchemaVersionsBeanTest {
+
+    //set thrown.expect to whatever a specific test needs
+    //this establishes a default of expecting no exceptions to be thrown
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
+    @Autowired
+    SchemaVersionsBean SchemaVersionsBean;
+
+    @Test
+    public void testGetContextForVersion() throws IOException {
+
+        SchemaVersions versions = SchemaVersionsBean.getSchemaVersions();
+        assertEquals(versions.getDefaultVersion(), new SchemaVersion("v15"));
+    }
+
+    @Test
+    public void testGetVersions() throws IOException {
+
+        List<SchemaVersion> versions = SchemaVersionsBean.getVersions();
+        assertNotNull(versions);
+    }
+
+    @Test
+    public void testGetters() throws IOException {
+
+        List<SchemaVersion> versionsList = SchemaVersionsBean.getVersions();
+        assertNotNull(versionsList);
+        SchemaVersions versions = SchemaVersionsBean.getSchemaVersions();
+        /*//assertEquals(versions.getAppRootVersion(), new SchemaVersion("v15"));
+        assertEquals(versions.getAppRootVersion(), new SchemaVersion("v11"));
+        assertEquals(versions.getDepthVersion(), new SchemaVersion("v10"));
+        assertEquals(versions.getEdgeLabelVersion(), new SchemaVersion("v12"));
+        assertEquals(versions.getNamespaceChangeVersion(), new SchemaVersion("v11"));
+        assertEquals(versions.getRelatedLinkVersion(), new SchemaVersion("v10"));*/
+
+        assertEquals(versions.getAppRootVersion(), new SchemaVersion("v15"));
+        assertEquals(versions.getDepthVersion(), new SchemaVersion("v15"));
+        assertEquals(versions.getEdgeLabelVersion(), new SchemaVersion("v15"));
+        assertEquals(versions.getNamespaceChangeVersion(), new SchemaVersion("v15"));
+        assertEquals(versions.getRelatedLinkVersion(), new SchemaVersion("v15"));
+
+    }
+
+}
diff --git a/aai-schema-ingest/src/test/java/org/onap/aai/testutils/BadEdgeConfigForValidationTest.java b/aai-schema-ingest/src/test/java/org/onap/aai/testutils/BadEdgeConfigForValidationTest.java
index ff2f22f6..fa57f976 100644
--- a/aai-schema-ingest/src/test/java/org/onap/aai/testutils/BadEdgeConfigForValidationTest.java
+++ b/aai-schema-ingest/src/test/java/org/onap/aai/testutils/BadEdgeConfigForValidationTest.java
@@ -20,9 +20,12 @@
 
 package org.onap.aai.testutils;
 
-import java.util.*;
+import org.onap.aai.setup.ConfigTranslator;
+import org.onap.aai.setup.SchemaLocationsBean;
+import org.onap.aai.setup.SchemaVersion;
+import org.onap.aai.setup.SchemaVersions;
 
-import org.onap.aai.setup.*;
+import java.util.*;
 
 /**
  * Good oxm, bad edge rules for rainy day edge rule validation testing
@@ -53,5 +56,4 @@ public class BadEdgeConfigForValidationTest extends ConfigTranslator {
         return input;
     }
 
-    
 }
diff --git a/aai-schema-ingest/src/test/java/org/onap/aai/testutils/BadNodeConfigForValidationTest.java b/aai-schema-ingest/src/test/java/org/onap/aai/testutils/BadNodeConfigForValidationTest.java
index a1a0e32a..829638fe 100644
--- a/aai-schema-ingest/src/test/java/org/onap/aai/testutils/BadNodeConfigForValidationTest.java
+++ b/aai-schema-ingest/src/test/java/org/onap/aai/testutils/BadNodeConfigForValidationTest.java
@@ -20,9 +20,15 @@
 
 package org.onap.aai.testutils;
 
-import java.util.*;
+import org.onap.aai.setup.ConfigTranslator;
+import org.onap.aai.setup.SchemaLocationsBean;
+import org.onap.aai.setup.SchemaVersion;
+import org.onap.aai.setup.SchemaVersions;
 
-import org.onap.aai.setup.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
 
 /**
  * All schema files here are valid for sunny day validator testing
diff --git a/aai-schema-ingest/src/test/java/org/onap/aai/testutils/ConfigTranslatorForWiringTest.java b/aai-schema-ingest/src/test/java/org/onap/aai/testutils/ConfigTranslatorForWiringTest.java
index 043f80e7..06e07f9a 100644
--- a/aai-schema-ingest/src/test/java/org/onap/aai/testutils/ConfigTranslatorForWiringTest.java
+++ b/aai-schema-ingest/src/test/java/org/onap/aai/testutils/ConfigTranslatorForWiringTest.java
@@ -20,9 +20,15 @@
 
 package org.onap.aai.testutils;
 
-import java.util.*;
+import org.onap.aai.setup.ConfigTranslator;
+import org.onap.aai.setup.SchemaLocationsBean;
+import org.onap.aai.setup.SchemaVersion;
+import org.onap.aai.setup.SchemaVersions;
 
-import org.onap.aai.setup.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
 
 public class ConfigTranslatorForWiringTest extends ConfigTranslator {
 
@@ -32,6 +38,7 @@ public class ConfigTranslatorForWiringTest extends ConfigTranslator {
 
     @Override
     public Map<SchemaVersion, List<String>> getNodeFiles() {
+
         String f = bean.getNodeDirectory() + "test_business_v10.xml";
         List<String> files = new ArrayList<>();
         files.add(f);
diff --git a/aai-schema-ingest/src/test/java/org/onap/aai/testutils/GoodConfigForValidationTest.java b/aai-schema-ingest/src/test/java/org/onap/aai/testutils/GoodConfigForValidationTest.java
index dbb24ec9..41f35371 100644
--- a/aai-schema-ingest/src/test/java/org/onap/aai/testutils/GoodConfigForValidationTest.java
+++ b/aai-schema-ingest/src/test/java/org/onap/aai/testutils/GoodConfigForValidationTest.java
@@ -20,13 +20,16 @@
 
 package org.onap.aai.testutils;
 
-import java.util.*;
-
 import org.onap.aai.setup.ConfigTranslator;
 import org.onap.aai.setup.SchemaLocationsBean;
 import org.onap.aai.setup.SchemaVersion;
 import org.onap.aai.setup.SchemaVersions;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
 /**
  * All schema files here are valid for sunny day validator testing
  */
diff --git a/aai-schema-ingest/src/test/java/org/onap/aai/testutils/SchemaIncompleteTranslator.java b/aai-schema-ingest/src/test/java/org/onap/aai/testutils/SchemaIncompleteTranslator.java
index d3df9dcc..23549e3f 100644
--- a/aai-schema-ingest/src/test/java/org/onap/aai/testutils/SchemaIncompleteTranslator.java
+++ b/aai-schema-ingest/src/test/java/org/onap/aai/testutils/SchemaIncompleteTranslator.java
@@ -20,17 +20,16 @@
 
 package org.onap.aai.testutils;
 
-import java.util.ArrayList;
-import java.util.EnumMap;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-
 import org.onap.aai.setup.ConfigTranslator;
 import org.onap.aai.setup.SchemaLocationsBean;
 import org.onap.aai.setup.SchemaVersion;
 import org.onap.aai.setup.SchemaVersions;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
 public class SchemaIncompleteTranslator extends ConfigTranslator {
     
     public SchemaIncompleteTranslator(SchemaLocationsBean bean, SchemaVersions schemaVersions) {
diff --git a/aai-schema-ingest/src/test/java/org/onap/aai/testutils/TestUtilConfigTranslator.java b/aai-schema-ingest/src/test/java/org/onap/aai/testutils/TestUtilConfigTranslator.java
index bbc0c3f9..3704b7cd 100644
--- a/aai-schema-ingest/src/test/java/org/onap/aai/testutils/TestUtilConfigTranslator.java
+++ b/aai-schema-ingest/src/test/java/org/onap/aai/testutils/TestUtilConfigTranslator.java
@@ -20,13 +20,22 @@
 
 package org.onap.aai.testutils;
 
-import java.util.*;
+import org.onap.aai.setup.ConfigTranslator;
+import org.onap.aai.setup.SchemaLocationsBean;
+import org.onap.aai.setup.SchemaVersion;
+import org.onap.aai.setup.SchemaVersions;
+import org.springframework.context.annotation.PropertySource;
 
-import org.onap.aai.setup.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+@PropertySource(value = "classpath:schema-ingest.properties", ignoreResourceNotFound = true)
+@PropertySource(value = "file:${schema.ingest.file}", ignoreResourceNotFound = true)
 
 public class TestUtilConfigTranslator extends ConfigTranslator {
 
-    public static final SchemaVersion LATEST = new SchemaVersion("v14");
+    public static final SchemaVersion LATEST = new SchemaVersion("v15");
     public TestUtilConfigTranslator(SchemaLocationsBean bean, SchemaVersions schemaVersions) {
         super(bean, schemaVersions);
     }
@@ -74,7 +83,6 @@ public class TestUtilConfigTranslator extends ConfigTranslator {
         files3.add("src/test/resources/edgeRules/test3.json");
         files3.add("src/test/resources/edgeRules/defaultEdgesTest.json");
         input.put(new SchemaVersion("v11"), files3);
-        
         return input;
     }
 }
diff --git a/aai-schema-ingest/src/test/java/org/onap/aai/testutils/TestUtilConfigTranslatorforBusiness.java b/aai-schema-ingest/src/test/java/org/onap/aai/testutils/TestUtilConfigTranslatorforBusiness.java
index 81644de8..2e515ec1 100644
--- a/aai-schema-ingest/src/test/java/org/onap/aai/testutils/TestUtilConfigTranslatorforBusiness.java
+++ b/aai-schema-ingest/src/test/java/org/onap/aai/testutils/TestUtilConfigTranslatorforBusiness.java
@@ -20,17 +20,16 @@
 
 package org.onap.aai.testutils;
 
-import java.util.ArrayList;
-import java.util.EnumMap;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-
 import org.onap.aai.setup.ConfigTranslator;
 import org.onap.aai.setup.SchemaLocationsBean;
 import org.onap.aai.setup.SchemaVersion;
 import org.onap.aai.setup.SchemaVersions;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
 public class TestUtilConfigTranslatorforBusiness extends ConfigTranslator {
     
     public TestUtilConfigTranslatorforBusiness(SchemaLocationsBean bean, SchemaVersions schemaVersions) {
diff --git a/aai-schema-ingest/src/test/java/org/onap/aai/validation/VersionValidatorRainyDayTest.java b/aai-schema-ingest/src/test/java/org/onap/aai/validation/VersionValidatorRainyDayTest.java
index 15396135..667a76ab 100644
--- a/aai-schema-ingest/src/test/java/org/onap/aai/validation/VersionValidatorRainyDayTest.java
+++ b/aai-schema-ingest/src/test/java/org/onap/aai/validation/VersionValidatorRainyDayTest.java
@@ -22,12 +22,13 @@ package org.onap.aai.validation;
 
 import static org.junit.Assert.*;
 
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.onap.aai.config.NodesConfiguration;
 import org.onap.aai.nodes.NodeIngestor;
-import org.onap.aai.setup.SchemaLocationsBean;
 import org.onap.aai.setup.SchemaVersion;
-import org.onap.aai.setup.SchemaVersions;
+import org.onap.aai.setup.SchemaVersionsBean;
 import org.onap.aai.testutils.BadNodeConfigForValidationTest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -36,9 +37,9 @@ import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = {SchemaLocationsBean.class, SchemaVersions.class, BadNodeConfigForValidationTest.class, NodeIngestor.class,
+@ContextConfiguration(classes = {NodesConfiguration.class, BadNodeConfigForValidationTest.class,
         CheckEverythingStrategy.class, DefaultVersionValidationModule.class, VersionValidator.class})
-@TestPropertySource(properties = { "schema.ingest.file = src/test/resources/forWiringTests/schema-ingest-wiring-test.properties" })
+@TestPropertySource(properties = { "schema.ingest.file = src/test/resources/forWiringTests/schema-ingest-wiring-test-local.properties" })
 @SpringBootTest
 public class VersionValidatorRainyDayTest {
     @Autowired
diff --git a/aai-schema-ingest/src/test/java/org/onap/aai/validation/VersionValidatorSunnyDayTest.java b/aai-schema-ingest/src/test/java/org/onap/aai/validation/VersionValidatorSunnyDayTest.java
index 3c67c0d1..2be68558 100644
--- a/aai-schema-ingest/src/test/java/org/onap/aai/validation/VersionValidatorSunnyDayTest.java
+++ b/aai-schema-ingest/src/test/java/org/onap/aai/validation/VersionValidatorSunnyDayTest.java
@@ -22,11 +22,13 @@ package org.onap.aai.validation;
 
 import static org.junit.Assert.*;
 
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.onap.aai.config.NodesConfiguration;
 import org.onap.aai.nodes.NodeIngestor;
-import org.onap.aai.setup.SchemaLocationsBean;
-import org.onap.aai.setup.SchemaVersions;
+
+import org.onap.aai.setup.SchemaVersionsBean;
 import org.onap.aai.testutils.GoodConfigForValidationTest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -36,15 +38,13 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = {
-        SchemaLocationsBean.class,
-        SchemaVersions.class,
+    NodesConfiguration.class,
         GoodConfigForValidationTest.class,
-        NodeIngestor.class,
         CheckEverythingStrategy.class,
         DefaultVersionValidationModule.class,
         VersionValidator.class
 })
-@TestPropertySource(properties = { "schema.ingest.file = src/test/resources/forWiringTests/schema-ingest-wiring-test.properties" })
+@TestPropertySource(properties = { "schema.ingest.file = src/test/resources/forWiringTests/schema-ingest-wiring-test-local.properties" })
 @SpringBootTest
 public class VersionValidatorSunnyDayTest {
     @Autowired
diff --git a/aai-schema-ingest/src/test/java/org/onap/aai/validation/edges/DefaultEdgeFieldsValidationModuleTest.java b/aai-schema-ingest/src/test/java/org/onap/aai/validation/edges/DefaultEdgeFieldsValidationModuleTest.java
index a38632b3..f92c636b 100644
--- a/aai-schema-ingest/src/test/java/org/onap/aai/validation/edges/DefaultEdgeFieldsValidationModuleTest.java
+++ b/aai-schema-ingest/src/test/java/org/onap/aai/validation/edges/DefaultEdgeFieldsValidationModuleTest.java
@@ -28,8 +28,6 @@ import java.util.Map;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.onap.aai.edges.enums.EdgeField;
-import org.onap.aai.validation.edges.DefaultEdgeFieldsValidationModule;
-import org.onap.aai.validation.edges.EdgeFieldsValidationModule;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.ContextConfiguration;
diff --git a/aai-schema-ingest/src/test/java/org/onap/aai/validation/edges/EdgeRuleValidatorRainyDayTest.java b/aai-schema-ingest/src/test/java/org/onap/aai/validation/edges/EdgeRuleValidatorRainyDayTest.java
index 8bd66565..5f553ed5 100644
--- a/aai-schema-ingest/src/test/java/org/onap/aai/validation/edges/EdgeRuleValidatorRainyDayTest.java
+++ b/aai-schema-ingest/src/test/java/org/onap/aai/validation/edges/EdgeRuleValidatorRainyDayTest.java
@@ -22,19 +22,15 @@ package org.onap.aai.validation.edges;
 
 import static org.junit.Assert.*;
 
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.onap.aai.config.NodesConfiguration;
 import org.onap.aai.nodes.NodeIngestor;
-import org.onap.aai.setup.SchemaLocationsBean;
-import org.onap.aai.setup.SchemaVersions;
+
+import org.onap.aai.setup.SchemaVersionsBean;
 import org.onap.aai.testutils.BadEdgeConfigForValidationTest;
 import org.onap.aai.validation.CheckEverythingStrategy;
-import org.onap.aai.validation.edges.CousinDefaultingValidationModule;
-import org.onap.aai.validation.edges.DefaultEdgeFieldsValidationModule;
-import org.onap.aai.validation.edges.EdgeRuleValidator;
-import org.onap.aai.validation.edges.NodeTypesValidationModule;
-import org.onap.aai.validation.edges.SingleContainmentValidationModule;
-import org.onap.aai.validation.edges.UniqueLabelValidationModule;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.ContextConfiguration;
@@ -42,11 +38,11 @@ import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = {SchemaLocationsBean.class, SchemaVersions.class, BadEdgeConfigForValidationTest.class, NodeIngestor.class,
+@ContextConfiguration(classes = {NodesConfiguration.class, BadEdgeConfigForValidationTest.class,
         CheckEverythingStrategy.class, DefaultEdgeFieldsValidationModule.class, UniqueLabelValidationModule.class,
         SingleContainmentValidationModule.class, CousinDefaultingValidationModule.class, NodeTypesValidationModule.class,
         EdgeRuleValidator.class})
-@TestPropertySource(properties = { "schema.ingest.file = src/test/resources/forWiringTests/schema-ingest-wiring-test.properties" })
+@TestPropertySource(properties = { "schema.ingest.file = src/test/resources/forWiringTests/schema-ingest-wiring-test-local.properties" })
 @SpringBootTest
 public class EdgeRuleValidatorRainyDayTest {
     @Autowired
diff --git a/aai-schema-ingest/src/test/java/org/onap/aai/validation/edges/EdgeRuleValidatorSunnyDayTest.java b/aai-schema-ingest/src/test/java/org/onap/aai/validation/edges/EdgeRuleValidatorSunnyDayTest.java
index a918356c..6c68027b 100644
--- a/aai-schema-ingest/src/test/java/org/onap/aai/validation/edges/EdgeRuleValidatorSunnyDayTest.java
+++ b/aai-schema-ingest/src/test/java/org/onap/aai/validation/edges/EdgeRuleValidatorSunnyDayTest.java
@@ -22,19 +22,15 @@ package org.onap.aai.validation.edges;
 
 import static org.junit.Assert.*;
 
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.onap.aai.config.NodesConfiguration;
 import org.onap.aai.nodes.NodeIngestor;
-import org.onap.aai.setup.SchemaLocationsBean;
-import org.onap.aai.setup.SchemaVersions;
+
+import org.onap.aai.setup.SchemaVersionsBean;
 import org.onap.aai.testutils.GoodConfigForValidationTest;
 import org.onap.aai.validation.CheckEverythingStrategy;
-import org.onap.aai.validation.edges.CousinDefaultingValidationModule;
-import org.onap.aai.validation.edges.DefaultEdgeFieldsValidationModule;
-import org.onap.aai.validation.edges.EdgeRuleValidator;
-import org.onap.aai.validation.edges.NodeTypesValidationModule;
-import org.onap.aai.validation.edges.SingleContainmentValidationModule;
-import org.onap.aai.validation.edges.UniqueLabelValidationModule;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.ContextConfiguration;
@@ -42,11 +38,11 @@ import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = {SchemaLocationsBean.class, SchemaVersions.class, GoodConfigForValidationTest.class, NodeIngestor.class,
+@ContextConfiguration(classes = {NodesConfiguration.class, GoodConfigForValidationTest.class,
         CheckEverythingStrategy.class, DefaultEdgeFieldsValidationModule.class, UniqueLabelValidationModule.class,
         SingleContainmentValidationModule.class, CousinDefaultingValidationModule.class, NodeTypesValidationModule.class,
         EdgeRuleValidator.class})
-@TestPropertySource(properties = { "schema.ingest.file = src/test/resources/forWiringTests/schema-ingest-wiring-test.properties" })
+@TestPropertySource(properties = { "schema.ingest.file = src/test/resources/forWiringTests/schema-ingest-wiring-test-local.properties" })
 @SpringBootTest
 public class EdgeRuleValidatorSunnyDayTest {
     @Autowired
diff --git a/aai-schema-ingest/src/test/java/org/onap/aai/validation/edges/NodeTypesValidationModuleTest.java b/aai-schema-ingest/src/test/java/org/onap/aai/validation/edges/NodeTypesValidationModuleTest.java
index 245e0600..fc854061 100644
--- a/aai-schema-ingest/src/test/java/org/onap/aai/validation/edges/NodeTypesValidationModuleTest.java
+++ b/aai-schema-ingest/src/test/java/org/onap/aai/validation/edges/NodeTypesValidationModuleTest.java
@@ -25,12 +25,14 @@ import static org.junit.Assert.*;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.onap.aai.config.NodesConfiguration;
 import org.onap.aai.nodes.NodeIngestor;
-import org.onap.aai.setup.SchemaLocationsBean;
+
 import org.onap.aai.setup.SchemaVersion;
-import org.onap.aai.setup.SchemaVersions;
+import org.onap.aai.setup.SchemaVersionsBean;
 import org.onap.aai.testutils.TestUtilConfigTranslator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -39,8 +41,8 @@ import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = {SchemaLocationsBean.class, SchemaVersions.class, TestUtilConfigTranslator.class, NodeIngestor.class, NodeTypesValidationModule.class})
-@TestPropertySource(properties = { "schema.ingest.file = src/test/resources/forWiringTests/schema-ingest-wiring-test.properties" })
+@ContextConfiguration(classes = {NodesConfiguration.class, TestUtilConfigTranslator.class, NodeTypesValidationModule.class})
+@TestPropertySource(properties = { "schema.ingest.file = src/test/resources/forWiringTests/schema-ingest-wiring-test-local.properties" })
 @SpringBootTest
 public class NodeTypesValidationModuleTest {
     @Autowired
diff --git a/aai-schema-ingest/src/test/java/org/onap/aai/validation/nodes/NodeValidatorRainyDayTest.java b/aai-schema-ingest/src/test/java/org/onap/aai/validation/nodes/NodeValidatorRainyDayTest.java
index 86fe8a77..fc4ddd45 100644
--- a/aai-schema-ingest/src/test/java/org/onap/aai/validation/nodes/NodeValidatorRainyDayTest.java
+++ b/aai-schema-ingest/src/test/java/org/onap/aai/validation/nodes/NodeValidatorRainyDayTest.java
@@ -24,23 +24,25 @@ import static org.junit.Assert.*;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.onap.aai.nodes.NodeIngestor;
-import org.onap.aai.setup.SchemaLocationsBean;
-import org.onap.aai.setup.SchemaVersions;
+import org.onap.aai.config.NodesConfiguration;
+
 import org.onap.aai.testutils.BadNodeConfigForValidationTest;
 import org.onap.aai.validation.CheckEverythingStrategy;
 import org.onap.aai.validation.nodes.DefaultDuplicateNodeDefinitionValidationModule;
 import org.onap.aai.validation.nodes.NodeValidator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = {SchemaLocationsBean.class, SchemaVersions.class, BadNodeConfigForValidationTest.class, NodeIngestor.class,
-        CheckEverythingStrategy.class, DefaultDuplicateNodeDefinitionValidationModule.class, NodeValidator.class})
-@TestPropertySource(properties = { "schema.ingest.file = src/test/resources/forWiringTests/schema-ingest-wiring-test.properties" })
+@ContextConfiguration(classes = {BadNodeConfigForValidationTest.class, NodesConfiguration.class,
+    CheckEverythingStrategy.class, DefaultDuplicateNodeDefinitionValidationModule.class, NodeValidator.class})
+
+@TestPropertySource(properties = { "schema.ingest.file = src/test/resources/forWiringTests/schema-ingest-wiring-test-local.properties" })
+@DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_CLASS)
 @SpringBootTest
 public class NodeValidatorRainyDayTest {
     @Autowired
diff --git a/aai-schema-ingest/src/test/java/org/onap/aai/validation/nodes/NodeValidatorSchemaIncompleteTest.java b/aai-schema-ingest/src/test/java/org/onap/aai/validation/nodes/NodeValidatorSchemaIncompleteTest.java
index e40f9301..c6fe190d 100644
--- a/aai-schema-ingest/src/test/java/org/onap/aai/validation/nodes/NodeValidatorSchemaIncompleteTest.java
+++ b/aai-schema-ingest/src/test/java/org/onap/aai/validation/nodes/NodeValidatorSchemaIncompleteTest.java
@@ -20,18 +20,18 @@
 
 package org.onap.aai.validation.nodes;
 
-import org.eclipse.persistence.jaxb.dynamic.DynamicJAXBContext;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
+import org.onap.aai.config.NodesConfiguration;
 import org.onap.aai.nodes.NodeIngestor;
-import org.onap.aai.setup.SchemaLocationsBean;
+
 import org.onap.aai.setup.SchemaVersion;
-import org.onap.aai.setup.SchemaVersions;
+
 import org.onap.aai.testutils.SchemaIncompleteTranslator;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -48,11 +48,12 @@ import javax.xml.transform.TransformerException;
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
-@Ignore
+
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = {SchemaLocationsBean.class, SchemaVersions.class, SchemaIncompleteTranslator.class, NodeIngestor.class})
-@TestPropertySource(properties = { "schema.ingest.file = src/test/resources/forWiringTests/schema-ingest-wiring-test.properties" })
-//@SpringBootTest
+@ContextConfiguration(classes = { SchemaIncompleteTranslator.class, NodesConfiguration.class})
+
+@TestPropertySource(properties = { "schema.ingest.file = src/test/resources/forWiringTests/schema-ingest-wiring-test-local.properties" })
+@SpringBootTest
 public class NodeValidatorSchemaIncompleteTest {
     @Autowired
     NodeIngestor ni;
@@ -65,9 +66,9 @@ public class NodeValidatorSchemaIncompleteTest {
     //Throws a NullPointerException because a JavaType is referenced, but not defined
     @Test
     public void testIncompleteCombinedSchema() throws TransformerException, IOException, IllegalStateException {
-        thrown.expect(NullPointerException.class);
+        //thrown.expect(NullPointerException.class);
 
-        
+        //TODO Change for Exception
         ByteArrayOutputStream buffer = new ByteArrayOutputStream();
         printDocument(ni.getSchema(new SchemaVersion("v12")),buffer);
     }
@@ -84,5 +85,4 @@ public class NodeValidatorSchemaIncompleteTest {
         transformer.transform(new DOMSource(doc), 
              new StreamResult(new OutputStreamWriter(out, "UTF-8")));
     }
-
 }
diff --git a/aai-schema-ingest/src/test/java/org/onap/aai/validation/nodes/NodeValidatorSunnyDayTest.java b/aai-schema-ingest/src/test/java/org/onap/aai/validation/nodes/NodeValidatorSunnyDayTest.java
index 257d6e18..b69182fc 100644
--- a/aai-schema-ingest/src/test/java/org/onap/aai/validation/nodes/NodeValidatorSunnyDayTest.java
+++ b/aai-schema-ingest/src/test/java/org/onap/aai/validation/nodes/NodeValidatorSunnyDayTest.java
@@ -24,9 +24,8 @@ import static org.junit.Assert.*;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.onap.aai.nodes.NodeIngestor;
-import org.onap.aai.setup.SchemaLocationsBean;
-import org.onap.aai.setup.SchemaVersions;
+import org.onap.aai.config.NodesConfiguration;
+
 import org.onap.aai.testutils.GoodConfigForValidationTest;
 import org.onap.aai.validation.CheckEverythingStrategy;
 import org.onap.aai.validation.nodes.DefaultDuplicateNodeDefinitionValidationModule;
@@ -36,12 +35,12 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = {SchemaLocationsBean.class, SchemaVersions.class, GoodConfigForValidationTest.class, NodeIngestor.class,
+@ContextConfiguration(classes = {  NodesConfiguration.class, GoodConfigForValidationTest.class,
         CheckEverythingStrategy.class, DefaultDuplicateNodeDefinitionValidationModule.class, NodeValidator.class})
-@TestPropertySource(properties = { "schema.ingest.file = src/test/resources/forWiringTests/schema-ingest-wiring-test.properties" })
+@TestPropertySource(properties = { "schema.ingest.file = src/test/resources/forWiringTests/schema-ingest-wiring-test-local.properties" })
 @SpringBootTest
+
 public class NodeValidatorSunnyDayTest {
     @Autowired
     NodeValidator validator;
@@ -52,5 +51,4 @@ public class NodeValidatorSunnyDayTest {
         assertTrue(validator.validate());
         assertTrue("No errors found.".equals(validator.getErrorMsg()));
     }
-
 }
diff --git a/aai-schema-ingest/src/test/resources/edgeRules/test_v10.json b/aai-schema-ingest/src/test/resources/edgeRules/test_v10.json
new file mode 100644
index 00000000..66691ebf
--- /dev/null
+++ b/aai-schema-ingest/src/test/resources/edgeRules/test_v10.json
@@ -0,0 +1,48 @@
+{
+	"rules": [
+		{
+			"from": "foo",
+			"to": "bar",
+			"label": "eats",
+			"direction": "OUT",
+			"multiplicity": "One2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "${direction}",
+			"prevent-delete": "NONE",
+			"description": "Hard to describe"
+		},
+		{
+			"from": "foo",
+			"to": "bar",
+			"label": "eatz",
+			"direction": "IN",
+			"multiplicity": "One2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "${direction}",
+			"prevent-delete": "NONE",
+			"description": "Hard to describe"
+		},
+		{
+			"from": "foo",
+			"to": "baz",
+			"label": "isVeryHappyAbout",
+			"direction": "OUT",
+			"multiplicity": "One2Many",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "${direction}",
+			"prevent-delete": "NONE",
+			"description": "Hard to describe"
+		},
+		{
+			"from": "quux",
+			"to": "foo",
+			"label": "dancesWith",
+			"direction": "IN",
+			"multiplicity": "One2Many",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "${direction}",
+			"prevent-delete": "NONE",
+			"description": "Hard to describe"
+		}
+	]
+}
\ No newline at end of file
diff --git a/aai-schema-ingest/src/test/resources/edgeRules/test_v11.json b/aai-schema-ingest/src/test/resources/edgeRules/test_v11.json
new file mode 100644
index 00000000..4ca64030
--- /dev/null
+++ b/aai-schema-ingest/src/test/resources/edgeRules/test_v11.json
@@ -0,0 +1,124 @@
+{
+	"rules": [
+		{
+			"from": "l-interface",
+			"to": "logical-link",
+			"label": "tosca.relationships.network.LinksTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "logical-link",
+			"to": "l-interface",
+			"label": "org.onap.relationships.inventory.Source",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "false",
+			"description":""
+		},
+		{
+			"from": "logical-link",
+			"to": "l-interface",
+			"label": "org.onap.relationships.inventory.Destination",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "false",
+			"description":""
+		},
+		{
+			"from": "l-interface",
+			"to": "lag-interface",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "lag-interface",
+			"to": "logical-link",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "bloop",
+			"to": "bloop",
+			"label": "links",
+			"direction": "OUT",
+			"multiplicity": "ONE2ONE",
+			"contains-other-v": "IN",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "for testing same type direction flip requirement"
+		},
+        {
+            "from": "apple",
+            "to": "orange",
+            "label": "sitsBy",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "${direction}",
+            "prevent-delete": "NONE",
+            "default": "false",
+            "description":"for testing pairs with no default"
+        },
+        {
+            "from": "apple",
+            "to": "orange",
+            "label": "makesSaladWith",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "${direction}",
+            "prevent-delete": "NONE",
+            "default": "false",
+            "description":"for testing pairs with no default"
+        },
+        {
+            "from": "seed",
+            "to": "plant",
+            "label": "grows",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description":""
+        },
+        {
+            "from": "seed",
+            "to": "plant",
+            "label": "becomes",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "OUT",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description":""
+        }
+	]
+}
diff --git a/aai-schema-ingest/src/test/resources/edgeRules/test_v12.json b/aai-schema-ingest/src/test/resources/edgeRules/test_v12.json
new file mode 100644
index 00000000..483af52d
--- /dev/null
+++ b/aai-schema-ingest/src/test/resources/edgeRules/test_v12.json
@@ -0,0 +1,71 @@
+{
+	"rules": [
+		{
+			"from": "foo",
+			"to": "bar",
+			"label": "eats",
+			"direction": "OUT",
+			"multiplicity": "One2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "${direction}",
+			"prevent-delete": "NONE",
+			"description": "Hard to describe"
+		},
+		{
+			"from": "foo",
+			"to": "bar",
+			"label": "eatz",
+			"direction": "IN",
+			"multiplicity": "One2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "${direction}",
+			"prevent-delete": "NONE",
+			"description": "Hard to describe"
+		},
+		{
+			"from": "foo",
+			"to": "baz",
+			"label": "isVeryHappyAbout",
+			"direction": "OUT",
+			"multiplicity": "One2Many",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "${direction}",
+			"prevent-delete": "NONE",
+			"description": "Hard to describe"
+		},
+		{
+			"from": "quux",
+			"to": "foo",
+			"label": "dancesWith",
+			"direction": "IN",
+			"multiplicity": "One2Many",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "${direction}",
+			"prevent-delete": "NONE",
+			"description": "Hard to describe"
+		},
+        {
+            "from": "foo",
+            "to": "dog",
+            "label": "pets",
+            "direction": "OUT",
+            "multiplicity": "One2Many",
+            "contains-other-v": "NONE",
+            "delete-other-v": "${direction}",
+            "prevent-delete": "NONE",
+            "description": "Hard to describe"
+        },
+        {
+            "from": "dog",
+            "to": "puppy",
+            "label": "caresFor",
+            "direction": "OUT",
+            "multiplicity": "One2Many",
+            "contains-other-v": "NONE",
+            "delete-other-v": "${direction}",
+            "prevent-delete": "NONE",
+            "description": "Hard to describe",
+            "default": "true"
+        }
+	]
+}
diff --git a/aai-schema-ingest/src/test/resources/edgeRules/test_v13.json b/aai-schema-ingest/src/test/resources/edgeRules/test_v13.json
new file mode 100644
index 00000000..483af52d
--- /dev/null
+++ b/aai-schema-ingest/src/test/resources/edgeRules/test_v13.json
@@ -0,0 +1,71 @@
+{
+	"rules": [
+		{
+			"from": "foo",
+			"to": "bar",
+			"label": "eats",
+			"direction": "OUT",
+			"multiplicity": "One2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "${direction}",
+			"prevent-delete": "NONE",
+			"description": "Hard to describe"
+		},
+		{
+			"from": "foo",
+			"to": "bar",
+			"label": "eatz",
+			"direction": "IN",
+			"multiplicity": "One2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "${direction}",
+			"prevent-delete": "NONE",
+			"description": "Hard to describe"
+		},
+		{
+			"from": "foo",
+			"to": "baz",
+			"label": "isVeryHappyAbout",
+			"direction": "OUT",
+			"multiplicity": "One2Many",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "${direction}",
+			"prevent-delete": "NONE",
+			"description": "Hard to describe"
+		},
+		{
+			"from": "quux",
+			"to": "foo",
+			"label": "dancesWith",
+			"direction": "IN",
+			"multiplicity": "One2Many",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "${direction}",
+			"prevent-delete": "NONE",
+			"description": "Hard to describe"
+		},
+        {
+            "from": "foo",
+            "to": "dog",
+            "label": "pets",
+            "direction": "OUT",
+            "multiplicity": "One2Many",
+            "contains-other-v": "NONE",
+            "delete-other-v": "${direction}",
+            "prevent-delete": "NONE",
+            "description": "Hard to describe"
+        },
+        {
+            "from": "dog",
+            "to": "puppy",
+            "label": "caresFor",
+            "direction": "OUT",
+            "multiplicity": "One2Many",
+            "contains-other-v": "NONE",
+            "delete-other-v": "${direction}",
+            "prevent-delete": "NONE",
+            "description": "Hard to describe",
+            "default": "true"
+        }
+	]
+}
diff --git a/aai-schema-ingest/src/test/resources/edgeRules/test_v14.json b/aai-schema-ingest/src/test/resources/edgeRules/test_v14.json
new file mode 100644
index 00000000..483af52d
--- /dev/null
+++ b/aai-schema-ingest/src/test/resources/edgeRules/test_v14.json
@@ -0,0 +1,71 @@
+{
+	"rules": [
+		{
+			"from": "foo",
+			"to": "bar",
+			"label": "eats",
+			"direction": "OUT",
+			"multiplicity": "One2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "${direction}",
+			"prevent-delete": "NONE",
+			"description": "Hard to describe"
+		},
+		{
+			"from": "foo",
+			"to": "bar",
+			"label": "eatz",
+			"direction": "IN",
+			"multiplicity": "One2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "${direction}",
+			"prevent-delete": "NONE",
+			"description": "Hard to describe"
+		},
+		{
+			"from": "foo",
+			"to": "baz",
+			"label": "isVeryHappyAbout",
+			"direction": "OUT",
+			"multiplicity": "One2Many",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "${direction}",
+			"prevent-delete": "NONE",
+			"description": "Hard to describe"
+		},
+		{
+			"from": "quux",
+			"to": "foo",
+			"label": "dancesWith",
+			"direction": "IN",
+			"multiplicity": "One2Many",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "${direction}",
+			"prevent-delete": "NONE",
+			"description": "Hard to describe"
+		},
+        {
+            "from": "foo",
+            "to": "dog",
+            "label": "pets",
+            "direction": "OUT",
+            "multiplicity": "One2Many",
+            "contains-other-v": "NONE",
+            "delete-other-v": "${direction}",
+            "prevent-delete": "NONE",
+            "description": "Hard to describe"
+        },
+        {
+            "from": "dog",
+            "to": "puppy",
+            "label": "caresFor",
+            "direction": "OUT",
+            "multiplicity": "One2Many",
+            "contains-other-v": "NONE",
+            "delete-other-v": "${direction}",
+            "prevent-delete": "NONE",
+            "description": "Hard to describe",
+            "default": "true"
+        }
+	]
+}
diff --git a/aai-schema-ingest/src/test/resources/edgeRules/test_v15.json b/aai-schema-ingest/src/test/resources/edgeRules/test_v15.json
new file mode 100644
index 00000000..0932014c
--- /dev/null
+++ b/aai-schema-ingest/src/test/resources/edgeRules/test_v15.json
@@ -0,0 +1,275 @@
+{
+	"rules": [
+		{
+			"from": "foo",
+			"to": "bar",
+			"label": "eats",
+			"direction": "OUT",
+			"multiplicity": "One2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "${direction}",
+			"prevent-delete": "NONE",
+			"description": "Hard to describe"
+		},
+		{
+			"from": "foo",
+			"to": "bar",
+			"label": "eatz",
+			"direction": "IN",
+			"multiplicity": "One2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "${direction}",
+			"prevent-delete": "NONE",
+			"description": "Hard to describe"
+		},
+		{
+			"from": "foo",
+			"to": "baz",
+			"label": "isVeryHappyAbout",
+			"direction": "OUT",
+			"multiplicity": "One2Many",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "${direction}",
+			"prevent-delete": "NONE",
+			"description": "Hard to describe"
+		},
+		{
+			"from": "quux",
+			"to": "foo",
+			"label": "dancesWith",
+			"direction": "IN",
+			"multiplicity": "One2Many",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "${direction}",
+			"prevent-delete": "NONE",
+			"description": "Hard to describe"
+		},
+        {
+            "from": "foo",
+            "to": "dog",
+            "label": "pets",
+            "direction": "OUT",
+            "multiplicity": "One2Many",
+            "contains-other-v": "NONE",
+            "delete-other-v": "${direction}",
+            "prevent-delete": "NONE",
+            "description": "Hard to describe"
+        },
+        {
+            "from": "dog",
+            "to": "puppy",
+            "label": "caresFor",
+            "direction": "OUT",
+            "multiplicity": "One2Many",
+            "contains-other-v": "NONE",
+            "delete-other-v": "${direction}",
+            "prevent-delete": "NONE",
+            "description": "Hard to describe",
+            "default": "true"
+        },
+        {
+            "from": "l-interface",
+            "to": "logical-link",
+            "label": "tosca.relationships.network.LinksTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description":""
+        },
+        {
+            "from": "logical-link",
+            "to": "l-interface",
+            "label": "org.onap.relationships.inventory.Source",
+            "direction": "OUT",
+            "multiplicity": "ONE2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "false",
+            "description":""
+        },
+        {
+            "from": "logical-link",
+            "to": "l-interface",
+            "label": "org.onap.relationships.inventory.Destination",
+            "direction": "OUT",
+            "multiplicity": "ONE2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "false",
+            "description":""
+        },
+        {
+            "from": "l-interface",
+            "to": "lag-interface",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description":""
+        },
+        {
+            "from": "lag-interface",
+            "to": "logical-link",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description":""
+        },
+        {
+            "from": "bloop",
+            "to": "bloop",
+            "label": "links",
+            "direction": "OUT",
+            "multiplicity": "ONE2ONE",
+            "contains-other-v": "IN",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "for testing same type direction flip requirement"
+        },
+        {
+            "from": "parent",
+            "to": "notation",
+            "label": "has",
+            "direction": "OUT",
+            "multiplicity": "Many2Many",
+            "contains-other-v": "${direction}",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "description": "parent contains notation"
+        },
+        {
+            "from": "not-notation",
+            "to": "parent",
+            "label": "contains",
+            "direction": "OUT",
+            "multiplicity": "Many2Many",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "description": "parent contains not-notation"
+        },
+        {
+            "from": "parent",
+            "to": "out-out",
+            "label": "eats",
+            "direction": "OUT",
+            "multiplicity": "Many2Many",
+            "contains-other-v": "OUT",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "description": "parent contains out-out"
+        },
+        {
+            "from": "parent",
+            "to": "in-in",
+            "label": "verbs",
+            "direction": "IN",
+            "multiplicity": "Many2Many",
+            "contains-other-v": "IN",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "description": "parent contains in-in"
+        },
+        {
+            "from": "out-in",
+            "to": "parent",
+            "label": "alarms",
+            "direction": "OUT",
+            "multiplicity": "Many2Many",
+            "contains-other-v": "IN",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "description": "parent contains out-in"
+        },
+        {
+            "from": "in-out",
+            "to": "parent",
+            "label": "befriends",
+            "direction": "IN",
+            "multiplicity": "Many2Many",
+            "contains-other-v": "OUT",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "description": "parent contains in-out"
+        },
+        {
+            "from": "parent",
+            "to": "grandparent1",
+            "label": "has",
+            "direction": "OUT",
+            "multiplicity": "Many2Many",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "description": "parent contained by grandparent1"
+        },
+        {
+            "from": "grandparent2",
+            "to": "parent",
+            "label": "contains",
+            "direction": "OUT",
+            "multiplicity": "Many2Many",
+            "contains-other-v": "${direction}",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "description": "parent contained by grandparent2"
+        },
+        {
+            "from": "parent",
+            "to": "grandparent3",
+            "label": "eats",
+            "direction": "OUT",
+            "multiplicity": "Many2Many",
+            "contains-other-v": "IN",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "description": "parent contained by grandparent3"
+        },
+        {
+            "from": "parent",
+            "to": "grandparent4",
+            "label": "verbs",
+            "direction": "IN",
+            "multiplicity": "Many2Many",
+            "contains-other-v": "OUT",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "description": "parent contained by grandparent4"
+        },
+        {
+            "from": "grandparent5",
+            "to": "parent",
+            "label": "alarms",
+            "direction": "OUT",
+            "multiplicity": "Many2Many",
+            "contains-other-v": "OUT",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "description": "parent contained by grandparent5"
+        },
+        {
+            "from": "grandparent6",
+            "to": "parent",
+            "label": "befriends",
+            "direction": "IN",
+            "multiplicity": "Many2Many",
+            "contains-other-v": "IN",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "description": "parent contained by grandparent6"
+        }
+	]
+}
diff --git a/aai-schema-ingest/src/test/resources/edgeRules/test_v8.json b/aai-schema-ingest/src/test/resources/edgeRules/test_v8.json
new file mode 100644
index 00000000..483af52d
--- /dev/null
+++ b/aai-schema-ingest/src/test/resources/edgeRules/test_v8.json
@@ -0,0 +1,71 @@
+{
+	"rules": [
+		{
+			"from": "foo",
+			"to": "bar",
+			"label": "eats",
+			"direction": "OUT",
+			"multiplicity": "One2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "${direction}",
+			"prevent-delete": "NONE",
+			"description": "Hard to describe"
+		},
+		{
+			"from": "foo",
+			"to": "bar",
+			"label": "eatz",
+			"direction": "IN",
+			"multiplicity": "One2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "${direction}",
+			"prevent-delete": "NONE",
+			"description": "Hard to describe"
+		},
+		{
+			"from": "foo",
+			"to": "baz",
+			"label": "isVeryHappyAbout",
+			"direction": "OUT",
+			"multiplicity": "One2Many",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "${direction}",
+			"prevent-delete": "NONE",
+			"description": "Hard to describe"
+		},
+		{
+			"from": "quux",
+			"to": "foo",
+			"label": "dancesWith",
+			"direction": "IN",
+			"multiplicity": "One2Many",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "${direction}",
+			"prevent-delete": "NONE",
+			"description": "Hard to describe"
+		},
+        {
+            "from": "foo",
+            "to": "dog",
+            "label": "pets",
+            "direction": "OUT",
+            "multiplicity": "One2Many",
+            "contains-other-v": "NONE",
+            "delete-other-v": "${direction}",
+            "prevent-delete": "NONE",
+            "description": "Hard to describe"
+        },
+        {
+            "from": "dog",
+            "to": "puppy",
+            "label": "caresFor",
+            "direction": "OUT",
+            "multiplicity": "One2Many",
+            "contains-other-v": "NONE",
+            "delete-other-v": "${direction}",
+            "prevent-delete": "NONE",
+            "description": "Hard to describe",
+            "default": "true"
+        }
+	]
+}
diff --git a/aai-schema-ingest/src/test/resources/edgeRules/test_v9.json b/aai-schema-ingest/src/test/resources/edgeRules/test_v9.json
new file mode 100644
index 00000000..6fa9c6c4
--- /dev/null
+++ b/aai-schema-ingest/src/test/resources/edgeRules/test_v9.json
@@ -0,0 +1,4 @@
+{
+	"rules": [
+	]
+}
diff --git a/aai-schema-ingest/src/test/resources/edgerequests.json b/aai-schema-ingest/src/test/resources/edgerequests.json
new file mode 100644
index 00000000..0878686f
--- /dev/null
+++ b/aai-schema-ingest/src/test/resources/edgerequests.json
@@ -0,0 +1,50 @@
+{
+    "mock-uri":
+    [
+        {
+            "aai-uri": "/versions",
+            "response-file": "payload/versions.json",
+            "content": "application/json;charset=UTF-8"
+        },
+        {
+            "aai-uri": "/edgerules?version=v8",
+            "response-file": "edgeRules/test_v8.json",
+            "content": "application/json;charset=UTF-8"
+        },
+        {
+            "aai-uri": "/edgerules?version=v9",
+            "response-file": "edgeRules/test_v9.json",
+            "content": "application/json;charset=UTF-8"
+        },
+        {
+            "aai-uri": "/edgerules?version=v10",
+            "response-file": "edgeRules/test_v10.json",
+            "content": "application/json;charset=UTF-8"
+        },
+        {
+            "aai-uri": "/edgerules?version=v11",
+            "response-file": "edgeRules/test_v11.json",
+            "content": "application/json;charset=UTF-8"
+        },
+        {
+            "aai-uri": "/edgerules?version=v12",
+            "response-file": "edgeRules/test_v12.json",
+            "content": "application/json;charset=UTF-8"
+        },
+        {
+            "aai-uri": "/edgerules?version=v13",
+            "response-file": "edgeRules/test_v13.json",
+            "content": "application/json;charset=UTF-8"
+        },
+        {
+            "aai-uri": "/edgerules?version=v14",
+            "response-file": "edgeRules/test_v14.json",
+            "content": "application/json;charset=UTF-8"
+        },
+        {
+            "aai-uri": "/edgerules?version=v15",
+            "response-file": "edgeRules/test_v15.json",
+            "content": "application/json;charset=UTF-8"
+        }
+    ]
+}
diff --git a/aai-schema-ingest/src/test/resources/forWiringTests/aai_oxm_v13.xml b/aai-schema-ingest/src/test/resources/forWiringTests/aai_oxm_v13.xml
index ec814118..1c862965 100644
--- a/aai-schema-ingest/src/test/resources/forWiringTests/aai_oxm_v13.xml
+++ b/aai-schema-ingest/src/test/resources/forWiringTests/aai_oxm_v13.xml
@@ -4627,4 +4627,5 @@
 				<xml-property name="container" value="evcs"/>
 			</xml-properties>
 		</java-type>
-    </java-types>\n</xml-bindings>
+    </java-types>
+</xml-bindings>
diff --git a/aai-schema-ingest/src/test/resources/forWiringTests/schema-ingest-ss-wiring-test.properties b/aai-schema-ingest/src/test/resources/forWiringTests/schema-ingest-ss-wiring-test.properties
new file mode 100644
index 00000000..d27198da
--- /dev/null
+++ b/aai-schema-ingest/src/test/resources/forWiringTests/schema-ingest-ss-wiring-test.properties
@@ -0,0 +1,20 @@
+schema.configuration.location=NA
+server.local.startpath=src/main/resources/
+schema.service.base.url=https://localhost:8452/aai/schema-service/v1/
+schema.service.nodes.endpoint=nodes?version=
+schema.service.edges.endpoint=edgerules?version=
+schema.service.versions.endpoint=versions
+#Remove the below once we remove dependencies on schema-version value
+schema.version.list=v8,v9,v10,v11,v12,v13,v14,v15
+schema.version.depth.start=v10
+schema.version.related.link.start=v10
+schema.version.app.root.start=v11
+schema.version.namespace.change.start=v11
+schema.version.edge.label.start=v12
+schema.version.api.default=v15
+schema.local=true
+mock.filename=mockrequests
+spring.application.name=aai
+schema.translator.list=schema-service
+schema.service.client=mock-no-auth
+
diff --git a/aai-schema-ingest/src/test/resources/forWiringTests/schema-ingest-wiring-test-local-node.properties b/aai-schema-ingest/src/test/resources/forWiringTests/schema-ingest-wiring-test-local-node.properties
new file mode 100644
index 00000000..5d1173d0
--- /dev/null
+++ b/aai-schema-ingest/src/test/resources/forWiringTests/schema-ingest-wiring-test-local-node.properties
@@ -0,0 +1,14 @@
+schema.configuration.location=NA
+schema.nodes.location=src/test/resources/oxm/
+schema.edges.location=src/test/resources/edgeRules/
+schema.version.list=v9,v10,v11,v12,v13,v14,v15
+schema.version.depth.start=v10
+schema.version.related.link.start=v10
+schema.version.app.root.start=v11
+schema.version.namespace.change.start=v11
+schema.version.edge.label.start=v12
+schema.version.api.default=v15
+server.local.startpath=src/main/resources/
+schema.local=true
+spring.application.name=aai
+schema.translator.list=config
diff --git a/aai-schema-ingest/src/test/resources/forWiringTests/schema-ingest-wiring-test-local.properties b/aai-schema-ingest/src/test/resources/forWiringTests/schema-ingest-wiring-test-local.properties
new file mode 100644
index 00000000..c213a558
--- /dev/null
+++ b/aai-schema-ingest/src/test/resources/forWiringTests/schema-ingest-wiring-test-local.properties
@@ -0,0 +1,15 @@
+schema.configuration.location=NA
+schema.nodes.location=src/test/resources/oxm/
+schema.edges.location=src/test/resources/edgeRules/
+schema.version.list=v8,v9,v10,v11,v12,v13,v14,v15
+schema.version.depth.start=v10
+schema.version.related.link.start=v10
+schema.version.app.root.start=v11
+schema.version.namespace.change.start=v11
+schema.version.edge.label.start=v12
+schema.version.api.default=v15
+server.local.startpath=src/main/resources/
+schema.local=true
+spring.application.name=aai
+schema.translator.list=config
+
diff --git a/aai-schema-ingest/src/test/resources/forWiringTests/schema-ingest-wiring-test.properties b/aai-schema-ingest/src/test/resources/forWiringTests/schema-ingest-wiring-test.properties
index 393b8f12..f372d06d 100644
--- a/aai-schema-ingest/src/test/resources/forWiringTests/schema-ingest-wiring-test.properties
+++ b/aai-schema-ingest/src/test/resources/forWiringTests/schema-ingest-wiring-test.properties
@@ -1,10 +1,20 @@
 schema.configuration.location=NA
 schema.nodes.location=src/test/resources/oxm/
 schema.edges.location=src/test/resources/edgeRules/
-schema.version.list=v7,v8,v9,v10,v11,v12,v13,v14
-schema.version.depth.start=v9
+schema.version.list=v8,v9,v10,v11,v12,v13,v14,v15
+schema.version.depth.start=v10
 schema.version.related.link.start=v10
 schema.version.app.root.start=v11
 schema.version.namespace.change.start=v11
 schema.version.edge.label.start=v12
-schema.version.api.default=v14
\ No newline at end of file
+schema.version.api.default=v15
+server.local.startpath=src/main/resources/
+schema.service.base.url=https://localhost:8452/aai/schema-service/v1
+schema.service.nodes.endpoint=node-schema?version=
+schema.service.edges.endpoint=edgerules?version=
+schema.service.versions.endpoint=versions
+schema.local=false
+mock.filename=edgerequests
+spring.application.name=aai
+schema.translator.list=schema-service
+schema.service.client=mock-no-auth
diff --git a/aai-schema-ingest/src/test/resources/mockrequests.json b/aai-schema-ingest/src/test/resources/mockrequests.json
new file mode 100644
index 00000000..7d669007
--- /dev/null
+++ b/aai-schema-ingest/src/test/resources/mockrequests.json
@@ -0,0 +1,52 @@
+{
+    "mock-uri":
+    [
+    {
+        "aai-uri": "/versions",
+        "response-file": "payload/versions.json",
+        "content": "application/json;charset=UTF-8"
+    },
+    {
+        "aai-uri": "/nodes?version=v8",
+        "response-file": "oxm/test_combined_network_business_v8.xml",
+        "content": "application/json;charset=UTF-8"
+    },
+        {
+            "aai-uri": "/nodes?version=v9",
+            "response-file": "oxm/test_combined_network_business_v9.xml",
+            "content": "application/json;charset=UTF-8"
+        },
+        {
+            "aai-uri": "/nodes?version=v10",
+            "response-file": "oxm/test_combined_network_business_v10.xml",
+            "content": "application/json;charset=UTF-8"
+        },
+        {
+            "aai-uri": "/nodes?version=v11",
+            "response-file": "oxm/test_combined_network_business_v11.xml",
+            "content": "application/json;charset=UTF-8"
+        },
+        {
+            "aai-uri": "/nodes?version=v12",
+            "response-file": "oxm/test_combined_network_business_v12.xml",
+            "content": "application/json;charset=UTF-8"
+        },
+        {
+            "aai-uri": "/nodes?version=v13",
+            "response-file": "oxm/test_combined_v13.xml",
+            "content": "application/json;charset=UTF-8"
+        },
+        {
+            "aai-uri": "/nodes?version=v14",
+            "response-file": "oxm/test_combined_network_business_v14.xml",
+            "content": "application/json;charset=UTF-8"
+        },
+        {
+            "aai-uri": "/nodes?version=v15",
+            "response-file": "oxm/test_combined_network_business_v15.xml",
+            "content": "application/json;charset=UTF-8"
+        }
+    ]
+
+
+}
diff --git a/aai-schema-ingest/src/test/resources/oxm/test_business_v10.xml b/aai-schema-ingest/src/test/resources/oxm/test_business_v10.xml
index 5ead4178..c3b60dbd 100644
--- a/aai-schema-ingest/src/test/resources/oxm/test_business_v10.xml
+++ b/aai-schema-ingest/src/test/resources/oxm/test_business_v10.xml
@@ -19,9 +19,9 @@
   ============LICENSE_END=========================================================
   -->
 
-<xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.v12" xml-mapping-metadata-complete="true">
+<xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.v10" xml-mapping-metadata-complete="true">
 	<xml-schema element-form-default="QUALIFIED">
-		<xml-ns namespace-uri="http://org.onap.aai.inventory/v12" />
+		<xml-ns namespace-uri="http://org.onap.aai.inventory/v10" />
 	</xml-schema>
 	<java-types>
 
@@ -47,4 +47,4 @@
 		</java-type>
 		
 	</java-types>
-</xml-bindings>
\ No newline at end of file
+</xml-bindings>
diff --git a/aai-schema-ingest/src/test/resources/oxm/test_combined_network_business_v10.xml b/aai-schema-ingest/src/test/resources/oxm/test_combined_network_business_v10.xml
new file mode 100644
index 00000000..a0fd77ca
--- /dev/null
+++ b/aai-schema-ingest/src/test/resources/oxm/test_combined_network_business_v10.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+  ============LICENSE_START=======================================================
+  org.openecomp.aai
+  ================================================================================
+  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+  ================================================================================
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  ============LICENSE_END=========================================================
+  -->
+
+<xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.v10" xml-mapping-metadata-complete="true">
+    <xml-schema element-form-default="QUALIFIED">
+        <xml-ns namespace-uri="http://org.onap.aai.inventory/v10" />
+    </xml-schema>
+    <java-types>
+
+        <java-type name="Foo">
+            <xml-root-element name="foo" />
+            <java-attributes>
+                <xml-element java-attribute="fooId" name="foo-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id of Foo.  This is unique across the graph." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="fooName" name="foo-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of Foo." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="quantity" name="quantity" required="false" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="How many." />
+                    </xml-properties>
+                </xml-element>
+
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="General purpose metasyntactic variable" />
+                <xml-property name="nameProps" value="foo-name" />
+                <xml-property name="uniqueProps" value="foo-id" />
+            </xml-properties>
+        </java-type>
+
+
+
+        <java-type name="Bar">
+            <xml-root-element name="bar" />
+            <java-attributes>
+                <xml-element java-attribute="barId" name="bar-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id of Bar  This is unique across the graph." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="quantity" name="quantity" required="false" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="How many." />
+                    </xml-properties>
+                </xml-element>
+
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="General purpose metasyntactic variable" />
+                <xml-property name="uniqueProps" value="bar-id" />
+            </xml-properties>
+        </java-type>
+
+
+    </java-types>
+</xml-bindings>
+
+
+
diff --git a/aai-schema-ingest/src/test/resources/oxm/test_combined_network_business_v11.xml b/aai-schema-ingest/src/test/resources/oxm/test_combined_network_business_v11.xml
new file mode 100644
index 00000000..17ae17af
--- /dev/null
+++ b/aai-schema-ingest/src/test/resources/oxm/test_combined_network_business_v11.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+  ============LICENSE_START=======================================================
+  org.openecomp.aai
+  ================================================================================
+  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+  ================================================================================
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  ============LICENSE_END=========================================================
+  -->
+
+<xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.v11" xml-mapping-metadata-complete="true">
+    <xml-schema element-form-default="QUALIFIED">
+        <xml-ns namespace-uri="http://org.onap.aai.inventory/v11" />
+    </xml-schema>
+    <java-types>
+
+        <java-type name="Foo">
+            <xml-root-element name="foo" />
+            <java-attributes>
+                <xml-element java-attribute="fooId" name="foo-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id of Foo.  This is unique across the graph." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="fooName" name="foo-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of Foo." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="quantity" name="quantity" required="false" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="How many." />
+                    </xml-properties>
+                </xml-element>
+
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="General purpose metasyntactic variable" />
+                <xml-property name="nameProps" value="foo-name" />
+                <xml-property name="uniqueProps" value="foo-id" />
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Quux">
+            <xml-root-element name="quux" />
+            <java-attributes>
+                <xml-element java-attribute="qManagerName" name="q-manager-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id of Quux owner.  This is unique across the graph." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="color" name="color" required="false" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="color" />
+                    </xml-properties>
+                </xml-element>
+
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="General purpose metasyntactic variable" />
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Bar">
+            <xml-root-element name="bar" />
+            <java-attributes>
+                <xml-element java-attribute="barId" name="bar-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id of Bar  This is unique across the graph." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="quantity" name="quantity" required="false" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="How many." />
+                    </xml-properties>
+                </xml-element>
+
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="General purpose metasyntactic variable" />
+                <xml-property name="uniqueProps" value="bar-id" />
+            </xml-properties>
+        </java-type>
+
+
+    </java-types>
+</xml-bindings>
+
+
+
diff --git a/aai-schema-ingest/src/test/resources/oxm/test_combined_network_business_v12.xml b/aai-schema-ingest/src/test/resources/oxm/test_combined_network_business_v12.xml
new file mode 100644
index 00000000..d59cd5a9
--- /dev/null
+++ b/aai-schema-ingest/src/test/resources/oxm/test_combined_network_business_v12.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+  ============LICENSE_START=======================================================
+  org.openecomp.aai
+  ================================================================================
+  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+  ================================================================================
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  ============LICENSE_END=========================================================
+  -->
+
+<xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.v12" xml-mapping-metadata-complete="true">
+    <xml-schema element-form-default="QUALIFIED">
+        <xml-ns namespace-uri="http://org.onap.aai.inventory/v12" />
+    </xml-schema>
+    <java-types>
+
+        <java-type name="Foo">
+            <xml-root-element name="foo" />
+            <java-attributes>
+                <xml-element java-attribute="fooId" name="foo-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id of Foo.  This is unique across the graph." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="fooName" name="foo-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of Foo." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="quantity" name="quantity" required="false" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="How many." />
+                    </xml-properties>
+                </xml-element>
+
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="General purpose metasyntactic variable" />
+                <xml-property name="nameProps" value="foo-name" />
+                <xml-property name="uniqueProps" value="foo-id" />
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Quux">
+            <xml-root-element name="quux" />
+            <java-attributes>
+                <xml-element java-attribute="qManagerName" name="q-manager-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id of Quux owner.  This is unique across the graph." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="color" name="color" required="false" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="color" />
+                    </xml-properties>
+                </xml-element>
+
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="General purpose metasyntactic variable" />
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Bar">
+            <xml-root-element name="bar" />
+            <java-attributes>
+                <xml-element java-attribute="barId" name="bar-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id of Bar  This is unique across the graph." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="quantity" name="quantity" required="false" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="How many." />
+                    </xml-properties>
+                </xml-element>
+
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="General purpose metasyntactic variable" />
+                <xml-property name="uniqueProps" value="bar-id" />
+            </xml-properties>
+        </java-type>
+
+
+    </java-types>
+</xml-bindings>
+
+
+
diff --git a/aai-schema-ingest/src/test/resources/oxm/test_combined_network_business_v13.xml b/aai-schema-ingest/src/test/resources/oxm/test_combined_network_business_v13.xml
new file mode 100644
index 00000000..f3fef9a5
--- /dev/null
+++ b/aai-schema-ingest/src/test/resources/oxm/test_combined_network_business_v13.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+  ============LICENSE_START=======================================================
+  org.openecomp.aai
+  ================================================================================
+  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+  ================================================================================
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  ============LICENSE_END=========================================================
+  -->
+
+<xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.v13" xml-mapping-metadata-complete="true">
+    <xml-schema element-form-default="QUALIFIED">
+        <xml-ns namespace-uri="http://org.onap.aai.inventory/v13" />
+    </xml-schema>
+    <java-types>
+
+        <java-type name="Foo">
+            <xml-root-element name="foo" />
+            <java-attributes>
+                <xml-element java-attribute="fooId" name="foo-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id of Foo.  This is unique across the graph." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="fooName" name="foo-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of Foo." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="quantity" name="quantity" required="false" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="How many." />
+                    </xml-properties>
+                </xml-element>
+
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="General purpose metasyntactic variable" />
+                <xml-property name="nameProps" value="foo-name" />
+                <xml-property name="uniqueProps" value="foo-id" />
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Quux">
+            <xml-root-element name="quux" />
+            <java-attributes>
+                <xml-element java-attribute="qManagerName" name="q-manager-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id of Quux owner.  This is unique across the graph." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="color" name="color" required="false" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="color" />
+                    </xml-properties>
+                </xml-element>
+
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="General purpose metasyntactic variable" />
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Bar">
+            <xml-root-element name="bar" />
+            <java-attributes>
+                <xml-element java-attribute="barId" name="bar-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id of Bar  This is unique across the graph." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="quantity" name="quantity" required="false" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="How many." />
+                    </xml-properties>
+                </xml-element>
+
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="General purpose metasyntactic variable" />
+                <xml-property name="uniqueProps" value="bar-id" />
+            </xml-properties>
+        </java-type>
+
+
+    </java-types>
+</xml-bindings>
+
+
+
diff --git a/aai-schema-ingest/src/test/resources/oxm/test_combined_network_business_v14.xml b/aai-schema-ingest/src/test/resources/oxm/test_combined_network_business_v14.xml
new file mode 100644
index 00000000..a0cc0ed4
--- /dev/null
+++ b/aai-schema-ingest/src/test/resources/oxm/test_combined_network_business_v14.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+  ============LICENSE_START=======================================================
+  org.openecomp.aai
+  ================================================================================
+  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+  ================================================================================
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  ============LICENSE_END=========================================================
+  -->
+
+<xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.v14" xml-mapping-metadata-complete="true">
+    <xml-schema element-form-default="QUALIFIED">
+        <xml-ns namespace-uri="http://org.onap.aai.inventory/v14" />
+    </xml-schema>
+    <java-types>
+
+        <java-type name="Foo">
+            <xml-root-element name="foo" />
+            <java-attributes>
+                <xml-element java-attribute="fooId" name="foo-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id of Foo.  This is unique across the graph." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="fooName" name="foo-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of Foo." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="quantity" name="quantity" required="false" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="How many." />
+                    </xml-properties>
+                </xml-element>
+
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="General purpose metasyntactic variable" />
+                <xml-property name="nameProps" value="foo-name" />
+                <xml-property name="uniqueProps" value="foo-id" />
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Quux">
+            <xml-root-element name="quux" />
+            <java-attributes>
+                <xml-element java-attribute="qManagerName" name="q-manager-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id of Quux owner.  This is unique across the graph." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="color" name="color" required="false" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="color" />
+                    </xml-properties>
+                </xml-element>
+
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="General purpose metasyntactic variable" />
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Bar">
+            <xml-root-element name="bar" />
+            <java-attributes>
+                <xml-element java-attribute="barId" name="bar-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id of Bar  This is unique across the graph." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="quantity" name="quantity" required="false" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="How many." />
+                    </xml-properties>
+                </xml-element>
+
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="General purpose metasyntactic variable" />
+                <xml-property name="uniqueProps" value="bar-id" />
+            </xml-properties>
+        </java-type>
+
+
+    </java-types>
+</xml-bindings>
+
+
+
diff --git a/aai-schema-ingest/src/test/resources/oxm/test_combined_network_business_v15.xml b/aai-schema-ingest/src/test/resources/oxm/test_combined_network_business_v15.xml
new file mode 100644
index 00000000..b1c5519c
--- /dev/null
+++ b/aai-schema-ingest/src/test/resources/oxm/test_combined_network_business_v15.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+  ============LICENSE_START=======================================================
+  org.openecomp.aai
+  ================================================================================
+  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+  ================================================================================
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  ============LICENSE_END=========================================================
+  -->
+
+<xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.v15" xml-mapping-metadata-complete="true">
+    <xml-schema element-form-default="QUALIFIED">
+        <xml-ns namespace-uri="http://org.onap.aai.inventory/v15" />
+    </xml-schema>
+    <java-types>
+
+        <java-type name="Foo">
+            <xml-root-element name="foo" />
+            <java-attributes>
+                <xml-element java-attribute="fooId" name="foo-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id of Foo.  This is unique across the graph." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="fooName" name="foo-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of Foo." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="quantity" name="quantity" required="false" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="How many." />
+                    </xml-properties>
+                </xml-element>
+
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="General purpose metasyntactic variable" />
+                <xml-property name="nameProps" value="foo-name" />
+                <xml-property name="uniqueProps" value="foo-id" />
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Quux">
+            <xml-root-element name="quux" />
+            <java-attributes>
+                <xml-element java-attribute="qManagerName" name="q-manager-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id of Quux owner.  This is unique across the graph." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="color" name="color" required="false" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="color" />
+                    </xml-properties>
+                </xml-element>
+
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="General purpose metasyntactic variable" />
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Bar">
+            <xml-root-element name="bar" />
+            <java-attributes>
+                <xml-element java-attribute="barId" name="bar-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id of Bar  This is unique across the graph." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="quantity" name="quantity" required="false" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="How many." />
+                    </xml-properties>
+                </xml-element>
+
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="General purpose metasyntactic variable" />
+                <xml-property name="uniqueProps" value="bar-id" />
+            </xml-properties>
+        </java-type>
+
+
+    </java-types>
+</xml-bindings>
+
+
+
diff --git a/aai-schema-ingest/src/test/resources/oxm/test_combined_network_business_v8.xml b/aai-schema-ingest/src/test/resources/oxm/test_combined_network_business_v8.xml
new file mode 100644
index 00000000..06c7c4e5
--- /dev/null
+++ b/aai-schema-ingest/src/test/resources/oxm/test_combined_network_business_v8.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+  ============LICENSE_START=======================================================
+  org.openecomp.aai
+  ================================================================================
+  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+  ================================================================================
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  ============LICENSE_END=========================================================
+  -->
+
+<xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.v8" xml-mapping-metadata-complete="true">
+    <xml-schema element-form-default="QUALIFIED">
+        <xml-ns namespace-uri="http://org.onap.aai.inventory/v8" />
+    </xml-schema>
+    <java-types>
+
+        <java-type name="Foo">
+            <xml-root-element name="foo" />
+            <java-attributes>
+                <xml-element java-attribute="fooId" name="foo-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id of Foo.  This is unique across the graph." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="fooName" name="foo-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of Foo." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="quantity" name="quantity" required="false" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="How many." />
+                    </xml-properties>
+                </xml-element>
+
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="General purpose metasyntactic variable" />
+                <xml-property name="nameProps" value="foo-name" />
+                <xml-property name="uniqueProps" value="foo-id" />
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Quux">
+            <xml-root-element name="quux" />
+            <java-attributes>
+                <xml-element java-attribute="qManagerName" name="q-manager-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id of Quux owner.  This is unique across the graph." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="color" name="color" required="false" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="color" />
+                    </xml-properties>
+                </xml-element>
+
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="General purpose metasyntactic variable" />
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Bar">
+            <xml-root-element name="bar" />
+            <java-attributes>
+                <xml-element java-attribute="barId" name="bar-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id of Bar  This is unique across the graph." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="quantity" name="quantity" required="false" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="How many." />
+                    </xml-properties>
+                </xml-element>
+
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="General purpose metasyntactic variable" />
+                <xml-property name="uniqueProps" value="bar-id" />
+            </xml-properties>
+        </java-type>
+
+
+    </java-types>
+</xml-bindings>
+
+
+
diff --git a/aai-schema-ingest/src/test/resources/oxm/test_combined_network_business_v9.xml b/aai-schema-ingest/src/test/resources/oxm/test_combined_network_business_v9.xml
new file mode 100644
index 00000000..838a728a
--- /dev/null
+++ b/aai-schema-ingest/src/test/resources/oxm/test_combined_network_business_v9.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+  ============LICENSE_START=======================================================
+  org.openecomp.aai
+  ================================================================================
+  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+  ================================================================================
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  ============LICENSE_END=========================================================
+  -->
+
+<xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.v9" xml-mapping-metadata-complete="true">
+    <xml-schema element-form-default="QUALIFIED">
+        <xml-ns namespace-uri="http://org.onap.aai.inventory/v9" />
+    </xml-schema>
+    <java-types>
+
+        <java-type name="Foo">
+            <xml-root-element name="foo" />
+            <java-attributes>
+                <xml-element java-attribute="fooId" name="foo-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id of Foo.  This is unique across the graph." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="fooName" name="foo-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of Foo." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="quantity" name="quantity" required="false" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="How many." />
+                    </xml-properties>
+                </xml-element>
+
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="General purpose metasyntactic variable" />
+                <xml-property name="nameProps" value="foo-name" />
+                <xml-property name="uniqueProps" value="foo-id" />
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Quux">
+            <xml-root-element name="quux" />
+            <java-attributes>
+                <xml-element java-attribute="qManagerName" name="q-manager-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id of Quux owner.  This is unique across the graph." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="color" name="color" required="false" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="color" />
+                    </xml-properties>
+                </xml-element>
+
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="General purpose metasyntactic variable" />
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Bar">
+            <xml-root-element name="bar" />
+            <java-attributes>
+                <xml-element java-attribute="barId" name="bar-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id of Bar  This is unique across the graph." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="quantity" name="quantity" required="false" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="How many." />
+                    </xml-properties>
+                </xml-element>
+
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="General purpose metasyntactic variable" />
+                <xml-property name="uniqueProps" value="bar-id" />
+            </xml-properties>
+        </java-type>
+
+
+    </java-types>
+</xml-bindings>
+
+
+
diff --git a/aai-schema-ingest/src/test/resources/oxm/test_combined_v13.xml b/aai-schema-ingest/src/test/resources/oxm/test_combined_v13.xml
new file mode 100644
index 00000000..14da0168
--- /dev/null
+++ b/aai-schema-ingest/src/test/resources/oxm/test_combined_v13.xml
@@ -0,0 +1,4629 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.v13" xml-mapping-metadata-complete="true">
+    <xml-schema element-form-default="QUALIFIED">
+        <xml-ns namespace-uri="http://org.onap.aai.inventory/v13" />
+    </xml-schema>
+    <java-types>
+        <java-type name="AllottedResources">
+            <xml-properties>
+                <xml-property name="description" value="This object is used to store slices of services being offered" />
+            </xml-properties>
+            <xml-root-element name="allotted-resources" />
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="allottedResource" name="allotted-resource" type="inventory.aai.onap.org.v13.AllottedResource" />
+            </java-attributes>
+        </java-type>
+        <java-type name="AllottedResource">
+            <xml-root-element name="allotted-resource" />
+            <java-attributes>
+                <xml-element java-attribute="id" name="id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Allotted Resource id UUID assigned to this instance." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="description" name="description" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The descriptive information assigned to this allotted resource instance" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Link back to more information in the controller" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC model id for this resource or service model." />
+                        <xml-property name="visibility" value="deployment" />
+                        <xml-property name="requires" value="model-version-id" />
+                        <xml-property name="dbAlias" value="model-invariant-id-local" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC model version for this resource or service model." />
+                        <xml-property name="visibility" value="deployment" />
+                        <xml-property name="requires" value="model-invariant-id" />
+                        <xml-property name="dbAlias" value="model-version-id-local" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC model version for this resource or service model." />
+                        <xml-property name="visibility" value="internal" />
+                        <xml-property name="dataCopy" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Concurrency value" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Orchestration status" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicator for whether the resource is considered operational" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="type" name="type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Generic description of the type of allotted resource." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="role" name="role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="role in the network that this resource will be providing." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="tunnelXconnects" name="tunnel-xconnects" type="inventory.aai.onap.org.v13.TunnelXconnects" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Represents a slice or partial piece of a resource that gets separately allotted" />
+                <xml-property name="nameProps" value="description" />
+                <xml-property name="uniqueProps" value="id" />
+                <xml-property name="indexedProps" value="id,model-invariant-id,model-version-id,type,role" />
+                <xml-property name="dependentOn" value="service-instance" />
+                <xml-property name="container" value="allotted-resources" />
+                <!--  <xml-property name="namespace" value="network" /> -->
+            </xml-properties>
+        </java-type>
+        <java-type name="Business">
+            <xml-properties>
+                <xml-property name="description" value="Namespace for business related constructs" />
+            </xml-properties>
+            <xml-root-element name="business" />
+            <java-attributes>
+                <xml-element java-attribute="connectors" name="connectors" type="inventory.aai.onap.org.v13.Connectors" />
+                <xml-element java-attribute="customers" name="customers" type="inventory.aai.onap.org.v13.Customers" />
+                <xml-element java-attribute="linesOfBusiness" name="lines-of-business" type="inventory.aai.onap.org.v13.LinesOfBusiness" />
+                <xml-element java-attribute="owningEntities" name="owning-entities" type="inventory.aai.onap.org.v13.OwningEntities" />
+                <xml-element java-attribute="platforms" name="platforms" type="inventory.aai.onap.org.v13.Platforms" />
+                <xml-element java-attribute="projects" name="projects" type="inventory.aai.onap.org.v13.Projects" />
+            </java-attributes>
+        </java-type>
+        <java-type name="Connectors">
+            <xml-properties>
+                <xml-property name="description" value="Collection of resource instances used to connect a variety of disparate inventory widgets" />
+            </xml-properties>
+            <xml-root-element name="connectors" />
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="connector" name="connector" type="inventory.aai.onap.org.v13.Connector" />
+            </java-attributes>
+        </java-type>
+        <java-type name="Connector">
+            <xml-root-element name="connector" />
+            <java-attributes>
+                <xml-element java-attribute="resourceInstanceId" name="resource-instance-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id of resource instance." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC model id for this resource or service model." />
+                        <xml-property name="visibility" value="deployment" />
+                        <xml-property name="requires" value="model-version-id" />
+                        <xml-property name="dbAlias" value="model-invariant-id-local" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC model version for this resource or service model." />
+                        <xml-property name="visibility" value="deployment" />
+                        <xml-property name="requires" value="model-invariant-id" />
+                        <xml-property name="dbAlias" value="model-version-id-local" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC model version for this resource or service model." />
+                        <xml-property name="visibility" value="internal" />
+                        <xml-property name="dataCopy" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="widgetModelVersion" name="widget-model-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+                <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v13.Metadata" />
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Collection of resource instances used to connect a variety of disparate inventory widgets" />
+                <xml-property name="indexedProps" value="resource-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version" />
+                <xml-property name="container" value="connectors" />
+                <xml-property name="namespace" value="business" />
+            </xml-properties>
+        </java-type>
+        <java-type name="Customers">
+            <xml-properties>
+                <xml-property name="description" value="Collection of customer identifiers to provide linkage back to BSS information." />
+            </xml-properties>
+            <xml-root-element name="customers" />
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="customer" name="customer" type="inventory.aai.onap.org.v13.Customer" />
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="maximumDepth" value="0" />
+            </xml-properties>
+        </java-type>
+        <java-type name="Customer">
+            <xml-root-element name="customer" />
+            <java-attributes>
+                <xml-element java-attribute="globalCustomerId" name="global-customer-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Global customer id used across ECOMP to uniquely identify customer." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="subscriberName" name="subscriber-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Subscriber name, an alternate way to retrieve a customer." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="subscriberType" name="subscriber-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Subscriber type, a way to provide VID with only the INFRA customers." />
+                        <xml-property name="defaultValue" value="CUST" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceSubscriptions" name="service-subscriptions" type="inventory.aai.onap.org.v13.ServiceSubscriptions" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="customer identifiers to provide linkage back to BSS information." />
+                <xml-property name="nameProps" value="subscriber-name" />
+                <xml-property name="indexedProps" value="subscriber-name,global-customer-id,subscriber-type" />
+                <xml-property name="searchable" value="global-customer-id,subscriber-name" />
+                <xml-property name="uniqueProps" value="global-customer-id" />
+                <xml-property name="container" value="customers" />
+                <xml-property name="namespace" value="business" />
+            </xml-properties>
+        </java-type>
+        <java-type name="LinesOfBusiness">
+            <xml-properties>
+                <xml-property name="description" value="Collection of lines-of-business" />
+            </xml-properties>
+            <xml-root-element name="lines-of-business" />
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="lineOfBusiness" name="line-of-business" type="inventory.aai.onap.org.v13.LineOfBusiness" />
+            </java-attributes>
+        </java-type>
+        <java-type name="LineOfBusiness">
+            <xml-root-element name="line-of-business" />
+            <java-attributes>
+                <xml-element java-attribute="lineOfBusinessName" name="line-of-business-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the line-of-business (product)" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="describes a line-of-business" />
+                <xml-property name="indexedProps" value="line-of-business-name" />
+                <xml-property name="uniqueProps" value="line-of-business-name" />
+                <xml-property name="container" value="lines-of-business" />
+                <xml-property name="namespace" value="business" />
+            </xml-properties>
+        </java-type>
+        <java-type name="OwningEntities">
+            <xml-properties>
+                <xml-property name="description" value="Collection of owning-entities" />
+            </xml-properties>
+            <xml-root-element name="owning-entities" />
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="owningEntity" name="owning-entity" type="inventory.aai.onap.org.v13.OwningEntity" />
+            </java-attributes>
+        </java-type>
+        <java-type name="OwningEntity">
+            <xml-root-element name="owning-entity" />
+            <java-attributes>
+                <xml-element java-attribute="owningEntityId" name="owning-entity-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="UUID of an owning entity" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="owningEntityName" name="owning-entity-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Owning entity name" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="describes an owning-entity" />
+                <xml-property name="indexedProps" value="owning-entity-id,owning-entity-name" />
+                <xml-property name="searchable" value="owning-entity-id" />
+                <xml-property name="uniqueProps" value="owning-entity-id,owning-entity-name" />
+                <xml-property name="container" value="owning-entities" />
+                <xml-property name="namespace" value="business" />
+            </xml-properties>
+        </java-type>
+        <java-type name="Platforms">
+            <xml-properties>
+                <xml-property name="description" value="Collection of platforms" />
+            </xml-properties>
+            <xml-root-element name="platforms" />
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="platform" name="platform" type="inventory.aai.onap.org.v13.Platform" />
+            </java-attributes>
+        </java-type>
+        <java-type name="Platform">
+            <xml-root-element name="platform" />
+            <java-attributes>
+                <xml-element java-attribute="platformName" name="platform-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the platform" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="describes a platform" />
+                <xml-property name="indexedProps" value="platform-name" />
+                <xml-property name="uniqueProps" value="platform-name" />
+                <xml-property name="container" value="platforms" />
+                <xml-property name="namespace" value="business" />
+            </xml-properties>
+        </java-type>
+        <java-type name="Projects">
+            <xml-properties>
+                <xml-property name="description" value="Collection of projects" />
+            </xml-properties>
+            <xml-root-element name="projects" />
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="project" name="project" type="inventory.aai.onap.org.v13.Project" />
+            </java-attributes>
+        </java-type>
+        <java-type name="Project">
+            <xml-root-element name="project" />
+            <java-attributes>
+                <xml-element java-attribute="projectName" name="project-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the project deploying a service" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="describes the project" />
+                <xml-property name="indexedProps" value="project-name" />
+                <xml-property name="uniqueProps" value="project-name" />
+                <xml-property name="container" value="projects" />
+                <xml-property name="namespace" value="business" />
+            </xml-properties>
+        </java-type>
+        <java-type name="ServiceSubscriptions">
+            <xml-properties>
+                <xml-property name="description" value="Collection of objects that group service instances." />
+            </xml-properties>
+            <xml-root-element name="service-subscriptions" />
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="serviceSubscription" name="service-subscription" type="inventory.aai.onap.org.v13.ServiceSubscription" />
+            </java-attributes>
+        </java-type>
+        <java-type name="ServiceSubscription">
+            <xml-root-element name="service-subscription" />
+            <java-attributes>
+                <xml-element java-attribute="serviceType" name="service-type" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Value defined by orchestration to identify this service across ECOMP." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="tempUbSubAccountId" name="temp-ub-sub-account-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="This property will be deleted from A&amp;AI in the near future. Only stop gap solution." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceInstances" name="service-instances" type="inventory.aai.onap.org.v13.ServiceInstances">
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Object that group service instances." />
+                <xml-property name="indexedProps" value="service-type" />
+                <xml-property name="dependentOn" value="customer" />
+                <xml-property name="container" value="service-subscriptions" />
+                <xml-property name="crossEntityReference" value="service-instance,service-type" />
+            </xml-properties>
+        </java-type>
+        <java-type name="ServiceInstances">
+            <xml-properties>
+                <xml-property name="description" value="Collection of service instances" />
+            </xml-properties>
+            <xml-root-element name="service-instances" />
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="serviceInstance" name="service-instance" type="inventory.aai.onap.org.v13.ServiceInstance" />
+            </java-attributes>
+        </java-type>
+        <java-type name="ServiceInstance">
+            <xml-root-element name="service-instance" />
+            <java-attributes>
+                <xml-element java-attribute="serviceInstanceId" name="service-instance-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Uniquely identifies this instance of a service" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceInstanceName" name="service-instance-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="This field will store a name assigned to the service-instance." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceType" name="service-type" required="false" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="String capturing type of service." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceRole" name="service-role" required="false" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="String capturing the service role." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="environmentContext" name="environment-context" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="This field will store the environment context assigned to the service-instance." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="workloadContext" name="workload-context" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="This field will store the workload context assigned to the service-instance." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC model id for this resource or service model." />
+                        <xml-property name="visibility" value="deployment" />
+                        <xml-property name="requires" value="model-version-id" />
+                        <xml-property name="dbAlias" value="model-invariant-id-local" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC model version for this resource or service model." />
+                        <xml-property name="visibility" value="deployment" />
+                        <xml-property name="requires" value="model-invariant-id" />
+                        <xml-property name="dbAlias" value="model-version-id-local" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC model version for this resource or service model." />
+                        <xml-property name="visibility" value="internal" />
+                        <xml-property name="dataCopy" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="widgetModelVersion" name="widget-model-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="bandwidthTotal" name="bandwidth-total" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicates the total bandwidth to be used for this service." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="bandwidthUpWan1" name="bandwidth-up-wan1" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="indicates the upstream bandwidth this service will use on the WAN1 port of the physical device." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="bandwidthDownWan1" name="bandwidth-down-wan1" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="indicates the downstream bandwidth this service will use on the WAN1 port of the physical device." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="bandwidthUpWan2" name="bandwidth-up-wan2" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="indicates the upstream bandwidth this service will use on the WAN2 port of the physical device." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="bandwidthDownWan2" name="bandwidth-down-wan2" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="indicates the downstream bandwidth this service will use on the WAN2 port of the physical device." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vhnPortalUrl" name="vhn-portal-url" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL customers will use to access the vHN Portal." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceInstanceLocationId" name="service-instance-location-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="An identifier that customers assign to the location where this service is being used." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Path to the controller object." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Orchestration status of this service." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+                <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v13.Metadata" />
+                <xml-element java-attribute="allottedResources" name="allotted-resources" type="inventory.aai.onap.org.v13.AllottedResources" />
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Instance of a service" />
+                <xml-property name="indexedProps" value="service-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,service-instance-name,service-instance-location-id,orchestration-status,environment-context,workload-context" />
+                <xml-property name="nameProps" value="service-instance-name" />
+                <xml-property name="searchable" value="service-instance-id,service-instance-name" />
+                <xml-property name="uniqueProps" value="service-instance-id" />
+                <xml-property name="dependentOn" value="service-subscription" />
+                <xml-property name="container" value="service-instances" />
+            </xml-properties>
+        </java-type>
+        <java-type name="TunnelXconnects">
+            <xml-properties>
+                <xml-property name="description" value="This object is used to store the specific tunnel cross connect aspects of an allotted resource" />
+            </xml-properties>
+            <xml-root-element name="tunnel-xconnects" />
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="tunnelXconnect" name="tunnel-xconnect" type="inventory.aai.onap.org.v13.TunnelXconnect" />
+            </java-attributes>
+        </java-type>
+        <java-type name="TunnelXconnect">
+            <xml-root-element name="tunnel-xconnect" />
+            <java-attributes>
+                <xml-element java-attribute="id" name="id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Allotted Resource id UUID assigned to this instance." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="bandwidthUpWan1" name="bandwidth-up-wan1" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The WAN uplink bandwidth for WAN1" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="bandwidthDownWan1" name="bandwidth-down-wan1" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The WAN downlink bandwidth for WAN1" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="bandwidthUpWan2" name="bandwidth-up-wan2" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The WAN uplink bandwidth for WAN2" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="bandwidthDownWan2" name="bandwidth-down-wan2" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The WAN downlink bandwidth for WAN2" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Concurrency value" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Represents the specifics of a tunnel cross connect piece of a resource that gets separately allotted" />
+                <xml-property name="uniqueProps" value="id" />
+                <xml-property name="indexedProps" value="id" />
+                <xml-property name="dependentOn" value="allotted-resource" />
+                <xml-property name="container" value="tunnel-xconnects" />
+                <!--  <xml-property name="namespace" value="network" /> -->
+            </xml-properties>
+        </java-type>
+        <java-type name="RelationshipList">
+            <xml-root-element name="relationship-list" />
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="relationship" name="relationship" type="inventory.aai.onap.org.v13.Relationship" />
+            </java-attributes>
+        </java-type>
+        <java-type name="Relationship">
+            <xml-root-element name="relationship" />
+            <java-attributes>
+                <xml-element java-attribute="relatedTo" name="related-to" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="A keyword provided by A&amp;AI to indicate type of node." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipLabel" name="relationship-label" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The edge label for this relationship." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relatedLink" name="related-link" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL to the object in A&amp;AI." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element container-type="java.util.ArrayList" java-attribute="relationshipData" name="relationship-data" type="inventory.aai.onap.org.v13.RelationshipData" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="relatedToProperty" name="related-to-property" type="inventory.aai.onap.org.v13.RelatedToProperty" />
+            </java-attributes>
+        </java-type>
+        <java-type name="RelatedToProperty">
+            <xml-root-element name="related-to-property" />
+            <java-attributes>
+                <xml-element java-attribute="propertyKey" name="property-key" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Key part of a key/value pair" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Value part of a key/value pair" />
+                    </xml-properties>
+                </xml-element>
+            </java-attributes>
+        </java-type>
+        <java-type name="RelationshipData">
+            <xml-root-element name="relationship-data" />
+            <java-attributes>
+                <xml-element java-attribute="relationshipKey" name="relationship-key" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="A keyword provided by A&amp;AI to indicate an attribute." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipValue" name="relationship-value" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Value of the attribute." />
+                    </xml-properties>
+                </xml-element>
+            </java-attributes>
+        </java-type>
+        <java-type name="Metadata">
+            <xml-properties>
+                <xml-property name="description" value="Collection of metadatum (key/value pairs)" />
+            </xml-properties>
+            <xml-root-element name="metadata" />
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="metadatum" name="metadatum" type="inventory.aai.onap.org.v13.Metadatum" />
+            </java-attributes>
+        </java-type>
+        <java-type name="Metadatum">
+            <xml-root-element name="metadatum" />
+            <java-attributes>
+                <xml-element java-attribute="metaname" name="metaname" required="true" type="java.lang.String" xml-key="true" />
+                <xml-element java-attribute="metaval" name="metaval" required="true" type="java.lang.String" />
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                    </xml-properties>
+                </xml-element>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Key/value pairs" />
+                <xml-property name="indexedProps" value="metaname" />
+                <xml-property name="dependentOn" value="tenant,image,service-instance,connector,model" />
+                <xml-property name="container" value="metadata" />
+            </xml-properties>
+        </java-type>
+        <java-type name="Collections">
+            <xml-root-element name="collections" />
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="collection" name="collection" type="inventory.aai.onap.org.v13.Collection" />
+            </java-attributes>
+        </java-type>
+        <java-type name="Collection">
+            <xml-root-element name="collection"/>
+            <java-attributes>
+                <xml-element java-attribute="collectionId" name="collection-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Collection Object UUID"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ASDC model id for this resource or service model" />
+                        <xml-property name="visibility" value="deployment" />
+                        <xml-property name="requires" value="model-version-id" />
+                        <xml-property name="dbAlias" value="model-invariant-id-local" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Model Version" />
+                        <xml-property name="visibility" value="deployment" />
+                        <xml-property name="requires" value="model-invariant-id" />
+                        <xml-property name="dbAlias" value="model-version-id-local" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="collectionName" name="collection-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="collection name" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="collectionType" name="collection-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Collection type" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="collectionRole" name="collection-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Collection Role" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="collectionFunction" name="collection-function" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Collection function" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="orchestration status" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="collectionCustomizationId" name="collection-customization-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Captures the id of all the configuration used to customize the resource for the service" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList"/>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." />
+                    </xml-properties>
+                </xml-element>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="namespace" value="network" />
+                <xml-property name="description" value="represents the collection resource in the TOSCA model" />
+                <xml-property name="uniqueProps" value="collection-id" />
+                <xml-property name="indexedProps" value="collection-id,model-invariant-id,model-version-id" />
+                <xml-property name="container" value="collections" />
+            </xml-properties>
+        </java-type>
+        <java-type name="ConstrainedElementSets">
+            <xml-root-element name="constrained-element-sets" />
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="constrainedElementSet" name="constrained-element-set" type="inventory.aai.onap.org.v13.ConstrainedElementSet" />
+            </java-attributes>
+        </java-type>
+        <java-type name="ConstrainedElementSet">
+            <xml-properties>
+                <xml-property name="description" value="This is how we would capture constraints defining allowed sets of elements." />
+                <xml-property name="uniqueProps" value="constrained-element-set-uuid" />
+                <xml-property name="indexedProps" value="constrained-element-set-uuid" />
+                <xml-property name="allowDirectRead" value="true" />
+                <xml-property name="allowDirectWrite" value="false" />
+                <xml-property name="container" value="constrained-element-sets" />
+            </xml-properties>
+            <xml-root-element name="constrained-element-set" />
+            <java-attributes>
+                <xml-element java-attribute="constrainedElementSetUuid" name="constrained-element-set-uuid" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="autoGenerateUuid" value="true" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="constraintType" name="constraint-type" required="true" type="java.lang.String" />
+                <xml-element java-attribute="checkType" name="check-type" required="true" type="java.lang.String" />
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" />
+                <xml-element java-attribute="elementChoiceSets" name="element-choice-sets" type="inventory.aai.onap.org.v13.ElementChoiceSets" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+            </java-attributes>
+        </java-type>
+        <java-type name="ElementChoiceSets">
+            <xml-root-element name="element-choice-sets" />
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="elementChoiceSet" name="element-choice-set" type="inventory.aai.onap.org.v13.ElementChoiceSet" />
+            </java-attributes>
+        </java-type>
+        <java-type name="ElementChoiceSet">
+            <xml-properties>
+                <xml-property name="description" value="This is how we would capture constraints defining allowed sets of elements." />
+                <xml-property name="uniqueProps" value="element-choice-set-uuid" />
+                <xml-property name="indexedProps" value="element-choice-set-uuid" />
+                <xml-property name="allowDirectRead" value="true" />
+                <xml-property name="allowDirectWrite" value="false" />
+                <xml-property name="container" value="element-choice-sets" />
+            </xml-properties>
+            <xml-root-element name="element-choice-set" />
+            <java-attributes>
+                <xml-element java-attribute="elementChoiceSetUuid" name="element-choice-set-uuid" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="autoGenerateUuid" value="true" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="elementChoiceSetName" name="element-choice-set-name" required="true" type="java.lang.String" />
+                <xml-element java-attribute="cardinality" name="cardinality" type="java.lang.String" />
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" />
+                <xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.onap.org.v13.ModelElements" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+            </java-attributes>
+        </java-type>
+        <java-type name="NamedQueries">
+            <xml-root-element name="named-queries" />
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="namedQuery" name="named-query" type="inventory.aai.onap.org.v13.NamedQuery" />
+            </java-attributes>
+        </java-type>
+        <java-type name="NamedQuery">
+            <xml-properties>
+                <xml-property name="description" value="TBD" />
+                <xml-property name="nameProps" value="named-query-name" />
+                <xml-property name="uniqueProps" value="named-query-uuid" />
+                <xml-property name="indexedProps" value="named-query-uuid,named-query-name" />
+                <xml-property name="container" value="named-queries" />
+                <xml-property name="namespace" value="service-design-and-creation" />
+            </xml-properties>
+            <xml-root-element name="named-query" />
+            <java-attributes>
+                <xml-element java-attribute="namedQueryUuid" name="named-query-uuid" required="true" type="java.lang.String" xml-key="true" />
+                <xml-element java-attribute="namedQueryName" name="named-query-name" required="true" type="java.lang.String" />
+                <xml-element java-attribute="namedQueryVersion" name="named-query-version" required="true" type="java.lang.String" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="requiredInputParams" name="required-input-param" type="java.lang.String" >
+                    <xml-element-wrapper name="required-input-params" />
+                </xml-element>
+                <xml-element java-attribute="description" name="description" type="java.lang.String" />
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" />
+                <xml-element java-attribute="namedQueryElements" name="named-query-elements" type="inventory.aai.onap.org.v13.NamedQueryElements" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+            </java-attributes>
+        </java-type>
+        <java-type name="NamedQueryElements">
+            <xml-root-element name="named-query-elements" />
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="namedQueryElement" name="named-query-element" type="inventory.aai.onap.org.v13.NamedQueryElement" />
+            </java-attributes>
+        </java-type>
+        <java-type name="NamedQueryElement">
+            <xml-properties>
+                <xml-property name="description" value="TBD" />
+                <xml-property name="uniqueProps" value="named-query-element-uuid" />
+                <xml-property name="indexedProps" value="named-query-element-uuid" />
+                <xml-property name="allowDirectRead" value="true" />
+                <xml-property name="allowDirectWrite" value="false" />
+                <xml-property name="container" value="named-query-elements" />
+            </xml-properties>
+            <xml-root-element name="named-query-element" />
+            <java-attributes>
+                <xml-element java-attribute="namedQueryElementUuid" name="named-query-element-uuid" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="autoGenerateUuid" value="true" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element container-type="java.util.ArrayList" java-attribute="propertyCollectList" name="property-collect-list" type="java.lang.String" />
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" />
+                <xml-element java-attribute="propertyLimitDesc" name="property-limit-desc" type="java.lang.String" />
+                <xml-element java-attribute="doNotOutput" name="do-not-output" type="java.lang.String" />
+                <xml-element java-attribute="namedQueryElements" name="named-query-elements" type="inventory.aai.onap.org.v13.NamedQueryElements" />
+                <xml-element java-attribute="relatedLookups" name="related-lookups" type="inventory.aai.onap.org.v13.RelatedLookups" />
+                <xml-element java-attribute="propertyConstraints" name="property-constraints" type="inventory.aai.onap.org.v13.PropertyConstraints" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+            </java-attributes>
+        </java-type>
+        <java-type name="RelatedLookups">
+            <xml-root-element name="related-lookups" />
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="relatedLookup" name="related-lookup" type="inventory.aai.onap.org.v13.RelatedLookup" />
+            </java-attributes>
+        </java-type>
+        <java-type name="RelatedLookup">
+            <xml-properties>
+                <xml-property name="description" value="TBD" />
+                <xml-property name="uniqueProps" value="related-lookup-uuid" />
+                <xml-property name="indexedProps" value="related-lookup-uuid" />
+                <xml-property name="allowDirectRead" value="true" />
+                <xml-property name="allowDirectWrite" value="false" />
+                <xml-property name="container" value="related-lookups" />
+            </xml-properties>
+            <xml-root-element name="related-lookup" />
+            <java-attributes>
+                <xml-element java-attribute="relatedLookupUuid" name="related-lookup-uuid" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="autoGenerateUuid" value="true" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="sourceNodeType" name="source-node-type" required="true" type="java.lang.String" />
+                <xml-element java-attribute="sourceNodeProperty" name="source-node-property" required="true" type="java.lang.String" />
+                <xml-element java-attribute="targetNodeType" name="target-node-type" required="true" type="java.lang.String" />
+                <xml-element java-attribute="targetNodeProperty" name="target-node-property" required="true" type="java.lang.String" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="propertyCollectList" name="property-collect-list" type="java.lang.String" />
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+            </java-attributes>
+        </java-type>
+        <java-type name="PropertyConstraints">
+            <xml-root-element name="property-constraints" />
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="propertyConstraint" name="property-constraint" type="inventory.aai.onap.org.v13.PropertyConstraint" />
+            </java-attributes>
+        </java-type>
+        <java-type name="PropertyConstraint">
+            <xml-properties>
+                <xml-property name="description" value="TBD" />
+                <xml-property name="uniqueProps" value="property-constraint-uuid" />
+                <xml-property name="indexedProps" value="property-constraint-uuid" />
+                <xml-property name="allowDirectRead" value="true" />
+                <xml-property name="allowDirectWrite" value="false" />
+                <xml-property name="container" value="property-constraints" />
+            </xml-properties>
+            <xml-root-element name="property-constraint" />
+            <java-attributes>
+                <xml-element java-attribute="propertyConstraintUuid" name="property-constraint-uuid" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="autoGenerateUuid" value="true" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="constraintType" name="constraint-type" required="true" type="java.lang.String" />
+                <xml-element java-attribute="propertyName" name="property-name" required="true" type="java.lang.String" />
+                <xml-element java-attribute="propertyValue" name="property-value" required="true" type="java.lang.String" />
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" />
+            </java-attributes>
+        </java-type>
+        <java-type name="ServiceDesignAndCreation">
+            <xml-properties>
+                <xml-property name="description" value="Namespace for objects managed by ASDC" />
+            </xml-properties>
+            <xml-root-element name="service-design-and-creation" />
+            <java-attributes>
+                <xml-element java-attribute="vnfImages" name="vnf-images" type="inventory.aai.onap.org.v13.VnfImages" />
+                <xml-element java-attribute="services" name="services" type="inventory.aai.onap.org.v13.Services" />
+                <xml-element java-attribute="serviceCapabilities" name="service-capabilities" type="inventory.aai.onap.org.v13.ServiceCapabilities" />
+                <xml-element java-attribute="models" name="models" type="inventory.aai.onap.org.v13.Models" />
+                <xml-element java-attribute="namedQueries" name="named-queries" type="inventory.aai.onap.org.v13.NamedQueries" />
+            </java-attributes>
+        </java-type>
+        <java-type name="Services">
+            <xml-properties>
+                <xml-property name="description" value="Collection of service model definitions.  Likely to be deprecated in favor of models from ASDC." />
+            </xml-properties>
+            <xml-root-element name="services" />
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="service" name="service" type="inventory.aai.onap.org.v13.Service" />
+            </java-attributes>
+        </java-type>
+        <java-type name="Service">
+            <xml-root-element name="service" />
+            <java-attributes>
+                <xml-element java-attribute="serviceId" name="service-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="This gets defined by others to provide a unique ID for the service, we accept what is sent." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceDescription" name="service-description" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Description of the service" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceSelflink" name="service-selflink" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceVersion" name="service-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="service version" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Stand-in for service model definitions.  Likely to be deprecated in favor of models from ASDC.  Does not strictly map to ASDC services." />
+                <xml-property name="indexedProps" value="service-description,service-id" />
+                <xml-property name="container" value="services" />
+                <xml-property name="namespace" value="service-design-and-creation" />
+            </xml-properties>
+        </java-type>
+        <java-type name="ServiceCapabilities">
+            <xml-properties>
+                <xml-property name="description" value="Collection of service capabilities." />
+            </xml-properties>
+            <xml-root-element name="service-capabilities" />
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="serviceCapability" name="service-capability" type="inventory.aai.onap.org.v13.ServiceCapability" />
+            </java-attributes>
+        </java-type>
+        <java-type name="ServiceCapability">
+            <xml-root-element name="service-capability" />
+            <java-attributes>
+                <xml-element java-attribute="serviceType" name="service-type" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="This gets defined by others to provide a unique ID for the service, we accept what is sent." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Early definition of server/resource pairings, likely to be replaced by models.  No new use should be made of this." />
+                <xml-property name="indexedProps" value="service-type,vnf-type" />
+                <xml-property name="container" value="service-capabilities" />
+                <xml-property name="namespace" value="service-design-and-creation" />
+            </xml-properties>
+        </java-type>
+        <java-type name="VnfImages">
+            <xml-properties>
+                <xml-property name="description" value="Collection of image objects that pertain to a VNF that doesn't have associated vservers.  This is a kludge." />
+            </xml-properties>
+            <xml-root-element name="vnf-images" />
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vnfImage" name="vnf-image" type="inventory.aai.onap.org.v13.VnfImage" />
+            </java-attributes>
+        </java-type>
+        <java-type name="VnfImage">
+            <xml-root-element name="vnf-image" />
+            <java-attributes>
+                <xml-element java-attribute="vnfImageUuid" name="vnf-image-uuid" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID of this asset" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="application" name="application" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The application that the image instantiates." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="applicationVendor" name="application-vendor" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The vendor of the application." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="applicationVersion" name="application-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The version of the application." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Image object that pertain to a VNF that doesn't have associated vservers.  This is a kludge." />
+                <xml-property name="indexedProps" value="application,vnf-image-uuid,application-vendor,application-version" />
+                <xml-property name="uniqueProps" value="vnf-image-uuid" />
+                <xml-property name="container" value="vnf-images" />
+                <xml-property name="namespace" value="service-design-and-creation" />
+            </xml-properties>
+        </java-type>
+        <java-type name="Models">
+            <xml-properties>
+                <xml-property name="description" value="Collection of subgraph definitions provided by ASDC to describe the inventory assets and their connections related to ASDC models" />
+            </xml-properties>
+            <xml-root-element name="models" />
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="model" name="model" type="inventory.aai.onap.org.v13.Model" />
+            </java-attributes>
+        </java-type>
+        <java-type name="Model">
+            <xml-root-element name="model" />
+            <xml-properties>
+                <xml-property name="description" value="Subgraph definition provided by ASDC to describe an inventory asset and its connections related to ASDC models, independent of version" />
+                <xml-property name="nameProps" value="model-type" />
+                <xml-property name="indexedProps" value="model-invariant-id,model-type" />
+                <xml-property name="uniqueProps" value="model-invariant-id" />
+                <xml-property name="container" value="models" />
+                <xml-property name="namespace" value="service-design-and-creation" />
+            </xml-properties>
+            <java-attributes>
+                <xml-element java-attribute="modelInvariantId" name="model-invariant-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique identifier corresponding to the main definition of a model in ASDC" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelType" name="model-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Type of the model, e.g., service, resource, widget, etc." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelVers" name="model-vers" type="inventory.aai.onap.org.v13.ModelVers" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+            </java-attributes>
+        </java-type>
+        <java-type name="ModelVers">
+            <xml-root-element name="model-vers" />
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="modelVer" name="model-ver" type="inventory.aai.onap.org.v13.ModelVer" />
+            </java-attributes>
+        </java-type>
+        <java-type name="ModelVer">
+            <xml-root-element name="model-ver" />
+            <xml-properties>
+                <xml-property name="description" value="Subgraph definition provided by ASDC to describe a specific version of an inventory asset and its connections related to ASDC models" />
+                <xml-property name="nameProps" value="model-name" />
+                <xml-property name="indexedProps" value="model-version-id,model-name,model-version,distribution-status" />
+                <xml-property name="uniqueProps" value="model-version-id" />
+                <xml-property name="container" value="model-vers" />
+            </xml-properties>
+            <java-attributes>
+                <xml-element java-attribute="modelVersionId" name="model-version-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique identifier corresponding to one version of a model in ASDC" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelName" name="model-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the model, which can change from version to version." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelVersion" name="model-version" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Version" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="distributionStatus" name="distribution-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Distribution Status" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelDescription" name="model-description" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Description" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.onap.org.v13.ModelElements" />
+                <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v13.Metadata" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+            </java-attributes>
+        </java-type>
+        <java-type name="ModelElements">
+            <xml-root-element name="model-elements" />
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="modelElement" name="model-element" type="inventory.aai.onap.org.v13.ModelElement" />
+            </java-attributes>
+        </java-type>
+        <java-type name="ModelElement">
+            <xml-properties>
+                <xml-property name="description" value="Defines how other models combine to make up a higher-level model." />
+                <xml-property name="uniqueProps" value="model-element-uuid" />
+                <xml-property name="indexedProps" value="model-element-uuid" />
+                <xml-property name="allowDirectRead" value="true" />
+                <xml-property name="allowDirectWrite" value="false" />
+                <xml-property name="container" value="model-elements" />
+            </xml-properties>
+            <xml-root-element name="model-element" />
+            <java-attributes>
+                <xml-element java-attribute="modelElementUuid" name="model-element-uuid" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="autoGenerateUuid" value="true" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="newDataDelFlag" name="new-data-del-flag" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicates whether this element was created as part of instantiation from this model" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="cardinality" name="cardinality" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="How many of this type of element are required/allowed" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element container-type="java.util.ArrayList" java-attribute="linkagePoints" name="linkage-points" type="java.lang.String" >
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.onap.org.v13.ModelElements">
+                    <xml-properties>
+                        <xml-property name="description" value="Defines how other models combine to make up a higher-level model" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelConstraints" name="model-constraints" type="inventory.aai.onap.org.v13.ModelConstraints">
+                    <xml-properties>
+                        <xml-property name="description" value="Describes new constraints on this model element that are not part of that model's definition" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+            </java-attributes>
+        </java-type>
+        <java-type name="ModelConstraints">
+            <xml-root-element name="model-constraints" />
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="modelConstraint" name="model-constraint" type="inventory.aai.onap.org.v13.ModelConstraint" />
+            </java-attributes>
+        </java-type>
+        <java-type name="ModelConstraint">
+            <xml-properties>
+                <xml-property name="description" value="This is how we would capture constraints defining allowed sets of elements." />
+                <xml-property name="uniqueProps" value="model-constraint-uuid" />
+                <xml-property name="indexedProps" value="model-constraint-uuid" />
+                <xml-property name="allowDirectRead" value="true" />
+                <xml-property name="allowDirectWrite" value="false" />
+                <xml-property name="container" value="model-constraints" />
+            </xml-properties>
+            <xml-root-element name="model-constraint" />
+            <java-attributes>
+                <xml-element java-attribute="modelConstraintUuid" name="model-constraint-uuid" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="autoGenerateUuid" value="true" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="constrainedElementSetUuidToReplace" name="constrained-element-set-uuid-to-replace" required="true" type="java.lang.String" />
+                <xml-element java-attribute="constrainedElementSets" name="constrained-element-sets" type="inventory.aai.onap.org.v13.ConstrainedElementSets" />
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                    </xml-properties>
+                </xml-element>
+            </java-attributes>
+        </java-type>
+        <java-type name="LInterfaces">
+            <xml-properties>
+                <xml-property name="description" value="Collection of logical interfaces." />
+            </xml-properties>
+            <xml-root-element name="l-interfaces" />
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="lInterface" name="l-interface" type="inventory.aai.onap.org.v13.LInterface" />
+            </java-attributes>
+        </java-type>
+        <java-type name="LInterface">
+            <xml-root-element name="l-interface" />
+            <java-attributes>
+                <xml-element java-attribute="interfaceName" name="interface-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Name given to the interface" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="E.g., CUSTOMER, UPLINK, etc." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="v6WanLinkIp" name="v6-wan-link-ip" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Questionably placed - v6 ip addr of this interface (is in vr-lan-interface from Mary B." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="interfaceId" name="interface-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ID of interface" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="macaddr" name="macaddr" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="MAC address for the interface" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="networkName" name="network-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the network" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Whether A&amp;AI should be managing this interface of not. Could have value like CUSTOMER" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="interfaceDescription" name="interface-description" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Human friendly text regarding this interface." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="isPortMirrored" name="is-port-mirrored" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="boolean indicatating whether or not port is a mirrored." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element default-value="false" java-attribute="inMaint" name="in-maint" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Prov Status of the logical interface. Valid values [PREPROV/NVTPROV/PROV]." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element default-value="false" java-attribute="isIpUnnumbered" name="is-ip-unnumbered" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="Flag indicating the interface uses the IP Unnumbered configuration." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="allowedAddressPairs" name="allowed-address-pairs" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Freeform field for storing an ip address, list of ip addresses or a subnet block." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlans" name="vlans" type="inventory.aai.onap.org.v13.Vlans" />
+                <xml-element java-attribute="sriovVfs" name="sriov-vfs" type="inventory.aai.onap.org.v13.SriovVfs" />
+                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v13.LInterfaces" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v13.L3InterfaceIpv4AddressList" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v13.L3InterfaceIpv6AddressList" />
+                <xml-element java-attribute="adminStatus" name="admin-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Administrative status of the interface. Valid values are 'up', 'down', or 'testing'." />
+                    </xml-properties>
+                </xml-element>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Logical interfaces, e.g., a vnic." />
+                <xml-property name="indexedProps" value="macaddr,interface-id,interface-name,network-name" />
+                <xml-property name="dependentOn" value="generic-vnf,newvce,p-interface,vserver,lag-interface" />
+                <xml-property name="container" value="l-interfaces" />
+            </xml-properties>
+        </java-type>
+        <java-type name="SriovVfs">
+            <xml-properties>
+                <xml-property name="description" value="Collection of SR-IOV Virtual Functions." />
+            </xml-properties>
+            <xml-root-element name="sriov-vfs" />
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="sriovVf" name="sriov-vf" type="inventory.aai.onap.org.v13.SriovVf" />
+            </java-attributes>
+        </java-type>
+        <java-type name="SriovVf">
+            <xml-root-element name="sriov-vf" />
+            <java-attributes>
+                <xml-element java-attribute="pciId" name="pci-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="PCI ID used to identify the sriov-vf" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vfVlanFilter" name="vf-vlan-filter" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="This metadata provides option to specify list of VLAN filters applied on VF to pass the traffic to VM." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vfMacFilter" name="vf-mac-filter" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="When MAC filters are specified, VF-agent service configures VFs to do MAC level filtering before the traffic is passed to VM." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vfVlanStrip" name="vf-vlan-strip" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="When this field is set to true, VF will configured to strip the outer TAG before the traffic is passed to VM." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vfVlanAntiSpoofCheck" name="vf-vlan-anti-spoof-check" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="This option ensures anti VLAN spoof checks are done at the VF level to comply with security. The disable check will also be honored per the VNF needs for trusted VMs." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vfMacAntiSpoofCheck" name="vf-mac-anti-spoof-check" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="This option ensures anti MAC spoof checks are done at the VF level to comply with security. The disable check will also be honored per the VNF needs for trusted VMs." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vfMirrors" name="vf-mirrors" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="This option defines the set of Mirror objects which essentially mirrors the traffic from source to set of collector VNF Ports." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vfBroadcastAllow" name="vf-broadcast-allow" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="This option, if set to true, sets the VF in promiscuous mode and allows all broadcast traffic to reach the VM" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vfUnknownMulticastAllow" name="vf-unknown-multicast-allow" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="This option, if set to true, sets the VF in promiscuous mode and allows unknown multicast traffic to reach the VM" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vfUnknownUnicastAllow" name="vf-unknown-unicast-allow" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="This option, if set to true, sets the VF in promiscuous mode and allows unknown unicast traffic to reach the VM" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vfInsertStag" name="vf-insert-stag" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="This option, if set to true, instructs to insert outer tag after traffic comes out of VM." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vfLinkStatus" name="vf-link-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="This option is used to set the link status.  Valid values as of 1607 are on, off, and auto." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Neutron network id of the interface" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="SR-IOV Virtual Function (not to be confused with virtual network function)" />
+                <xml-property name="indexedProps" value="pci-id,vf-vlan-filter,vf-mac-filter,vf-vlan-strip,neutron-network-id" />
+                <xml-property name="dependentOn" value="l-interface" />
+                <xml-property name="container" value="sriov-vfs" />
+            </xml-properties>
+        </java-type>
+        <java-type name="L3InterfaceIpv4AddressList">
+            <xml-root-element name="l3-interface-ipv4-address-list" />
+            <java-attributes>
+                <xml-element java-attribute="l3InterfaceIpv4Address" name="l3-interface-ipv4-address" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="IP address" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="l3InterfaceIpv4PrefixLength" name="l3-interface-ipv4-prefix-length" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Prefix length, 32 for single address" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Inner VLAN tag" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Outer VLAN tag" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="isFloating" name="is-floating" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicator of fixed or floating address" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Neutron network id of the interface that address belongs to" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Neutron id of subnet that address belongs to" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="IPv4 Address Range" />
+                <xml-property name="indexedProps" value="l3-interface-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id" />
+                <xml-property name="dependentOn" value="vlan,l-interface,vnfc" />
+            </xml-properties>
+        </java-type>
+        <java-type name="Vlans">
+            <xml-root-element name="vlans" />
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vlan" name="vlan" type="inventory.aai.onap.org.v13.Vlan" />
+            </java-attributes>
+        </java-type>
+        <java-type name="Vlan">
+            <xml-root-element name="vlan" />
+            <java-attributes>
+                <xml-element java-attribute="vlanInterface" name="vlan-interface" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="String that identifies the interface" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Inner VLAN tag" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Outer VLAN tag" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Captures the numeric part of the speed" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Captures the units corresponding to the speed" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanDescription" name="vlan-description" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used to describe (the service associated with) the vlan" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="backdoorConnection" name="backdoor-connection" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Whether customer is going to use this VLAN for backdoor connection to another customer premise device." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vpnKey" name="vpn-key" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="This indicates the customers VPN ID associated with this vlan" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Status of a vnf's vlan interface, on which the customer circuit resides, mastered by SDN-C." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element default-value="false" java-attribute="inMaint" name="in-maint" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Prov Status of the VLAN configuration related to a logical interface. Valid values [PREPROV/NVTPROV/PROV]." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element default-value="false" java-attribute="isIpUnnumbered" name="is-ip-unnumbered" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="Flag indicating the interface uses the IP Unnumbered configuration." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v13.L3InterfaceIpv4AddressList" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v13.L3InterfaceIpv6AddressList" />
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Definition of vlan" />
+                <xml-property name="indexedProps" value="vlan-interface,vlan-id-inner,vpn-key" />
+                <xml-property name="dependentOn" value="l-interface" />
+                <xml-property name="container" value="vlans" />
+            </xml-properties>
+        </java-type>
+        <java-type name="L3InterfaceIpv6AddressList">
+            <xml-root-element name="l3-interface-ipv6-address-list" />
+            <java-attributes>
+                <xml-element java-attribute="l3InterfaceIpv6Address" name="l3-interface-ipv6-address" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="IP address" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="l3InterfaceIpv6PrefixLength" name="l3-interface-ipv6-prefix-length" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Prefix length, 128 for single address" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Inner VLAN tag" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Outer VLAN tag" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="isFloating" name="is-floating" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicator of fixed or floating address" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Neutron network id of the interface that address belongs to" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Neutron id of subnet that address belongs to" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="IPv6 Address Range" />
+                <xml-property name="indexedProps" value="l3-interface-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id" />
+                <xml-property name="dependentOn" value="vlan,l-interface,vnfc" />
+            </xml-properties>
+        </java-type>
+        <java-type name="PInterfaces">
+            <xml-properties>
+                <xml-property name="description" value="Collection of physical interfaces." />
+            </xml-properties>
+            <xml-root-element name="p-interfaces" />
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="pInterface" name="p-interface" type="inventory.aai.onap.org.v13.PInterface" />
+            </java-attributes>
+        </java-type>
+        <java-type name="PInterface">
+            <xml-root-element name="p-interface" />
+            <java-attributes>
+                <xml-element java-attribute="interfaceName" name="interface-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Name that identifies the physical interface" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Captures the numeric part of the speed" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Captures the units corresponding to the speed" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="portDescription" name="port-description" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Nature of the services and connectivity on this port." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="equipmentIdentifier" name="equipment-identifier" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="CLEI or other specification for p-interface hardware." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Role specification for p-interface hardware." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="interfaceType" name="interface-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicates the physical properties of the interface." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element default-value="false" java-attribute="inMaint" name="in-maint" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="invStatus" name="inv-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="inventory status" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+                <xml-element java-attribute="sriovPfs" name="sriov-pfs" type="inventory.aai.onap.org.v13.SriovPfs" />
+                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v13.LInterfaces" />
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Physical interface (e.g., nic)" />
+                <xml-property name="indexedProps" value="interface-name,prov-status" />
+                <xml-property name="nameProps" value="prov-status" />
+                <xml-property name="dependentOn" value="vpls-pe,pserver,pnf" />
+                <xml-property name="container" value="p-interfaces" />
+            </xml-properties>
+        </java-type>
+        <java-type name="LagInterfaces">
+            <xml-properties>
+                <xml-property name="description" value="Collection of link aggregate interfaces." />
+            </xml-properties>
+            <xml-root-element name="lag-interfaces" />
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="lagInterface" name="lag-interface" type="inventory.aai.onap.org.v13.LagInterface" />
+            </java-attributes>
+        </java-type>
+        <java-type name="LagInterface">
+            <xml-root-element name="lag-interface" />
+            <java-attributes>
+                <xml-element java-attribute="interfaceName" name="interface-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Name that identifies the link aggregate interface" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="interfaceDescription" name="interface-description" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Human friendly text regarding this interface." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Captures the numeric part of the speed" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Captures the units corresponding to the speed" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="interfaceId" name="interface-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ID of interface" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Role assigned to this Interface, should use values as defined in ECOMP Yang models." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element default-value="false" java-attribute="inMaint" name="in-maint" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v13.LInterfaces" />
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Link aggregate interface" />
+                <xml-property name="indexedProps" value="interface-name,interface-id,interface-role" />
+                <xml-property name="dependentOn" value="generic-vnf,pserver,vpls-pe,pnf" />
+                <xml-property name="container" value="lag-interfaces" />
+            </xml-properties>
+        </java-type>
+        <java-type name="Network">
+            <xml-properties>
+                <xml-property name="description" value="Namespace for network inventory resources." />
+            </xml-properties>
+            <xml-root-element name="network" />
+            <java-attributes>
+                <xml-element java-attribute="logicalLinks" name="logical-links" type="inventory.aai.onap.org.v13.LogicalLinks" />
+                <xml-element java-attribute="sitePairSets" name="site-pair-sets" type="inventory.aai.onap.org.v13.SitePairSets" />
+                <xml-element java-attribute="vpnBindings" name="vpn-bindings" type="inventory.aai.onap.org.v13.VpnBindings" />
+                <xml-element java-attribute="vplsPes" name="vpls-pes" type="inventory.aai.onap.org.v13.VplsPes" />
+                <xml-element java-attribute="multicastConfigurations" name="multicast-configurations" type="inventory.aai.onap.org.v13.MulticastConfigurations" />
+                <xml-element java-attribute="vces" name="vces" type="inventory.aai.onap.org.v13.Vces" />
+                <xml-element java-attribute="vnfcs" name="vnfcs" type="inventory.aai.onap.org.v13.Vnfcs" />
+                <xml-element java-attribute="l3Networks" name="l3-networks" type="inventory.aai.onap.org.v13.L3Networks" />
+                <xml-element java-attribute="networkPolicies" name="network-policies" type="inventory.aai.onap.org.v13.NetworkPolicies" />
+                <xml-element java-attribute="genericVnfs" name="generic-vnfs" type="inventory.aai.onap.org.v13.GenericVnfs" />
+                <xml-element java-attribute="lagLinks" name="lag-links" type="inventory.aai.onap.org.v13.LagLinks" />
+                <xml-element java-attribute="newvces" name="newvces" type="inventory.aai.onap.org.v13.Newvces" />
+                <xml-element java-attribute="pnfs" name="pnfs" type="inventory.aai.onap.org.v13.Pnfs" />
+                <xml-element java-attribute="physicalLinks" name="physical-links" type="inventory.aai.onap.org.v13.PhysicalLinks" />
+                <xml-element java-attribute="ipsecConfigurations" name="ipsec-configurations" type="inventory.aai.onap.org.v13.IpsecConfigurations" />
+                <xml-element java-attribute="routeTableReferences" name="route-table-references" type="inventory.aai.onap.org.v13.RouteTableReferences" />
+                <xml-element java-attribute="instanceGroups" name="instance-groups" type="inventory.aai.onap.org.v13.InstanceGroups" />
+                <xml-element java-attribute="zones" name="zones" type="inventory.aai.onap.org.v13.Zones" />
+                <xml-element java-attribute="configurations" name="configurations" type="inventory.aai.onap.org.v13.Configurations" />
+                <xml-element java-attribute="forwardingPaths" name="forwarding-paths" type="inventory.aai.onap.org.v13.ForwardingPaths" />
+                <xml-element java-attribute="collections" name="collections" type="inventory.aai.onap.org.v13.Collections" />
+            </java-attributes>
+        </java-type>
+        <java-type name="Configurations">
+            <xml-properties>
+                <xml-property name="description" value="Collection of configurations" />
+            </xml-properties>
+            <xml-root-element name="configurations" />
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="configuration" name="configuration" type="inventory.aai.onap.org.v13.Configuration" />
+            </java-attributes>
+        </java-type>
+        <java-type name="Configuration">
+            <xml-root-element name="configuration" />
+            <java-attributes>
+                <xml-element java-attribute="configurationId" name="configuration-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="UUID assigned to configuration." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicates the entity that will manage this feature. Could be an organization or the name of the application as well." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="configurationName" name="configuration-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the configuration." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="configurationType" name="configuration-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="port-mirroring-configuration." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="configurationSubType" name="configuration-sub-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="vprobe, pprobe." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC model id for this resource or service model." />
+                        <xml-property name="visibility" value="deployment" />
+                        <xml-property name="requires" value="model-version-id" />
+                        <xml-property name="dbAlias" value="model-invariant-id-local" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC model version for this resource or service model." />
+                        <xml-property name="visibility" value="deployment" />
+                        <xml-property name="requires" value="model-invariant-id" />
+                        <xml-property name="dbAlias" value="model-version-id-local" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Orchestration status of the configuration." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicator for whether the resource is considered operational." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="configurationSelflink" name="configuration-selflink" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details from SDN-GC." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="id of  the configuration used to customize the resource" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="tunnelBandwidth" name="tunnel-bandwidth" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="DHV Site Effective Bandwidth" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vendorAllowedMaxBandwidth" name="vendor-allowed-max-bandwidth" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Velocloud Nominal Throughput - VNT" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+                <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v13.Metadata" />
+                <xml-element java-attribute="forwarderEvcs" name="forwarder-evcs" type="inventory.aai.onap.org.v13.ForwarderEvcs" />
+                <xml-element java-attribute="evcs" name="evcs" type="inventory.aai.onap.org.v13.Evcs" />
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Generic configuration object." />
+                <xml-property name="indexedProps" value="configuration-id,model-invariant-id,model-version-id" />
+                <xml-property name="uniqueProps" value="configuration-id" />
+                <xml-property name="container" value="configurations" />
+                <xml-property name="namespace" value="network" />
+            </xml-properties>
+        </java-type>
+        <java-type name="LogicalLinks">
+            <xml-properties>
+                <xml-property name="description" value="Collection of logical connections" />
+            </xml-properties>
+            <xml-root-element name="logical-links" />
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="logicalLink" name="logical-link" type="inventory.aai.onap.org.v13.LogicalLink" />
+            </java-attributes>
+        </java-type>
+        <java-type name="LogicalLink">
+            <xml-root-element name="logical-link" />
+            <java-attributes>
+                <xml-element java-attribute="linkName" name="link-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="e.g., evc-name, or vnf-nameA_interface-nameA_vnf-nameZ_interface-nameZ" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element default-value="false" required="true" java-attribute="inMaint" name="in-maint" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="linkType" name="link-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Type of logical link, e.g., evc" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Captures the numeric part of the speed" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Captures the units corresponding to the speed" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipVersion" name="ip-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="v4, v6, or ds for dual stack (should be att-ip-version)" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="routingProtocol" name="routing-protocol" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="For example, static or BGP" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC model id for this resource or service model." />
+                        <xml-property name="visibility" value="deployment" />
+                        <xml-property name="requires" value="model-version-id" />
+                        <xml-property name="dbAlias" value="model-invariant-id-local" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC model version for this resource or service model." />
+                        <xml-property name="visibility" value="deployment" />
+                        <xml-property name="requires" value="model-invariant-id" />
+                        <xml-property name="dbAlias" value="model-version-id-local" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC model version for this resource or service model." />
+                        <xml-property name="visibility" value="internal" />
+                        <xml-property name="dataCopy" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="widgetModelVersion" name="widget-model-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indication of operational status of the logical link." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Trigger for operational monitoring of this VNF by BAU Service Assurance systems." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="linkRole" name="link-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indication of the network use of the logical link." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="linkName2" name="link-name2" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Alias or alternate name (CLCI or D1 name)." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="linkId" name="link-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="UUID of the logical-link, SDNC generates this." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="circuitId" name="circuit-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Circuit id" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="purpose" name="purpose" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Reason for this entity, role it is playing" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Logical links generally connect l-interfaces but are used to express logical connectivity between two points" />
+                <xml-property name="indexedProps" value="link-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,link-id,prov-status,circuit-id,purpose" />
+                <xml-property name="uniqueProps" value="link-id" />
+                <xml-property name="container" value="logical-links" />
+                <xml-property name="namespace" value="network" />
+                <xml-property name="searchable" value="link-name" />
+            </xml-properties>
+        </java-type>
+        <java-type name="SitePairSets">
+            <xml-properties>
+                <xml-property name="description" value="Collection of sets of instances for probes related to generic-vnf" />
+            </xml-properties>
+            <xml-root-element name="site-pair-sets" />
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="sitePairSet" name="site-pair-set" type="inventory.aai.onap.org.v13.SitePairSet" />
+            </java-attributes>
+        </java-type>
+        <java-type name="SitePairSet">
+            <xml-root-element name="site-pair-set" />
+            <java-attributes>
+                <xml-element java-attribute="sitePairSetId" name="site-pair-set-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id of site pair set." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="routingInstances" name="routing-instances" type="inventory.aai.onap.org.v13.RoutingInstances" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Set of instances for probes used to measure service level agreements" />
+                <xml-property name="indexedProps" value="site-pair-set-id" />
+                <xml-property name="uniqueProps" value="site-pair-set-id" />
+                <xml-property name="container" value="site-pair-sets" />
+                <xml-property name="namespace" value="network" />
+            </xml-properties>
+        </java-type>
+        <java-type name="RoutingInstances">
+            <xml-properties>
+                <xml-property name="description" value="set of probes related to generic-vnf routing instance" />
+            </xml-properties>
+            <xml-root-element name="routing-instances" />
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="routingInstance" name="routing-instance" type="inventory.aai.onap.org.v13.RoutingInstance" />
+            </java-attributes>
+        </java-type>
+        <java-type name="RoutingInstance">
+            <xml-root-element name="routing-instance" />
+            <java-attributes>
+                <xml-element java-attribute="routingInstanceId" name="routing-instance-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id of routing instance" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="rpmOwner" name="rpm-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="rpm owner" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="sitePairs" name="site-pairs" type="inventory.aai.onap.org.v13.SitePairs" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="indexedProps" value="routing-instance-id" />
+                <xml-property name="dependentOn" value="site-pair-set" />
+                <xml-property name="container" value="routing-instances" />
+            </xml-properties>
+        </java-type>
+        <java-type name="SitePairs">
+            <xml-properties>
+                <xml-property name="description" value="probe within a set" />
+            </xml-properties>
+            <xml-root-element name="site-pairs" />
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="sitePair" name="site-pair" type="inventory.aai.onap.org.v13.SitePair" />
+            </java-attributes>
+        </java-type>
+        <java-type name="SitePair">
+            <xml-root-element name="site-pair" />
+            <java-attributes>
+                <xml-element java-attribute="sitePairId" name="site-pair-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="unique identifier of probe" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="sourceIp" name="source-ip" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Prefix address" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="destinationIp" name="destination-ip" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Prefix address" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipVersion" name="ip-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ip version, v4, v6" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="destinationHostname" name="destination-hostname" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Hostname of the destination equipment to which SLAs are measured against." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="destinationEquipType" name="destination-equip-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The type of destinatination equipment. Could be Router, UCPE, etc." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="classesOfService" name="classes-of-service" type="inventory.aai.onap.org.v13.ClassesOfService" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="indexedProps" value="site-pair-id" />
+                <xml-property name="uniqueProps" value="site-pair-id" />
+                <xml-property name="dependentOn" value="routing-instance" />
+                <xml-property name="container" value="site-pairs" />
+            </xml-properties>
+        </java-type>
+        <java-type name="ClassesOfService">
+            <xml-properties>
+                <xml-property name="description" value="class-of-service of probe" />
+            </xml-properties>
+            <xml-root-element name="classes-of-service" />
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="classOfService" name="class-of-service" type="inventory.aai.onap.org.v13.ClassOfService" />
+            </java-attributes>
+        </java-type>
+        <java-type name="ClassOfService">
+            <xml-root-element name="class-of-service" />
+            <java-attributes>
+                <xml-element java-attribute="cos" name="cos" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="unique identifier of probe" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="probeId" name="probe-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="identifier of probe" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="probeType" name="probe-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="type of probe" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="indexedProps" value="cos" />
+                <xml-property name="dependentOn" value="site-pair" />
+                <xml-property name="container" value="classes-of-service" />
+            </xml-properties>
+        </java-type>
+        <java-type name="VpnBindings">
+            <xml-root-element name="vpn-bindings" />
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vpnBinding" name="vpn-binding" type="inventory.aai.onap.org.v13.VpnBinding" />
+            </java-attributes>
+        </java-type>
+        <java-type name="VpnBinding">
+            <xml-root-element name="vpn-binding" />
+            <java-attributes>
+                <xml-element java-attribute="vpnId" name="vpn-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="VPN ID, globally unique within A&amp;AI" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vpnName" name="vpn-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="VPN Name" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vpnPlatform" name="vpn-platform" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the platform associated with the VPN example AVPN, Mobility" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vpnType" name="vpn-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Type of the vpn, should be taken from enumerated/valid values" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vpnRegion" name="vpn-region" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="region of customer vpn" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="customerVpnId" name="customer-vpn-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="id for this customer vpn" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="routeDistinguisher" name="route-distinguisher" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used to distinguish the distinct VPN routes of separate customers who connect to the provider in an MPLS network." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="routeTargets" name="route-targets" type="inventory.aai.onap.org.v13.RouteTargets" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList">
+                    <xml-properties>
+                        <xml-property name="description" value="l3-networks relate to vpn-bindings" />
+                    </xml-properties>
+                </xml-element>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="VPN binding" />
+                <xml-property name="nameProps" value="vpn-name,vpn-type" />
+                <xml-property name="indexedProps" value="vpn-name,vpn-id,vpn-type" />
+                <xml-property name="searchable" value="vpn-id,vpn-name" />
+                <xml-property name="uniqueProps" value="vpn-id" />
+                <xml-property name="container" value="vpn-bindings" />
+                <xml-property name="namespace" value="network" />
+            </xml-properties>
+        </java-type>
+        <java-type name="VplsPes">
+            <xml-properties>
+                <xml-property name="description" value="Collection of VPLS Provider Edge routers" />
+            </xml-properties>
+            <xml-root-element name="vpls-pes" />
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vplsPe" name="vpls-pe" type="inventory.aai.onap.org.v13.VplsPe" />
+            </java-attributes>
+        </java-type>
+        <java-type name="VplsPe">
+            <xml-root-element name="vpls-pe" />
+            <java-attributes>
+                <xml-element java-attribute="equipmentName" name="equipment-name" required="true" type="java.lang.String" xml-key="true" />
+                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Trigger for operational monitoring of this VNF by BAU Service Assurance systems." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by GenericVnf (v4-loopback0-ip-address)." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Client should send valid enumerated value, e.g., VPLS-PE." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Temporary location for stag to get to VCE" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+                <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v13.PInterfaces" />
+                <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v13.LagInterfaces" />
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="VPLS Provider Edge routers." />
+                <xml-property name="indexedProps" value="prov-status,equipment-name" />
+                <xml-property name="container" value="vpls-pes" />
+                <xml-property name="namespace" value="network" />
+            </xml-properties>
+        </java-type>
+        <java-type name="MulticastConfigurations">
+            <xml-properties>
+                <xml-property name="description" value="multicast configuration of generic-vnf ip-address" />
+            </xml-properties>
+            <xml-root-element name="multicast-configurations" />
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="multicastConfiguration" name="multicast-configuration" type="inventory.aai.onap.org.v13.MulticastConfiguration" />
+            </java-attributes>
+        </java-type>
+        <java-type name="MulticastConfiguration">
+            <xml-root-element name="multicast-configuration" />
+            <java-attributes>
+                <xml-element java-attribute="multicastConfigurationId" name="multicast-configuration-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id of multicast configuration." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="multicastProtocol" name="multicast-protocol" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="protocol of multicast configuration" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="rpType" name="rp-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="rp type of multicast configuration" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="indexedProps" value="multicast-configuration-id" />
+                <xml-property name="uniqueProps" value="multicast-configuration-id" />
+                <xml-property name="container" value="multicast-configurations" />
+                <xml-property name="namespace" value="network" />
+            </xml-properties>
+        </java-type>
+        <java-type name="Vces">
+            <xml-properties>
+                <xml-property name="description" value="Collection of Virtual Customer Edge Routers, used specifically for Gamma.  This object is deprecated." />
+            </xml-properties>
+            <xml-root-element name="vces" />
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vce" name="vce" type="inventory.aai.onap.org.v13.Vce" />
+            </java-attributes>
+        </java-type>
+        <java-type name="Vce">
+            <xml-root-element name="vce" />
+            <java-attributes>
+                <xml-element java-attribute="vnfId" name="vnf-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id of VNF.  This is unique across the graph." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vnfName" name="vnf-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of VNF." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vnfName2" name="vnf-name2" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Alternate name of VNF." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceId" name="service-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique identifier of service, does not strictly map to ASDC services, SOON TO BE DEPRECATED." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="regionalResourceZone" name="regional-resource-zone" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Regional way of organizing pservers, source of truth should define values" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicator for whether the resource is considered operational" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="OBSOLETE -  do not use" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Network role being played by this VNF" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Orchestration status of this VNF, mastered by MSO" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vpeId" name="vpe-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID of VPE connected to this VCE." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="v6VceWanAddress" name="v6-vce-wan-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Valid v6 IP address for the WAN Link on this router.  Implied length of /64." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Address tail-f uses to configure vce, also used for troubleshooting and is IP used for traps generated by VCE." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipv4Loopback0Address" name="ipv4-loopback0-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Loopback0 address" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="entitlementResourceUuid" name="entitlement-resource-uuid" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="OBSOLETE -  see child relationships" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="portGroups" name="port-groups" type="inventory.aai.onap.org.v13.PortGroups" />
+                <xml-element java-attribute="licenses" name="licenses" type="inventory.aai.onap.org.v13.Licenses" />
+                <xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.onap.org.v13.Entitlements" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Virtual Customer Edge Router, used specifically for Gamma.  This object is deprecated." />
+                <xml-property name="nameProps" value="vnf-name" />
+                <xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id" />
+                <xml-property name="searchable" value="vnf-id,vnf-name,vnf-name2" />
+                <xml-property name="uniqueProps" value="vnf-id" />
+                <xml-property name="container" value="vces" />
+                <xml-property name="namespace" value="network" />
+                <xml-property name="extends" value="vnf" />
+            </xml-properties>
+        </java-type>
+        <java-type name="PortGroups">
+            <xml-root-element name="port-groups" />
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="portGroup" name="port-group" type="inventory.aai.onap.org.v13.PortGroup" />
+            </java-attributes>
+        </java-type>
+        <java-type name="PortGroup">
+            <xml-root-element name="port-group" />
+            <java-attributes>
+                <xml-element java-attribute="interfaceId" name="interface-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID of the interface" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Neutron network id of this Interface" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="neutronNetworkName" name="neutron-network-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Neutron network name of this Interface" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Role assigned to this Interface, should use values as defined in ECOMP Yang models." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="portGroupId" name="port-group-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID for port group in vmware" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="portGroupName" name="port-group-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Likely to duplicate value of neutron network name" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="switchName" name="switch-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="DVS or standard switch name (should be non-null for port groups associated with DVS)" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Orchestration status of this VNF, mastered by MSO" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="cvlanTags" name="cvlan-tags" type="inventory.aai.onap.org.v13.CvlanTags" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Used to capture the network interfaces of this VCE" />
+                <xml-property name="nameProps" value="port-group-name" />
+                <xml-property name="indexedProps" value="port-group-id,heat-stack-id,interface-id,interface-name,switch-name" />
+                <xml-property name="dependentOn" value="vce" />
+                <xml-property name="container" value="port-groups" />
+            </xml-properties>
+        </java-type>
+        <java-type name="CvlanTags">
+            <xml-root-element name="cvlan-tags" />
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="cvlanTagEntry" name="cvlan-tag-entry" type="inventory.aai.onap.org.v13.CvlanTagEntry" />
+            </java-attributes>
+        </java-type>
+        <java-type name="CvlanTagEntry">
+            <xml-root-element name="cvlan-tag-entry" />
+            <java-attributes>
+                <xml-element java-attribute="cvlanTag" name="cvlan-tag" required="true" type="java.lang.Long" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="See mis-na-virtualization-platform.yang" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="dependentOn" value="port-group" />
+                <xml-property name="indexedProps" value="cvlan-tag" />
+                <xml-property name="container" value="cvlan-tags" />
+            </xml-properties>
+        </java-type>
+        <java-type name="Vnfcs">
+            <xml-properties>
+                <xml-property name="description" value="virtual network components associated with a vserver from application controller." />
+            </xml-properties>
+            <xml-root-element name="vnfcs" />
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vnfc" name="vnfc" type="inventory.aai.onap.org.v13.Vnfc" />
+            </java-attributes>
+        </java-type>
+        <java-type name="Vnfc">
+            <xml-root-element name="vnfc" />
+            <java-attributes>
+                <xml-element java-attribute="vnfcName" name="vnfc-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID of vnfc." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="nfcNamingCode" name="nfc-naming-code" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Short code that is used in naming instances of the item being modeled" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="nfcFunction" name="nfc-function" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="English description of function that the specific resource deployment is providing. Assigned as part of the customization of a resource in a service" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="prov status of this vnfc" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Orchestration status of this VNF, mastered by APP-C" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipaddressV4OamVip" name="ipaddress-v4-oam-vip" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Oam V4 vip address of this vnfc" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element default-value="false" required="true" java-attribute="inMaint" name="in-maint" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element default-value="false" required="true" java-attribute="isClosedLoopDisabled" name="is-closed-loop-disabled" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="used to indicate whether closed loop function is enabled on this node" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="groupNotation" name="group-notation" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Group notation of VNFC" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC model id for this resource or service model." />
+                        <xml-property name="visibility" value="deployment" />
+                        <xml-property name="requires" value="model-version-id" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC model version for this resource or service model." />
+                        <xml-property name="visibility" value="deployment" />
+                        <xml-property name="requires" value="model-invariant-id" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v13.L3InterfaceIpv4AddressList" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v13.L3InterfaceIpv6AddressList" />
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="indexedProps" value="vnfc-name,prov-status,nfc-function,nfc-naming-code,ipaddress-v4-oam-vip,in-maint,is-closed-loop-disabled,group-notation,model-invariant-id,model-version-id" />
+                <xml-property name="searchable" value="vnfc-name" />
+                <xml-property name="container" value="vnfcs" />
+                <xml-property name="namespace" value="network" />
+            </xml-properties>
+        </java-type>
+        <java-type name="L3Networks">
+            <xml-root-element name="l3-networks" />
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3Network" name="l3-network" type="inventory.aai.onap.org.v13.L3Network" />
+            </java-attributes>
+        </java-type>
+        <java-type name="L3Network">
+            <xml-root-element name="l3-network" />
+            <java-attributes>
+                <xml-element java-attribute="networkId" name="network-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Network ID, should be uuid. Unique across A&amp;AI." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="networkName" name="network-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the network, governed by some naming convention.." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="networkType" name="network-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Type of the network - who defines these values?" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="networkRole" name="network-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Role the network plans - who defines these values?" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="networkTechnology" name="network-technology" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Network technology - who defines these values?" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Neutron network id of this Interface" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element default-value="false" required="true" java-attribute="isBoundToVpn" name="is-bound-to-vpn" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="Set to true if bound to VPN" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceId" name="service-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique identifier of service from ASDC.  Does not strictly map to ASDC services.  SOON TO BE DEPRECATED" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="networkRoleInstance" name="network-role-instance" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="network role instance" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Orchestration status of this VNF, mastered by MSO" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="contrailNetworkFqdn" name="contrail-network-fqdn" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Contrail FQDN for the network" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC model id for this resource or service model." />
+                        <xml-property name="visibility" value="deployment" />
+                        <xml-property name="requires" value="model-version-id" />
+                        <xml-property name="dbAlias" value="model-invariant-id-local" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC model version for this resource or service model." />
+                        <xml-property name="visibility" value="deployment" />
+                        <xml-property name="requires" value="model-invariant-id" />
+                        <xml-property name="dbAlias" value="model-version-id-local" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC model version for this resource or service model." />
+                        <xml-property name="visibility" value="internal" />
+                        <xml-property name="dataCopy" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="captures the id of all the configuration used to customize the resource for the service." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="widgetModelVersion" name="widget-model-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="physicalNetworkName" name="physical-network-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name associated with the physical network." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="isProviderNetwork" name="is-provider-network" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="boolean indicatating whether or not network is a provider network." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="isSharedNetwork" name="is-shared-network" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="boolean indicatating whether or not network is a shared network." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="isExternalNetwork" name="is-external-network" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="boolean indicatating whether or not network is an external network." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Path to the controller object." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicator for whether the resource is considered operational." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="subnets" name="subnets" type="inventory.aai.onap.org.v13.Subnets" />
+                <xml-element java-attribute="ctagAssignments" name="ctag-assignments" type="inventory.aai.onap.org.v13.CtagAssignments" />
+                <xml-element java-attribute="segmentationAssignments" name="segmentation-assignments" type="inventory.aai.onap.org.v13.SegmentationAssignments" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" >
+                    <xml-properties>
+                        <xml-property name="description" value="Relates to tenant (or is it a child of tenant), complex, service, vpn-binding" />
+                    </xml-properties>
+                </xml-element>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Generic network definition" />
+                <xml-property name="nameProps" value="network-name" />
+                <xml-property name="indexedProps" value="heat-stack-id,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role" />
+                <xml-property name="searchable" value="network-id,network-name" />
+                <xml-property name="uniqueProps" value="network-id" />
+                <xml-property name="container" value="l3-networks" />
+                <xml-property name="namespace" value="network" />
+            </xml-properties>
+        </java-type>
+        <java-type name="NetworkPolicies">
+            <xml-root-element name="network-policies" />
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="networkPolicy" name="network-policy" type="inventory.aai.onap.org.v13.NetworkPolicy" />
+            </java-attributes>
+        </java-type>
+        <java-type name="NetworkPolicy">
+            <xml-root-element name="network-policy" />
+            <java-attributes>
+                <xml-element java-attribute="networkPolicyId" name="network-policy-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="UUID representing unique key to this instance" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="networkPolicyFqdn" name="network-policy-fqdn" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Contrail FQDN for the policy" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ID for the openStack Heat instance" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="nameProps" value="network-policy-fqdn" />
+                <xml-property name="indexedProps" value="network-policy-id,network-policy-fqdn" />
+                <xml-property name="searchable" value="network-policy-id,network-policy-fqdn" />
+                <xml-property name="uniqueProps" value="network-policy-id" />
+                <xml-property name="container" value="network-policies" />
+                <xml-property name="namespace" value="network" />
+            </xml-properties>
+        </java-type>
+        <java-type name="CtagAssignments">
+            <xml-root-element name="ctag-assignments" />
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="ctagAssignment" name="ctag-assignment" type="inventory.aai.onap.org.v13.CtagAssignment" />
+            </java-attributes>
+        </java-type>
+        <java-type name="CtagAssignment">
+            <xml-root-element name="ctag-assignment" />
+            <java-attributes>
+                <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" required="true" type="java.lang.Long" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="id." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="indexedProps" value="vlan-id-inner" />
+                <xml-property name="dependentOn" value="l3-network" />
+                <xml-property name="container" value="ctag-assignments" />
+            </xml-properties>
+        </java-type>
+        <java-type name="Subnets">
+            <xml-root-element name="subnets" />
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="subnet" name="subnet" type="inventory.aai.onap.org.v13.Subnet" />
+            </java-attributes>
+        </java-type>
+        <java-type name="Subnet">
+            <xml-root-element name="subnet" />
+            <java-attributes>
+                <xml-element java-attribute="subnetId" name="subnet-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Subnet ID, should be UUID." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="subnetName" name="subnet-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name associated with the subnet." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Neutron id of this subnet" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="gatewayAddress" name="gateway-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="gateway ip address" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="networkStartAddress" name="network-start-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="network start address" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="cidrMask" name="cidr-mask" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="cidr mask" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipVersion" name="ip-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ip version" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Orchestration status of this VNF, mastered by MSO" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element default-value="false" required="true" java-attribute="dhcpEnabled" name="dhcp-enabled" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="dhcp enabled" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dhcpStart" name="dhcp-start" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the start address reserved for use by dhcp" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dhcpEnd" name="dhcp-end" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the last address reserved for use by dhcp" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="subnetRole" name="subnet-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="role of the subnet, referenced when assigning IPs" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipAssignmentDirection" name="ip-assignment-direction" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ip address assignment direction of the subnet" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="subnetSequence" name="subnet-sequence" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="sequence of the subnet" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="hostRoutes" name="host-routes" type="inventory.aai.onap.org.v13.HostRoutes" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="indexedProps" value="subnet-id,subnet-name" />
+                <xml-property name="nameProps" value="subnet-name" />
+                <xml-property name="uniqueProps" value="subnet-id" />
+                <xml-property name="dependentOn" value="l3-network" />
+                <xml-property name="container" value="subnets" />
+            </xml-properties>
+        </java-type>
+        <java-type name="GenericVnfs">
+            <xml-properties>
+                <xml-property name="description" value="Collection of VNFs" />
+            </xml-properties>
+            <xml-root-element name="generic-vnfs" />
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="genericVnf" name="generic-vnf" type="inventory.aai.onap.org.v13.GenericVnf" />
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="maximumDepth" value="0" />
+            </xml-properties>
+        </java-type>
+        <java-type name="GenericVnf">
+            <xml-root-element name="generic-vnf" />
+            <java-attributes>
+                <xml-element java-attribute="vnfId" name="vnf-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id of VNF.  This is unique across the graph." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vnfName" name="vnf-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of VNF." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vnfName2" name="vnf-name2" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Alternate name of VNF." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceId" name="service-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique identifier of service, does not necessarily map to ASDC service models.  SOON TO BE DEPRECATED" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="regionalResourceZone" name="regional-resource-zone" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Regional way of organizing pservers, source of truth should define values" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems." />
+                        <xml-property name="suggestibleOnSearch" value="true"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicator for whether the resource is considered operational.  Valid values are in-service-path and out-of-service-path." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="OBSOLETE -  do not use" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Client should send valid enumerated value" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Orchestration status of this VNF, used by MSO." />
+                        <xml-property name="suggestibleOnSearch" value="true"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="identifier of managed by ATT or customer" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by generic-vnf." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipv4Loopback0Address" name="ipv4-loopback0-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="v4 Loopback0 address" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="nmLanV6Address" name="nm-lan-v6-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="v6 Loopback address" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="managementV6Address" name="management-v6-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="v6 management address" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vcpu" name="vcpu" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="number of vcpus ordered for this instance of VNF, used for VNFs with no vservers/flavors, to be used only by uCPE" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vcpuUnits" name="vcpu-units" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="units associated with vcpu, used for VNFs with no vservers/flavors, to be used only by uCPE" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vmemory" name="vmemory" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="number of GB of memory ordered for this instance of VNF, used for VNFs with no vservers/flavors, to be used only by uCPE" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vmemoryUnits" name="vmemory-units" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="units associated with vmemory, used for VNFs with no vservers/flavors, to be used only by uCPE" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vdisk" name="vdisk" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="number of vdisks ordered for this instance of VNF, used for VNFs with no vservers/flavors, to be used only uCPE" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vdiskUnits" name="vdisk-units" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="units associated with vdisk, used for VNFs with no vservers/flavors, to be used only by uCPE" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element default-value="false" required="true" java-attribute="inMaint" name="in-maint" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element default-value="false" required="true" java-attribute="isClosedLoopDisabled" name="is-closed-loop-disabled" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="used to indicate whether closed loop function is enabled on this node" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="summaryStatus" name="summary-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="details regarding the generic-vnf operation, PLEASE DISCONTINUE USE OF THIS FIELD." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="encryptedAccessFlag" name="encrypted-access-flag" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="indicates whether generic-vnf access uses SSH" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="entitlementAssignmentGroupUuid" name="entitlement-assignment-group-uuid" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="UUID of the Entitlement group used for licensing VNFs, OBSOLETE -  See child relationships." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="entitlementResourceUuid" name="entitlement-resource-uuid" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="UUID of the specific entitlement resource.  OBSOLETE -  See child relationships." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="licenseAssignmentGroupUuid" name="license-assignment-group-uuid" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="UUID of the license assignment group.  OBSOLETE -  See child relationships." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="licenseKeyUuid" name="license-key-uuid" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="UUID of the actual license resource.  OBSOLETE -  See child relationships." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC model id for this resource or service model." />
+                        <xml-property name="visibility" value="deployment" />
+                        <xml-property name="requires" value="model-version-id" />
+                        <xml-property name="dbAlias" value="model-invariant-id-local" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC model version for this resource or service model." />
+                        <xml-property name="visibility" value="deployment" />
+                        <xml-property name="requires" value="model-invariant-id" />
+                        <xml-property name="dbAlias" value="model-version-id-local" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC model version for this resource or service model." />
+                        <xml-property name="visibility" value="internal" />
+                        <xml-property name="dataCopy" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="captures the id of all the configuration used to customize the resource for the service." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="widgetModelVersion" name="widget-model-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="asNumber" name="as-number" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="as-number of the VNF" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="regionalResourceSubzone" name="regional-resource-subzone" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="represents sub zone of the rr plane" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="nfType" name="nf-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Generic description of the type of NF" />
+                        <xml-property name="suggestibleOnSearch" value="true"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="nfFunction" name="nf-function" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="English description of Network function that the specific VNF deployment is providing" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="nfRole" name="nf-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="role in the network that this model will be providing" />
+                        <xml-property name="suggestibleOnSearch" value="true"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="nfNamingCode" name="nf-naming-code" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="string assigned to this model used for naming purposes" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Path to the controller object." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipv4OamGatewayAddress" name="ipv4-oam-gateway-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Gateway address" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipv4OamGatewayAddressPrefixLength" name="ipv4-oam-gateway-address-prefix-length" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Prefix length for oam-address" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Temporary location for S-TAG to get to VCE" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="nmProfileName" name="nm-profile-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Network Management profile of this VNF" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v13.LInterfaces" />
+                <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v13.LagInterfaces" />
+                <xml-element java-attribute="vfModules" name="vf-modules" type="inventory.aai.onap.org.v13.VfModules" />
+                <xml-element java-attribute="licenses" name="licenses" type="inventory.aai.onap.org.v13.Licenses" />
+                <xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.onap.org.v13.Entitlements" />
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="General purpose VNF" />
+                <xml-property name="nameProps" value="vnf-name" />
+                <xml-property name="indexedProps" value="is-closed-loop-disabled,vnf-name2,vnf-type,heat-stack-id,in-maint,vnf-name,vnf-id,regional-resource-zone,prov-status,service-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,nf-type,nf-function,nf-naming-code,nf-role" />
+                <xml-property name="searchable" value="vnf-id,vnf-name,vnf-name2" />
+                <xml-property name="uniqueProps" value="vnf-id" />
+                <xml-property name="container" value="generic-vnfs" />
+                <xml-property name="namespace" value="network" />
+                <xml-property name="extends" value="vnf" />
+                <xml-property name="containsSuggestibleProps" value="true"/>
+                <xml-property name="suggestionAliases" value="VNFs"/>
+            </xml-properties>
+        </java-type>
+        <java-type name="VfModules">
+            <xml-properties>
+                <xml-property name="description" value="Collection of vf-modules, a deployment unit of VNFCs" />
+            </xml-properties>
+            <xml-root-element name="vf-modules" />
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vfModule" name="vf-module" type="inventory.aai.onap.org.v13.VfModule" />
+            </java-attributes>
+        </java-type>
+        <java-type name="VfModule">
+            <xml-root-element name="vf-module" />
+            <java-attributes>
+                <xml-element java-attribute="vfModuleId" name="vf-module-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID of vf-module." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vfModuleName" name="vf-module-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of vf-module" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Heat stack id corresponding to this instance." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="orchestration status of this vf-module, mastered by MSO" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element default-value="false" required="true" java-attribute="isBaseVfModule" name="is-base-vf-module" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="used to indicate whether or not this object is base vf module" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC model id for this resource or service model." />
+                        <xml-property name="visibility" value="deployment" />
+                        <xml-property name="requires" value="model-version-id" />
+                        <xml-property name="dbAlias" value="model-invariant-id-local" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC model version for this resource or service model." />
+                        <xml-property name="visibility" value="deployment" />
+                        <xml-property name="requires" value="model-invariant-id" />
+                        <xml-property name="dbAlias" value="model-version-id-local" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC model version for this resource or service model." />
+                        <xml-property name="visibility" value="internal" />
+                        <xml-property name="dataCopy" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="captures the id of all the configuration used to customize the resource for the service." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="widgetModelVersion" name="widget-model-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="contrailServiceInstanceFqdn" name="contrail-service-instance-fqdn" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the Contrail unique ID for a service-instance" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="moduleIndex" name="module-index" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="the index will track the number of modules of a given type that have been deployed in a VNF, starting with 0, and always choosing the lowest available digit" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Path to the controller object." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="a deployment unit of VNFCs" />
+                <xml-property name="indexedProps" value="vf-module-id,vf-module-name,heat-stack-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-service-instance-fqdn" />
+                <xml-property name="searchable" value="vf-module-id,vf-module-name" />
+                <xml-property name="dependentOn" value="generic-vnf" />
+                <xml-property name="container" value="vf-modules" />
+            </xml-properties>
+        </java-type>
+        <java-type name="LagLinks">
+            <xml-properties>
+                <xml-property name="description" value="Collection of link aggregation connections" />
+            </xml-properties>
+            <xml-root-element name="lag-links" />
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="lagLink" name="lag-link" type="inventory.aai.onap.org.v13.LagLink" />
+            </java-attributes>
+        </java-type>
+        <java-type name="LagLink">
+            <xml-root-element name="lag-link" />
+            <java-attributes>
+                <xml-element java-attribute="linkName" name="link-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Alphabetical concatenation of lag-interface names" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="LAG links can connect lag-interfaces" />
+                <xml-property name="indexedProps" value="link-name" />
+                <xml-property name="container" value="lag-links" />
+                <xml-property name="namespace" value="network" />
+            </xml-properties>
+        </java-type>
+        <java-type name="Newvces">
+            <xml-properties>
+                <xml-property name="description" value="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce." />
+            </xml-properties>
+            <xml-root-element name="newvces" />
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="newvce" name="newvce" type="inventory.aai.onap.org.v13.Newvce" />
+            </java-attributes>
+        </java-type>
+        <java-type name="Newvce">
+            <xml-root-element name="newvce" />
+            <java-attributes>
+                <xml-element java-attribute="vnfId2" name="vnf-id2" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id of VNF, can't use same attribute name right now until we promote this new object" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vnfName" name="vnf-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of VNF." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vnfName2" name="vnf-name2" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Alternate name of VNF." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Trigger for operational monitoring of this VNF by BAU Service Assurance systems." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicator for whether the resource is considered operational" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="OBSOLETE -  do not use" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by GenericVnf (v4-loopback0-ip-address)." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Client should send valid enumerated value." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipv4Loopback0Address" name="ipv4-loopback0-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="v4 Loopback0 address" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Orchestration status of this VNF, mastered by MSO." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v13.LInterfaces" />
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce." />
+                <xml-property name="nameProps" value="vnf-name" />
+                <xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,prov-status,vnf-id2" />
+                <xml-property name="searchable" value="vnf-id2,vnf-name,vnf-name2" />
+                <xml-property name="uniqueProps" value="vnf-id2" />
+                <xml-property name="container" value="newvces" />
+                <xml-property name="namespace" value="network" />
+            </xml-properties>
+        </java-type>
+        <java-type name="Pnfs">
+            <xml-properties>
+                <xml-property name="description" value="Collection of Physical Network Functions." />
+            </xml-properties>
+            <xml-root-element name="pnfs" />
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="pnf" name="pnf" type="inventory.aai.onap.org.v13.Pnf" />
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="maximumDepth" value="0" />
+            </xml-properties>
+        </java-type>
+        <java-type name="Pnf">
+            <xml-root-element name="pnf" />
+            <java-attributes>
+                <xml-element java-attribute="pnfName" name="pnf-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="unique name of Physical Network Function." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="pnfName2" name="pnf-name2" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="name of Physical Network Function." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="pnfName2Source" name="pnf-name2-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="source of name2" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="pnfId" name="pnf-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="id of pnf" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="equipType" name="equip-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Equipment type.  Source of truth should define valid values." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="equipVendor" name="equip-vendor" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Equipment vendor.  Source of truth should define valid values." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="equipModel" name="equip-model" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Equipment model.  Source of truth should define valid values." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="identifier of managed by ATT or customer" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipaddressV4Oam" name="ipaddress-v4-oam" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ipv4-oam-address with new naming convention for IP addresses" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="swVersion" name="sw-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="sw-version is the version of SW for the hosted application on the PNF." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element default-value="false" required="true" java-attribute="inMaint" name="in-maint" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="Used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="frameId" name="frame-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ID of the physical frame (relay rack) where pnf is installed." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serialNumber" name="serial-number" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Serial number of the device" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipaddressV4Loopback0" name="ipaddress-v4-loopback-0" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="IPV4 Loopback 0 address" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipaddressV6Loopback0" name="ipaddress-v6-loopback-0" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="IPV6 Loopback 0 address" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipaddressV4Aim" name="ipaddress-v4-aim" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="IPV4 AIM address" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipaddressV6Aim" name="ipaddress-v6-aim" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="IPV6 AIM address" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipaddressV6Oam" name="ipaddress-v6-oam" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="IPV6 OAM address" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="invStatus" name="inv-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="CANOPI's inventory status.  Only set with values exactly as defined by CANOPI." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Prov Status of this device (not under canopi control) Valid values [PREPROV/NVTPROV/PROV]" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="nfRole" name="nf-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Nf Role is the role performed by this instance in the network." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The ASDC model id for this resource  model." />
+                        <xml-property name="visibility" value="deployment" />
+                        <xml-property name="requires" value="model-version-id" />
+                        <xml-property name="dbAlias" value="model-invariant-id-local" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The ASDC model version for this resource  model." />
+                        <xml-property name="visibility" value="deployment" />
+                        <xml-property name="requires" value="model-invariant-id" />
+                        <xml-property name="dbAlias" value="model-version-id-local" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+                <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v13.PInterfaces" />
+                <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v13.LagInterfaces" />
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="PNF represents a physical network function. typically equipment used in the D1 world. in 1607, this will be populated by SDN-C to represent a premises router that a uCPE connects to. But this can be used to represent any physical device that is not an AIC node or uCPE." />
+                <xml-property name="indexedProps" value="pnf-name,orchestration-status,inv-status,model-invariant-id,model-version-id" />
+                <xml-property name="searchable" value="pnf-name" />
+                <xml-property name="uniqueProps" value="pnf-name" />
+                <xml-property name="container" value="pnfs" />
+                <xml-property name="namespace" value="network" />
+            </xml-properties>
+        </java-type>
+        <java-type name="PhysicalLinks">
+            <xml-properties>
+                <xml-property name="description" value="Collection of physical connections, typically between p-interfaces" />
+            </xml-properties>
+            <xml-root-element name="physical-links" />
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="physicalLink" name="physical-link" type="inventory.aai.onap.org.v13.PhysicalLink" />
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="maximumDepth" value="0" />
+            </xml-properties>
+        </java-type>
+        <java-type name="PhysicalLink">
+            <xml-root-element name="physical-link" />
+            <java-attributes>
+                <xml-element java-attribute="linkName" name="link-name" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="e.g., hostnameA_p-connection_nameA_hostnameZ+p_connection-nameZ" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Captures the numeric part of the speed" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Captures the units corresponding to the speed" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="circuitId" name="circuit-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Circuit it" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dualMode" name="dual-mode" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Dual access mode (e.g., primary, secondary" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="To provide information on who manages this circuit. A&amp;AI or 3rd party transport provider" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceProviderName" name="service-provider-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the service Provider on this link." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceProviderBandwidthUpValue" name="service-provider-bandwidth-up-value" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Upstream Bandwidth value agreed with the service provider" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceProviderBandwidthUpUnits" name="service-provider-bandwidth-up-units" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Units for the upstream BW value" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceProviderBandwidthDownValue" name="service-provider-bandwidth-down-value" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Downstream Bandwidth value agreed with the service provider" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceProviderBandwidthDownUnits" name="service-provider-bandwidth-down-units" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Units for downstream BW value" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Collection of physical connections, typically between p-interfaces" />
+                <xml-property name="indexedProps" value="circuit-id,link-name" />
+                <xml-property name="alternateKeys1" value="circuit-id" />
+                <xml-property name="container" value="physical-links" />
+                <xml-property name="namespace" value="network" />
+                <xml-property name="searchable" value="link-name,circuit-id" />
+            </xml-properties>
+        </java-type>
+        <java-type name="VigServers">
+            <xml-root-element name="vig-servers" />
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vigServer" name="vig-server" type="inventory.aai.onap.org.v13.VigServer" />
+            </java-attributes>
+        </java-type>
+        <java-type name="VigServer">
+            <xml-root-element name="vig-server" />
+            <java-attributes>
+                <xml-element java-attribute="vigAddressType" name="vig-address-type" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="indicates whether the VIG is for AVPN or INTERNET" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element container-type="java.util.ArrayList" java-attribute="ipaddressV4Vig" name="ipaddress-v4-vig" type="java.lang.String" >
+                    <xml-properties>
+                        <xml-property name="description" value="v4 IP of the vig server" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element container-type="java.util.ArrayList" java-attribute="ipaddressV6Vig" name="ipaddress-v6-vig" type="java.lang.String" >
+                    <xml-properties>
+                        <xml-property name="description" value="v6 IP of the vig server" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="vig-server contains information about a vig server used for IPSec-configuration. Populated by SDN-C from 1607" />
+                <xml-property name="indexedProps" value="vig-address-type" />
+                <xml-property name="dependentOn" value="ipsec-configuration" />
+                <xml-property name="container" value="vig-servers" />
+            </xml-properties>
+        </java-type>
+        <java-type name="IpsecConfigurations">
+            <xml-root-element name="ipsec-configurations" />
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="ipsecConfiguration" name="ipsec-configuration" type="inventory.aai.onap.org.v13.IpsecConfiguration" />
+            </java-attributes>
+        </java-type>
+        <java-type name="IpsecConfiguration">
+            <xml-root-element name="ipsec-configuration" />
+            <java-attributes>
+                <xml-element java-attribute="ipsecConfigurationId" name="ipsec-configuration-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="UUID of this configuration" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="requestedVigAddressType" name="requested-vig-address-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicate the type of VIG server like AVPN, INTERNET, BOTH" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="requestedEncryptionStrength" name="requested-encryption-strength" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Encryption values like 3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="requestedDmzType" name="requested-dmz-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ATT can offer a shared DMZ or a DMZ specific to a customer" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="sharedDmzNetworkAddress" name="shared-dmz-network-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Network address of shared DMZ" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="requestedCustomerName" name="requested-customer-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="If the DMZ is a custom DMZ, this field will indicate the customer information" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ikeVersion" name="ike-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="can be 1 or 2" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ikev1Authentication" name="ikev1-authentication" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Contains values like md5, sha1, sha256, sha384" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ikev1Encryption" name="ikev1-encryption" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Encyption values like 3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ikev1DhGroup" name="ikev1-dh-group" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Diffie-Hellman group like DH-GROUP2, DH-GROUP5, DH-GROUP14" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ikev1AmGroupId" name="ikev1-am-group-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Group name defined in VIG for clients using aggressive mode" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ikev1AmPassword" name="ikev1-am-password" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="pre-shared key for the above group name " />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ikev1SaLifetime" name="ikev1-sa-lifetime" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Lifetime for IKEv1 SA" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipsecAuthentication" name="ipsec-authentication" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="md5, sha1, sha256, sha384" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipsecEncryption" name="ipsec-encryption" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipsecSaLifetime" name="ipsec-sa-lifetime" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Life time for IPSec SA" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipsecPfs" name="ipsec-pfs" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="enable PFS or not" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="xauthUserId" name="xauth-userid" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="user ID for xAuth, sm-user,ucpeHostName,nmteHostName" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="xauthUserPassword" name="xauth-user-password" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Encrypted using the Juniper $9$ algorithm" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dpdInterval" name="dpd-interval" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The time between DPD probe" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dpdFrequency" name="dpd-frequency" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Maximum number of DPD before claiming the tunnel is down" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+                <xml-element java-attribute="vigServers" name="vig-servers" type="inventory.aai.onap.org.v13.VigServers" />
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="IPSec configuration node will contain various configuration data for the NMTE VNF. This node will have an edge to the generic-vnf (vnf type = TE). Starting 1607, this data will be populated by SDN-C" />
+                <xml-property name="indexedProps" value="ipsec-configuration-id" />
+                <xml-property name="uniqueProps" value="ipsec-configuration-id" />
+                <xml-property name="container" value="ipsec-configurations" />
+                <xml-property name="namespace" value="network" />
+            </xml-properties>
+        </java-type>
+        <java-type name="RouteTableReferences">
+            <xml-properties>
+                <xml-property name="description" value="Collection of openstack route table references"/>
+            </xml-properties>
+            <xml-root-element name="route-table-references"/>
+            <java-attributes>
+                <xml-element name="route-table-reference" type="inventory.aai.onap.org.v13.RouteTableReference" java-attribute="routeTableReference" container-type="java.util.ArrayList"/>
+            </java-attributes>
+        </java-type>
+        <java-type name="RouteTableReference">
+            <xml-root-element name="route-table-reference" />
+            <java-attributes>
+                <xml-element java-attribute="routeTableReferenceId" name="route-table-reference-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Route Table Reference id, UUID assigned to this instance." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="routeTableReferenceFqdn" name="route-table-reference-fqdn" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="FQDN entry in the route table." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Concurrency value" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+            </java-attributes>
+
+            <xml-properties>
+                <xml-property name="description" value="Openstack route table reference." />
+                <xml-property name="nameProps" value="route-table-reference-fqdn" />
+                <xml-property name="uniqueProps" value="route-table-reference-id" />
+                <xml-property name="indexedProps" value="route-table-reference-id,route-table-reference-fqdn" />
+                <xml-property name="container" value="route-table-references" />
+                <xml-property name="namespace" value="network" />
+            </xml-properties>
+        </java-type>
+        <java-type name="InstanceGroups">
+            <xml-properties>
+                <xml-property name="description" value="Collection of openstack route table references" />
+            </xml-properties>
+            <xml-root-element name="instance-groups" />
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="instanceGroup" name="instance-group" type="inventory.aai.onap.org.v13.InstanceGroup" />
+            </java-attributes>
+        </java-type>
+        <java-type name="InstanceGroup">
+            <xml-root-element name="instance-group" />
+            <java-attributes>
+
+                <xml-element java-attribute="id" name="id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Instance Group ID, UUID assigned to this instance." />
+                    </xml-properties>
+                </xml-element>
+
+                <xml-element java-attribute="instanceGroupRole" name="instance-group-role" required="false" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="role of the instance group." />
+                    </xml-properties>
+                </xml-element>
+
+                <xml-element java-attribute="modelInvariantId" name="model-invariant-id" required="false" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ASDC model id for this resource or service model." />
+                        <xml-property name="visibility" value="deployment" />
+                        <xml-property name="requires" value="model-version-id" />
+                        <xml-property name="dbAlias" value="model-invariant-id-local" />
+                    </xml-properties>
+                </xml-element>
+
+                <xml-element java-attribute="modelVersionId" name="model-version-id" required="false" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ASDC model version uid for this resource model." />
+                        <xml-property name="visibility" value="deployment" />
+                        <xml-property name="requires" value="model-invariant-id" />
+                        <xml-property name="dbAlias" value="model-version-id-local" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="description" name="description" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Descriptive text to help identify the usage of this instance-group" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="instanceGroupType" name="instance-group-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Only valid value today is lower case ha for high availability" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Concurrency value" />
+                    </xml-properties>
+                </xml-element>
+
+                <xml-element java-attribute="instanceGroupName" name="instance-group-name" required="false" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Instance-Group Name." />
+                    </xml-properties>
+                </xml-element>
+
+                <xml-element java-attribute="instanceGroupFunction" name="instance-group-function" required="false" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Instance-Group Function" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+            </java-attributes>
+
+            <xml-properties>
+                <xml-property name="description" value="General mechanism for grouping instances" />
+                <xml-property name="nameProps" value="description,instance-group-name" />
+                <xml-property name="uniqueProps" value="id" />
+                <xml-property name="searchable" value="id,description"/>
+                <xml-property name="indexedProps" value="id,description,type,sub-type,model-invariant-id,model-version-id" />
+                <xml-property name="container" value="instance-groups" />
+                <xml-property name="namespace" value="network" />
+            </xml-properties>
+        </java-type>
+        <java-type name="SegmentationAssignments">
+            <xml-properties>
+                <xml-property name="description" value="Collection of openstack segmentation assignments" />
+            </xml-properties>
+            <xml-root-element name="segmentation-assignments" />
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="segmentationAssignment" name="segmentation-assignment" type="inventory.aai.onap.org.v13.SegmentationAssignment" />
+            </java-attributes>
+        </java-type>
+        <java-type name="SegmentationAssignment">
+            <xml-root-element name="segmentation-assignment" />
+            <java-attributes>
+                <xml-element java-attribute="segmentationId" name="segmentation-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Route Table Reference id, UUID assigned to this instance." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Concurrency value" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Openstack segmentation assignment." />
+                <xml-property name="indexedProps" value="segmentation-id" />
+                <xml-property name="dependentOn" value="l3-network" />
+                <xml-property name="container" value="segmentation-assignments" />
+            </xml-properties>
+        </java-type>
+        <java-type name="Entitlements">
+            <xml-properties>
+                <xml-property name="description" value="Entitlements, keyed by group-uuid and resource-uuid, related to license management" />
+            </xml-properties>
+            <xml-root-element name="entitlements" />
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="entitlement" name="entitlement" type="inventory.aai.onap.org.v13.Entitlement" />
+            </java-attributes>
+        </java-type>
+        <java-type name="Entitlement">
+            <xml-root-element name="entitlement" />
+            <java-attributes>
+                <xml-element java-attribute="groupUuid" name="group-uuid" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID for the entitlement group the resource comes from, should be uuid." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceUuid" name="resource-uuid" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID of an entitlement resource. " />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Concurrency value" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Metadata for entitlement group." />
+                <xml-property name="indexedProps" value="group-uuid,resource-uuid" />
+                <xml-property name="dependentOn" value="generic-vnf,vce" />
+                <xml-property name="container" value="entitlements" />
+            </xml-properties>
+        </java-type>
+        <java-type name="Licenses">
+            <xml-properties>
+                <xml-property name="description" value="Licenses to be allocated across resources, keyed by group-uuid and resource-uuid, related to license management" />
+            </xml-properties>
+            <xml-root-element name="licenses" />
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="license" name="license" type="inventory.aai.onap.org.v13.License" />
+            </java-attributes>
+        </java-type>
+        <java-type name="License">
+            <xml-root-element name="license" />
+            <java-attributes>
+                <xml-element java-attribute="groupUuid" name="group-uuid" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID for the license group the resource belongs to, should be uuid." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceUuid" name="resource-uuid" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID of a license resource. " />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Concurrency value" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Metadata for license group." />
+                <xml-property name="indexedProps" value="group-uuid,resource-uuid" />
+                <xml-property name="dependentOn" value="generic-vnf,vce" />
+                <xml-property name="container" value="licenses" />
+            </xml-properties>
+        </java-type>
+        <java-type name="Vnf">
+            <xml-root-element name="vnf"/>
+            <java-attributes>
+                <xml-element java-attribute="vnfId" name="vnf-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id of VNF.  This is unique across the graph." />
+                    </xml-properties>
+                </xml-element>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Abstract vnf class" />
+                <xml-property name="indexedProps" value="vnf-id" />
+                <xml-property name="uniqueProps" value="vnf-id" />
+                <xml-property name="inheritors" value="vce,generic-vnf" />
+                <xml-property name="abstract" value="true" />
+            </xml-properties>
+        </java-type>
+        <java-type name="Zones">
+            <xml-properties>
+                <xml-property name="description" value="Collection of zones" />
+            </xml-properties>
+            <xml-root-element name="zones" />
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="zone" name="zone" type="inventory.aai.onap.org.v13.Zone" />
+            </java-attributes>
+        </java-type>
+        <java-type name="Zone">
+            <xml-root-element name="zone" />
+            <java-attributes>
+                <xml-element java-attribute="zoneId" name="zone-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Code assigned by AIC to the zone" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="zoneName" name="zone-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="English name associated with the zone" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="designType" name="design-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Design of zone [Medium/Large…]" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="zoneContext" name="zone-context" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Context of zone [production/test]" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="status" name="status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Status of a zone." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Concurrency value" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="A zone is a grouping of assets in a location homing to the same connections into the CBB" />
+                <xml-property name="nameProps" value="zone-name" />
+                <xml-property name="indexedProps" value="zone-id,design-type,zone-context" />
+                <xml-property name="uniqueProps" value="zone-id" />
+                <xml-property name="container" value="zones" />
+                <xml-property name="namespace" value="network" />
+            </xml-properties>
+        </java-type>
+        <java-type name="RouteTargets">
+            <xml-properties>
+                <xml-property name="description" value="Collection of route target information" />
+            </xml-properties>
+            <xml-root-element name="route-targets" />
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="routeTarget" name="route-target" type="inventory.aai.onap.org.v13.RouteTarget" />
+            </java-attributes>
+        </java-type>
+        <java-type name="RouteTarget">
+            <xml-root-element name="route-target" />
+            <java-attributes>
+                <xml-element java-attribute="globalRouteTarget" name="global-route-target" required="true" xml-key="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Number used to identify an RT, globally unique in the network" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="routeTargetRole" name="route-target-role" required="true" xml-key="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Role assigned to this route target" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Route target information" />
+                <xml-property name="container" value="route-targets" />
+                <xml-property name="dependentOn" value="vpn-binding" />
+                <xml-property name="canBeLinked" value="true" />
+            </xml-properties>
+        </java-type>
+        <java-type name="SriovPfs">
+            <xml-properties>
+                <xml-property name="description" value="Collection of SR-IOV Physical Functions." />
+            </xml-properties>
+            <xml-root-element name="sriov-pfs" />
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="sriovPf" name="sriov-pf" type="inventory.aai.onap.org.v13.SriovPf" />
+            </java-attributes>
+        </java-type>
+        <java-type name="SriovPf">
+            <xml-root-element name="sriov-pf" />
+            <java-attributes>
+                <xml-element java-attribute="pfPciId" name="pf-pci-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifier for the sriov-pf" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="SR-IOV Physical Function" />
+                <xml-property name="indexedProps" value="pf-pci-id" />
+                <xml-property name="dependentOn" value="p-interface" />
+                <xml-property name="container" value="sriov-pfs" />
+            </xml-properties>
+        </java-type>
+        <java-type name="HostRoutes">
+            <xml-root-element name="host-routes" />
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="hostRoute" name="host-route" type="inventory.aai.onap.org.v13.HostRoute" />
+            </java-attributes>
+        </java-type>
+        <java-type name="HostRoute">
+            <xml-root-element name="host-route" />
+            <java-attributes>
+                <xml-element java-attribute="hostRouteId" name="host-route-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="host-route id" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="routePrefix" name="route-prefix" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="subnet prefix" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="nextHop" name="next-hop" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Could be ip-address, hostname, or service-instance" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="nextHopType" name="next-hop-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Should be ip-address, hostname, or service-instance to match next-hop" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="indexedProps" value="host-route-id" />
+                <xml-property name="dependentOn" value="subnet" />
+                <xml-property name="container" value="host-routes" />
+            </xml-properties>
+        </java-type>
+        <java-type name="ForwardingPaths">
+            <xml-root-element name="forwarding-paths" />
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="forwardingPath" name="forwarding-path" type="inventory.aai.onap.org.v13.ForwardingPath" />
+            </java-attributes>
+        </java-type>
+        <java-type name="ForwardingPath">
+            <xml-root-element name="forwarding-path"/>
+            <xml-properties>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="indexedProps" value="forwarding-path-id,forwarding-path-name"/>
+                <xml-property name="description" value="Entity that describes the sequenced forwarding path between interfaces of services or resources"/>
+                <xml-property name="container" value="forwarding-paths" />
+                <xml-property name="nameProps" value="forwarding-path-name" />
+                <xml-property name="uniqueProps" value="forwarding-path-id" />
+            </xml-properties>
+            <java-attributes>
+                <xml-element java-attribute="forwardingPathId" name="forwarding-path-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID of this FP"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="forwardingPathName" name="forwarding-path-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the FP"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList"/>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the self link for this FP"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="forwarders" name="forwarders" type="inventory.aai.onap.org.v13.Forwarders" />
+            </java-attributes>
+        </java-type>
+        <java-type name="Forwarders">
+            <xml-root-element name="forwarders" />
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="forwarder" name="forwarder" type="inventory.aai.onap.org.v13.Forwarder" />
+            </java-attributes>
+        </java-type>
+        <java-type name="Forwarder">
+            <xml-root-element name="forwarder"/>
+            <xml-properties>
+                <xml-property name="indexedProps" value="sequence"/>
+                <xml-property name="description" value="Entity describing a sequenced segment of forwarding path"/>
+                <xml-property name="container" value="forwarders" />
+                <xml-property name="dependentOn" value="forwarding-path" />
+            </xml-properties>
+            <java-attributes>
+                <xml-element java-attribute="sequence" name="sequence" required="true" type="java.lang.Integer" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID of this segmentation"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="forwarderRole" name="forwarder-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ingress, intermediate, egress"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList"/>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+            </java-attributes>
+        </java-type>
+        <java-type name="ForwarderEvcs">
+            <xml-root-element name="forwarder-evcs"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="forwarderEvc" name="forwarder-evc" type="inventory.aai.onap.org.v13.ForwarderEvc"/>
+            </java-attributes>
+        </java-type>
+        <java-type name="ForwarderEvc">
+            <xml-root-element name="forwarder-evc"/>
+            <java-attributes>
+                <xml-element java-attribute="forwarderEvcId" name="forwarder-evc-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Key for forwarder-evc object"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="circuitId" name="circuit-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Circuit ID from customer/ESP/ingress end of EVC, or reference to beater circuit on gateway/network/egress end of EVC" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ivlan" name="ivlan" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Internal VLAN." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="svlan" name="svlan" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="SVLAN value for ingress of egress forwarder." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="cvlan" name="cvlan" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="CVLAN value for ingress of egress forwarder." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanMappings" name="vlan-mappings" type="inventory.aai.onap.org.v13.VlanMappings" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList"/>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="forwarder object is an optional child object of the Configuration object." />
+                <xml-property name="dependentOn" value="configuration" />
+                <xml-property name="uniqueProps" value="forwarder-evc-id" />
+                <xml-property name="container" value="forwarder-evcs" />
+            </xml-properties>
+        </java-type>
+        <java-type name="VlanMappings">
+            <xml-properties>
+                <xml-property name="description" value="Collection of vlan mappings." />
+            </xml-properties>
+            <xml-root-element name="vlan-mappings" />
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vlanMapping" name="vlan-mapping" type="inventory.aai.onap.org.v13.VlanMapping" />
+            </java-attributes>
+        </java-type>
+        <java-type name="VlanMapping">
+            <xml-root-element name="vlan-mapping" />
+            <java-attributes>
+                <xml-element java-attribute="vlanMappingId" name="vlan-mapping-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Key for vlan-mapping object." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="uniCvlan" name="uni-cvlan" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="CVLAN value from the UNI/ingress side of the SAREA gateway access device." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="nniSvlan" name="nni-svlan" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="SVLAN value from the NNI/egress side of the SAREA gateway access device." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="nniCvlan" name="nni-cvlan" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="CVLAN value from the NNI/egress side of the SAREA gateway access device." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ivLan" name="ivlan" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The internal VLAN ('IVLAN') value.  Specific to Arista devices." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList"/>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" />
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="vlan-mapping object is an optional child object of the forwarder-evc object.  A given forwarder-evc object may have multiple vlan-mapping objects." />
+                <xml-property name="dependentOn" value="forwarder-evc" />
+                <xml-property name="uniqueProps" value="vlan-mapping-id" />
+                <xml-property name="container" value="vlan-mappings" />
+            </xml-properties>
+        </java-type>
+        <java-type name="Evcs">
+            <xml-root-element name="evcs" />
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="evc" name="evc" type="inventory.aai.onap.org.v13.Evc" />
+            </java-attributes>
+        </java-type>
+        <java-type name="Evc">
+            <xml-root-element name="evc" />
+            <java-attributes>
+                <xml-element java-attribute="evcId" name="evc-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique/key field for the evc object" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="forwardingPathTopology" name="forwarding-path-topology" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Point-to-Point, Multi-Point" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="cirValue" name="cir-value" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Commited Information Rate" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="cirUnits" name="cir-units" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="CIR units" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="connectionDiversityGroupId" name="connection-diversity-group-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Diversity Group ID" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceHours" name="service-hours" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="formerly Performance Group" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="espEvcCircuitId" name="esp-evc-circuit-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="EVC Circuit ID of ESP EVC" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="espEvcCirValue" name="esp-evc-cir-value" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Committed Information Rate (For ESP)" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="espEvcCirUnits" name="esp-evc-cir-units" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="CIR units (For ESP)" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="espItuCode" name="esp-itu-code" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies ESP" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="collectorPopClli" name="collector-pop-clli" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Collector POP CLLI (from the hostname of the access pnf)" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="interConnectTypeIngress" name="inter-connect-type-ingress" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Interconnect type on ingress side of EVC." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="tagmodeAccessIngress" name="tagmode-access-ingress" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="tagode for collector side of EVC" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="tagmodeAccessEgress" name="tagmode-access-egress" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="tagMode for network side of EVC" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList"/>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="evc object is an optional child object of the Configuration object." />
+                <xml-property name="dependentOn" value="configuration" />
+                <xml-property name="uniqueProps" value="evc-id" />
+                <xml-property name="container" value="evcs" />
+            </xml-properties>
+        </java-type></java-types></xml-bindings>
diff --git a/aai-schema-ingest/src/test/resources/oxm/test_network_v10.xml b/aai-schema-ingest/src/test/resources/oxm/test_network_v10.xml
index e7d77ac9..e52a58c2 100644
--- a/aai-schema-ingest/src/test/resources/oxm/test_network_v10.xml
+++ b/aai-schema-ingest/src/test/resources/oxm/test_network_v10.xml
@@ -19,9 +19,9 @@
   ============LICENSE_END=========================================================
   -->
 
-<xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.v12" xml-mapping-metadata-complete="true">
+<xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.v10" xml-mapping-metadata-complete="true">
 	<xml-schema element-form-default="QUALIFIED">
-		<xml-ns namespace-uri="http://org.onap.aai.inventory/v12" />
+		<xml-ns namespace-uri="http://org.onap.aai.inventory/v10" />
 	</xml-schema>
 	<java-types>
 
@@ -48,4 +48,4 @@
 		</java-type>
 		
 	</java-types>
-</xml-bindings>
\ No newline at end of file
+</xml-bindings>
diff --git a/aai-schema-ingest/src/test/resources/payload/versions.json b/aai-schema-ingest/src/test/resources/payload/versions.json
new file mode 100644
index 00000000..a1b608ba
--- /dev/null
+++ b/aai-schema-ingest/src/test/resources/payload/versions.json
@@ -0,0 +1,18 @@
+{
+"versions": [
+"v8",
+"v9",
+"v10",
+    "v11",
+    "v12",
+    "v13",
+    "v14",
+    "v15"
+],
+"edge-version": "v15",
+"default-version": "v15",
+"depth-version": "v15",
+"app-root-version": "v15",
+"related-link-version": "v15",
+"namespace-change-version": "v15"
+}
diff --git a/aai-schema-ingest/src/test/resources/schemaservice-endpoints.json b/aai-schema-ingest/src/test/resources/schemaservice-endpoints.json
new file mode 100644
index 00000000..07d637dd
--- /dev/null
+++ b/aai-schema-ingest/src/test/resources/schemaservice-endpoints.json
@@ -0,0 +1,9 @@
+"schema-service-endpoints" : {
+    "version-endpoint": {
+        "uri": "/versions",
+        "response" : {
+           "versions" : ["v9", "v10", "v11"],
+           "default" : "v14",
+        }
+        }
+}