added schema validation tools

Issue-ID: AAI-879
Change-Id: I028547c97450372252b76286a8b10f4dbed4d2bf
Signed-off-by: Threefoot, Jane (jt6620) <jt6620@att.com>

34 files changed, 1457 insertions, 98 deletions

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 642ede83..b424e840 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
@@ -1,14 +1,14 @@
-/**
+/** 
  * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
- * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 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
+ *   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,
@@ -16,7 +16,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * ============LICENSE_END=========================================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
+
 package org.onap.aai.edges;
 
 import java.io.BufferedReader;
@@ -55,7 +58,7 @@ import static com.jayway.jsonpath.Criteria.where;
  * 	information, including allowing various filters to extract particular rules.
  */
 public class EdgeIngestor {
-	private Map<Version, List<DocumentContext>> versionJsonFilesMap = new EnumMap<>(Version.class);
+	private Map<Version, List<DocumentContext>> versionJsonFilesMap;
 	private static final String READ_START = "$.rules.[?]";
 	private static final String READ_ALL_START = "$.rules.*";
 	
@@ -69,38 +72,8 @@ public class EdgeIngestor {
 	 */
 	public EdgeIngestor(ConfigTranslator translator) {
 		Map<Version, List<String>> filesToIngest = translator.getEdgeFiles();
-		
-		for (Entry<Version, List<String>> verFile : filesToIngest.entrySet()) {
-			Version v = verFile.getKey();
-			List<String> files = verFile.getValue();
-			
-			List<DocumentContext> docs = new ArrayList<>();
-	
-			for (String rulesFilename : files) {
-				String fileContents = readInJsonFile(rulesFilename);
-				docs.add(JsonPath.parse(fileContents));
-			}
-			versionJsonFilesMap.put(v, docs);
-		}
-	}
-	
-	/**
-	 * 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();
+		JsonIngestor ji = new JsonIngestor();
+		versionJsonFilesMap = ji.ingest(filesToIngest);
 	}
 	
 	//-----methods for getting rule info-----//
@@ -533,46 +506,16 @@ public class EdgeIngestor {
 	private Multimap<String, EdgeRule> convertToEdgeRules(List<Map<String, String>> allFound) {
 		Multimap<String, EdgeRule> rules = ArrayListMultimap.create();
 		
+		TypeAlphabetizer alpher = new TypeAlphabetizer();
+		
 		if (!allFound.isEmpty()) {
 			for (Map<String, String> raw : allFound) {
 				EdgeRule converted = new EdgeRule(raw);
-				String alphabetizedKey = buildAlphabetizedKey(raw.get(EdgeField.FROM.toString()), raw.get(EdgeField.TO.toString()));
+				String alphabetizedKey = alpher.buildAlphabetizedKey(raw.get(EdgeField.FROM.toString()), raw.get(EdgeField.TO.toString()));
 				rules.put(alphabetizedKey, converted);
 			}
 		}
 		
 		return rules;
 	}
-	
-	/**
-	 * Builds the multimap key for the rules, where nodetypes are alphabetically sorted
-	 * (ignoring dashes).
-	 * 
-	 * @param nodeA - first nodetype
-	 * @param nodeB - second nodetype
-	 * @return {alphabetically first nodetype}|{alphabetically second nodetype}
-	 * 		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.
-	 */
-	private String buildAlphabetizedKey(String nodeA, String nodeB) {
-		//normalize
-		String normalizedNodeA = nodeA.replace("-", "");
-		String normalizedNodeB = nodeB.replace("-", "");
-		int cmp = normalizedNodeA.compareTo(normalizedNodeB);
-		
-		StringBuilder sb = new StringBuilder();
-		if (cmp <= 0) {
-			sb.append(nodeA);
-			sb.append("|");
-			sb.append(nodeB);
-		} else {
-			sb.append(nodeB);
-			sb.append("|");
-			sb.append(nodeA);
-		}
-		return sb.toString();
-	}
 }
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 bac217d1..f859aae6 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
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
- * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 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.
@@ -16,6 +16,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * ============LICENSE_END=========================================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 package org.onap.aai.edges;
 
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 701977a6..3029685f 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
@@ -1,14 +1,14 @@
-/**
+/** 
  * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
- * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 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
+ *   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,
@@ -16,7 +16,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * ============LICENSE_END=========================================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
+
 package org.onap.aai.edges;
 
 import org.onap.aai.edges.enums.AAIDirection;
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
new file mode 100644
index 00000000..29a2e3b9
--- /dev/null
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/edges/JsonIngestor.java
@@ -0,0 +1,88 @@
+/** 
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 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=========================================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ */
+
+package org.onap.aai.edges;
+
+import java.io.BufferedReader;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.EnumMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.onap.aai.setup.Version;
+
+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 Map<Version, List<String>> filesToIngest - map of filenames to ingest
+	 * 			per Version
+	 * @return Map<Version, List<DocumentContext>> - map of DocumentContexts per Version
+	 */
+	public Map<Version, List<DocumentContext>> ingest(Map<Version, List<String>> filesToIngest) {
+		Map<Version, List<DocumentContext>> result = new EnumMap<>(Version.class);
+		
+		for (Entry<Version, List<String>> verFiles : filesToIngest.entrySet()) {
+			Version 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();
+	}
+}
diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/edges/TypeAlphabetizer.java b/aai-schema-ingest/src/main/java/org/onap/aai/edges/TypeAlphabetizer.java
new file mode 100644
index 00000000..2106d3a5
--- /dev/null
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/edges/TypeAlphabetizer.java
@@ -0,0 +1,67 @@
+/** 
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 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=========================================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ */
+
+package org.onap.aai.edges;
+
+/**
+ * Helper class to produce alphabetized keys for EdgeIngestor and EdgeValidator
+ */
+public class TypeAlphabetizer {
+	/**
+	 * Builds key for edge rules, where nodetypes are alphabetically sorted
+	 * (ignoring dashes).
+	 * 
+	 * @param nodeA - first nodetype
+	 * @param nodeB - second nodetype
+	 * @return {alphabetically first nodetype}|{alphabetically second nodetype}
+	 * 		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 String buildAlphabetizedKey(String nodeA, String nodeB) {
+		if (nodeA == null) {
+			nodeA = "";
+		}
+		if (nodeB == null) {
+			nodeB = "";
+		}
+		
+		//normalize
+		String normalizedNodeA = nodeA.replace("-", "");
+		String normalizedNodeB = nodeB.replace("-", "");
+		int cmp = normalizedNodeA.compareTo(normalizedNodeB);
+		
+		StringBuilder sb = new StringBuilder();
+		if (cmp <= 0) {
+			sb.append(nodeA);
+			sb.append("|");
+			sb.append(nodeB);
+		} else {
+			sb.append(nodeB);
+			sb.append("|");
+			sb.append(nodeA);
+		}
+		return sb.toString();
+	}
+}
diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/edges/enums/AAIDirection.java b/aai-schema-ingest/src/main/java/org/onap/aai/edges/enums/AAIDirection.java
index 8ea5157b..3f748a50 100644
--- a/aai-schema-ingest/src/main/java/org/onap/aai/edges/enums/AAIDirection.java
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/edges/enums/AAIDirection.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
- * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 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.
@@ -16,6 +16,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * ============LICENSE_END=========================================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 package org.onap.aai.edges.enums;
 
diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/edges/enums/DirectionNotation.java b/aai-schema-ingest/src/main/java/org/onap/aai/edges/enums/DirectionNotation.java
index 7e4a65c2..203249a4 100644
--- a/aai-schema-ingest/src/main/java/org/onap/aai/edges/enums/DirectionNotation.java
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/edges/enums/DirectionNotation.java
@@ -1,14 +1,14 @@
-/**
+/** 
  * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
- * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 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
+ *   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,
@@ -16,7 +16,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * ============LICENSE_END=========================================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
+
 package org.onap.aai.edges.enums;
 
 public enum DirectionNotation { 
diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/edges/enums/EdgeField.java b/aai-schema-ingest/src/main/java/org/onap/aai/edges/enums/EdgeField.java
index e75a516d..3e896f61 100644
--- a/aai-schema-ingest/src/main/java/org/onap/aai/edges/enums/EdgeField.java
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/edges/enums/EdgeField.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
- * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 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.
@@ -16,7 +16,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * ============LICENSE_END=========================================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
+
 package org.onap.aai.edges.enums;
 
 /**
diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/edges/enums/EdgeProperty.java b/aai-schema-ingest/src/main/java/org/onap/aai/edges/enums/EdgeProperty.java
index 4ec3f071..2f6afa47 100644
--- a/aai-schema-ingest/src/main/java/org/onap/aai/edges/enums/EdgeProperty.java
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/edges/enums/EdgeProperty.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
- * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 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.
@@ -16,7 +16,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * ============LICENSE_END=========================================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
+
 package org.onap.aai.edges.enums;
 
 /**
diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/edges/enums/EdgeType.java b/aai-schema-ingest/src/main/java/org/onap/aai/edges/enums/EdgeType.java
index 4a921420..00dce0fd 100644
--- a/aai-schema-ingest/src/main/java/org/onap/aai/edges/enums/EdgeType.java
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/edges/enums/EdgeType.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
- * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 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.
@@ -16,6 +16,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * ============LICENSE_END=========================================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 package org.onap.aai.edges.enums;
 
diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/edges/enums/MultiplicityRule.java b/aai-schema-ingest/src/main/java/org/onap/aai/edges/enums/MultiplicityRule.java
index 7f672c42..4fc8938d 100644
--- a/aai-schema-ingest/src/main/java/org/onap/aai/edges/enums/MultiplicityRule.java
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/edges/enums/MultiplicityRule.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
- * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 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.
@@ -16,6 +16,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * ============LICENSE_END=========================================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 package org.onap.aai.edges.enums;
 
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 9baf7902..ebb9739b 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,14 +1,14 @@
-/**
+/** 
  * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
- * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 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
+ *   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,
@@ -16,7 +16,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * ============LICENSE_END=========================================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
+
 package org.onap.aai.edges.exceptions;
 
 public class AmbiguousRuleChoiceException extends Exception {
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 0bf414fa..e1a8fe6b 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,14 +1,14 @@
-/**
+/** 
  * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
- * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 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
+ *   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,
@@ -16,7 +16,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * ============LICENSE_END=========================================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
+
 package org.onap.aai.edges.exceptions;
 
 public class EdgeRuleNotFoundException extends Exception {
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 849ad577..bafc6b32 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
@@ -1,14 +1,14 @@
-/**
+/** 
  * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
- * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 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
+ *   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,
@@ -16,21 +16,31 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * ============LICENSE_END=========================================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
+
 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.ArrayList;
 import java.util.EnumMap;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Set;
 
+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 org.eclipse.persistence.jaxb.JAXBContextProperties;
 import org.eclipse.persistence.jaxb.dynamic.DynamicJAXBContext;
@@ -39,6 +49,11 @@ import org.onap.aai.setup.ConfigTranslator;
 import org.onap.aai.setup.Version;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import org.w3c.dom.Document;
+import org.w3c.dom.NodeList;
+import org.xml.sax.SAXException;
+
+import com.google.common.base.CaseFormat;
 
 @Component
 /**
@@ -47,6 +62,7 @@ import org.springframework.stereotype.Component;
 public class NodeIngestor {
 	
 	private Map<Version, DynamicJAXBContext> versionContextMap = new EnumMap<>(Version.class);
+	private Map<Version, Set<String>> typesPerVersion = new EnumMap<>(Version.class);
 	
 	@Autowired
 	/**
@@ -64,8 +80,9 @@ public class NodeIngestor {
 				List<String> files = verFiles.getValue();
 				final DynamicJAXBContext ctx = ingest(files);
 				versionContextMap.put(v, ctx);
+				typesPerVersion.put(v, getAllNodeTypes(files));
 			}
-		} catch (FileNotFoundException | JAXBException e) {
+		} catch (JAXBException | ParserConfigurationException | SAXException | IOException e) {
 			throw new ExceptionInInitializerError(e);
 		}
 	}
@@ -91,6 +108,28 @@ public class NodeIngestor {
 		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();
+		
+		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();
+				types.add(CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_HYPHEN, type));
+			}
+		}
+		
+		return types;
+	}
 
 	/**
 	 * Gets the DynamicJAXBContext for the given version
@@ -101,4 +140,15 @@ public class NodeIngestor {
 	public DynamicJAXBContext getContextForVersion(Version v) {
 		return versionContextMap.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 boolean hasNodeType(String nodeType, Version v) {
+		return typesPerVersion.get(v).contains(nodeType);
+	}
 }
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 e22dcdc1..b34622de 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
@@ -1,14 +1,14 @@
-/**
+/** 
  * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
- * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 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
+ *   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,
@@ -16,7 +16,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * ============LICENSE_END=========================================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
+
 package org.onap.aai.setup;
 
 import java.util.List;
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 8cc09ddd..b5b878af 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
@@ -1,14 +1,14 @@
-/**
+/** 
  * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
- * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 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
+ *   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,
@@ -16,7 +16,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * ============LICENSE_END=========================================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
+
 package org.onap.aai.setup;
 
 import org.springframework.beans.factory.annotation.Value;
diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/setup/Version.java b/aai-schema-ingest/src/main/java/org/onap/aai/setup/Version.java
index 81303f06..1fd1481d 100644
--- a/aai-schema-ingest/src/main/java/org/onap/aai/setup/Version.java
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/setup/Version.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
- * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 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.
@@ -16,10 +16,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * ============LICENSE_END=========================================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 package org.onap.aai.setup;
 
 public enum Version {
+	V7,
 	V8,
 	V9,
 	V10,
diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/validation/AAISchemaValidationException.java b/aai-schema-ingest/src/main/java/org/onap/aai/validation/AAISchemaValidationException.java
new file mode 100644
index 00000000..a3784b77
--- /dev/null
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/validation/AAISchemaValidationException.java
@@ -0,0 +1,32 @@
+/** 
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 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=========================================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ */
+
+package org.onap.aai.validation;
+
+/**
+ * Indicates that a fatal error in the A&AI schema has been found.
+ */
+public class AAISchemaValidationException extends IllegalStateException {
+	public AAISchemaValidationException(String msg) {
+		super(msg);
+	}
+}
diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/validation/CheckEverythingStrategy.java b/aai-schema-ingest/src/main/java/org/onap/aai/validation/CheckEverythingStrategy.java
new file mode 100644
index 00000000..d8b4eb39
--- /dev/null
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/validation/CheckEverythingStrategy.java
@@ -0,0 +1,72 @@
+/** 
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 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=========================================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ */
+
+/**
+ * 
+ */
+package org.onap.aai.validation;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.lang.StringUtils;
+
+/**
+ * When an error is found, mark that it is NOT ok to 
+ * continue with installation/whatever other caller function, 
+ * and keep track of the message but
+ * keep validating so all issues are found in one run.
+ */
+public class CheckEverythingStrategy implements SchemaErrorStrategy {
+	private boolean isOK = true;
+	private List<String> errorMsgs = new ArrayList<>();
+
+	/* (non-Javadoc)
+	 * @see org.onap.aai.edges.validation.SchemaErrorStrategy#isOK()
+	 */
+	@Override
+	public boolean isOK() {
+		return isOK;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.onap.aai.edges.validation.SchemaErrorStrategy#getErrorMsg()
+	 */
+	@Override
+	public String getErrorMsg() {
+		if (errorMsgs.isEmpty()) {
+			return "No errors found.";
+		} else {
+			return StringUtils.join(errorMsgs, "\n");
+		}
+	}
+
+	/* (non-Javadoc)
+	 * @see org.onap.aai.edges.validation.SchemaErrorStrategy#notifyOnError(java.lang.String)
+	 */
+	@Override
+	public void notifyOnError(String errorMsg) {
+		isOK = false;
+		errorMsgs.add(errorMsg);
+	}
+
+}
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
new file mode 100644
index 00000000..d1f5647b
--- /dev/null
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/validation/DefaultVersionValidationModule.java
@@ -0,0 +1,78 @@
+/** 
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 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=========================================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ */
+
+/**
+ * 
+ */
+package org.onap.aai.validation;
+
+import java.util.List;
+import java.util.Map;
+
+import org.onap.aai.setup.ConfigTranslator;
+import org.onap.aai.setup.Version;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * By default, A&AI must have schema files for all current
+ * supported Versions in the Version enum
+ *
+ */
+@Component
+public class DefaultVersionValidationModule implements VersionValidationModule {
+	private ConfigTranslator config;
+	
+	@Autowired
+	public DefaultVersionValidationModule(ConfigTranslator config) {
+		this.config = config;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.onap.aai.validation.VersionValidationModule#validate(org.onap.aai.setup.ConfigTranslator)
+	 */
+	@Override
+	public String validate() {
+		Map<Version, List<String>> nodeConfig = config.getNodeFiles();
+		Map<Version, List<String>> edgeConfig = config.getEdgeFiles();
+		
+		StringBuilder missingVers = new StringBuilder().append("Missing schema for the following versions: ");
+		boolean isMissing = false;
+		for (Version v : Version.values()) {
+			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/FailFastStrategy.java b/aai-schema-ingest/src/main/java/org/onap/aai/validation/FailFastStrategy.java
new file mode 100644
index 00000000..07180855
--- /dev/null
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/validation/FailFastStrategy.java
@@ -0,0 +1,63 @@
+/** 
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 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=========================================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ */
+
+/**
+ * 
+ */
+package org.onap.aai.validation;
+
+/**
+ * Fails out the validation process as soon as
+ * an error is found. Tells the validation's calling
+ * process to abort.
+ */
+public class FailFastStrategy implements SchemaErrorStrategy {
+	private boolean isOK = true;
+	private String errorMsg = "No errors found.";
+
+	/* (non-Javadoc)
+	 * @see org.onap.aai.edges.validation.SchemaErrorStrategy#isOK()
+	 */
+	@Override
+	public boolean isOK() {
+		return isOK;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.onap.aai.edges.validation.SchemaErrorStrategy#getErrorMsg()
+	 */
+	@Override
+	public String getErrorMsg() {
+		return errorMsg;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.onap.aai.edges.validation.SchemaErrorStrategy#notifyOnError(java.lang.String)
+	 */
+	@Override
+	public void notifyOnError(String errorMsg) {
+		isOK = false;
+		this.errorMsg = errorMsg;
+		throw new AAISchemaValidationException(errorMsg);
+	}
+
+}
diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/validation/SchemaErrorStrategy.java b/aai-schema-ingest/src/main/java/org/onap/aai/validation/SchemaErrorStrategy.java
new file mode 100644
index 00000000..0f2f2673
--- /dev/null
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/validation/SchemaErrorStrategy.java
@@ -0,0 +1,61 @@
+/** 
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 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=========================================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ */
+
+package org.onap.aai.validation;
+
+/**
+ * Controls response to finding problems in the schema files.
+ */
+public interface SchemaErrorStrategy {
+	/**
+	 * Gives if it is OK to proceed with whatever process
+	 * invoked the validation (probably the installation of
+	 * the A&AI instance).
+	 * 
+	 * @return boolean
+	 */
+	public boolean isOK();
+	
+	/**
+	 * Gets the error message(s) gathered in the course
+	 * of validation. 
+	 * 
+	 * @return String error message or messages concatenated together
+	 */
+	public String getErrorMsg();
+	
+	/**
+	 * Invokes the ErrorStrategy to do whatever response to
+	 * an issue in the schema having been found.
+	 * 
+	 * Options:
+	 * -Throw an exception if the whole process should be 
+	 *  immediately aborted
+	 * -Set OK status to false, store the message and allow the
+	 *  validation process to continue and find any other issues
+	 * -Completely ignore that something is wrong
+	 * etc.
+	 * 
+	 * @param String errorMsg - the error message from the validator module
+	 */
+	public void notifyOnError(String errorMsg);
+}
diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/validation/VersionValidationModule.java b/aai-schema-ingest/src/main/java/org/onap/aai/validation/VersionValidationModule.java
new file mode 100644
index 00000000..e0b6e12a
--- /dev/null
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/validation/VersionValidationModule.java
@@ -0,0 +1,40 @@
+/** 
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 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=========================================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ */
+
+package org.onap.aai.validation;
+
+
+/**
+ * Defines the behavior for what versions are required/optional.
+ * 
+ * Constructor must take ConfigTranslator via autowiring.
+ */
+public interface VersionValidationModule {
+	
+	/**
+	 * Validates that all required versions have schema
+	 * configured for them.
+	 *   
+	 * @return empty string if none missing or else an appropriate error
+	 */
+	public String validate();
+}
diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/validation/VersionValidator.java b/aai-schema-ingest/src/main/java/org/onap/aai/validation/VersionValidator.java
new file mode 100644
index 00000000..24c05db0
--- /dev/null
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/validation/VersionValidator.java
@@ -0,0 +1,55 @@
+/** 
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 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=========================================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ */
+
+package org.onap.aai.validation;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * Verifies that the schema config covers
+ * all required versions
+ */
+@Component
+public class VersionValidator {
+	private SchemaErrorStrategy strat;
+	private VersionValidationModule verMod;
+	
+	@Autowired
+	public VersionValidator(SchemaErrorStrategy strategy, VersionValidationModule verMod) {
+		this.strat = strategy;
+		this.verMod = verMod;
+	}
+	
+	public boolean validate() {
+		String result = verMod.validate();
+		if (!"".equals(result)) {
+			strat.notifyOnError(result);
+		}
+		
+		return strat.isOK();
+	}
+	
+	public String getErrorMsg() {
+		return strat.getErrorMsg();
+	}
+}
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
new file mode 100644
index 00000000..85b4dc64
--- /dev/null
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/validation/edges/CousinDefaultingValidationModule.java
@@ -0,0 +1,87 @@
+/** 
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 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=========================================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ */
+
+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 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;
+
+/**
+ * Validates that in the collection of cousin rules between a given node type pair,
+ * there is exactly 1 set default=true. 
+ */
+public class CousinDefaultingValidationModule {
+
+	/**
+	 * Validates that in the collection of cousin rules between a given node type pair,
+	 * there is exactly 1 set default=true. 
+	 * 
+	 * @param String nodeTypePair - pair of A&AI node types in the form "typeA|typeB"
+	 * @param List<DocumentContext> ctxs - the ingested json schema to validate
+	 * @return empty string if ok, appropriate error message otherwise
+	 */
+	public String validate(String nodeTypePair, List<DocumentContext> ctxs) {
+		String[] types = nodeTypePair.split("\\|");
+		EdgeRuleQuery lookup = new EdgeRuleQuery.Builder(types[0], types[1]).edgeType(EdgeType.COUSIN).build();
+		List<Map<String, String>> rules = new ArrayList<>();
+		for (DocumentContext ctx : ctxs) {
+			rules.addAll(ctx.read("$.rules.[?]", lookup.getFilter()));
+		}
+		
+		if (rules.isEmpty()) {
+			return ""; //bc irrelevant check
+		}
+		
+		int defaultCount = 0;
+		Set<String> defLabels = new HashSet<>();
+		for (Map<String, String> rule : rules) {
+			if ("true".equals(rule.get(EdgeField.DEFAULT.toString()))) {
+				defaultCount++;
+				defLabels.add(rule.get(EdgeField.LABEL.toString()));
+			}
+		}
+		
+		StringBuilder errorBase = new StringBuilder().append("Pair ").append(nodeTypePair).append(" must have exactly one cousin rule set as default. ");
+		if (defaultCount == 1) {
+			return "";
+		} else if (defaultCount == 0){
+			errorBase.append("None set.");
+			return errorBase.toString();
+		} else {
+			errorBase.append("Multiple set, see labels: ");
+			for (String label : defLabels) {
+				errorBase.append(label).append(" ");
+			}
+			return errorBase.toString();
+		}
+	}
+}
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
new file mode 100644
index 00000000..ff58e7dd
--- /dev/null
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/validation/edges/DefaultEdgeFieldsValidationModule.java
@@ -0,0 +1,75 @@
+/** 
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 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=========================================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ */
+
+/**
+ * 
+ */
+package org.onap.aai.validation.edges;
+
+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
+ * All fields in EdgeField enum are required EXCEPT description
+ *
+ */
+public class DefaultEdgeFieldsValidationModule implements EdgeFieldsValidationModule {
+
+	/* (non-Javadoc)
+	 * @see org.onap.aai.edges.EdgeFieldsValidator#verifyFields(java.util.Map)
+	 */
+	@Override
+	public String verifyFields(Map<String, String> rule) {
+		EnumSet<EdgeField> missingFields = EnumSet.complementOf(EnumSet.allOf(EdgeField.class));
+		
+		for (EdgeField f : EdgeField.values()) {
+			if (!rule.containsKey(f.toString()) && (f != EdgeField.DESCRIPTION)) { //description is optional
+				missingFields.add(f);
+			}
+		}
+		
+		StringBuilder errorMsg = new StringBuilder();
+		if (!missingFields.isEmpty()) {
+			errorMsg.append("Rule ").append(ruleToString(rule)).append(" missing required fields: ");
+			for (EdgeField mf : missingFields) {
+				errorMsg.append(mf.toString()).append(" ");
+			}
+		}
+		
+		return errorMsg.toString();
+	}
+	
+	private String ruleToString(Map<String, String> rule) {
+		StringBuilder sb = new StringBuilder();
+		for (Entry<String, String> fields : rule.entrySet()) {
+			sb.append(fields.getKey()).append(":").append(fields.getValue()).append(" ");
+		}
+		
+		return sb.toString();
+	}
+
+}
diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/validation/edges/EdgeFieldsValidationModule.java b/aai-schema-ingest/src/main/java/org/onap/aai/validation/edges/EdgeFieldsValidationModule.java
new file mode 100644
index 00000000..b2d153fa
--- /dev/null
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/validation/edges/EdgeFieldsValidationModule.java
@@ -0,0 +1,56 @@
+/** 
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 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=========================================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ */
+
+package org.onap.aai.validation.edges;
+
+import java.util.Map;
+
+/**
+ * Verifies that a given raw edge rule contains all required fields.
+ *
+ */
+public interface EdgeFieldsValidationModule {
+	
+	/**
+	 * Verifies the given rule has all required fields.
+	 * Implement to check for what you determine to be required.
+	 * You may also throw an error on unexpected fields if you wish,
+	 * whatever makes sense for your system.
+	 * 
+	 * @param rule - Map<String, String> that will look something like this:
+	 * 		{
+	 *			"from": "foo",
+	 *			"to": "bar",
+	 *			"label": "tosca.relationships.network.BindsTo",
+	 *			"direction": "OUT",
+	 *			"multiplicity": "ONE2ONE",
+	 *			"contains-other-v": "NONE",
+	 *			"delete-other-v": "NONE",
+	 *			"prevent-delete": "NONE",
+	 *			"default": "true",
+	 *			"description":"An edge comment"
+	 *		}
+	 * @return empty String if no errors found, or String with
+	 * 	the appropriate error message
+	 */
+	public String verifyFields(Map<String, String> rule);
+}
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
new file mode 100644
index 00000000..34c603aa
--- /dev/null
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/validation/edges/EdgeRuleValidator.java
@@ -0,0 +1,115 @@
+/** 
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 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=========================================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ */
+
+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.Map.Entry;
+import java.util.Set;
+
+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.Version;
+import org.onap.aai.validation.SchemaErrorStrategy;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import com.jayway.jsonpath.DocumentContext;
+
+/**
+ * Runs all validations against the ingested schema
+ */
+@Component
+public class EdgeRuleValidator {
+	private Map<Version, List<DocumentContext>> versionJsonFilesMap;
+	private final SchemaErrorStrategy strat;
+	protected final EdgeFieldsValidationModule fieldValidator;
+	protected final UniqueLabelValidationModule labelValidator;
+	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;
+	}
+	
+	public boolean validate() {
+		
+		for (Entry<Version, List<DocumentContext>> verEntry : versionJsonFilesMap.entrySet()) {
+			Version v = verEntry.getKey();
+			List<DocumentContext> ctxs = verEntry.getValue();
+			List<Map<String, String>> rules = collectRules(ctxs);
+			Set<String> nodeTypePairs = new HashSet<>();
+			TypeAlphabetizer alpher = new TypeAlphabetizer();
+			
+			for (Map<String, String> rule : rules) {
+				handleResult(fieldValidator.verifyFields(rule));
+				nodeTypePairs.add(alpher.buildAlphabetizedKey(rule.get(EdgeField.FROM.toString()), rule.get(EdgeField.TO.toString())));
+			}
+			
+			for (String nodeTypePair : nodeTypePairs) {
+				handleResult(labelValidator.validate(nodeTypePair, ctxs));
+				handleResult(containsValidator.validate(nodeTypePair, ctxs)); 
+				handleResult(defaultsValidator.validate(nodeTypePair, ctxs));
+			}
+			
+			handleResult(typeValidator.validate(nodeTypePairs, v));
+		}
+		
+		return strat.isOK();
+	}
+	
+	private List<Map<String, String>> collectRules(List<DocumentContext> ctxs) {
+		List<Map<String, String>> rules = new ArrayList<>();
+		
+		for (DocumentContext ctx : ctxs) {
+			rules.addAll(ctx.read("$.rules.*"));
+		}
+		
+		return rules;
+	}
+	
+	private void handleResult(String result) {
+		if (!"".equals(result)) {
+			strat.notifyOnError(result);
+		}
+	}
+	
+	public String getErrorMsg() {
+		return strat.getErrorMsg();
+	}
+}
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
new file mode 100644
index 00000000..6d061245
--- /dev/null
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/validation/edges/NodeTypesValidationModule.java
@@ -0,0 +1,90 @@
+/** 
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 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=========================================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ */
+
+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.Version;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * Validates that the node types appearing in the edge rules are valid
+ * against the ingested OXM.
+ * 
+ * (This is why the node validation has to be run before the edge validation)
+ */
+@Component
+public class NodeTypesValidationModule {
+	private NodeIngestor ni;
+	
+	@Autowired
+	public NodeTypesValidationModule(NodeIngestor ni) {
+		this.ni = ni;
+	}
+	
+	/**
+	 * Validate that every node type in the given set is defined in 
+	 * the OXM for the given version
+	 * 
+	 * @param Collection<String> nodeTypes - all the node types in
+	 * 				the edge rules for the given version being validated
+	 * @param Version v - the version being validated 
+	 * @return empty string if all types are present in the given version's ingested OXM, else
+	 * 	appropriate error message
+	 */
+	public String validate(Collection<String> nodeTypePairs, Version v) {
+		//setup
+		Set<String> nodeTypes = new HashSet<>();
+		for (String pair : nodeTypePairs) {
+			String[] types = pair.split("\\|");
+			
+			for (String type : types) {
+				if (!"".equals(type)) {
+					nodeTypes.add(type);
+				}
+			}
+		}
+		
+		//validation
+		Set<String> badTypes = new HashSet<>();
+		for (String type : nodeTypes) {
+			if (!ni.hasNodeType(type, v)) {
+				badTypes.add(type);
+			}
+		}
+		
+		if (badTypes.isEmpty()) {
+			return "";
+		} else {
+			StringBuilder errorBase = new StringBuilder().append("Invalid node type(s) found: ");
+			for (String bt : badTypes) {
+				errorBase.append(bt).append(" ");
+			}
+			return errorBase.toString();
+		}
+	}
+}
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
new file mode 100644
index 00000000..15e1c2aa
--- /dev/null
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/validation/edges/SingleContainmentValidationModule.java
@@ -0,0 +1,63 @@
+/** 
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 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=========================================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ */
+
+package org.onap.aai.validation.edges;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.onap.aai.edges.EdgeRuleQuery;
+import org.onap.aai.edges.enums.EdgeType;
+
+import com.jayway.jsonpath.DocumentContext;
+
+/**
+ * Validates that the given node type pair has at most one containment relationship
+ * in their edge rules.
+ * 
+ */
+public class SingleContainmentValidationModule {
+	
+	/**
+	 * Validates that the given node type pair has at most one containment relationship
+	 * in their edge rules.
+	 * 
+	 * @param String nodeTypePair - pair of A&AI node types in the form "typeA|typeB"
+	 * @param List<DocumentContext> ctxs - the ingested json to validate
+	 * @return empty string if passes, else appropriate error message
+	 */
+	public String validate(String nodeTypePair, List<DocumentContext> ctxs) {
+		String[] types = nodeTypePair.split("\\|");
+		EdgeRuleQuery lookup = new EdgeRuleQuery.Builder(types[0], types[1]).edgeType(EdgeType.TREE).build();
+		List<Map<String, String>> rules = new ArrayList<>();
+		for (DocumentContext ctx : ctxs) {
+			rules.addAll(ctx.read("$.rules.[?]", lookup.getFilter()));
+		}
+		
+		if (rules.isEmpty() || rules.size() == 1) {
+			return ""; 
+		} else { //had more than one containment relationship for the pair
+			return "Pair " + nodeTypePair + " has multiple containment rules. Only one allowed.";
+		}
+	}
+}
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
new file mode 100644
index 00000000..bed6cadd
--- /dev/null
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/validation/edges/UniqueLabelValidationModule.java
@@ -0,0 +1,73 @@
+/** 
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 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=========================================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ */
+
+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 org.onap.aai.edges.EdgeRuleQuery;
+import org.onap.aai.edges.EdgeRuleQuery.Builder;
+import org.onap.aai.edges.enums.EdgeField;
+
+import com.jayway.jsonpath.DocumentContext;
+
+/**
+ * Applies label validation rules
+ *
+ */
+public class UniqueLabelValidationModule {
+	
+	/**
+	 * Validates that the given pair of node types have no duplicate labels in
+	 * their edge rules
+	 * 
+	 * @param String nodeTypePair - of the form "typeA|typeB"
+	 * @param List<DocumentContext> ctxs - the edge rule json to pull rules from
+	 * 			(ie all files for one version)
+	 * @return empty string if no errors, else string error message
+	 */
+	public String validate(String nodeTypePair, List<DocumentContext> ctxs) {
+		String[] types = nodeTypePair.split("\\|");
+		EdgeRuleQuery lookup = new EdgeRuleQuery.Builder(types[0], types[1]).build();
+		
+		List<Map<String, String>> rules = new ArrayList<>();
+		for (DocumentContext ctx : ctxs) {
+			rules.addAll(ctx.read("$.rules.[?]", lookup.getFilter()));
+		}
+		
+		Set<String> labelsSeen = new HashSet<>();
+		for (Map<String, String> rule : rules) {
+			String label = rule.get(EdgeField.LABEL.toString());
+			if (labelsSeen.contains(label)) {
+				return "Pair " + nodeTypePair + " has multiple rules using the same label: " + label + 
+						". Every rule between the same node type pair must have a unique label.";
+			} else {
+				labelsSeen.add(label);
+			}
+		}
+		return "";
+	}
+}
diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/validation/nodes/DefaultDuplicateNodeDefinitionValidationModule.java b/aai-schema-ingest/src/main/java/org/onap/aai/validation/nodes/DefaultDuplicateNodeDefinitionValidationModule.java
new file mode 100644
index 00000000..f8536684
--- /dev/null
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/validation/nodes/DefaultDuplicateNodeDefinitionValidationModule.java
@@ -0,0 +1,106 @@
+/** 
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 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=========================================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ */
+
+package org.onap.aai.validation.nodes;
+
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Collection;
+import java.util.List;
+
+import javax.xml.XMLConstants;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.onap.aai.setup.Version;
+import org.w3c.dom.Document;
+import org.w3c.dom.NodeList;
+import org.xml.sax.SAXException;
+
+import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.Multimap;
+
+/**
+ * Default duplicate rules for A&AI -
+ * node types may never have a duplicate definition
+ * within the same Version's file set.
+ * 
+ * Finds all duplicates and what files they're in.
+ *
+ */
+public class DefaultDuplicateNodeDefinitionValidationModule implements DuplicateNodeDefinitionValidationModule {
+
+	/* (non-Javadoc)
+	 * @see org.onap.aai.nodes.validation.DuplicateNodeDefinitionValidationModule#findDuplicates(java.util.List)
+	 */
+	@Override
+	public String findDuplicates(List<String> files, Version v) {
+		try {
+			final DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();
+			docFactory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
+			final DocumentBuilder docBuilder = docFactory.newDocumentBuilder();
+				
+			Multimap<String, String> types = ArrayListMultimap.create();
+			boolean foundDups = false;
+			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();
+					if (types.containsKey(type)) {
+						foundDups = true;
+					}
+					types.put(type, file);
+				}
+			}
+			
+			if (foundDups) {
+				return buildErrorMsg(types, v);
+			} else {
+				return "";
+			}
+		} catch (ParserConfigurationException | SAXException | IOException e) {
+			// TODO something useful with this information
+			return e.getMessage();
+		}
+	}
+	
+	private String buildErrorMsg(Multimap<String, String> types, Version v) {
+		StringBuilder errorMsg = new StringBuilder().append("Duplicates found in version ").append(v.toString()).append(". ");
+		for (String nodeType : types.keySet()) {
+			Collection<String> files = types.get(nodeType);
+			if (files.size() == 1) {
+				continue; //only record the duplicated ones
+			}
+			errorMsg.append(nodeType).append(" has definitions in ");
+			for (String file : files) {
+				errorMsg.append(file).append(" ");
+			}
+		}
+		return errorMsg.toString();
+	}
+
+}
diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/validation/nodes/DuplicateNodeDefinitionValidationModule.java b/aai-schema-ingest/src/main/java/org/onap/aai/validation/nodes/DuplicateNodeDefinitionValidationModule.java
new file mode 100644
index 00000000..b7cd4a07
--- /dev/null
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/validation/nodes/DuplicateNodeDefinitionValidationModule.java
@@ -0,0 +1,49 @@
+/** 
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 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=========================================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ */
+
+package org.onap.aai.validation.nodes;
+
+import java.util.List;
+
+import org.onap.aai.setup.Version;
+
+/**
+ * Defines rules for duplicate node definitions in a set of files
+ * (where the intent is the set of files is all the OXM for one version).
+ * 
+ * Example Options:
+ * -Any duplicated definition found is an error
+ * -Duplicates within a namespace are OK but not across namespaces
+ * -Anything goes
+ * etc.
+ */
+public interface DuplicateNodeDefinitionValidationModule {
+	/**
+	 * Finds any duplicates according to the defined rules
+	 * 
+	 * @param files - the OXM files to use with full directory
+	 * @return empty String if none found, else a String
+	 * 	with appropriate information about what node types
+	 *  were found
+	 */
+	public String findDuplicates(List<String> files, Version v);
+}
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
new file mode 100644
index 00000000..f8089a19
--- /dev/null
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/validation/nodes/NodeValidator.java
@@ -0,0 +1,61 @@
+/** 
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 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=========================================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ */
+
+package org.onap.aai.validation.nodes;
+
+import java.util.List;
+import java.util.Map.Entry;
+
+import org.onap.aai.setup.ConfigTranslator;
+import org.onap.aai.setup.Version;
+import org.onap.aai.validation.SchemaErrorStrategy;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+public class NodeValidator {
+	private ConfigTranslator translator;
+	private SchemaErrorStrategy strat;
+	private DuplicateNodeDefinitionValidationModule dupChecker;
+
+	@Autowired
+	public NodeValidator(ConfigTranslator translator, SchemaErrorStrategy strategy, DuplicateNodeDefinitionValidationModule dupChecker) {
+		this.translator = translator;
+		this.strat = strategy;
+		this.dupChecker = dupChecker;
+	}
+	
+	public boolean validate() {
+		
+		for(Entry<Version, List<String>> entry : translator.getNodeFiles().entrySet()) {
+			String result = dupChecker.findDuplicates(entry.getValue(), entry.getKey());
+			if (!"".equals(result)) {
+				strat.notifyOnError(result);
+			}
+		}
+		return strat.isOK();
+	}
+	
+	public String getErrorMsg() {
+		return strat.getErrorMsg();
+	}
+}