[AAI-50] Add support for v11 version APIs

updated swagger html generation to generate v11
Added to introspection version v11. Update latest aaipropertes to v11
Created v10 versioned edge rules.java
Created v11 oxm using the v10 oxm

Change-Id: Ic56e86b15b8b18fa1ac70dfba5f7e08f58df843f
Signed-off-by: Maharajh, Robby (rx2202) <rx2202@att.com>

5 files changed, 480 insertions, 4 deletions

diff --git a/aai-core/src/main/java/org/openecomp/aai/db/props/AAIProperties.java b/aai-core/src/main/java/org/openecomp/aai/db/props/AAIProperties.java
index 2b335e17..caac6744 100644
--- a/aai-core/src/main/java/org/openecomp/aai/db/props/AAIProperties.java
+++ b/aai-core/src/main/java/org/openecomp/aai/db/props/AAIProperties.java
@@ -31,7 +31,7 @@ public class AAIProperties {
 	public static final String CREATED_TS = "aai-created-ts";
 	public static final String RESOURCE_VERSION = "resource-version";
 	public static final String AAI_URI = "aai-uri";
-	public static final Version LATEST = Version.v10;
+	public static final Version LATEST = Version.v11;
 	public static final Integer MAXIMUM_DEPTH = 10000;
 	public static final String LINKED = "linked";
 	public static final String DB_ALIAS_SUFFIX = "-local";
diff --git a/aai-core/src/main/java/org/openecomp/aai/dbmodel/v10/gen/DbEdgeRules.java b/aai-core/src/main/java/org/openecomp/aai/dbmodel/v10/gen/DbEdgeRules.java
new file mode 100644
index 00000000..d2056848
--- /dev/null
+++ b/aai-core/src/main/java/org/openecomp/aai/dbmodel/v10/gen/DbEdgeRules.java
@@ -0,0 +1,475 @@
+/*-
+ * ============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=========================================================
+ */
+
+package org.openecomp.aai.dbmodel.v10.gen;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.google.common.collect.ImmutableSetMultimap;
+import com.google.common.collect.Multimap;
+
+public class DbEdgeRules {
+
+	/*
+	 * The EdgeRules data is set up as a key (fromNodeTypeA|toNodeTypeB) mapped
+	 * to a string which holds the info we need to build an edge from nodeTypeA
+	 * to nodeTypeB. Note -- the MultiMap will let us define more than one type
+	 * of edge between a given pair of nodeTypes, but for now we never define
+	 * more than one.
+	 * 
+	 * The edgeInfo part is comma separated and looks like this:
+	 * "edgeLabel,direction,multiplicityRule,isParent,usesResource,hasDelTarget,SVC-INFRA" This
+	 * format is encoded into the EdgeInfoMap below. 
+	 * MultiplicityRule can be either "Many2Many", "Many2One", "One2Many" or "One2One"
+	 * The values for the things after multiplicityRule can be either "true", "false" or "reverse". "reverse" is
+	 * really saying that this tag does apply, but the edge will be traversed
+	 * the opposite way from the same tag that just has "true".
+	 */
+	public static final Map<Integer, String> EdgeInfoMap;
+	static {
+		EdgeInfoMap = new HashMap<Integer, String>();
+		EdgeInfoMap.put(0, "edgeLabel");
+		EdgeInfoMap.put(1, "direction");
+		EdgeInfoMap.put(2, "multiplicityRule");
+		EdgeInfoMap.put(3, "isParent");
+		EdgeInfoMap.put(4, "usesResource");
+		EdgeInfoMap.put(5, "hasDelTarget");
+		EdgeInfoMap.put(6, "SVC-INFRA");
+	}
+	
+	public static Integer firstTagIndex = 3;
+
+	public static final Multimap<String, String> EdgeRules = new ImmutableSetMultimap.Builder<String, String>()
+			.putAll("availability-zone|complex",
+					"groupsResourcesIn,OUT,Many2Many,false,false,false,false")
+			.putAll("generic-vnf|license-key-resource",
+					"uses,OUT,Many2Many,false,false,false,false")
+			.putAll("availability-zone|service-capability",
+					"supportsServiceCapability,OUT,Many2Many,false,false,false,false")
+			.putAll("cloud-region|complex",
+					"locatedIn,OUT,Many2One,false,false,false,false")
+			.putAll("cloud-region|l3-network",
+					"uses,OUT,Many2Many,false,false,false,false")
+			.putAll("cloud-region|tenant",
+					"has,OUT,One2Many,true,false,false,reverse")
+			.putAll("cloud-region|image",
+					"has,OUT,One2Many,true,false,false,false")
+			.putAll("cloud-region|flavor",
+					"has,OUT,One2Many,true,false,false,false")
+			.putAll("cloud-region|availability-zone",
+					"has,OUT,One2Many,true,false,false,false")
+			.putAll("cloud-region|oam-network",
+					"has,OUT,One2Many,true,false,false,false")
+			.putAll("cloud-region|dvs-switch",
+					"has,OUT,One2Many,true,false,false,false")
+			.putAll("cloud-region|volume-group",
+					"has,OUT,One2Many,true,true,false,false")
+			.putAll("cloud-region|group-assignment",
+					"has,OUT,One2Many,true,false,false,false")
+			.putAll("cloud-region|snapshot",
+					"has,OUT,One2Many,true,false,false,false")
+			.putAll("cloud-region|zone",
+					"isMemberOf,OUT,Many2One,false,false,false,false")
+			.putAll("complex|ctag-pool",
+					"hasCtagPool,OUT,Many2Many,true,false,false,false")
+			.putAll("complex|l3-network",
+					"usesL3Network,OUT,Many2Many,false,false,false,true")
+			.putAll("ctag-pool|availability-zone",
+					"supportsAvailabilityZone,OUT,Many2Many,false,false,false,false")
+			.putAll("customer|service-subscription",
+					"subscribesTo,OUT,Many2Many,true,false,false,reverse")
+			.putAll("dvs-switch|availability-zone",
+					"existsIn,OUT,Many2Many,false,false,false,false")
+			.putAll("generic-vnf|l-interface",
+					"hasLInterface,OUT,Many2Many,true,false,false,true")
+			.putAll("generic-vnf|availability-zone",
+					"hasAvailabilityZone,OUT,Many2Many,false,false,false,true")
+			.putAll("generic-vnf|lag-interface",
+					"hasLAGInterface,OUT,Many2Many,true,false,false,true")
+			.putAll("generic-vnf|l3-network",
+					"usesL3Network,OUT,Many2Many,false,true,false,true")
+			.putAll("generic-vnf|pserver",
+					"runsOnPserver,OUT,Many2Many,false,true,false,true")
+			.putAll("generic-vnf|vnf-image",
+					"usesVnfImage,OUT,Many2One,false,false,false,true")
+			.putAll("generic-vnf|vserver",
+					"runsOnVserver,OUT,One2Many,false,true,false,true")
+			.putAll("generic-vnf|service-instance",
+					"hasInstance,OUT,Many2Many,false,true,false,true")
+			.putAll("generic-vnf|site-pair-set",
+					"hasSitePairSet,OUT,Many2Many,false,false,false,false")
+			.putAll("generic-vnf|network-profile",
+					"hasNetworkProfile,OUT,Many2Many,false,false,false,false")
+			.putAll("group-assignment|tenant",
+					"has,OUT,Many2Many,false,false,false,false")
+			.putAll("group-assignment|pserver",
+					"has,OUT,One2Many,false,false,false,false")
+			.putAll("image|metadata", "hasMetaData,OUT,Many2Many,true,false,false,false")
+			.putAll("image|metadatum",
+					"hasMetaDatum,OUT,Many2Many,true,false,false,false")
+			.putAll("l-interface|instance-group",
+					"isMemberOf,OUT,Many2Many,false,false,false,false")			
+			.putAll("l-interface|l3-interface-ipv4-address-list",
+					"hasIpAddress,OUT,Many2Many,true,false,false,true")
+			.putAll("l-interface|l3-interface-ipv6-address-list",
+					"hasIpAddress,OUT,Many2Many,true,false,false,true")
+			.putAll("l-interface|l-interface",
+					"has,OUT,One2Many,true,false,false,true")
+			.putAll("l-interface|logical-link",
+					"usesLogicalLink,OUT,Many2Many,false,false,true,true")
+			.putAll("lag-interface|logical-link",
+					"uses,OUT,Many2Many,false,false,true,true")
+			.putAll("l-interface|vlan","hasVlan,OUT,Many2Many,true,false,false,false")
+			.putAll("l-interface|sriov-vf","has,OUT,One2One,true,false,false,false")
+			.putAll("l3-interface-ipv4-address-list|instance-group",
+					"isMemberOf,OUT,Many2Many,false,false,false,false")
+			.putAll("l3-interface-ipv6-address-list|instance-group",
+					"isMemberOf,OUT,Many2Many,false,false,false,false")
+			.putAll("l3-interface-ipv4-address-list|l3-network",
+					"isMemberOf,OUT,Many2Many,false,false,false,true")
+			.putAll("l3-interface-ipv6-address-list|l3-network",
+					"isMemberOf,OUT,Many2Many,false,false,false,true")
+			.putAll("l3-interface-ipv4-address-list|subnet",
+					"isMemberOf,OUT,Many2Many,false,false,false,true")
+			.putAll("l3-interface-ipv6-address-list|subnet",
+					"isMemberOf,OUT,Many2Many,false,false,false,true")
+			.putAll("l3-network|vpn-binding",
+					"usesVpnBinding,OUT,Many2Many,false,false,false,false")
+			.putAll("l3-network|subnet",
+					"hasSubnet,OUT,Many2Many,true,false,false,reverse")
+			.putAll("l3-network|service-instance",
+					"hasInstance,OUT,Many2Many,false,false,false,reverse")
+			.putAll("l3-network|ctag-assignment",
+					"hasCtagAssignment,OUT,Many2Many,true,false,false,true")
+			.putAll("l3-network|network-policy",
+					"uses,OUT,Many2Many,false,false,false,true")
+			.putAll("l3-network|segmentation-assignment",
+					"has,OUT,One2Many,true,false,false,false")
+			.putAll("l3-network|route-table-reference",
+					"uses,OUT,Many2Many,false,false,false,false")
+			.putAll("lag-interface|lag-link",
+					"usesLAGLink,OUT,Many2Many,false,true,true,true")
+			.putAll("lag-interface|p-interface",
+					"usesPInterface,OUT,Many2Many,false,true,false,true")
+			.putAll("lag-interface|l-interface",
+					"hasLInterface,OUT,Many2Many,true,false,false,true")		
+			.putAll("logical-link|lag-link",
+					"usesLAGLink,OUT,Many2Many,false,true,false,true")	
+			.putAll("logical-link|pnf",
+					"bridgedTo,OUT,Many2Many,false,false,false,false")	
+			.putAll("logical-link|logical-link",
+					"uses,OUT,One2Many,false,false,false,true")	
+			.putAll("model|model-ver",
+					"has,OUT,One2Many,true,false,false,false")
+			.putAll("model-ver|model-element",
+					"startsWith,OUT,One2Many,true,false,false,false")
+			.putAll("model-element|model-ver",
+					"isA,OUT,Many2One,false,false,false,false")
+			.putAll("model-ver|metadatum",
+					"hasMetaData,OUT,One2Many,true,false,false,false")
+			.putAll("model-element|model-element",
+					"connectsTo,OUT,One2Many,true,false,false,false")
+			.putAll("model-element|model-constraint",
+					"uses,OUT,One2Many,true,false,false,false")
+			.putAll("model-element|constrained-element-set",
+					"connectsTo,OUT,One2Many,true,false,false,false")
+			.putAll("model-constraint|constrained-element-set",
+					"uses,OUT,One2Many,true,false,false,false")
+			.putAll("constrained-element-set|element-choice-set",
+					"uses,OUT,One2Many,true,false,false,false")
+			.putAll("element-choice-set|model-element",
+					"has,OUT,One2Many,true,false,false,false")
+			.putAll("named-query|model",
+					"relatedTo,OUT,One2Many,false,false,false,false")
+			.putAll("named-query|named-query-element",
+					"startsWith,OUT,One2One,true,false,false,false")
+			.putAll("named-query-element|named-query-element",
+					"connectsTo,OUT,Many2Many,true,false,false,false")
+			.putAll("named-query-element|model",
+					"isA,OUT,Many2One,false,false,false,false")
+			.putAll("named-query-element|property-constraint",
+					"uses,OUT,One2Many,true,false,false,false")
+			.putAll("named-query-element|related-lookup",
+					"uses,OUT,One2Many,true,false,false,false")
+			.putAll("instance-group|model",
+					"targets,OUT,Many2Many,false,false,false,false")
+			.putAll("newvce|l-interface",
+					"hasLInterface,OUT,Many2Many,true,false,false,false")
+			.putAll("oam-network|complex",
+					"definedFor,OUT,Many2Many,false,false,false,false")
+			.putAll("oam-network|service-capability",
+					"supportsServiceCapability,OUT,Many2Many,false,false,false,false")
+			.putAll("p-interface|l-interface",
+					"hasLInterface,OUT,Many2Many,true,false,false,true")
+			.putAll("p-interface|physical-link",
+					"usesPhysicalLink,OUT,Many2Many,false,false,true,false")
+			.putAll("p-interface|logical-link",
+                    "usesLogicalLink,OUT,Many2One,false,false,false,true")		
+			.putAll("port-group|cvlan-tag", "hasCTag,OUT,Many2Many,true,true,false,true")
+			.putAll("pserver|complex", "locatedIn,OUT,Many2One,false,false,false,true")
+			.putAll("pserver|cloud-region","locatedIn,OUT,Many2One,false,false,false,true")
+			.putAll("pserver|availability-zone","existsIn,OUT,Many2One,false,false,false,true")
+			.putAll("pserver|lag-interface",
+					"hasLAGInterface,OUT,Many2Many,true,false,false,true")
+			.putAll("pserver|p-interface",
+					"hasPinterface,OUT,Many2Many,true,true,false,true")
+			.putAll("pserver|zone",
+					"isMemberOf,OUT,Many2One,false,false,false,false")	
+			.putAll("pnf|p-interface",
+					"hasPinterface,OUT,Many2Many,true,true,false,true")
+			.putAll("pnf|lag-interface",
+					"has,OUT,One2Many,true,false,false,true")
+			.putAll("pnf|complex",
+					"locatedIn,OUT,Many2One,false,false,false,false")	
+			.putAll("pnf|instance-group",
+					"isMemberOf,OUT,Many2Many,false,false,false,false")	
+			.putAll("pnf|zone",
+					"isMemberOf,OUT,Many2One,false,false,false,false")	
+			.putAll("service-instance|cvlan-tag",
+					"hasIPAGFacingVLAN,OUT,Many2Many,false,true,false,false")			
+			.putAll("service-instance|pnf",
+					"uses,OUT,One2Many,false,true,false,false")	
+			.putAll("service-subscription|service-instance",
+					"hasInstance,OUT,Many2Many,true,false,false,reverse")
+			.putAll("site-pair-set|routing-instance",
+					"hasRoutingInstance,OUT,Many2Many,true,false,false,false")
+			.putAll("routing-instance|site-pair",
+					"hasSitePair,OUT,Many2Many,true,false,false,false")					
+			.putAll("site-pair|class-of-service",
+					"hasClassOfService,OUT,Many2Many,true,false,false,false")
+			.putAll("tenant|l3-network",
+					"usesL3Network,OUT,Many2Many,false,false,false,false")
+			.putAll("tenant|service-subscription",
+					"relatedTo,OUT,Many2Many,false,false,false,false")
+			.putAll("tenant|vserver", "owns,OUT,One2Many,true,false,false,reverse")
+			.putAll("vce|availability-zone",
+					"hasAvailabilityZone,OUT,Many2Many,false,false,false,false")
+			.putAll("vce|complex", "locatedIn,OUT,Many2Many,false,false,false,true")
+			.putAll("vce|port-group", "hasPortGroup,OUT,Many2Many,true,true,false,true")
+			.putAll("vce|vserver", "runsOnVserver,OUT,Many2Many,false,true,false,true")
+			.putAll("vce|service-instance",
+					"hasServiceInstance,OUT,Many2Many,false,false,false,reverse")
+			.putAll("virtual-data-center|generic-vnf",
+					"hasVNF,OUT,Many2Many,false,false,false,reverse")
+			.putAll("vlan|l3-interface-ipv4-address-list",
+					"hasIpAddress,OUT,Many2Many,true,false,false,true")
+			.putAll("vlan|l3-interface-ipv6-address-list",
+					"hasIpAddress,OUT,Many2Many,true,false,false,true")
+			.putAll("vpe|complex", "locatedIn,OUT,Many2Many,false,false,false,false")
+			.putAll("vpe|ctag-pool", "usesCtagPool,OUT,Many2Many,false,false,false,false")
+			.putAll("vpe|l-interface",
+					"hasLInterface,OUT,Many2Many,true,false,false,false")
+			.putAll("vpe|lag-interface",
+					"hasLAGInterface,OUT,Many2Many,true,false,false,false")
+			.putAll("vpe|vserver", "runsOnVserver,OUT,Many2Many,false,true,false,false")
+			.putAll("vpls-pe|complex", "locatedIn,OUT,Many2Many,false,false,false,false")
+			.putAll("vpls-pe|ctag-pool",
+					"usesCtagPool,OUT,Many2Many,false,false,false,false")
+			.putAll("vpls-pe|p-interface",
+					"hasPinterface,OUT,Many2Many,true,false,false,false")
+			.putAll("vpls-pe|lag-interface",
+					"hasLAGinterface,OUT,Many2Many,true,false,false,false")
+			.putAll("vserver|flavor", "hasFlavor,OUT,Many2One,false,false,false,true")
+			.putAll("vserver|image", "hasImage,OUT,Many2One,false,false,false,true")
+			.putAll("vserver|ipaddress",
+					"hasIpAddress,OUT,Many2Many,true,true,false,false")
+			.putAll("vserver|l-interface",
+					"hasLInterface,OUT,Many2Many,true,false,false,true")
+			.putAll("vserver|pserver",
+					"runsOnPserver,OUT,Many2One,false,true,false,true")
+			.putAll("vserver|volume", "hasVolume,OUT,Many2Many,true,true,false,true")
+			.putAll("vserver|vnfc", "hosts,OUT,Many2Many,false,true,false,true")
+			.putAll("vserver|snapshot", "uses,OUT,One2One,false,false,false,true")
+            .putAll("service-instance|connector", "uses,OUT,Many2Many,false,true,false,false")
+            .putAll("service-instance|metadatum", "hasMetaData,OUT,Many2Many,true,false,false,false")
+            .putAll("service-instance|logical-link", "uses,OUT,Many2Many,false,false,true,false")
+			.putAll("service-instance|vlan", "dependsOn,OUT,One2Many,false,true,false,false")
+			.putAll("service-instance|service-instance", "dependsOn,OUT,One2Many,false,true,false,false")
+            .putAll("connector|virtual-data-center", "contains,OUT,Many2Many,false,false,false,false")
+            .putAll("connector|metadatum", "hasMetaData,OUT,Many2Many,true,false,false,false")
+            .putAll("virtual-data-center|logical-link", "contains,OUT,Many2Many,false,true,false,false")
+            .putAll("logical-link|generic-vnf", "bridgedTo,OUT,Many2Many,false,false,false,false")
+            .putAll("logical-link|pserver", "bridgedTo,OUT,Many2Many,false,false,false,false")
+            .putAll("vlan|multicast-configuration", "uses,OUT,Many2Many,false,true,false,false")
+            .putAll("volume-group|complex", "existsIn,OUT,Many2Many,false,false,false,true")
+            .putAll("volume-group|tenant", "belongsTo,OUT,Many2Many,false,false,false,true")
+            .putAll("ipsec-configuration|vig-server", "hasVigServer,OUT,One2Many,true,true,false,false")
+            .putAll("generic-vnf|ipsec-configuration", "uses,OUT,Many2One,false,true,false,false")
+            .putAll("vf-module|volume-group", "uses,OUT,One2One,false,false,false,true")
+            .putAll("vserver|vf-module", "isPartOf,OUT,Many2One,false,false,false,true")
+            .putAll("vf-module|l3-network", "uses,OUT,Many2Many,false,false,false,true")
+            .putAll("vf-module|vnfc", "uses,OUT,One2Many,false,false,true,true")
+            .putAll("generic-vnf|vf-module", "has,OUT,One2Many,true,false,false,true")
+            .putAll("generic-vnf|volume-group", "uses,OUT,One2Many,false,false,false,true")
+            .putAll("generic-vnf|vnfc", "uses,OUT,One2Many,false,false,true,true")
+            .putAll("vlan|logical-link", "usesLogicalLink,OUT,Many2Many,false,false,true,true")
+            .putAll("vpn-binding|route-target", "has,OUT,One2Many,true,false,false,false")
+            .putAll("service-instance|ctag-assignment","uses,OUT,One2Many,false,false,false,false")
+            // The next edge is needed in 1702 but will be worked in user story AAI-6848
+            //.putAll("service-instance|allotted-resource", "uses,OUT,Many2Many,false,false,false,false")
+            .putAll("allotted-resource|generic-vnf", "isPartOf,OUT,Many2Many,false,false,false,false")
+            .putAll("allotted-resource|l3-network", "isPartOf,OUT,Many2Many,false,false,false,false")
+            .putAll("allotted-resource|instance-group", "isMemberOf,OUT,Many2Many,false,false,false,false")
+            .putAll("allotted-resource|network-policy", "uses,OUT,One2One,false,false,false,false")
+            .putAll("allotted-resource|vlan", "isPartOf,OUT,Many2Many,false,false,false,false")
+            .putAll("generic-vnf|instance-group", "isMemberOf,OUT,Many2Many,false,false,false,false")
+            .putAll("service-instance|instance-group", "isMemberOf,OUT,Many2Many,false,false,false,false")      
+            .putAll("allotted-resource|tunnel-xconnect", "has,OUT,One2One,true,false,false,false")
+            .putAll("logical-link|cloud-region", "existsIn,OUT,Many2Many,false,false,false,false")
+            .putAll("logical-link|vpn-binding", "uses,OUT,Many2Many,false,false,false,false")
+            .putAll("generic-vnf|entitlement", "has,OUT,One2Many,true,false,false,false")
+            .putAll("generic-vnf|license", "has,OUT,One2Many,true,false,false,false")
+            .putAll("vce|entitlement", "has,OUT,One2Many,true,false,false,false")
+            .putAll("vce|license", "has,OUT,One2Many,true,false,false,false")
+            .putAll("vpe|entitlement", "has,OUT,One2Many,true,false,false,false")
+            .putAll("vpe|license", "has,OUT,One2Many,true,false,false,false")
+            .putAll("zone|complex", "existsIn,OUT,Many2One,false,false,false,false")
+            .putAll("service-instance|allotted-resource", "has,OUT,Many2Many,true,false,false,false")
+            .putAll("service-instance|allotted-resource", "uses,OUT,Many2Many,false,false,false,false")
+			.build();
+
+	public static final Multimap<String, String> DefaultDeleteScope = new ImmutableSetMultimap.Builder<String, String>()
+			.putAll("customer", "CASCADE_TO_CHILDREN")
+			.putAll("cloud-region", "THIS_NODE_ONLY")
+			.putAll("service-subscription", "CASCADE_TO_CHILDREN")
+			.putAll("service-instance", "CASCADE_TO_CHILDREN")
+			.putAll("vce", "CASCADE_TO_CHILDREN")
+			.putAll("port-group", "CASCADE_TO_CHILDREN")
+			.putAll("cvlan-tag", "THIS_NODE_ONLY")
+			.putAll("tenant", "THIS_NODE_ONLY")
+			.putAll("license-key-resource", "ERROR_IF_ANY_IN_EDGES")
+			.putAll("vserver", "CASCADE_TO_CHILDREN")
+			.putAll("volume", "THIS_NODE_ONLY")
+			.putAll("ipaddress", "THIS_NODE_ONLY")
+			.putAll("image", "ERROR_4_IN_EDGES_OR_CASCADE")
+			.putAll("pserver", "ERROR_4_IN_EDGES_OR_CASCADE")
+			.putAll("availability-zone", "ERROR_IF_ANY_IN_EDGES")
+			.putAll("oam-network", "ERROR_IF_ANY_IN_EDGES")
+			.putAll("dvs-switch", "THIS_NODE_ONLY")
+			.putAll("service-capability", "ERROR_IF_ANY_IN_EDGES")
+			.putAll("complex", "ERROR_4_IN_EDGES_OR_CASCADE")
+			.putAll("flavor", "ERROR_IF_ANY_IN_EDGES")
+			.putAll("metadata", "THIS_NODE_ONLY")
+			.putAll("metadatum", "THIS_NODE_ONLY")
+			.putAll("model", "ERROR_4_IN_EDGES_OR_CASCADE")
+			.putAll("model-ver", "ERROR_4_IN_EDGES_OR_CASCADE")
+			.putAll("model-element", "CASCADE_TO_CHILDREN")
+			.putAll("model-constraint", "CASCADE_TO_CHILDREN")
+			.putAll("property-constraint", "CASCADE_TO_CHILDREN")
+			.putAll("related-lookup", "CASCADE_TO_CHILDREN")
+			.putAll("constrained-element-set", "CASCADE_TO_CHILDREN")
+			.putAll("element-choice-set", "CASCADE_TO_CHILDREN")
+			.putAll("named-query", "CASCADE_TO_CHILDREN")
+			.putAll("named-query-element", "CASCADE_TO_CHILDREN")
+			.putAll("network-policy", "THIS_NODE_ONLY")
+			.putAll("collect-lookup", "THIS_NODE_ONLY")
+			.putAll("service", "ERROR_IF_ANY_IN_EDGES")
+			.putAll("newvce", "CASCADE_TO_CHILDREN")
+			.putAll("vpe", "CASCADE_TO_CHILDREN")
+			.putAll("vpls-pe", "CASCADE_TO_CHILDREN")
+			.putAll("l-interface", "CASCADE_TO_CHILDREN")
+			.putAll("vlan", "CASCADE_TO_CHILDREN")
+			.putAll("p-interface", "CASCADE_TO_CHILDREN")
+			.putAll("l3-interface-ipv6-address-list", "THIS_NODE_ONLY")
+			.putAll("l3-interface-ipv4-address-list", "THIS_NODE_ONLY")
+			.putAll("logical-link", "THIS_NODE_ONLY")
+			.putAll("physical-link", "THIS_NODE_ONLY")
+			.putAll("lag-link", "THIS_NODE_ONLY")
+			.putAll("lag-interface", "CASCADE_TO_CHILDREN")
+			.putAll("virtual-data-center", "CASCADE_TO_CHILDREN")
+			.putAll("generic-vnf", "CASCADE_TO_CHILDREN")
+			.putAll("l3-network", "CASCADE_TO_CHILDREN")
+			.putAll("ctag-pool", "THIS_NODE_ONLY")
+			.putAll("subnet", "THIS_NODE_ONLY")
+			.putAll("sriov-vf", "THIS_NODE_ONLY")
+			.putAll("vpn-binding", "ERROR_4_IN_EDGES_OR_CASCADE")
+			.putAll("vnf-image", "ERROR_IF_ANY_IN_EDGES")
+			.putAll("site-pair-set", "CASCADE_TO_CHILDREN")
+			.putAll("routing-instance", "CASCADE_TO_CHILDREN")
+			.putAll("site-pair", "CASCADE_TO_CHILDREN")
+			.putAll("class-of-service", "THIS_NODE_ONLY")
+			.putAll("connector", "CASCADE_TO_CHILDREN")
+			.putAll("vnfc", "THIS_NODE_ONLY")
+			.putAll("multicast-configuration", "THIS_NODE_ONLY")
+			.putAll("volume-group", "THIS_NODE_ONLY")
+			.putAll("ctag-assignment", "THIS_NODE_ONLY")
+			.putAll("pnf", "CASCADE_TO_CHILDREN")
+			.putAll("ipsec-configuration", "CASCADE_TO_CHILDREN")
+			.putAll("vig-server", "THIS_NODE_ONLY")
+			.putAll("vf-module", "THIS_NODE_ONLY")
+			.putAll("snapshot", "THIS_NODE_ONLY")
+			.putAll("group-assignment", "THIS_NODE_ONLY")
+			.putAll("segmentation-assignment", "THIS_NODE_ONLY")
+			.putAll("route-table-reference", "THIS_NODE_ONLY")
+			.putAll("network-profile", "THIS_NODE_ONLY")
+			.putAll("allotted-resource", "CASCADE_TO_CHILDREN")
+			.putAll("tunnel-xconnect", "THIS_NODE_ONLY")
+			.putAll("instance-group","THIS_NODE_ONLY")
+			.putAll("entitlement","THIS_NODE_ONLY")
+			.putAll("license","THIS_NODE_ONLY")
+			.putAll("zone", "THIS_NODE_ONLY")
+			.putAll("route-target", "CASCADE_TO_CHILDREN").build();
+
+	// NOTE -- Sorry, this is ugly, but we are mapping the nodeTypeCategory two
+	// ways just to
+	// make the code a little less bulky. But that means that we need to ensure
+	// that
+	// nodeTypeCategory and nodeTypeCatMap are kept in synch.
+
+	// NodeTypeCategory: key is: nodeTypeCategory, value is:
+	// "nodeTypes,keyProperties,AltKeyProps,depNode4UniquenessFlag"
+	public static final Multimap<String, String> NodeTypeCategory = new ImmutableSetMultimap.Builder<String, String>()
+			.putAll("vnf", "vce|vpe|generic-vnf,vnf-id,,true").build();
+
+	// NodeTypeCatMap: key is nodeType; value is: "nodeTypeCategory"
+	// So -- we're assuming that a nodeType can only be in one nodeTypeCategory.
+	public static final Map<String, String> NodeTypeCatMap;
+	static {
+		NodeTypeCatMap = new HashMap<String, String>();
+		NodeTypeCatMap.put("vpe", "vnf");
+		NodeTypeCatMap.put("vce", "vnf");
+		NodeTypeCatMap.put("generic-vnf", "vnf");
+	}
+
+	// ReservedPropNames: keys are property names of (node) properties that are
+	// common to all nodes and
+	// should not be removed if not passed in on an UPDATE request.
+	public static final Map<String, String> ReservedPropNames;
+	static {
+		ReservedPropNames = new HashMap<String, String>();
+		ReservedPropNames.put("source-of-truth", "");
+		ReservedPropNames.put("last-mod-source-of-truth", "");
+		ReservedPropNames.put("aai-created-ts", "");
+		ReservedPropNames.put("aai-last-mod-ts", "");
+	}
+	
+	// This just lists which node types can be connected to themselves recursively.
+	// It's temporary - since DbEdgeRules is going to be overhauled in 16-10, this will
+	// get generated automatically.   But for 1607, it can work like this.
+	public static final Map<String, String> CanBeRecursiveNT;
+	static {
+		CanBeRecursiveNT = new HashMap<String, String>();
+		CanBeRecursiveNT.put("model-element", "");
+		CanBeRecursiveNT.put("service-instance", "");
+		CanBeRecursiveNT.put("named-query-element", "");
+	}
+
+}
diff --git a/aai-core/src/main/java/org/openecomp/aai/introspection/Version.java b/aai-core/src/main/java/org/openecomp/aai/introspection/Version.java
index ee4f9fd5..b0f6f55d 100644
--- a/aai-core/src/main/java/org/openecomp/aai/introspection/Version.java
+++ b/aai-core/src/main/java/org/openecomp/aai/introspection/Version.java
@@ -23,5 +23,6 @@ package org.openecomp.aai.introspection;
 public enum Version {
 	v8,
 	v9,
-	v10;
+	v10, 
+	v11;
 }
diff --git a/aai-core/src/main/java/org/openecomp/aai/util/swagger/GenerateSwagger.java b/aai-core/src/main/java/org/openecomp/aai/util/swagger/GenerateSwagger.java
index 66e91318..07f201e7 100644
--- a/aai-core/src/main/java/org/openecomp/aai/util/swagger/GenerateSwagger.java
+++ b/aai-core/src/main/java/org/openecomp/aai/util/swagger/GenerateSwagger.java
@@ -36,7 +36,7 @@ public class GenerateSwagger {
     public static final String DEFAULT_WIKI = "";
 
     public static final String DEFAULT_SCHEMA_DIR = "../aai-schema";
-    public static final String CURRENT_VERSION = "v10";
+    public static final String CURRENT_VERSION = "v11";
 
     public static void main(String[] args) throws IOException, TemplateException {
 
diff --git a/aai-core/src/main/resources/swagger.html.ftl b/aai-core/src/main/resources/swagger.html.ftl
index 4b9a4908..0506783f 100644
--- a/aai-core/src/main/resources/swagger.html.ftl
+++ b/aai-core/src/main/resources/swagger.html.ftl
@@ -34,7 +34,7 @@
 <body>
 <div class="container">
     <h1>Active and Available Inventory REST API.</h1>
-    <p class="sw-info-version">Version: <span>v10</span></p>
+    <p class="sw-info-version">Version: <span>v11</span></p>
     <p><p>${description}</p>
     </p>