re base code

Change-Id: I12a5ca14a6d8a87e9316b9ff362eb131105f98a5
Issue-ID: SDC-1566
Signed-off-by: Michael Lando <ml636r@att.com>

103 files changed, 25818 insertions, 21019 deletions

diff --git a/common/onap-common-configuration-management/onap-configuration-management-api/pom.xml b/common/onap-common-configuration-management/onap-configuration-management-api/pom.xml
index 61b6cb0614..83a8215851 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-api/pom.xml
+++ b/common/onap-common-configuration-management/onap-configuration-management-api/pom.xml
@@ -1,15 +1,16 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
 
-    <name>onap-configuration-management-api</name>
-    <artifactId>onap-configuration-management-api</artifactId>
+	<name>onap-configuration-management-api</name>
+	<artifactId>onap-configuration-management-api</artifactId>
 
-    <parent>
-        <artifactId>onap-common-configuration-management</artifactId>
-        <groupId>org.onap.sdc.common</groupId>
-        <version>1.3.0-SNAPSHOT</version>
-        <relativePath>..</relativePath>
-    </parent>
+	<parent>
+		<artifactId>onap-common-configuration-management</artifactId>
+		<groupId>org.onap.sdc.common</groupId>
+		<version>1.3.0-SNAPSHOT</version>
+		<relativePath>..</relativePath>
+	</parent>
 
 </project>
diff --git a/common/onap-common-configuration-management/onap-configuration-management-cli/pom.xml b/common/onap-common-configuration-management/onap-configuration-management-cli/pom.xml
index f242fcc5d9..a6caa37e10 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-cli/pom.xml
+++ b/common/onap-common-configuration-management/onap-configuration-management-cli/pom.xml
@@ -1,55 +1,57 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.onap.sdc.common</groupId>
-    <name>onap-configuration-management-cli</name>
-    <artifactId>onap-configuration-management-cli</artifactId>
+	<groupId>org.onap.sdc.common</groupId>
+	<name>onap-configuration-management-cli</name>
+	<artifactId>onap-configuration-management-cli</artifactId>
 
-    <parent>
-        <artifactId>onap-common-configuration-management</artifactId>
-        <groupId>org.onap.sdc.common</groupId>
-        <version>1.2.0-SNAPSHOT</version>
-        <relativePath>..</relativePath>
-    </parent>
+	<parent>
+		<artifactId>onap-common-configuration-management</artifactId>
+		<groupId>org.onap.sdc.common</groupId>
+		<version>1.2.0-SNAPSHOT</version>
+		<relativePath>..</relativePath>
+	</parent>
 
-    <dependencies>
-	<dependency>
-	    <groupId>org.onap.sdc.common</groupId>
-	    <artifactId>onap-configuration-management-api</artifactId>
-	    <version>${project.version}</version>
-	</dependency>
-	<dependency>
-		<groupId>tools</groupId>
-		<artifactId>tools</artifactId>
-		<version>1.8</version>
-		<optional>true</optional>
-	</dependency>
-    </dependencies>
+	<dependencies>
+		<dependency>
+			<groupId>org.onap.sdc.common</groupId>
+			<artifactId>onap-configuration-management-api</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>tools</groupId>
+			<artifactId>tools</artifactId>
+			<version>1.8</version>
+			<optional>true</optional>
+		</dependency>
+	</dependencies>
 
-    <build>
-    	<plugins>
-    		<plugin>
-    			<groupId>org.apache.maven.plugins</groupId>
-    			<artifactId>maven-shade-plugin</artifactId>
-    			<version>1.5</version>
-    			<executions>
-    				<execution>
-    					<phase>package</phase>
-    					<goals>
-    						<goal>shade</goal>
-    					</goals>
-    					<configuration>
-			              <transformers>
-			                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-			                  <mainClass>org.onap.config.gui.app.Configuration</mainClass>
-			                </transformer>
-			              </transformers>
-			            </configuration>
-    				</execution>
-    			</executions>
-    		</plugin>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-shade-plugin</artifactId>
+				<version>1.5</version>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<goals>
+							<goal>shade</goal>
+						</goals>
+						<configuration>
+							<transformers>
+								<transformer
+									implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+									<mainClass>org.onap.config.gui.app.Configuration</mainClass>
+								</transformer>
+							</transformers>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
-    </build>
+	</build>
 
 </project>
diff --git a/common/onap-common-configuration-management/onap-configuration-management-cli/src/main/java/org/onap/config/cli/app/Configuration.java b/common/onap-common-configuration-management/onap-configuration-management-cli/src/main/java/org/onap/config/cli/app/Configuration.java
index d1a93f0041..03bd4a02e9 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-cli/src/main/java/org/onap/config/cli/app/Configuration.java
+++ b/common/onap-common-configuration-management/onap-configuration-management-cli/src/main/java/org/onap/config/cli/app/Configuration.java
@@ -1,17 +1,15 @@
 package org.onap.config.cli.app;
 
-import org.onap.config.api.ConfigurationChangeListener;
 import org.onap.config.api.ConfigurationManager;
 
-import java.util.HashMap;
-import java.util.Map;
-
 import javax.management.JMX;
 import javax.management.MBeanServerConnection;
 import javax.management.ObjectName;
 import javax.management.remote.JMXConnector;
 import javax.management.remote.JMXConnectorFactory;
 import javax.management.remote.JMXServiceURL;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * The type Configuration.
diff --git a/common/onap-common-configuration-management/onap-configuration-management-cli/src/main/java/org/onap/config/gui/app/Configuration.java b/common/onap-common-configuration-management/onap-configuration-management-cli/src/main/java/org/onap/config/gui/app/Configuration.java
index fa7cf5b77a..f51d04b68c 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-cli/src/main/java/org/onap/config/gui/app/Configuration.java
+++ b/common/onap-common-configuration-management/onap-configuration-management-cli/src/main/java/org/onap/config/gui/app/Configuration.java
@@ -5,26 +5,12 @@ import com.sun.tools.attach.VirtualMachine;
 import com.sun.tools.attach.VirtualMachineDescriptor;
 import org.onap.config.api.ConfigurationManager;
 
-import java.awt.BorderLayout;
-import java.awt.Button;
-import java.awt.CardLayout;
-import java.awt.Checkbox;
-import java.awt.CheckboxGroup;
-import java.awt.Choice;
-import java.awt.Dialog;
-import java.awt.Dimension;
-import java.awt.Frame;
-import java.awt.GraphicsDevice;
-import java.awt.GraphicsEnvironment;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.GridLayout;
-import java.awt.Label;
-import java.awt.Panel;
-import java.awt.ScrollPane;
-import java.awt.TextArea;
-import java.awt.TextField;
-import java.awt.Toolkit;
+import javax.management.JMX;
+import javax.management.MBeanServerConnection;
+import javax.management.ObjectName;
+import javax.management.remote.JMXConnector;
+import javax.management.remote.JMXConnectorFactory;
+import javax.management.remote.JMXServiceURL;
 import java.awt.event.ItemEvent;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
@@ -34,12 +20,6 @@ import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
-import javax.management.JMX;
-import javax.management.MBeanServerConnection;
-import javax.management.ObjectName;
-import javax.management.remote.JMXConnector;
-import javax.management.remote.JMXConnectorFactory;
-import javax.management.remote.JMXServiceURL;
 
 
 /**
diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/pom.xml b/common/onap-common-configuration-management/onap-configuration-management-core/pom.xml
index c610307494..40693df779 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-core/pom.xml
+++ b/common/onap-common-configuration-management/onap-configuration-management-core/pom.xml
@@ -1,112 +1,113 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
 
-    <name>onap-configuration-management-core</name>
-    <artifactId>onap-configuration-management-core</artifactId>
+	<name>onap-configuration-management-core</name>
+	<artifactId>onap-configuration-management-core</artifactId>
 
-    <parent>
-        <artifactId>onap-common-configuration-management</artifactId>
-        <groupId>org.onap.sdc.common</groupId>
-        <version>1.3.0-SNAPSHOT</version>
-        <relativePath>..</relativePath>
-    </parent>
+	<parent>
+		<artifactId>onap-common-configuration-management</artifactId>
+		<groupId>org.onap.sdc.common</groupId>
+		<version>1.3.0-SNAPSHOT</version>
+		<relativePath>..</relativePath>
+	</parent>
 
-    <dependencies>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>2.5.4</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.dataformat</groupId>
-            <artifactId>jackson-dataformat-yaml</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-configuration2</artifactId>
-            <version>2.1</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-            <version>1.2</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-beanutils</groupId>
-            <artifactId>commons-beanutils</artifactId>
-            <version>${commons.beanutils.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>3.3.2</version>
-        </dependency>
-        <dependency>
-            <groupId>com.github.adejanovski</groupId>
-            <artifactId>cassandra-jdbc-wrapper</artifactId>
-            <version>3.1.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-dbcp2</artifactId>
-            <version>2.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-pool2</artifactId>
-            <version>2.4.2</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>${commons.io.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>net.sf.corn</groupId>
-            <artifactId>corn-cps</artifactId>
-            <version>1.1.7</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.sun</groupId>
-                    <artifactId>tools</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>com.virtlink.commons</groupId>
-            <artifactId>commons-configuration2-jackson</artifactId>
-            <version>0.6.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-core</artifactId>
-            <version>2.7</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.sdc.common</groupId>
-            <artifactId>onap-configuration-management-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <version>${servlet-api.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-            <version>2.8.1</version>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-            <version>${junit.version}</version>
-        </dependency>
+	<dependencies>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+			<version>2.5.4</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.dataformat</groupId>
+			<artifactId>jackson-dataformat-yaml</artifactId>
+			<version>${jackson.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-configuration2</artifactId>
+			<version>2.1</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-logging</groupId>
+			<artifactId>commons-logging</artifactId>
+			<version>1.2</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-beanutils</groupId>
+			<artifactId>commons-beanutils</artifactId>
+			<version>${commons.beanutils.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-lang3</artifactId>
+			<version>3.3.2</version>
+		</dependency>
+		<dependency>
+			<groupId>com.github.adejanovski</groupId>
+			<artifactId>cassandra-jdbc-wrapper</artifactId>
+			<version>3.1.0</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-dbcp2</artifactId>
+			<version>2.0</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-pool2</artifactId>
+			<version>2.4.2</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+			<version>${commons.io.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>net.sf.corn</groupId>
+			<artifactId>corn-cps</artifactId>
+			<version>1.1.7</version>
+			<exclusions>
+				<exclusion>
+					<groupId>com.sun</groupId>
+					<artifactId>tools</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>com.virtlink.commons</groupId>
+			<artifactId>commons-configuration2-jackson</artifactId>
+			<version>0.6.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-core</artifactId>
+			<version>2.7</version>
+		</dependency>
+		<dependency>
+			<groupId>org.onap.sdc.common</groupId>
+			<artifactId>onap-configuration-management-api</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>javax.servlet-api</artifactId>
+			<version>${servlet-api.version}</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-annotations</artifactId>
+			<version>2.8.1</version>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<scope>test</scope>
+			<version>${junit.version}</version>
+		</dependency>
 
-    </dependencies>
+	</dependencies>
 
 </project>
diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/ConfigurationUtils.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/ConfigurationUtils.java
index 53baaec2cf..db64f7f7fc 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/ConfigurationUtils.java
+++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/ConfigurationUtils.java
@@ -26,7 +26,7 @@ import org.onap.config.impl.AgglomerateConfiguration;
 import org.onap.config.impl.ConfigurationDataSource;
 import org.onap.config.type.ConfigurationMode;
 import org.onap.config.type.ConfigurationType;
-
+ 
 import javax.sql.DataSource;
 import java.io.File;
 import java.lang.reflect.Field;
@@ -67,6 +67,11 @@ import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import java.util.concurrent.Executors;
+import java.util.concurrent.ThreadFactory;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
 import static com.google.common.collect.ImmutableMap.builder;
 
 import static java.util.Optional.ofNullable;
@@ -74,6 +79,10 @@ import static org.onap.config.api.Hint.EXTERNAL_LOOKUP;
 import static org.onap.config.api.Hint.LATEST_LOOKUP;
 import static org.onap.config.api.Hint.NODE_SPECIFIC;
 
+
+import static com.google.common.collect.ImmutableMap.builder;
+import static org.onap.config.api.Hint.*;
+
 /**
  * The type Configuration utils.
  */
diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/AggregateConfiguration.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/AggregateConfiguration.java
index c8d76d9bd9..7698d3f8ec 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/AggregateConfiguration.java
+++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/AggregateConfiguration.java
@@ -5,7 +5,6 @@ import org.apache.commons.configuration2.Configuration;
 import org.apache.commons.configuration2.tree.MergeCombiner;
 import org.apache.commons.configuration2.tree.OverrideCombiner;
 import org.apache.commons.configuration2.tree.UnionCombiner;
-import static org.onap.config.Constants.LOAD_ORDER_KEY;
 import org.onap.config.ConfigurationUtils;
 import org.onap.config.type.ConfigurationMode;
 
@@ -14,6 +13,8 @@ import java.net.URL;
 import java.util.HashMap;
 import java.util.*;
 
+import static org.onap.config.Constants.LOAD_ORDER_KEY;
+
 /**
  * The type Aggregate configuration.
  */
diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/CliConfigurationImpl.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/CliConfigurationImpl.java
index 53ebf2943b..6663c85805 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/CliConfigurationImpl.java
+++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/CliConfigurationImpl.java
@@ -1,43 +1,27 @@
 package org.onap.config.impl;
 
-import static org.onap.config.Constants.DB_NAMESPACE;
-import static org.onap.config.Constants.DEFAULT_NAMESPACE;
-import static org.onap.config.Constants.DEFAULT_TENANT;
-import static org.onap.config.Constants.KEY_ELEMENTS_DELEMETER;
-import static org.onap.config.Constants.LOAD_ORDER_KEY;
-import static org.onap.config.Constants.MBEAN_NAME;
-import static org.onap.config.Constants.MODE_KEY;
-import static org.onap.config.Constants.NAMESPACE_KEY;
+import org.apache.commons.configuration2.*;
+import org.onap.config.ConfigurationUtils;
+import org.onap.config.Constants;
+import org.onap.config.api.ConfigurationManager;
+import org.onap.config.api.Hint;
+import org.onap.config.type.ConfigurationQuery;
+import org.onap.config.type.ConfigurationUpdate;
 
 import java.io.File;
 import java.io.PrintWriter;
+import java.util.*;
 import java.lang.management.ManagementFactory;
 import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
+
 import javax.management.MBeanServer;
 import javax.management.MBeanServerDelegate;
 import javax.management.MBeanServerNotification;
 import javax.management.Notification;
 import javax.management.ObjectName;
 import javax.management.StandardMBean;
-import org.apache.commons.configuration2.CombinedConfiguration;
-import org.apache.commons.configuration2.CompositeConfiguration;
-import org.apache.commons.configuration2.Configuration;
-import org.apache.commons.configuration2.FileBasedConfiguration;
-import org.apache.commons.configuration2.PropertiesConfiguration;
-import org.onap.config.ConfigurationUtils;
-import org.onap.config.Constants;
-import org.onap.config.api.ConfigurationManager;
-import org.onap.config.api.Hint;
-import org.onap.config.type.ConfigurationQuery;
-import org.onap.config.type.ConfigurationUpdate;
+
+import static org.onap.config.Constants.*;
 
 /**
  * The type Cli configuration.
diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ConfigurationChangeNotifier.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ConfigurationChangeNotifier.java
index 015634b1cd..88c71c14e0 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ConfigurationChangeNotifier.java
+++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ConfigurationChangeNotifier.java
@@ -5,7 +5,7 @@ import org.onap.config.Constants;
 import org.onap.config.api.ConfigurationChangeListener;
 import org.onap.config.api.ConfigurationManager;
 import org.onap.config.api.Hint;
-
+ 
 import java.io.File;
 import java.io.IOException;
 import java.lang.management.ManagementFactory;
@@ -37,6 +37,7 @@ import javax.management.MBeanServerConnection;
 import javax.management.ObjectName;
 
 
+
 /**
  * The type Configuration change notifier.
  */
diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ConfigurationDataSource.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ConfigurationDataSource.java
index ea9c61f635..64fd22e431 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ConfigurationDataSource.java
+++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ConfigurationDataSource.java
@@ -5,13 +5,8 @@ import org.apache.commons.dbcp2.BasicDataSource;
 import org.apache.commons.lang3.StringUtils;
 import org.onap.config.ConfigurationUtils;
 import org.onap.config.Constants;
-
+import java.util.*;
 import java.sql.Driver;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.ServiceLoader;
-import java.util.Set;
 
 /**
  * The type Configuration data source.
diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ConfigurationFilter.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ConfigurationFilter.java
index 9df69ed1d7..2956943f7e 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ConfigurationFilter.java
+++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ConfigurationFilter.java
@@ -3,6 +3,7 @@ package org.onap.config.impl;
 import org.onap.config.Constants;
 import org.onap.config.api.Configuration;
 
+import javax.servlet.annotation.WebFilter;
 import java.io.IOException;
 import javax.servlet.Filter;
 import javax.servlet.FilterChain;
@@ -10,7 +11,8 @@ import javax.servlet.FilterConfig;
 import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
-import javax.servlet.annotation.WebFilter;
+
+
 
 @WebFilter("/")
 public class ConfigurationFilter implements Filter {
diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ConfigurationImpl.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ConfigurationImpl.java
index 7faf3ee8cf..00725b1165 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ConfigurationImpl.java
+++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ConfigurationImpl.java
@@ -1,7 +1,5 @@
 package org.onap.config.impl;
 
-import static org.onap.config.ConfigurationUtils.getConfigurationRepositoryKey;
-
 import org.apache.commons.configuration2.Configuration;
 import org.apache.commons.configuration2.DatabaseConfiguration;
 import org.onap.config.ConfigurationUtils;
@@ -26,6 +24,8 @@ import java.util.Map;
 import java.util.Set;
 import java.util.function.Predicate;
 
+import static org.onap.config.ConfigurationUtils.getConfigurationRepositoryKey;
+
 /**
  * The type Configuration.
  */
diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ConfigurationRepository.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ConfigurationRepository.java
index 1c3bc1313f..953f793b9d 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ConfigurationRepository.java
+++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ConfigurationRepository.java
@@ -12,15 +12,7 @@ import org.onap.config.Constants;
 
 import java.io.File;
 import java.sql.Timestamp;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 /**
  * The type Configuration repository.
diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ContextListener.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ContextListener.java
index cf87db936d..cc31e775b7 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ContextListener.java
+++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ContextListener.java
@@ -1,13 +1,14 @@
 package org.onap.config.impl;
 
-import static org.onap.config.Constants.MBEAN_NAME;
+import org.onap.config.api.ConfigurationManager;
 
-import java.lang.management.ManagementFactory;
 import javax.management.ObjectName;
 import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
 import javax.servlet.annotation.WebListener;
-import org.onap.config.api.ConfigurationManager;
+import java.lang.management.ManagementFactory;
+
+import static org.onap.config.Constants.MBEAN_NAME;
 
 @WebListener
 public class ContextListener implements ServletContextListener {
diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/ConfigurationUtilsTest.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/ConfigurationUtilsTest.java
index 90966fccf6..707573640b 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/ConfigurationUtilsTest.java
+++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/ConfigurationUtilsTest.java
@@ -5,9 +5,7 @@ import org.junit.Test;
 import java.util.Arrays;
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 public class ConfigurationUtilsTest {
     @Test
diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/pom.xml b/common/onap-common-configuration-management/onap-configuration-management-test/pom.xml
index 64ed8a84b1..700513ea5d 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-test/pom.xml
+++ b/common/onap-common-configuration-management/onap-configuration-management-test/pom.xml
@@ -1,48 +1,49 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
 
-    <name>onap-configuration-management-test</name>
-    <artifactId>onap-configuration-management-test</artifactId>
+	<name>onap-configuration-management-test</name>
+	<artifactId>onap-configuration-management-test</artifactId>
 
-    <parent>
-        <artifactId>onap-common-configuration-management</artifactId>
-        <groupId>org.onap.sdc.common</groupId>
-        <version>1.3.0-SNAPSHOT</version>
-        <relativePath>..</relativePath>
-    </parent>
+	<parent>
+		<artifactId>onap-common-configuration-management</artifactId>
+		<groupId>org.onap.sdc.common</groupId>
+		<version>1.3.0-SNAPSHOT</version>
+		<relativePath>..</relativePath>
+	</parent>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.onap.sdc.common</groupId>
-            <artifactId>onap-configuration-management-core</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>${junit.version}</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
+	<dependencies>
+		<dependency>
+			<groupId>org.onap.sdc.common</groupId>
+			<artifactId>onap-configuration-management-core</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>${junit.version}</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>${mvn.surefire.version}</version>
-                <configuration>
-                    <skipTests>true</skipTests>
-                    <systemPropertyVariables>
-                        <config.location>${project.basedir}/src/test/resources</config.location>
-                        <node.config.location>${user.home}/TestResources</node.config.location>
-                    </systemPropertyVariables>
-                    <includes>
-                        <include>**/TestCMSuite.java</include>
-                    </includes>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>${mvn.surefire.version}</version>
+				<configuration>
+					<skipTests>true</skipTests>
+					<systemPropertyVariables>
+						<config.location>${project.basedir}/src/test/resources</config.location>
+						<node.config.location>${user.home}/TestResources</node.config.location>
+					</systemPropertyVariables>
+					<includes>
+						<include>**/TestCMSuite.java</include>
+					</includes>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 </project>
diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/TestCMSuite.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/TestCMSuite.java
index de265c7281..59df849571 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/TestCMSuite.java
+++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/TestCMSuite.java
@@ -1,30 +1,9 @@
 package org.onap.config;
 
-import org.onap.config.test.CLIFallbackAndLookupTest;
-import org.onap.config.test.CLITest;
-import org.onap.config.test.ConfigSourceLocationTest;
-import org.onap.config.test.DynamicConfigurationTest;
-import org.onap.config.test.FallbackConfigTest;
-import org.onap.config.test.FallbackToGlobalNSTest;
-import org.onap.config.test.GlobalAndNSConfigTest;
-import org.onap.config.test.JAVAPropertiesConfigTest;
-import org.onap.config.test.JSONConfigTest;
-import org.onap.config.test.LoadOrderMergeAndOverrideTest;
-import org.onap.config.test.ModeAsConfigPropTest;
-import org.onap.config.test.MultiTenancyConfigTest;
-import org.onap.config.test.NodeSpecificCLITest;
-import org.onap.config.test.NotificationForNodeConfigTest;
-import org.onap.config.test.NotificationOnPropValTest;
-import org.onap.config.test.ResourceChangeNotificationTest;
-import org.onap.config.test.UnregisterNotificationTest;
-import org.onap.config.test.ValidateDefaultModeTest;
-import org.onap.config.test.ValidateNodeConfigTest;
-import org.onap.config.test.XMLConfigTest;
-import org.onap.config.test.YAMLConfigTest;
-import org.onap.config.test.*;
 import org.junit.AfterClass;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
+import org.onap.config.test.*;
 
 /**
  * Created by sheetalm on 10/25/2016.
diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/CLIFallbackAndLookupTest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/CLIFallbackAndLookupTest.java
index 1e345aee3d..d5990c8dac 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/CLIFallbackAndLookupTest.java
+++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/CLIFallbackAndLookupTest.java
@@ -1,13 +1,13 @@
 package org.onap.config.test;
 
-import org.onap.config.util.ConfigTestConstant;
-import org.onap.config.Constants;
-import org.onap.config.api.ConfigurationManager;
-import org.onap.config.util.TestUtil;
-import org.junit.Assert;
 import org.junit.After;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.onap.config.Constants;
+import org.onap.config.api.ConfigurationManager;
+import org.onap.config.util.ConfigTestConstant;
+import org.onap.config.util.TestUtil;
 
 import javax.management.JMX;
 import javax.management.MBeanServerConnection;
diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/CLITest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/CLITest.java
index de863efe5b..18b9c2650b 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/CLITest.java
+++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/CLITest.java
@@ -1,14 +1,14 @@
 package org.onap.config.test;
 
-import org.onap.config.util.ConfigTestConstant;
-import org.onap.config.Constants;
-import org.onap.config.api.ConfigurationChangeListener;
-import org.onap.config.api.ConfigurationManager;
-import org.onap.config.util.TestUtil;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.onap.config.Constants;
+import org.onap.config.api.ConfigurationChangeListener;
+import org.onap.config.api.ConfigurationManager;
+import org.onap.config.util.ConfigTestConstant;
+import org.onap.config.util.TestUtil;
 
 import javax.management.JMX;
 import javax.management.MBeanServerConnection;
diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ConfigSourceLocationTest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ConfigSourceLocationTest.java
index 6751a5cc31..c997e09f8e 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ConfigSourceLocationTest.java
+++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ConfigSourceLocationTest.java
@@ -1,19 +1,19 @@
 package org.onap.config.test;
 
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 import org.onap.config.api.Configuration;
 import org.onap.config.api.ConfigurationManager;
 import org.onap.config.util.ConfigTestConstant;
 import org.onap.config.util.TestUtil;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.Assert;
 
 import java.io.File;
+import java.io.FileOutputStream;
 import java.io.IOException;
-import java.util.Properties;
 import java.io.OutputStream;
-import java.io.FileOutputStream;
+import java.util.Properties;
 
 /**
  * Created by sheetalm on 10/14/2016.
diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/DynamicConfigurationTest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/DynamicConfigurationTest.java
index 86422d2361..166ba63fab 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/DynamicConfigurationTest.java
+++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/DynamicConfigurationTest.java
@@ -1,14 +1,14 @@
 package org.onap.config.test;
 
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 import org.onap.config.api.Configuration;
 import org.onap.config.api.ConfigurationManager;
 import org.onap.config.api.DynamicConfiguration;
 import org.onap.config.util.ConfigTestConstant;
 import org.onap.config.util.TestUtil;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
 
 import java.io.File;
 import java.io.FileOutputStream;
diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/FallbackToGlobalNSTest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/FallbackToGlobalNSTest.java
index 14d74fb040..b70247b040 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/FallbackToGlobalNSTest.java
+++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/FallbackToGlobalNSTest.java
@@ -1,13 +1,13 @@
 package org.onap.config.test;
 
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 import org.onap.config.api.Configuration;
 import org.onap.config.api.ConfigurationManager;
 import org.onap.config.util.ConfigTestConstant;
 import org.onap.config.util.TestUtil;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.Assert;
 
 import java.io.IOException;
 
diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/GlobalAndNSConfigTest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/GlobalAndNSConfigTest.java
index a0bb51a73f..e4a511064e 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/GlobalAndNSConfigTest.java
+++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/GlobalAndNSConfigTest.java
@@ -1,13 +1,13 @@
 package org.onap.config.test;
 
-import org.onap.config.api.Configuration;
-import org.onap.config.api.ConfigurationManager;
-import org.onap.config.util.ConfigTestConstant;
-import org.onap.config.util.TestUtil;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.onap.config.api.Configuration;
+import org.onap.config.api.ConfigurationManager;
+import org.onap.config.util.ConfigTestConstant;
+import org.onap.config.util.TestUtil;
 
 import java.io.IOException;
 
diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/JAVAPropertiesConfigTest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/JAVAPropertiesConfigTest.java
index ab47765a1c..994bd7260b 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/JAVAPropertiesConfigTest.java
+++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/JAVAPropertiesConfigTest.java
@@ -1,9 +1,9 @@
 package org.onap.config.test;
 
-import org.onap.config.util.TestUtil;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.onap.config.util.TestUtil;
 
 import java.io.IOException;
 
diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/JSONConfigTest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/JSONConfigTest.java
index b3fcb730fb..bf6ea5c243 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/JSONConfigTest.java
+++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/JSONConfigTest.java
@@ -1,9 +1,9 @@
 package org.onap.config.test;
 
-import org.onap.config.util.TestUtil;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.onap.config.util.TestUtil;
 
 import java.io.IOException;
 
diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/LoadOrderMergeAndOverrideTest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/LoadOrderMergeAndOverrideTest.java
index 244511cbf0..d179edfcfb 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/LoadOrderMergeAndOverrideTest.java
+++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/LoadOrderMergeAndOverrideTest.java
@@ -1,7 +1,5 @@
 package org.onap.config.test;
 
-import static org.onap.config.util.TestUtil.writeFile;
-
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -13,6 +11,8 @@ import org.onap.config.util.TestUtil;
 
 import java.io.IOException;
 
+import static org.onap.config.util.TestUtil.writeFile;
+
 /**
  * Scenario
  * Check loadorder for merge and overide. Higher loadorder takes precedence for override
diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ModeAsConfigPropTest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ModeAsConfigPropTest.java
index 17130d37c1..7c93af0cf1 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ModeAsConfigPropTest.java
+++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ModeAsConfigPropTest.java
@@ -1,13 +1,13 @@
 package org.onap.config.test;
 
-import org.onap.config.api.Configuration;
-import org.onap.config.api.ConfigurationManager;
-import org.onap.config.util.ConfigTestConstant;
-import org.onap.config.util.TestUtil;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.onap.config.api.Configuration;
+import org.onap.config.api.ConfigurationManager;
+import org.onap.config.util.ConfigTestConstant;
+import org.onap.config.util.TestUtil;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/MultiTenancyConfigTest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/MultiTenancyConfigTest.java
index 8cdd634794..5765c4de2f 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/MultiTenancyConfigTest.java
+++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/MultiTenancyConfigTest.java
@@ -1,13 +1,13 @@
 package org.onap.config.test;
 
-import org.onap.config.api.Configuration;
-import org.onap.config.api.ConfigurationManager;
-import org.onap.config.util.ConfigTestConstant;
-import org.onap.config.util.TestUtil;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.onap.config.api.Configuration;
+import org.onap.config.api.ConfigurationManager;
+import org.onap.config.util.ConfigTestConstant;
+import org.onap.config.util.TestUtil;
 
 import java.io.IOException;
 
diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/NodeSpecificCLITest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/NodeSpecificCLITest.java
index 41745d36ff..9bd5788532 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/NodeSpecificCLITest.java
+++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/NodeSpecificCLITest.java
@@ -1,13 +1,13 @@
 package org.onap.config.test;
 
-import org.onap.config.util.ConfigTestConstant;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.Test;
 import org.onap.config.Constants;
 import org.onap.config.api.ConfigurationChangeListener;
 import org.onap.config.api.ConfigurationManager;
+import org.onap.config.util.ConfigTestConstant;
 import org.onap.config.util.TestUtil;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.Test;
 
 import javax.management.JMX;
 import javax.management.MBeanServerConnection;
diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/NotificationForNodeConfigTest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/NotificationForNodeConfigTest.java
index 55af6900a6..1486522ca7 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/NotificationForNodeConfigTest.java
+++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/NotificationForNodeConfigTest.java
@@ -1,14 +1,14 @@
 package org.onap.config.test;
 
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 import org.onap.config.api.Configuration;
 import org.onap.config.api.ConfigurationChangeListener;
 import org.onap.config.api.ConfigurationManager;
 import org.onap.config.util.ConfigTestConstant;
 import org.onap.config.util.TestUtil;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
 
 import java.io.File;
 import java.io.FileOutputStream;
diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/NotificationOnPropValTest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/NotificationOnPropValTest.java
index c7b93b019a..ca8e812ef4 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/NotificationOnPropValTest.java
+++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/NotificationOnPropValTest.java
@@ -1,14 +1,14 @@
 package org.onap.config.test;
 
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 import org.onap.config.api.Configuration;
 import org.onap.config.api.ConfigurationChangeListener;
 import org.onap.config.api.ConfigurationManager;
 import org.onap.config.util.ConfigTestConstant;
 import org.onap.config.util.TestUtil;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.Assert;
 
 import java.io.File;
 import java.io.FileOutputStream;
diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ResourceChangeNotificationTest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ResourceChangeNotificationTest.java
index 54bd339f29..4547e49d95 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ResourceChangeNotificationTest.java
+++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ResourceChangeNotificationTest.java
@@ -1,20 +1,18 @@
 package org.onap.config.test;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.onap.config.util.ConfigTestConstant;
-
-import org.onap.config.util.TestUtil;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
-
 import org.onap.config.api.Configuration;
 import org.onap.config.api.ConfigurationChangeListener;
 import org.onap.config.api.ConfigurationManager;
+import org.onap.config.util.ConfigTestConstant;
+import org.onap.config.util.TestUtil;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Scenario 7
diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/UnregisterNotificationTest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/UnregisterNotificationTest.java
index cdfcfdf22d..687df0e935 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/UnregisterNotificationTest.java
+++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/UnregisterNotificationTest.java
@@ -1,14 +1,14 @@
 package org.onap.config.test;
 
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 import org.onap.config.api.Configuration;
 import org.onap.config.api.ConfigurationChangeListener;
 import org.onap.config.api.ConfigurationManager;
 import org.onap.config.util.ConfigTestConstant;
 import org.onap.config.util.TestUtil;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
 
 import java.io.File;
 import java.io.FileOutputStream;
diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ValidateDefaultModeTest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ValidateDefaultModeTest.java
index f9ce9a37ed..3711322056 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ValidateDefaultModeTest.java
+++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ValidateDefaultModeTest.java
@@ -1,12 +1,12 @@
 package org.onap.config.test;
 
-import org.onap.config.api.Configuration;
-import org.onap.config.api.ConfigurationManager;
-import org.onap.config.util.ConfigTestConstant;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.onap.config.api.Configuration;
+import org.onap.config.api.ConfigurationManager;
+import org.onap.config.util.ConfigTestConstant;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ValidateNodeConfigTest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ValidateNodeConfigTest.java
index e4f3a84b05..c3f8719de9 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ValidateNodeConfigTest.java
+++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ValidateNodeConfigTest.java
@@ -1,13 +1,13 @@
 package org.onap.config.test;
 
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 import org.onap.config.api.Configuration;
 import org.onap.config.api.ConfigurationManager;
 import org.onap.config.util.ConfigTestConstant;
 import org.onap.config.util.TestUtil;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.Assert;
 
 import java.io.File;
 import java.io.FileOutputStream;
diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/XMLConfigTest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/XMLConfigTest.java
index ae6fc3e7b1..22832d378c 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/XMLConfigTest.java
+++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/XMLConfigTest.java
@@ -1,9 +1,9 @@
 package org.onap.config.test;
 
-import org.onap.config.util.TestUtil;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.onap.config.util.TestUtil;
 
 import java.io.IOException;
 
diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/YAMLConfigTest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/YAMLConfigTest.java
index 46240402f4..f0e7ec54f7 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/YAMLConfigTest.java
+++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/YAMLConfigTest.java
@@ -1,9 +1,9 @@
 package org.onap.config.test;
 
-import org.onap.config.util.TestUtil;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.onap.config.util.TestUtil;
 
 import java.io.IOException;
 
diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/util/TestUtil.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/util/TestUtil.java
index 83f0371c33..59078c2edb 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/util/TestUtil.java
+++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/util/TestUtil.java
@@ -1,16 +1,16 @@
 package org.onap.config.util;
 
-import org.onap.config.ConfigurationUtils;
-import org.onap.config.api.Configuration;
-import org.onap.config.api.ConfigurationManager;
-import org.junit.Assert;
-
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.junit.Assert;
+import org.onap.config.ConfigurationUtils;
+import org.onap.config.api.Configuration;
+import org.onap.config.api.ConfigurationManager;
+
 /**
  * Created by sheetalm on 10/13/2016.
  */
diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLI/config.json b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLI/config.json
index 5d98a327db..6fb2d5e786 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLI/config.json
+++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLI/config.json
@@ -1,8 +1,12 @@
 {
-    "artifact": {
-      "name": { "minlength": "6" },
-      "extension": "pdf,tgz,xls"
-    },
-  "_config":{"namespace": "OPENECOMP:CLI", "mergeStrategy": "union"}
-
+	"artifact": {
+		"name": {
+			"minlength": "6"
+		},
+		"extension": "pdf,tgz,xls"
+	},
+	"_config": {
+		"namespace": "OPENECOMP:CLI",
+		"mergeStrategy": "union"
+	}
 }
\ No newline at end of file
diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLI/config.xml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLI/config.xml
index 2f09871bd5..4f01b69ead 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLI/config.xml
+++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLI/config.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <artifact>
-        <name>
-            <maxlength>28</maxlength>
-        </name>
-        <extension>gz,tgz</extension>
-        <supportedencryption>Base64</supportedencryption>
-        <status>deleted</status>
-        <mandatory>
-            <name>true</name>
-        </mandatory>
-        <_config>
-            <namespace>OPENECOMP:CLI</namespace>
-            <mergeStrategy>merge</mergeStrategy>
-        </_config>
-    </artifact>
+	<artifact>
+		<name>
+			<maxlength>28</maxlength>
+		</name>
+		<extension>gz,tgz</extension>
+		<supportedencryption>Base64</supportedencryption>
+		<status>deleted</status>
+		<mandatory>
+			<name>true</name>
+		</mandatory>
+		<_config>
+			<namespace>OPENECOMP:CLI</namespace>
+			<mergeStrategy>merge</mergeStrategy>
+		</_config>
+	</artifact>
 </configuration>
\ No newline at end of file
diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLIFallback/config.json b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLIFallback/config.json
index a1db251671..00c1555526 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLIFallback/config.json
+++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLIFallback/config.json
@@ -1,8 +1,12 @@
 {
-    "artifact": {
-      "name": { "minlength": "6" },
-      "extension": "pdf,tgz,xls"
-    },
-  "_config":{"namespace": "OPENECOMP:CLIFallback", "mergeStrategy": "union"}
-
+	"artifact": {
+		"name": {
+			"minlength": "6"
+		},
+		"extension": "pdf,tgz,xls"
+	},
+	"_config": {
+		"namespace": "OPENECOMP:CLIFallback",
+		"mergeStrategy": "union"
+	}
 }
\ No newline at end of file
diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLIFallback/config.xml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLIFallback/config.xml
index 4c46762cdd..696f73f68a 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLIFallback/config.xml
+++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLIFallback/config.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <artifact>
-        <name>
-            <maxlength>28</maxlength>
-        </name>
-        <extension>gz,tgz</extension>
-        <supportedencryption>Base64</supportedencryption>
-        <status>deleted</status>
-        <mandatory>
-            <name>true</name>
-        </mandatory>
-        <_config>
-            <namespace>OPENECOMP:CLIFallback</namespace>
-            <mergeStrategy>merge</mergeStrategy>
-        </_config>
-    </artifact>
+	<artifact>
+		<name>
+			<maxlength>28</maxlength>
+		</name>
+		<extension>gz,tgz</extension>
+		<supportedencryption>Base64</supportedencryption>
+		<status>deleted</status>
+		<mandatory>
+			<name>true</name>
+		</mandatory>
+		<_config>
+			<namespace>OPENECOMP:CLIFallback</namespace>
+			<mergeStrategy>merge</mergeStrategy>
+		</_config>
+	</artifact>
 </configuration>
\ No newline at end of file
diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/DynamicConfiguration/config.json b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/DynamicConfiguration/config.json
index c909fe8466..7075a6a531 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/DynamicConfiguration/config.json
+++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/DynamicConfiguration/config.json
@@ -1,8 +1,12 @@
 {
-
-    "artifact": {
-      "name": { "minlength": "6" },
-      "extension": "pdf,tgz,xls"
-    },
-    "_config": {"namespace": "DynamicConfiguration", "mergeStrategy": "union"}
+	"artifact": {
+		"name": {
+			"minlength": "6"
+		},
+		"extension": "pdf,tgz,xls"
+	},
+	"_config": {
+		"namespace": "DynamicConfiguration",
+		"mergeStrategy": "union"
+	}
 }
\ No newline at end of file
diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/DynamicConfiguration/config.xml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/DynamicConfiguration/config.xml
index 3f046e232b..4ad707d21f 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/DynamicConfiguration/config.xml
+++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/DynamicConfiguration/config.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <artifact>
-        <name>
-            <maxlength>28</maxlength>
-        </name>
-        <extension>gz,tgz</extension>
-        <supportedencryption>Base64</supportedencryption>
-        <status>deleted</status>
-        <mandatory>
-            <name>true</name>
-        </mandatory>
-        <_config>
-            <namespace>DynamicConfiguration</namespace>
-            <mergeStrategy>merge</mergeStrategy>
-        </_config>
-    </artifact>
+	<artifact>
+		<name>
+			<maxlength>28</maxlength>
+		</name>
+		<extension>gz,tgz</extension>
+		<supportedencryption>Base64</supportedencryption>
+		<status>deleted</status>
+		<mandatory>
+			<name>true</name>
+		</mandatory>
+		<_config>
+			<namespace>DynamicConfiguration</namespace>
+			<mergeStrategy>merge</mergeStrategy>
+		</_config>
+	</artifact>
 </configuration>
\ No newline at end of file
diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/FallbackToGlobalNS/config.json b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/FallbackToGlobalNS/config.json
index 6f3d68ab75..165e318d38 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/FallbackToGlobalNS/config.json
+++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/FallbackToGlobalNS/config.json
@@ -1,9 +1,12 @@
 {
-
-    "artifact": {
-      "name": { "minlength": "6" },
-      "extension": "pdf,tgz,xls"
-    },
-    "_config":{"namespace": "FallbackToGlobalNS" , "mergeStrategy": "union"}
-
+	"artifact": {
+		"name": {
+			"minlength": "6"
+		},
+		"extension": "pdf,tgz,xls"
+	},
+	"_config": {
+		"namespace": "FallbackToGlobalNS",
+		"mergeStrategy": "union"
+	}
 }
\ No newline at end of file
diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/FallbackToGlobalNS/config.xml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/FallbackToGlobalNS/config.xml
index 9a881ab4a7..9e45acf8d4 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/FallbackToGlobalNS/config.xml
+++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/FallbackToGlobalNS/config.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <artifact>
-        <name>
-            <maxlength>28</maxlength>
-        </name>
-        <extension>gz,tgz</extension>
-        <supportedencryption>Base64</supportedencryption>
-        <status>deleted</status>
-        <mandatory>
-            <name>true</name>
-        </mandatory>
-    </artifact>
-    <_config>
-        <namespace>FallbackToGlobalNS</namespace>
-        <mergeStrategy>merge</mergeStrategy>
-    </_config>
+	<artifact>
+		<name>
+			<maxlength>28</maxlength>
+		</name>
+		<extension>gz,tgz</extension>
+		<supportedencryption>Base64</supportedencryption>
+		<status>deleted</status>
+		<mandatory>
+			<name>true</name>
+		</mandatory>
+	</artifact>
+	<_config>
+		<namespace>FallbackToGlobalNS</namespace>
+		<mergeStrategy>merge</mergeStrategy>
+	</_config>
 
 </configuration>
\ No newline at end of file
diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/GlobalAndNSConfig/config.json b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/GlobalAndNSConfig/config.json
index e59e65855c..26a5fcac0e 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/GlobalAndNSConfig/config.json
+++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/GlobalAndNSConfig/config.json
@@ -1,10 +1,13 @@
 {
-  
-    "artifact": {
-      "name": { "minlength": "6" },
-      "maxsize": "1048",
-      "extension": "pdf,tgz,xls"
-    },
-    "_config": { "mergeStrategy": "union","namespace":"GlobalAndNSConfig" }
-  
+	"artifact": {
+		"name": {
+			"minlength": "6"
+		},
+		"maxsize": "1048",
+		"extension": "pdf,tgz,xls"
+	},
+	"_config": {
+		"mergeStrategy": "union",
+		"namespace": "GlobalAndNSConfig"
+	}
 }
\ No newline at end of file
diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/GlobalAndNSConfig/config.xml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/GlobalAndNSConfig/config.xml
index d8292c167e..427766bfac 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/GlobalAndNSConfig/config.xml
+++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/GlobalAndNSConfig/config.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <artifact>
-        <name>
-            <maxlength>28</maxlength>
-        </name>
-        <extension>gz,tgz</extension>
-        <mandatory>
-            <name>true</name>
-        </mandatory>
-    </artifact>
-    <_config>
-        <namespace>GlobalAndNSConfig</namespace>
-        <mergeStrategy>merge</mergeStrategy>
-    </_config>
+	<artifact>
+		<name>
+			<maxlength>28</maxlength>
+		</name>
+		<extension>gz,tgz</extension>
+		<mandatory>
+			<name>true</name>
+		</mandatory>
+	</artifact>
+	<_config>
+		<namespace>GlobalAndNSConfig</namespace>
+		<mergeStrategy>merge</mergeStrategy>
+	</_config>
 </configuration>
\ No newline at end of file
diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/JSONConfiguration/config-M.json b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/JSONConfiguration/config-M.json
index 9c335724bc..eb657ec497 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/JSONConfiguration/config-M.json
+++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/JSONConfiguration/config-M.json
@@ -1,16 +1,18 @@
 {
-
-  "artifact": {
-    "name": { "maxlength": "28" },
-    "maxsize": "1048576",
-    "extension": "gz,tgz",
-    "supportedencryption": "Base64",
-    "status": "deleted",
-    "mandatory": { "name": "true" }
-  },
-  "_config": {
-    "namespace": "JSONConfig",
-    "mergeStrategy": "merge"
-  }
-
+	"artifact": {
+		"name": {
+			"maxlength": "28"
+		},
+		"maxsize": "1048576",
+		"extension": "gz,tgz",
+		"supportedencryption": "Base64",
+		"status": "deleted",
+		"mandatory": {
+			"name": "true"
+		}
+	},
+	"_config": {
+		"namespace": "JSONConfig",
+		"mergeStrategy": "merge"
+	}
 }
\ No newline at end of file
diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/JSONConfiguration/config-O.json b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/JSONConfiguration/config-O.json
index c324fc777c..a397a1bcd5 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/JSONConfiguration/config-O.json
+++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/JSONConfiguration/config-O.json
@@ -1,11 +1,13 @@
 {
-  "artifact": {
-    "name": { "allowedChar": "a-zA-Z_0-9" },
-    "encoded": "true",
-    "consumer": "appc,catalog"
-  },
-  "_config": {
-    "namespace": "JSONConfig",
-    "mergeStrategy": "override"
-  }
+	"artifact": {
+		"name": {
+			"allowedChar": "a-zA-Z_0-9"
+		},
+		"encoded": "true",
+		"consumer": "appc,catalog"
+	},
+	"_config": {
+		"namespace": "JSONConfig",
+		"mergeStrategy": "override"
+	}
 }
\ No newline at end of file
diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/JSONConfiguration/config-U.json b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/JSONConfiguration/config-U.json
index 05a7e2d7ff..18fbfb3670 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/JSONConfiguration/config-U.json
+++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/JSONConfiguration/config-U.json
@@ -1,11 +1,13 @@
 {
-  "artifact": {
-    "name": { "minlength": "6" },
-    "maxsize": "1048",
-    "extension": "pdf,tgz,xls"
-  },
-  "_config": {
-    "namespace": "JSONConfig",
-    "mergeStrategy": "union"
-  }
+	"artifact": {
+		"name": {
+			"minlength": "6"
+		},
+		"maxsize": "1048",
+		"extension": "pdf,tgz,xls"
+	},
+	"_config": {
+		"namespace": "JSONConfig",
+		"mergeStrategy": "union"
+	}
 }
\ No newline at end of file
diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/JSONConfiguration/config.json b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/JSONConfiguration/config.json
index 0538ba1717..1bb4e330b1 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/JSONConfiguration/config.json
+++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/JSONConfiguration/config.json
@@ -1,30 +1,28 @@
 {
-  "artifact": {
-    "name": {
-      "maxlength": "14",
-      "allowedChar": "a-zA-Z",
-      "allowedchar": "a-zA-Z"
-    },
-    "extension": [
-      "pdf",
-      "zip,xml"
-
-    ],
-    "supportedEncryption": [
-      "Base64",
-      "MD5"
-    ],
-    "status": [
-      "deleted",
-      "Deleted"
-    ],
-    "persistLocation": "/opt/spool,${sys:user.home}/asdc",
-    "jsonSchema": "@GeneratorList.json",
-    "xmlSchema": "@${env:path}/myschema.json",
-    "consumerAPPC": "${artifact.consumer}"
-
-  },
-  "_config": {
-    "namespace": "JSONConfig"
-  }
+	"artifact": {
+		"name": {
+			"maxlength": "14",
+			"allowedChar": "a-zA-Z",
+			"allowedchar": "a-zA-Z"
+		},
+		"extension": [
+			"pdf",
+			"zip,xml"
+		],
+		"supportedEncryption": [
+			"Base64",
+			"MD5"
+		],
+		"status": [
+			"deleted",
+			"Deleted"
+		],
+		"persistLocation": "/opt/spool,${sys:user.home}/asdc",
+		"jsonSchema": "@GeneratorList.json",
+		"xmlSchema": "@${env:path}/myschema.json",
+		"consumerAPPC": "${artifact.consumer}"
+	},
+	"_config": {
+		"namespace": "JSONConfig"
+	}
 }
\ No newline at end of file
diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/MergeStrategyAsConfigProp/config.json b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/MergeStrategyAsConfigProp/config.json
index 7c6d552b82..5540296ee4 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/MergeStrategyAsConfigProp/config.json
+++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/MergeStrategyAsConfigProp/config.json
@@ -1,8 +1,13 @@
 {
-  "artifact": {
-      "name": { "minlength": "6" },
-      "maxsize": "1048",
-      "extension": "pdf,tgz,xls"
-    },
-    "_config": { "mergeStrategy": "union" , "namespace":"ModeAsConfigProp" }
+	"artifact": {
+		"name": {
+			"minlength": "6"
+		},
+		"maxsize": "1048",
+		"extension": "pdf,tgz,xls"
+	},
+	"_config": {
+		"mergeStrategy": "union",
+		"namespace": "ModeAsConfigProp"
+	}
 }
\ No newline at end of file
diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/MergeStrategyAsConfigProp/config.xml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/MergeStrategyAsConfigProp/config.xml
index 2d05d2724c..74a999a0a5 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/MergeStrategyAsConfigProp/config.xml
+++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/MergeStrategyAsConfigProp/config.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <artifact>
-        <name>
-            <maxlength>28</maxlength>
-        </name>
-        <extension>gz,tgz</extension>
-        <mandatory>
-            <name>true</name>
-        </mandatory>
-    </artifact>
-    <_config>
-        <namespace>ModeAsConfigProp</namespace>
-        <mergeStrategy>merge</mergeStrategy>
-    </_config>
+	<artifact>
+		<name>
+			<maxlength>28</maxlength>
+		</name>
+		<extension>gz,tgz</extension>
+		<mandatory>
+			<name>true</name>
+		</mandatory>
+	</artifact>
+	<_config>
+		<namespace>ModeAsConfigProp</namespace>
+		<mergeStrategy>merge</mergeStrategy>
+	</_config>
 </configuration>
\ No newline at end of file
diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationForNodeConfig/config.json b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationForNodeConfig/config.json
index 0d6395af4f..cc6a033b70 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationForNodeConfig/config.json
+++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationForNodeConfig/config.json
@@ -1,12 +1,12 @@
 {
-
-    "artifact": {
-      "name": { "minlength": "6" },
-      "extension": "pdf,tgz,xls"
-    },
-    "_config":{
-      "namespace": "NotificationForNodeConfig",
-      "mergestrategy": "union"
-    }
-
+	"artifact": {
+		"name": {
+			"minlength": "6"
+		},
+		"extension": "pdf,tgz,xls"
+	},
+	"_config": {
+		"namespace": "NotificationForNodeConfig",
+		"mergestrategy": "union"
+	}
 }
\ No newline at end of file
diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationForNodeConfig/config.xml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationForNodeConfig/config.xml
index 20768aa949..7448cb0444 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationForNodeConfig/config.xml
+++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationForNodeConfig/config.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <artifact>
-        <name>
-            <maxlength>28</maxlength>
-        </name>
-        <extension>gz,tgz</extension>
-        <supportedencryption>Base64</supportedencryption>
-        <status>deleted</status>
-        <mandatory>
-            <name>true</name>
-        </mandatory>
-    </artifact>
-    <_config>
-        <namespace>NotificationForNodeConfig</namespace>
-        <mergestrategy>merge</mergestrategy>
-    </_config>
+	<artifact>
+		<name>
+			<maxlength>28</maxlength>
+		</name>
+		<extension>gz,tgz</extension>
+		<supportedencryption>Base64</supportedencryption>
+		<status>deleted</status>
+		<mandatory>
+			<name>true</name>
+		</mandatory>
+	</artifact>
+	<_config>
+		<namespace>NotificationForNodeConfig</namespace>
+		<mergestrategy>merge</mergestrategy>
+	</_config>
 </configuration>
\ No newline at end of file
diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationOnPropVal/config.json b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationOnPropVal/config.json
index fc7f2347aa..1027e072cc 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationOnPropVal/config.json
+++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationOnPropVal/config.json
@@ -1,9 +1,12 @@
 {
-  "artifact": {
-      "name": { "minlength": "6" },
-      "extension": "pdf,tgz,xls"
-   },
-
-  "_config": { "mergeStrategy": "union","namespace":"NotificationOnPropVal" }
-
+	"artifact": {
+		"name": {
+			"minlength": "6"
+		},
+		"extension": "pdf,tgz,xls"
+	},
+	"_config": {
+		"mergeStrategy": "union",
+		"namespace": "NotificationOnPropVal"
+	}
 }
\ No newline at end of file
diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationOnPropVal/config.xml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationOnPropVal/config.xml
index e3a24fbc32..cb88bb3363 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationOnPropVal/config.xml
+++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationOnPropVal/config.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <artifact>
-        <name>
-            <maxlength>28</maxlength>
-        </name>
-        <extension>gz,tgz</extension>
-        <supportedencryption>Base64</supportedencryption>
-        <status>deleted</status>
-        <mandatory>
-            <name>true</name>
-        </mandatory>
-    </artifact>
-    <_config>
-        <namespace>NotificationOnPropVal</namespace>
-        <mergeStrategy>merge</mergeStrategy>
-    </_config>
-  </configuration>
\ No newline at end of file
+	<artifact>
+		<name>
+			<maxlength>28</maxlength>
+		</name>
+		<extension>gz,tgz</extension>
+		<supportedencryption>Base64</supportedencryption>
+		<status>deleted</status>
+		<mandatory>
+			<name>true</name>
+		</mandatory>
+	</artifact>
+	<_config>
+		<namespace>NotificationOnPropVal</namespace>
+		<mergeStrategy>merge</mergeStrategy>
+	</_config>
+</configuration>
\ No newline at end of file
diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/SourceLocation/appjarconfig.json b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/SourceLocation/appjarconfig.json
index 42c6be91b9..0a955a1396 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/SourceLocation/appjarconfig.json
+++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/SourceLocation/appjarconfig.json
@@ -1,10 +1,13 @@
 {
-  
-    "artifact": {
-      "name": { "minlength": "6" },
-      "maxsize": "1048",
-      "extension": "pdf,tgz,xls"
-    },
-	"_config": { "mergeStrategy": "union","namespace":"SourceLocation" }
-  
+	"artifact": {
+		"name": {
+			"minlength": "6"
+		},
+		"maxsize": "1048",
+		"extension": "pdf,tgz,xls"
+	},
+	"_config": {
+		"mergeStrategy": "union",
+		"namespace": "SourceLocation"
+	}
 }
\ No newline at end of file
diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/SourceLocation/appjarconfig.xml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/SourceLocation/appjarconfig.xml
index 1162af576e..11add8c624 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/SourceLocation/appjarconfig.xml
+++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/SourceLocation/appjarconfig.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <artifact>
-       <name>
-            <maxlength>28</maxlength>
-       </name>
-        <maxsize>1048576</maxsize>
-        <extension>gz,tgz</extension>
-        <supportedencryption>Base64</supportedencryption>
-        <status>deleted</status>
-        <mandatory>
-            <name>true</name>
-        </mandatory>
-    </artifact>
+	<artifact>
+		<name>
+			<maxlength>28</maxlength>
+		</name>
+		<maxsize>1048576</maxsize>
+		<extension>gz,tgz</extension>
+		<supportedencryption>Base64</supportedencryption>
+		<status>deleted</status>
+		<mandatory>
+			<name>true</name>
+		</mandatory>
+	</artifact>
 	<_config>
-        <namespace>SourceLocation</namespace>
-        <mergeStrategy>merge</mergeStrategy>
-    </_config>
+		<namespace>SourceLocation</namespace>
+		<mergeStrategy>merge</mergeStrategy>
+	</_config>
 </configuration>
\ No newline at end of file
diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/UnregisterNotification/config.json b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/UnregisterNotification/config.json
index 3e0464016d..998bba0e34 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/UnregisterNotification/config.json
+++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/UnregisterNotification/config.json
@@ -1,9 +1,12 @@
 {
-  "artifact": {
-      "name": { "minlength": "6" },
-      "extension": "pdf,tgz,xls"
-   },
-
-  "_config": { "mergeStrategy": "union","namespace":"UnregisterNotification" }
-
+	"artifact": {
+		"name": {
+			"minlength": "6"
+		},
+		"extension": "pdf,tgz,xls"
+	},
+	"_config": {
+		"mergeStrategy": "union",
+		"namespace": "UnregisterNotification"
+	}
 }
\ No newline at end of file
diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/UnregisterNotification/config.xml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/UnregisterNotification/config.xml
index 1153658161..7f929af1bd 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/UnregisterNotification/config.xml
+++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/UnregisterNotification/config.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <artifact>
-        <name>
-            <maxlength>28</maxlength>
-        </name>
-        <extension>gz,tgz</extension>
-        <supportedencryption>Base64</supportedencryption>
-        <status>deleted</status>
-        <mandatory>
-            <name>true</name>
-        </mandatory>
-    </artifact>
-    <_config>
-        <namespace>UnregisterNotification</namespace>
-        <mergeStrategy>merge</mergeStrategy>
-    </_config>
-  </configuration>
\ No newline at end of file
+	<artifact>
+		<name>
+			<maxlength>28</maxlength>
+		</name>
+		<extension>gz,tgz</extension>
+		<supportedencryption>Base64</supportedencryption>
+		<status>deleted</status>
+		<mandatory>
+			<name>true</name>
+		</mandatory>
+	</artifact>
+	<_config>
+		<namespace>UnregisterNotification</namespace>
+		<mergeStrategy>merge</mergeStrategy>
+	</_config>
+</configuration>
\ No newline at end of file
diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/ValidateDefaultMode/config-defaultmode.json b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/ValidateDefaultMode/config-defaultmode.json
index 72833024c4..19ca08fd1d 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/ValidateDefaultMode/config-defaultmode.json
+++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/ValidateDefaultMode/config-defaultmode.json
@@ -1,8 +1,8 @@
 {
-  "artifact": {
-    "name": {
-      "minlength": "6"
-    },
-    "extension": "pdf,tgz,xls"
-  }
+	"artifact": {
+		"name": {
+			"minlength": "6"
+		},
+		"extension": "pdf,tgz,xls"
+	}
 }
\ No newline at end of file
diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/XMLConfiguration/config-M.xml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/XMLConfiguration/config-M.xml
index 320e53348d..ef9d2e37de 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/XMLConfiguration/config-M.xml
+++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/XMLConfiguration/config-M.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <artifact>
-        <name>
-            <maxlength>28</maxlength>
-        </name>
-        <maxsize>1048576</maxsize>
-        <extension>gz,tgz</extension>
-        <supportedencryption>Base64</supportedencryption>
-        <status>deleted</status>
-        <mandatory>
-            <name>true</name>
-        </mandatory>
-    </artifact>
-    <_config>
-        <namespace>XMLConfig</namespace>
-        <mergeStrategy>merge</mergeStrategy>
-    </_config>
+	<artifact>
+		<name>
+			<maxlength>28</maxlength>
+		</name>
+		<maxsize>1048576</maxsize>
+		<extension>gz,tgz</extension>
+		<supportedencryption>Base64</supportedencryption>
+		<status>deleted</status>
+		<mandatory>
+			<name>true</name>
+		</mandatory>
+	</artifact>
+	<_config>
+		<namespace>XMLConfig</namespace>
+		<mergeStrategy>merge</mergeStrategy>
+	</_config>
 </configuration>
\ No newline at end of file
diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/XMLConfiguration/config-O.xml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/XMLConfiguration/config-O.xml
index 508c920b83..868e2013bf 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/XMLConfiguration/config-O.xml
+++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/XMLConfiguration/config-O.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <artifact>
-        <name>
-            <allowedChar>a-zA-Z_0-9</allowedChar>
-        </name>
-        <encoded>true</encoded>
-        <consumer>appc,catalog</consumer>
-    </artifact>
-    <_config>
-        <namespace>XMLConfig</namespace>
-        <mergeStrategy>override</mergeStrategy>
-    </_config>
+	<artifact>
+		<name>
+			<allowedChar>a-zA-Z_0-9</allowedChar>
+		</name>
+		<encoded>true</encoded>
+		<consumer>appc,catalog</consumer>
+	</artifact>
+	<_config>
+		<namespace>XMLConfig</namespace>
+		<mergeStrategy>override</mergeStrategy>
+	</_config>
 </configuration>
\ No newline at end of file
diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/XMLConfiguration/config-U.xml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/XMLConfiguration/config-U.xml
index 962bd342f3..6d0192c142 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/XMLConfiguration/config-U.xml
+++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/XMLConfiguration/config-U.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <artifact>
-        <name>
-            <minlength>6</minlength>
-        </name>
-        <maxsize>1048</maxsize>
-        <extension>pdf,tgz,xls</extension>
-    </artifact>
-    <_config>
-        <namespace>XMLConfig</namespace>
-        <mergeStrategy>union</mergeStrategy>
-    </_config>
+	<artifact>
+		<name>
+			<minlength>6</minlength>
+		</name>
+		<maxsize>1048</maxsize>
+		<extension>pdf,tgz,xls</extension>
+	</artifact>
+	<_config>
+		<namespace>XMLConfig</namespace>
+		<mergeStrategy>union</mergeStrategy>
+	</_config>
 </configuration>
\ No newline at end of file
diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/XMLConfiguration/config.xml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/XMLConfiguration/config.xml
index 2fff65b2e0..5c6151f880 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/XMLConfiguration/config.xml
+++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/XMLConfiguration/config.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <artifact>
-        <name>
-            <maxlength>14</maxlength>
-            <allowedChar>a-zA-Z</allowedChar>
-            <allowedchar>a-zA-Z</allowedchar>
-        </name>
-       <!-- <maxsize></maxsize>-->
-        <extension>pdf</extension>
-        <extension>zip,xml</extension>
+	<artifact>
+		<name>
+			<maxlength>14</maxlength>
+			<allowedChar>a-zA-Z</allowedChar>
+			<allowedchar>a-zA-Z</allowedchar>
+		</name>
+		<!-- <maxsize></maxsize> -->
+		<extension>pdf</extension>
+		<extension>zip,xml</extension>
 
-        <supportedEncryption>Base64</supportedEncryption>
-        <supportedEncryption>MD5</supportedEncryption>
-        <status>deleted</status>
-        <status>Deleted</status>
-        <persistLocation>/opt/spool,${sys:user.home}/asdc</persistLocation>
-        <jsonSchema>@GeneratorList.json</jsonSchema>
-        <xmlSchema>@${env:path}/myschema.json</xmlSchema>
-        <consumerAPPC>${artifact.consumer}</consumerAPPC>
-    </artifact>
-    <_config>
-        <namespace>XMLConfig</namespace>
-    </_config>
+		<supportedEncryption>Base64</supportedEncryption>
+		<supportedEncryption>MD5</supportedEncryption>
+		<status>deleted</status>
+		<status>Deleted</status>
+		<persistLocation>/opt/spool,${sys:user.home}/asdc</persistLocation>
+		<jsonSchema>@GeneratorList.json</jsonSchema>
+		<xmlSchema>@${env:path}/myschema.json</xmlSchema>
+		<consumerAPPC>${artifact.consumer}</consumerAPPC>
+	</artifact>
+	<_config>
+		<namespace>XMLConfig</namespace>
+	</_config>
 </configuration>
\ No newline at end of file
diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/fallback/config-fallback-merge.xml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/fallback/config-fallback-merge.xml
index 3595efd87b..7872097491 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/fallback/config-fallback-merge.xml
+++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/fallback/config-fallback-merge.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <artifact>
-        <name>
-            <maxlength>28</maxlength>
-        </name>
-        <maxsize>1048576</maxsize>
-        <extension>gz,tgz</extension>
-        <supportedencryption>Base64</supportedencryption>
-        <status>deleted</status>
-        <mandatory>
-            <name>true</name>
-        </mandatory>
-    </artifact>
+	<artifact>
+		<name>
+			<maxlength>28</maxlength>
+		</name>
+		<maxsize>1048576</maxsize>
+		<extension>gz,tgz</extension>
+		<supportedencryption>Base64</supportedencryption>
+		<status>deleted</status>
+		<mandatory>
+			<name>true</name>
+		</mandatory>
+	</artifact>
 </configuration>
\ No newline at end of file
diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/fallback/config-fallback-override.json b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/fallback/config-fallback-override.json
index dd6087b70c..7cdc7632e6 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/fallback/config-fallback-override.json
+++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/fallback/config-fallback-override.json
@@ -1,7 +1,9 @@
 {
-  "artifact": {
-    "name": { "allowedChar": "a-zA-Z_0-9" },
-    "encoded": "true",
-    "consumer": "appc,catalog"
-  }
+	"artifact": {
+		"name": {
+			"allowedChar": "a-zA-Z_0-9"
+		},
+		"encoded": "true",
+		"consumer": "appc,catalog"
+	}
 }
\ No newline at end of file
diff --git a/common/onap-common-configuration-management/pom.xml b/common/onap-common-configuration-management/pom.xml
index 6c11bdf30c..2367531784 100644
--- a/common/onap-common-configuration-management/pom.xml
+++ b/common/onap-common-configuration-management/pom.xml
@@ -1,22 +1,23 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
 
-    <name>onap-common-configuration-management</name>
-    <artifactId>onap-common-configuration-management</artifactId>
-    <packaging>pom</packaging>
+	<name>onap-common-configuration-management</name>
+	<artifactId>onap-common-configuration-management</artifactId>
+	<packaging>pom</packaging>
 
-    <parent>
-        <groupId>org.onap.sdc.common</groupId>
-        <artifactId>onap-common-lib</artifactId>
-        <version>1.3.0-SNAPSHOT</version>
-        <relativePath>..</relativePath>
-    </parent>
+	<parent>
+		<groupId>org.onap.sdc.common</groupId>
+		<artifactId>onap-common-lib</artifactId>
+		<version>1.3.0-SNAPSHOT</version>
+		<relativePath>..</relativePath>
+	</parent>
 
-    <modules>
-        <module>onap-configuration-management-api</module>
-        <module>onap-configuration-management-core</module>
-        <module>onap-configuration-management-test</module>
-    </modules>
+	<modules>
+		<module>onap-configuration-management-api</module>
+		<module>onap-configuration-management-core</module>
+		<module>onap-configuration-management-test</module>
+	</modules>
 
 </project>
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/pom.xml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/pom.xml
index 7e40bc7b61..befaba4a28 100644
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/pom.xml
+++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/pom.xml
@@ -1,133 +1,134 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
 
-    <name>onap-sdc-artifact-generator-api</name>
-    <artifactId>onap-sdc-artifact-generator-api</artifactId>
+	<name>onap-sdc-artifact-generator-api</name>
+	<artifactId>onap-sdc-artifact-generator-api</artifactId>
 
-    <parent>
-        <artifactId>onap-common-lib</artifactId>
-        <groupId>org.onap.sdc.common</groupId>
-        <version>1.3.0-SNAPSHOT</version>
-        <relativePath>../../</relativePath>
-    </parent>
+	<parent>
+		<artifactId>onap-common-lib</artifactId>
+		<groupId>org.onap.sdc.common</groupId>
+		<version>1.3.0-SNAPSHOT</version>
+		<relativePath>../../</relativePath>
+	</parent>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.openecomp.sdc</groupId>
-            <artifactId>openecomp-sdc-logging-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.openecomp.sdc</groupId>
-            <artifactId>openecomp-sdc-logging-core</artifactId>
-            <version>${project.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>1.7.10</version>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <version>${logback.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-core</artifactId>
-            <version>${logback.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.dataformat</groupId>
-            <artifactId>jackson-dataformat-yaml</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
-            <version>${commons.codec.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.reflections</groupId>
-            <artifactId>reflections</artifactId>
-            <version>${org.reflections.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
-            <scope>test</scope>
-            <version>${testng.version}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>snakeyaml</artifactId>
-                    <groupId>org.yaml</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-            <version>${junit.version}</version>
-        </dependency>
+	<dependencies>
+		<dependency>
+			<groupId>org.openecomp.sdc</groupId>
+			<artifactId>openecomp-sdc-logging-api</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.openecomp.sdc</groupId>
+			<artifactId>openecomp-sdc-logging-core</artifactId>
+			<version>${project.version}</version>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>1.7.10</version>
+		</dependency>
+		<dependency>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-classic</artifactId>
+			<version>${logback.version}</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-core</artifactId>
+			<version>${logback.version}</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+			<version>${jackson.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.dataformat</groupId>
+			<artifactId>jackson-dataformat-yaml</artifactId>
+			<version>${jackson.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-codec</groupId>
+			<artifactId>commons-codec</artifactId>
+			<version>${commons.codec.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.reflections</groupId>
+			<artifactId>reflections</artifactId>
+			<version>${org.reflections.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.testng</groupId>
+			<artifactId>testng</artifactId>
+			<scope>test</scope>
+			<version>${testng.version}</version>
+			<exclusions>
+				<exclusion>
+					<artifactId>snakeyaml</artifactId>
+					<groupId>org.yaml</groupId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<scope>test</scope>
+			<version>${junit.version}</version>
+		</dependency>
 
-    </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
-                <version>${mvn.jaxb2.version}</version>
-                <executions>
-                    <execution>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <schemaDirectory>src/main/resources</schemaDirectory>
-                    <generatePackage>org.onap.sdc.generator.aai.xml</generatePackage>
-                    <generateDirectory>target/generated-sources/aai/xml</generateDirectory>
-                    <removeOldOutput>false</removeOldOutput>
-                    <cleanPackageDirectories>true</cleanPackageDirectories>
-                    <forceRegenerate>false</forceRegenerate>
-                    <debug>false</debug>
-                    <verbose>false</verbose>
-                    <schemaIncludes>
-                        <include>aai_schema_v11.xsd</include>
-                    </schemaIncludes>
-                    <extension>true</extension>
-                    <args>
-                        <arg>-Xannotate</arg>
-                    </args>
-                    <plugins>
-                        <plugin>
-                            <groupId>org.jvnet.jaxb2_commons</groupId>
-                            <artifactId>jaxb2-basics-annotate</artifactId>
-                            <version>0.6.4</version>
-                        </plugin>
-                        <!-- Add the dependencies with your annotations as 'plugins' below -->
-                        <plugin>
-                            <groupId>org.jvnet.jaxb2_commons</groupId>
-                            <artifactId>jaxb2-annotate-plugin-test-annox-annotations</artifactId>
-                            <version>1.0.0</version>
-                        </plugin>
-                    </plugins>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
+	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.jvnet.jaxb2.maven2</groupId>
+				<artifactId>maven-jaxb2-plugin</artifactId>
+				<version>${mvn.jaxb2.version}</version>
+				<executions>
+					<execution>
+						<phase>generate-sources</phase>
+						<goals>
+							<goal>generate</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<schemaDirectory>src/main/resources</schemaDirectory>
+					<generatePackage>org.onap.sdc.generator.aai.xml</generatePackage>
+					<generateDirectory>target/generated-sources/aai/xml</generateDirectory>
+					<removeOldOutput>false</removeOldOutput>
+					<cleanPackageDirectories>true</cleanPackageDirectories>
+					<forceRegenerate>false</forceRegenerate>
+					<debug>false</debug>
+					<verbose>false</verbose>
+					<schemaIncludes>
+						<include>aai_schema_v11.xsd</include>
+					</schemaIncludes>
+					<extension>true</extension>
+					<args>
+						<arg>-Xannotate</arg>
+					</args>
+					<plugins>
+						<plugin>
+							<groupId>org.jvnet.jaxb2_commons</groupId>
+							<artifactId>jaxb2-basics-annotate</artifactId>
+							<version>0.6.4</version>
+						</plugin>
+						<!-- Add the dependencies with your annotations as 'plugins' below -->
+						<plugin>
+							<groupId>org.jvnet.jaxb2_commons</groupId>
+							<artifactId>jaxb2-annotate-plugin-test-annox-annotations</artifactId>
+							<version>1.0.0</version>
+						</plugin>
+					</plugins>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 
 
 </project>
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/AaiModelGenerator.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/AaiModelGenerator.java
index 5c81ff5dda..ac39bb4b60 100644
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/AaiModelGenerator.java
+++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/AaiModelGenerator.java
@@ -20,9 +20,9 @@
 
 package org.onap.sdc.generator.aai;
 
-import org.onap.sdc.generator.data.GeneratorConstants;
 import org.onap.sdc.generator.aai.model.Resource;
 import org.onap.sdc.generator.aai.model.Service;
+import org.onap.sdc.generator.data.GeneratorConstants;
 import org.onap.sdc.generator.logging.CategoryLogLevel;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/FlavorWidget.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/FlavorWidget.java
index a427918bff..b08a3d4e27 100644
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/FlavorWidget.java
+++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/FlavorWidget.java
@@ -21,8 +21,8 @@
 package org.onap.sdc.generator.aai.model;
 
 import org.onap.sdc.generator.aai.types.Cardinality;
-import org.onap.sdc.generator.aai.types.ModelType;
 import org.onap.sdc.generator.aai.types.Model;
+import org.onap.sdc.generator.aai.types.ModelType;
 import org.onap.sdc.generator.aai.types.ModelWidget;
 
 @Model(widget = Widget.Type.FLAVOR, cardinality = Cardinality.UNBOUNDED, dataDeleteFlag = false)
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/ImageWidget.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/ImageWidget.java
index 52a52fc71e..aef01d8a5b 100644
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/ImageWidget.java
+++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/ImageWidget.java
@@ -21,8 +21,8 @@
 package org.onap.sdc.generator.aai.model;
 
 import org.onap.sdc.generator.aai.types.Cardinality;
-import org.onap.sdc.generator.aai.types.ModelType;
 import org.onap.sdc.generator.aai.types.Model;
+import org.onap.sdc.generator.aai.types.ModelType;
 import org.onap.sdc.generator.aai.types.ModelWidget;
 
 @Model(widget = Widget.Type.IMAGE, cardinality = Cardinality.UNBOUNDED, dataDeleteFlag = false)
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/LIntfWidget.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/LIntfWidget.java
index de62624392..d5f00ff50c 100644
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/LIntfWidget.java
+++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/LIntfWidget.java
@@ -21,8 +21,8 @@
 package org.onap.sdc.generator.aai.model;
 
 import org.onap.sdc.generator.aai.types.Cardinality;
-import org.onap.sdc.generator.aai.types.ModelType;
 import org.onap.sdc.generator.aai.types.Model;
+import org.onap.sdc.generator.aai.types.ModelType;
 import org.onap.sdc.generator.aai.types.ModelWidget;
 
 @Model(widget = Widget.Type.LINT, cardinality = Cardinality.UNBOUNDED, dataDeleteFlag = true)
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/OamNetwork.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/OamNetwork.java
index d51bf7af96..72686b5bc2 100644
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/OamNetwork.java
+++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/OamNetwork.java
@@ -21,9 +21,9 @@
 package org.onap.sdc.generator.aai.model;
 
 import org.onap.sdc.generator.aai.types.Cardinality;
+import org.onap.sdc.generator.aai.types.Model;
 import org.onap.sdc.generator.aai.types.ModelType;
 import org.onap.sdc.generator.aai.types.ModelWidget;
-import org.onap.sdc.generator.aai.types.Model;
 
 @Model(widget = Widget.Type.L3_NET, cardinality = Cardinality.UNBOUNDED, dataDeleteFlag = true)
 @ModelWidget(type = ModelType.WIDGET, name = "oam-network")
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/TenantWidget.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/TenantWidget.java
index 23e57be12f..93ca9c5178 100644
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/TenantWidget.java
+++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/TenantWidget.java
@@ -21,8 +21,8 @@
 package org.onap.sdc.generator.aai.model;
 
 import org.onap.sdc.generator.aai.types.Cardinality;
-import org.onap.sdc.generator.aai.types.ModelType;
 import org.onap.sdc.generator.aai.types.Model;
+import org.onap.sdc.generator.aai.types.ModelType;
 import org.onap.sdc.generator.aai.types.ModelWidget;
 
 @Model(widget = Widget.Type.TENANT, cardinality = Cardinality.UNBOUNDED, dataDeleteFlag = false)
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/VServerWidget.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/VServerWidget.java
index 6df5bb1407..c633f5b338 100644
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/VServerWidget.java
+++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/VServerWidget.java
@@ -21,8 +21,8 @@
 package org.onap.sdc.generator.aai.model;
 
 import org.onap.sdc.generator.aai.types.Cardinality;
-import org.onap.sdc.generator.aai.types.ModelType;
 import org.onap.sdc.generator.aai.types.Model;
+import org.onap.sdc.generator.aai.types.ModelType;
 import org.onap.sdc.generator.aai.types.ModelWidget;
 
 @Model(widget = Widget.Type.VSERVER, cardinality = Cardinality.UNBOUNDED, dataDeleteFlag = true)
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/VfModuleWidget.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/VfModuleWidget.java
index 9753db600c..b191538e50 100644
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/VfModuleWidget.java
+++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/VfModuleWidget.java
@@ -20,9 +20,9 @@
 
 package org.onap.sdc.generator.aai.model;
 
+import org.onap.sdc.generator.aai.types.Cardinality;
 import org.onap.sdc.generator.aai.types.Model;
 import org.onap.sdc.generator.aai.types.ModelType;
-import org.onap.sdc.generator.aai.types.Cardinality;
 import org.onap.sdc.generator.aai.types.ModelWidget;
 
 @Model(widget = Widget.Type.VFMODULE,
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/Widget.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/Widget.java
index b289b0a83c..dfb17cc660 100644
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/Widget.java
+++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/Widget.java
@@ -20,19 +20,19 @@
 
 package org.onap.sdc.generator.aai.model;
 
-import org.onap.sdc.generator.aai.types.ModelType;
-import org.onap.sdc.generator.data.ArtifactType;
-import org.onap.sdc.generator.data.GeneratorConstants;
-import org.onap.sdc.generator.aai.types.ModelWidget;
-import org.onap.sdc.generator.data.WidgetConfigurationUtil;
-import org.onap.sdc.generator.error.IllegalAccessException;
-
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Properties;
 import java.util.Set;
 
+import org.onap.sdc.generator.aai.types.ModelType;
+import org.onap.sdc.generator.aai.types.ModelWidget;
+import org.onap.sdc.generator.data.ArtifactType;
+import org.onap.sdc.generator.data.GeneratorConstants;
+import org.onap.sdc.generator.data.WidgetConfigurationUtil;
+import org.onap.sdc.generator.error.IllegalAccessException;
+
 public abstract class Widget extends Model {
 
   private Set<String> keys = new HashSet<>();
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/intf/ArtifactGenerator.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/intf/ArtifactGenerator.java
index 4578a150e0..7e198df4bb 100644
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/intf/ArtifactGenerator.java
+++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/intf/ArtifactGenerator.java
@@ -20,8 +20,8 @@
 
 package org.onap.sdc.generator.intf;
 
-import org.onap.sdc.generator.data.GenerationData;
 import org.onap.sdc.generator.data.Artifact;
+import org.onap.sdc.generator.data.GenerationData;
 
 import java.util.List;
 import java.util.Map;
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/service/ArtifactGenerationService.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/service/ArtifactGenerationService.java
index 2af9664481..60a90e9a9e 100644
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/service/ArtifactGenerationService.java
+++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/service/ArtifactGenerationService.java
@@ -20,12 +20,12 @@
 
 package org.onap.sdc.generator.service;
 
+import org.onap.sdc.generator.data.Artifact;
 import org.onap.sdc.generator.data.GenerationData;
 import org.onap.sdc.generator.data.GeneratorConstants;
+import org.onap.sdc.generator.logging.CategoryLogLevel;
 import org.openecomp.sdc.logging.api.Logger;
 import org.openecomp.sdc.logging.api.LoggerFactory;
-import org.onap.sdc.generator.data.Artifact;
-import org.onap.sdc.generator.logging.CategoryLogLevel;
 import org.slf4j.MDC;
 
 import java.util.List;
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/resources/aai_schema_v10.xsd b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/resources/aai_schema_v10.xsd
index 7bc3466506..31a5ba89f5 100644
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/resources/aai_schema_v10.xsd
+++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/resources/aai_schema_v10.xsd
@@ -1,6311 +1,7890 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <xs:schema elementFormDefault="qualified" version="1.0"
-           targetNamespace="http://org.openecomp.aai.inventory/v10"
-           xmlns:tns="http://org.openecomp.aai.inventory/v10"
-           xmlns:xs="http://www.w3.org/2001/XMLSchema"
-xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-    jaxb:version="2.1" 
-    xmlns:annox="http://annox.dev.java.net" 
-    jaxb:extensionBindingPrefixes="annox">
+	targetNamespace="http://org.openecomp.aai.inventory/v10"
+	xmlns:tns="http://org.openecomp.aai.inventory/v10"
+	xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" jaxb:version="2.1"
+	xmlns:annox="http://annox.dev.java.net"
+	jaxb:extensionBindingPrefixes="annox">
 
-  <xs:element name="inventory-item-data">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="property-name" type="xs:string" minOccurs="0"/>
-        <xs:element name="property-value" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="inventory-item">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="inventory-item-type" type="xs:string" minOccurs="0"/>
-        <xs:element name="inventory-item-link" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:inventory-item-data" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element ref="tns:tagged-inventory-item-list" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="tagged-inventory-item-list">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:inventory-item" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="edge-tag-query-result">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:tagged-inventory-item-list" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="start-node-filter">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="property-name" type="xs:string" minOccurs="0"/>
-        <xs:element name="property-value" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="include-node-filter">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="include-node-type" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="secondary-filter">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="property-name" type="xs:string" minOccurs="0"/>
-        <xs:element name="filter-type" type="xs:string" minOccurs="0"/>
-        <xs:element name="property-value" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="edge-tag-query-request">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="edge-tag" type="xs:string" minOccurs="0"/>
-        <xs:element name="result-detail" type="xs:string" minOccurs="0"/>
-        <xs:element name="start-node-type" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:start-node-filter" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element ref="tns:include-node-filter" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element ref="tns:secondary-filter" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="result-data">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="resource-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The specific type of node in the A&amp;AI graph")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-link" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The URL to the specific resource")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="search-results">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:result-data" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="relationship-data">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="relationship-key" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="A keyword provided by A&amp;AI to indicate an attribute.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="relationship-value" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Value of the attribute.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="related-to-property">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="property-key" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Key part of a key/value pair")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="property-value" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Value part of a key/value pair")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="relationship">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="related-to" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="A keyword provided by A&amp;AI to indicate type of node.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="related-link" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL to the object in A&amp;AI.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-data" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element ref="tns:related-to-property" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="relationship-list">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:relationship" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="oam-network">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="OAM network, to be deprecated shortly.  Do not use for new purposes. ",nameProps="network-name",indexedProps="cvlan-tag,network-uuid,network-name",dependentOn="cloud-region",container="oam-networks")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="network-uuid" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="UUID of the network. Unique across a cloud-region")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="network-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name of the network.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="cvlan-tag" type="xs:unsignedInt">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="cvlan-id")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipv4-oam-gateway-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for VNF firewall rule so customer cannot send customer traffic over this oam network")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipv4-oam-gateway-address-prefix-length" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for VNF firewall rule so customer cannot send customer traffic over this oam network")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="oam-networks">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of OAM networks, to be deprecated shortly.  Do not use for new purposes. ")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:oam-network" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="dvs-switch">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Digital virtual switch metadata, used by SDN-C to configure VCEs.  A&amp;AI needs to receive this data from the PO deployment team and administer it using the provisioningTool.sh into A&amp;AI. ",indexedProps="vcenter-url,switch-name",dependentOn="cloud-region",container="dvs-switches")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="switch-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="DVS switch name")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vcenter-url" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL used to reach the vcenter")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="dvs-switches">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of digital virtual switch metadata used for vmWare VCEs and VPEs.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:dvs-switch" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="availability-zone">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Availability zone, a collection of compute hosts/pservers",indexedProps="availability-zone-name",dependentOn="cloud-region",container="availability-zones")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="availability-zone-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Name of the availability zone.  Unique across a cloud region")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="hypervisor-type" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Type of hypervisor.  Source of truth should define valid values.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="operational-state" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="State that indicates whether the availability zone should be used, etc.  Source of truth should define valid values.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="az-and-dvs-switches">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:dvs-switches" minOccurs="0"/>
-        <xs:element ref="tns:availability-zone" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="sdn-zone-response">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:oam-networks" minOccurs="0"/>
-        <xs:element ref="tns:az-and-dvs-switches" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="search">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:edge-tag-query-result" minOccurs="0"/>
-        <xs:element ref="tns:edge-tag-query-request" minOccurs="0"/>
-        <xs:element ref="tns:search-results" minOccurs="0"/>
-        <xs:element ref="tns:sdn-zone-response" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="update-node-key">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="key-name" type="xs:string" minOccurs="0"/>
-        <xs:element name="key-value" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="action-data">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="property-name" type="xs:string" minOccurs="0"/>
-        <xs:element name="property-value" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="action">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="action-type" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:action-data" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="update">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Serves a PATCH like function.  Does not enforce concurrency control.  Clear each usage with AAI team.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="update-node-type" type="xs:string"/>
-        <xs:element ref="tns:update-node-key" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element name="update-node-uri" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:action" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="key-data">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="key-name" type="xs:string" minOccurs="0"/>
-        <xs:element name="key-value" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="notify">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="event-id" type="xs:string"/>
-        <xs:element name="node-type" type="xs:string" minOccurs="0"/>
-        <xs:element name="event-trigger" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:key-data" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element name="selflink" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="actions">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="APIs that are more action related than REST (e.g., notify, update).")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:update" minOccurs="0"/>
-        <xs:element ref="tns:notify" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="ctag-pool">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="A collection of C tags (vlan tags) grouped for a specific purpose.",indexedProps="availability-zone-name",dependentOn="complex",container="ctag-pools")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="target-pe" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="The Target provider edge router")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="availability-zone-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Name of the availability zone")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ctag-pool-purpose" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Describes what the intended purpose of this pool is.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ctag-values" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Comma separated list of ctags")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="ctag-pools">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:ctag-pool" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="complex">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of physical locations that can house cloud-regions.",indexedProps="identity-url,data-center-code,complex-name,physical-location-id",searchable="physical-location-id,data-center-code,complex-name,street1,street2,postal-code",uniqueProps="physical-location-id",container="complexes",namespace="cloud-infrastructure")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="physical-location-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique identifier for physical location, e.g., CLLI")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="data-center-code" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Data center code which can be an alternate way to identify a complex")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="complex-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Gamma complex name for LCP instance.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="identity-url" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL of the keystone identity service")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="physical-location-type" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Type, e.g., central office, data center.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="street1" type="xs:string"/>
-        <xs:element name="street2" type="xs:string" minOccurs="0"/>
-        <xs:element name="city" type="xs:string"/>
-        <xs:element name="state" type="xs:string" minOccurs="0"/>
-        <xs:element name="postal-code" type="xs:string"/>
-        <xs:element name="country" type="xs:string"/>
-        <xs:element name="region" type="xs:string"/>
-        <xs:element name="latitude" type="xs:string" minOccurs="0"/>
-        <xs:element name="longitude" type="xs:string" minOccurs="0"/>
-        <xs:element name="elevation" type="xs:string" minOccurs="0"/>
-        <xs:element name="lata" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:ctag-pools" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="complexes">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of physical locations that can house cloud-regions.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:complex" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="volume-group">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Persistent block-level storage.",indexedProps="volume-group-name,vnf-type,heat-stack-id,volume-group-id",searchable="volume-group-name",dependentOn="cloud-region",container="volume-groups")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="volume-group-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique ID of volume-group.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="volume-group-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name of the volume group.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="heat-stack-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Heat stack id corresponding to this volume-group")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vnf-type" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded and clients should expect changes                  to occur in the future to this field as ASDC matures.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Orchestration status of this volume-group")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="persona-model-customization-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="captures the id of all the configuration used to customize the resource for the service.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="volume-groups">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of persistent block-level storage.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:volume-group" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="volume">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Ephemeral Block storage volume.",indexedProps="volume-id",dependentOn="vserver",container="volumes")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="volume-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique ID of block storage volume relative to the vserver.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="volume-selflink" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="volumes">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of ephemeral Block storage volumes.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:volume" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="l3-interface-ipv4-address-list">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="IPv4 Address Range",indexedProps="l3-interface-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="vlan,l-interface")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="l3-interface-ipv4-address" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="IP address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="l3-interface-ipv4-prefix-length" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Prefix length, 32 for single address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vlan-id-inner" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Inner VLAN tag")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vlan-id-outer" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Outer VLAN tag")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="is-floating" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicator of fixed or floating address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="neutron-network-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Neutron network id of the interface that address belongs to")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="neutron-subnet-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Neutron id of subnet that address belongs to")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="l3-interface-ipv6-address-list">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="IPv6 Address Range",indexedProps="l3-interface-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="vlan,l-interface")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="l3-interface-ipv6-address" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="IP address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="l3-interface-ipv6-prefix-length" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Prefix length, 128 for single address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vlan-id-inner" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Inner VLAN tag")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vlan-id-outer" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Outer VLAN tag")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="is-floating" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicator of fixed or floating address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="neutron-network-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Neutron network id of the interface that address belongs to")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="neutron-subnet-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Neutron id of subnet that address belongs to")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vlan">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Definition of vlan",indexedProps="vlan-interface,vlan-id-inner,vpn-id",uniqueProps="vpn-id",dependentOn="l-interface",container="vlans")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="vlan-interface" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="String that identifies the interface")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vlan-id-inner" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Inner VLAN tag")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vlan-id-outer" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Outer VLAN tag")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="speed-value" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Captures the numeric part of the speed")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="speed-units" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Captures the units corresponding to the speed")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vlan-description" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used to describe (the service associated with) the vlan")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="backdoor-connection" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Whether customer is going to use this VLAN for backdoor connection to another customer premise device.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vpn-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This indicates the customers VPN ID associated with this vlan")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:l3-interface-ipv4-address-list" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element ref="tns:l3-interface-ipv6-address-list" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vlans">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:vlan" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="sriov-vf">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="SR-IOV Virtual Function (not to be confused with virtual network function)",indexedProps="pci-id,vf-vlan-filter,vf-mac-filter,vf-vlan-strip,neutron-network-id",dependentOn="l-interface",container="sriov-vfs")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="pci-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="PCI ID used to identify the sriov-vf")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vf-vlan-filter" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This metadata provides option to specify list of VLAN filters applied on VF to pass the traffic to VM.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vf-mac-filter" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="When MAC filters are specified, VF-agent service configures VFs to do MAC level filtering before the traffic is passed to VM.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vf-vlan-strip" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="When this field is set to true, VF will configured to strip the outer TAG before the traffic is passed to VM.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vf-vlan-anti-spoof-check" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This option ensures anti VLAN spoof checks are done at the VF level to comply with security. The disable check will also be honored per the VNF needs for trusted VMs.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vf-mac-anti-spoof-check" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This option ensures anti MAC spoof checks are done at the VF level to comply with security. The disable check will also be honored per the VNF needs for trusted VMs.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vf-mirrors" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This option defines the set of Mirror objects which essentially mirrors the traffic from source to set of collector VNF Ports.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vf-broadcast-allow" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This option, if set to true, sets the VF in promiscuous mode and allows all broadcast traffic to reach the VM")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vf-unknown-multicast-allow" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This option, if set to true, sets the VF in promiscuous mode and allows unknown multicast traffic to reach the VM")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vf-unknown-unicast-allow" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This option, if set to true, sets the VF in promiscuous mode and allows unknown unicast traffic to reach the VM")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vf-insert-stag" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This option, if set to true, instructs to insert outer tag after traffic comes out of VM.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vf-link-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This option is used to set the link status.  Valid values as of 1607 are on, off, and auto.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="neutron-network-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Neutron network id of the interface")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="sriov-vfs">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of SR-IOV Virtual Functions.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:sriov-vf" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="l-interface">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Logical interfaces, e.g., a vnic.",indexedProps="macaddr,interface-id,interface-name,network-name",dependentOn="generic-vnf,newvce,vpe,p-interface,vserver,lag-interface",container="l-interfaces")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="interface-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Name given to the interface")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="interface-role" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="E.g., CUSTOMER, UPLINK, etc.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="v6-wan-link-ip" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Questionably placed - v6 ip addr of this interface (is in vr-lan-interface from Mary B.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="selflink" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="interface-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="ID of interface")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="macaddr" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="MAC address for the interface")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="network-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name of the network")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="management-option" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Whether A&amp;AI should be managing this interface of not. Could have value like CUSTOMER")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="interface-description" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Human friendly text regarding this interface.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:vlans" minOccurs="0"/>
-        <xs:element ref="tns:sriov-vfs" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:l3-interface-ipv4-address-list" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element ref="tns:l3-interface-ipv6-address-list" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="l-interfaces">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of logical interfaces.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:l-interface" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vserver">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Virtual Servers, aka virtual machine or VM.",nameProps="vserver-name",indexedProps="is-closed-loop-disabled,prov-status,vserver-name,vserver-id,in-maint,vserver-name2",searchable="vserver-name,vserver-id,vserver-name2",dependentOn="tenant",container="vservers")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="vserver-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique identifier for this vserver relative to its tenant")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vserver-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name of vserver")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vserver-name2" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Alternative name of vserver")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="prov-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Trigger for operational monitoring of this resource by Service Assurance systems.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vserver-selflink" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="in-maint" type="xs:boolean">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="Used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="is-closed-loop-disabled" type="xs:boolean">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="Used to indicate whether closed loop function is enabled on this node")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:volumes" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:l-interfaces" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vservers">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of virtual Servers, aka virtual machines or VMs.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:vserver" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="tenant">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Openstack tenant",nameProps="tenant-name",indexedProps="tenant-name,tenant-id",searchable="tenant-name,tenant-id",dependentOn="cloud-region",container="tenants")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="tenant-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique id relative to the cloud-region.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="tenant-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Readable name of tenant")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:vservers" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="tenants">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of openstack tenants.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:tenant" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="flavor">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Openstack flavor.",nameProps="flavor-name",indexedProps="flavor-name,flavor-id",dependentOn="cloud-region",container="flavors")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="flavor-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Flavor id, expected to be unique across cloud-region.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="flavor-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Flavor name")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="flavor-vcpus" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Number of CPUs")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="flavor-ram" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Amount of memory")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="flavor-disk" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Disk space")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="flavor-ephemeral" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Amount of ephemeral disk space")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="flavor-swap" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="amount of swap space allocation")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="flavor-is-public" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="whether flavor is available to all users or private to the tenant it was created in.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="flavor-selflink" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="flavor-disabled" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Boolean as to whether this flavor is no longer enabled")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="flavors">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of openstack flavors.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:flavor" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="group-assignment">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Openstack group-assignment used to store exclusivity groups (EG).",nameProps="group-name",indexedProps="group-id,group-type,group-name",dependentOn="cloud-region",container="group-assignments")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="group-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Group id, expected to be unique across cloud-region.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="group-type" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Group type - the type of group this instance refers to")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="group-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Group name - name assigned to the group")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="group-description" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Group description - description of the group")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="group-assignments">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of openstack group assignments")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:group-assignment" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="snapshot">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Openstack snapshot",nameProps="snapshot-name",uniqueProps="snapshot-id",indexedProps="application,snapshot-name,application-vendor,snapshot-id,application-version,prev-snapshot-id",dependentOn="cloud-region",container="snapshots")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="snapshot-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Snapshot id, this is the key UUID assoc associated in glance with the snapshots.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="snapshot-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Snapshot name")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="snapshot-architecture" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Operating system architecture")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="snapshot-os-distro" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The common name of the operating system distribution in lowercase")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="snapshot-os-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The operating system version as specified by the distributor.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="application" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The application that the image instantiates.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="application-vendor" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The vendor of the application.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="application-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The version of the application.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="snapshot-selflink" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="prev-snapshot-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This field contains the UUID of the previous snapshot (if any).")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="snapshots">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of openstack snapshots")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:snapshot" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="metadatum">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Key/value pairs",indexedProps="metaname",dependentOn="tenant,image,service-instance,connector,model",container="metadata")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="metaname" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true)</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="metaval" type="xs:string"/>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="metadata">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of metadatum (key/value pairs)")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:metadatum" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="image">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Openstack image.",nameProps="image-name",indexedProps="application,image-name,application-vendor,image-id,application-version",dependentOn="cloud-region",container="images")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="image-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Image id, expected to be unique across cloud region")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="image-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Image name")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="image-architecture" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Operating system architecture.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="image-os-distro" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The common name of the operating system distribution in lowercase")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="image-os-version" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The operating system version as specified by the distributor.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="application" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The application that the image instantiates.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="application-vendor" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The vendor of the application.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="application-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The version of the application.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="image-selflink" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:metadata" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="images">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collectio of Openstack images.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:image" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="availability-zones">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of availability zones")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:availability-zone" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="cloud-region">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="cloud-region designates an installation of a cloud cluster or region or instantiation. In AT&amp;Ts OPENECOMP cloud, this could be an LCP or DCP. Cloud regions are uniquely identified by a composite key, cloud-owner + cloud-region-id. The format of the cloud-owner is vendor-cloudname and we will use OPENECOMP for AT&amp;T's OPENECOMP.",indexedProps="cloud-owner,cloud-region-id,cloud-type,owner-defined-type",nameProps="owner-defined-type",container="cloud-regions",namespace="cloud-infrastructure")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="cloud-owner" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Identifies the vendor and cloud name, e.g., OPENECOMP. First part of composite key should be formatted as vendor-cloudname")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="cloud-region-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Identifier used by the vendor for the region. Second part of composite key")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="cloud-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Type of the cloud (e.g., openstack)")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="owner-defined-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Cloud-owner defined type indicator (e.g., DCP, LCP)")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="cloud-region-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Software version employed at the site")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="identity-url" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL of the keystone identity service")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="cloud-zone" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Zone where the cloud is homed")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="complex-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="complex name for cloud-region instance")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:volume-groups" minOccurs="0"/>
-        <xs:element ref="tns:tenants" minOccurs="0"/>
-        <xs:element ref="tns:flavors" minOccurs="0"/>
-        <xs:element ref="tns:group-assignments" minOccurs="0"/>
-        <xs:element ref="tns:snapshots" minOccurs="0"/>
-        <xs:element ref="tns:images" minOccurs="0"/>
-        <xs:element ref="tns:dvs-switches" minOccurs="0"/>
-        <xs:element ref="tns:oam-networks" minOccurs="0"/>
-        <xs:element ref="tns:availability-zones" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="cloud-regions">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(maximumDepth="0")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:cloud-region" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="network-profile">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Network profile populated by SDN-GP for SNMP",indexedProps="nm-profile-name",container="network-profiles",namespace="cloud-infrastructure")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="nm-profile-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique name of network profile.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="community-string" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Encrypted SNMP community string")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="network-profiles">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of network profiles")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:network-profile" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="p-interface">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Physical interface (e.g., nic)",indexedProps="interface-name,prov-status",nameProps="prov-status",dependentOn="vpls-pe,pserver,pnf",container="p-interfaces")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="interface-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Name that identifies the physical interface")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="speed-value" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Captures the numeric part of the speed")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="speed-units" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Captures the units corresponding to the speed")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="port-description" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Nature of the services and connectivity on this port.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="equipment-identifier" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="CLEI or other specification for p-interface hardware.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="interface-role" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Role specification for p-interface hardware.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="interface-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicates the physical properties of the interface.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="prov-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Trigger for operational monitoring of this resource by Service Assurance systems.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:l-interfaces" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="p-interfaces">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of physical interfaces.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:p-interface" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="lag-interface">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Link aggregate interface",indexedProps="interface-name,interface-id,interface-role",dependentOn="generic-vnf,pserver,vpe,vpls-pe,pnf",container="lag-interfaces")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="interface-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Name that identifies the link aggregate interface")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="speed-value" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Captures the numeric part of the speed")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="speed-units" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Captures the units corresponding to the speed")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="interface-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="ID of interface")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="interface-role" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate
-                      target="field">@org.openecomp.aai.annotations.Metadata(description="Role
-                assigned to this Interface, should use values as defined in OPENECOMP Yang
-                models.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="prov-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Trigger for operational monitoring of this resource by Service Assurance systems.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:l-interfaces" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="lag-interfaces">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of link aggregate interfaces.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:lag-interface" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="pserver">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Compute host whose hostname must be unique and must exactly match what is sent as a relationship to a vserver.",nameProps="pserver-name2",indexedProps="hostname,in-maint,pserver-id,pserver-name2,inv-status",searchable="hostname,pserver-name2,pserver-id,ipv4-oam-address",container="pservers",namespace="cloud-infrastructure")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="hostname" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Value from executing hostname on the compute node.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ptnii-equip-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="PTNII name")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="number-of-cpus" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Number of cpus")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="disk-in-gigabytes" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Disk size, in GBs")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ram-in-megabytes" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="RAM size, in MBs")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="equip-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Equipment type.  Source of truth should define valid values.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="equip-vendor" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Equipment vendor.  Source of truth should define valid values.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="equip-model" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Equipment model.  Source of truth should define valid values.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="fqdn" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Fully-qualified domain name")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="pserver-selflink" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipv4-oam-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used to configure device, also used for troubleshooting and is IP used for traps generated by device.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="serial-number" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Serial number, may be queried")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipaddress-v4-loopback-0" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="IPV4 Loopback 0 address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipaddress-v6-loopback-0" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="IPV6 Loopback 0 address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipaddress-v4-aim" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="IPV4 AIM address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipaddress-v6-aim" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="IPV6 AIM address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipaddress-v6-oam" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="IPV6 OAM address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="inv-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="CANOPI's inventory status.  Only set with values exactly as defined by CANOPI.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="pserver-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="ID of Pserver")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="internet-topology" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="internet topology of Pserver")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="in-maint" type="xs:boolean">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="pserver-name2" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="alternative pserver name")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="purpose" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="purpose of pserver")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:p-interfaces" minOccurs="0"/>
-        <xs:element ref="tns:lag-interfaces" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="pservers">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of compute hosts.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:pserver" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="virtual-data-center">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Virtual organization of cloud infrastructure elements in a data center context",nameProps="vdc-name",indexedProps="vdc-name,vdc-id",container="virtual-data-centers",namespace="cloud-infrastructure")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="vdc-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique ID of the vdc")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vdc-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name of the virtual data center")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="virtual-data-centers">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Virtual organization of cloud infrastructure elements in a data center context")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:virtual-data-center" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="cloud-infrastructure">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Namespace for cloud infrastructure.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:complexes" minOccurs="0"/>
-        <xs:element ref="tns:cloud-regions" minOccurs="0"/>
-        <xs:element ref="tns:network-profiles" minOccurs="0"/>
-        <xs:element ref="tns:pservers" minOccurs="0"/>
-        <xs:element ref="tns:virtual-data-centers" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="license-key-resource">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata
-            (nameProps="name",indexedProps="assignment-group-uuid,openecomp-uuid,name",uniqueProps="openecomp-uuid",container="license-key-resources",namespace="license-management")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="att-uuid" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true)</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="assignment-type" type="xs:string" minOccurs="0"/>
-        <xs:element name="assignment-status" type="xs:string" minOccurs="0"/>
-        <xs:element name="assignment-group-uuid" type="xs:string"/>
-        <xs:element name="assignment-date" type="xs:string" minOccurs="0"/>
-        <xs:element name="name" type="xs:string" minOccurs="0"/>
-        <xs:element name="model-uuid" type="xs:string" minOccurs="0"/>
-        <xs:element name="model-version" type="xs:string" minOccurs="0"/>
-        <xs:element name="license-key" type="xs:string" minOccurs="0"/>
-        <xs:element name="license-key-file-url" type="xs:string" minOccurs="0"/>
-        <xs:element name="supplier-release-list" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="license-key-resources">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:license-key-resource" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="license-management">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:license-key-resources" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="connector">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of resource instances used to connect a variety of disparate inventory widgets",indexedProps="resource-instance-id,persona-model-id,persona-model-version,widget-model-id,widget-model-version",container="connectors",namespace="business")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="resource-instance-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique id of resource instance.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="persona-model-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="persona-model-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="widget-model-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="widget-model-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:metadata" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="connectors">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of resource instances used to connect a variety of disparate inventory widgets")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:connector" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="tunnel-xconnect">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Represents the specifics of a tunnel cross connect piece of a resource that gets separately allotted",uniqueProps="id",indexedProps="id",dependentOn="allotted-resource",container="tunnel-xconnects")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Allotted Resource id UUID assigned to this instance.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="bandwidth-up-wan1" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The WAN uplink bandwidth for WAN1")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="bandwidth-down-wan1" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The WAN downlink bandwidth for WAN1")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="bandwidth-up-wan2" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The WAN uplink bandwidth for WAN2")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="bandwidth-down-wan2" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The WAN downlink bandwidth for WAN2")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Concurrency value")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="tunnel-xconnects">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="This object is used to store the specific tunnel cross connect aspects of an allotted resource")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:tunnel-xconnect" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="allotted-resource">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Represents a slice or partial piece of a resource that gets separately allotted",nameProps="description",uniqueProps="id",indexedProps="id,persona-model-id,persona-model-version",dependentOn="service-instance",container="allotted-resources")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Allotted Resource id UUID assigned to this instance.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="description" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The descriptive information assigned to this allotted resource instance")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="selflink" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Link back to more information in the controller")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="persona-model-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="persona-model-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Concurrency value")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:tunnel-xconnects" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="allotted-resources">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="This object is used to store slices of services being offered")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:allotted-resource" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="service-instance">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Instance of a service",indexedProps="service-instance-id,persona-model-id,persona-model-version,widget-model-id,widget-model-version,service-instance-name,service-instance-location-id",nameProps="service-instance-name",searchable="service-instance-id,service-instance-name",uniqueProps="service-instance-id",dependentOn="service-subscription",container="service-instances")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="service-instance-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Uniquely identifies this instance of a service")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="service-instance-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This field will store a name assigned to the service-instance.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="persona-model-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="persona-model-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="widget-model-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="widget-model-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="bandwidth-total" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicates the total bandwidth to be used for this service.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="bandwidth-up-wan1" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="indicates the upstream bandwidth this service will use on the WAN1 port of the physical device.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="bandwidth-down-wan1" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="indicates the downstream bandwidth this service will use on the WAN1 port of the physical device.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="bandwidth-up-wan2" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="indicates the upstream bandwidth this service will use on the WAN2 port of the physical device.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="bandwidth-down-wan2" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="indicates the downstream bandwidth this service will use on the WAN2 port of the physical device.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vhn-portal-url" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL customers will use to access the vHN Portal.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="operational-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Operational status of the service-instance.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="service-instance-location-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="An identifier that customers assign to the location where this service is being used.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:metadata" minOccurs="0"/>
-        <xs:element ref="tns:allotted-resources" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="service-instances">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of service instances")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:service-instance" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="service-subscription">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Object that group service instances.",indexedProps="service-type",dependentOn="customer",container="service-subscriptions")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="service-type" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Value defined by orchestration to identify this service across OPENECOMP.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="temp-ub-sub-account-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This property will be deleted from A&amp;AI in the near future. Only stop gap solution.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:service-instances" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="service-subscriptions">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of objects that group service instances.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:service-subscription" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="customer">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="customer identifiers to provide linkage back to BSS information.",nameProps="subscriber-name",indexedProps="subscriber-name,global-customer-id,subscriber-type",searchable="subscriber-name,global-customer-id",uniqueProps="global-customer-id,subscriber-name",alternateKeys1="subscriber-name",container="customers",namespace="business")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="global-customer-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Global customer id used across OPENECOMP to uniquely identify customer.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="subscriber-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Subscriber name, an alternate way to retrieve a customer.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="subscriber-type" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Subscriber type, a way to provide VID with only the INFRA customers.",defaultValue="CUST")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:service-subscriptions" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="customers">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of customer identifiers to provide linkage back to BSS information.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:customer" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="business">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Namespace for business related constructs")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:connectors" minOccurs="0"/>
-        <xs:element ref="tns:customers" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vnf-image">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Image object that pertain to a VNF that doesn't have associated vservers.  This is a kludge.",indexedProps="application,openecomp-uuid,application-vendor,application-version",uniqueProps="openecomp-uuid",container="vnf-images",namespace="service-design-and-creation")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="att-uuid" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique ID of this asset")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="application" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The application that the image instantiates.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="application-vendor" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The vendor of the application.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="application-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The version of the application.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="selflink" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vnf-images">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of image objects that pertain to a VNF that doesn't have associated vservers.  This is a kludge.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:vnf-image" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="service">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Stand-in for service model definitions.  Likely to be deprecated in favor of models from ASDC.",indexedProps="service-description,service-id",container="services",namespace="service-design-and-creation")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="service-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="This gets defined by others to provide a unique ID for the service, we accept what is sent.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="service-description" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Description of the service")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="service-selflink" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="service-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="service version")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="services">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of service model definitions.  Likely to be deprecated in favor of models from ASDC.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:service" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="service-capability">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Early definition of server/resource pairings, likely to be replaced by models.  No new use should be made of this.",indexedProps="service-type,vnf-type",container="service-capabilities",namespace="service-design-and-creation")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="service-type" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="This gets defined by others to provide a unique ID for the service, we accept what is sent.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vnf-type" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded and clients should expect changes                  to occur in the future to this field as ASDC matures.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="service-capabilities">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of service capabilities.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:service-capability" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="element-choice-set">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="element-choice-set-uuid",indexedProps="element-choice-set-uuid",allowDirectRead="true",allowDirectWrite="false",container="element-choice-sets")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="element-choice-set-uuid" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="element-choice-set-name" type="xs:string"/>
-        <xs:element name="cardinality" type="xs:string" minOccurs="0"/>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:model-elements" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="element-choice-sets">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:element-choice-set" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="constrained-element-set">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="constrained-element-set-uuid",indexedProps="constrained-element-set-uuid",allowDirectRead="true",allowDirectWrite="false",container="constrained-element-sets")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="constrained-element-set-uuid" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="constraint-type" type="xs:string"/>
-        <xs:element name="check-type" type="xs:string"/>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:element-choice-sets" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="constrained-element-sets">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:constrained-element-set" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="model-constraint">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="model-constraint-uuid",indexedProps="model-constraint-uuid",allowDirectRead="true",allowDirectWrite="false",container="model-constraints")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="model-constraint-uuid" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="constrained-element-set-uuid-to-replace" type="xs:string"/>
-        <xs:element ref="tns:constrained-element-sets" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="model-constraints">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:model-constraint" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="model-element">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Defines how other models combine to make up a higher-level model.",uniqueProps="model-element-uuid",indexedProps="model-element-uuid",allowDirectRead="true",allowDirectWrite="false",container="model-elements")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="model-element-uuid" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="new-data-del-flag" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicates whether this element was created as part of instantiation from this model")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="cardinality" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="How many of this type of element are required/allowed")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="linkage-points" minOccurs="0">
-          <xs:complexType>
-            <xs:annotation>
-              <xs:appinfo>
-                <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Defines how other models combine to make up a higher-level model.",uniqueProps="model-element-uuid",indexedProps="model-element-uuid",allowDirectRead="true",allowDirectWrite="false",container="model-elements")</annox:annotate>
-              </xs:appinfo>
-            </xs:annotation>
-            <xs:sequence>
-              <xs:element name="linkage-point" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-            </xs:sequence>
-          </xs:complexType>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:model-elements" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Defines how other models combine to make up a higher-level model")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:model-constraints" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Describes new constraints on this model element that are not part of that model's definition")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="model-elements">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:model-element" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="model-ver">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Subgraph definition provided by ASDC to describe a specific version of an inventory asset and its connections related to ASDC models",nameProps="model-name",indexedProps="model-version-id,model-name,model-version",uniqueProps="model-version-id",container="model-vers",namespace="service-design-and-creation")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="model-version-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique identifier corresponding to one version of a model in ASDC")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name of the model, which can change from version to version.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-version" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Version")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-description" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Description")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:model-elements" minOccurs="0"/>
-        <xs:element ref="tns:metadata" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="model-vers">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:model-ver" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="model">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Subgraph definition provided by ASDC to describe an inventory asset and its connections related to ASDC models, independent of version",nameProps="model-type",indexedProps="model-invariant-id,model-type",uniqueProps="model-invariant-id",container="models",namespace="service-design-and-creation")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="model-invariant-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique identifier corresponding to the main definition of a model in ASDC")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-type" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Type of the model, e.g., service, resource, widget, etc.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:model-vers" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="models">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of subgraph definitions provided by ASDC to describe the inventory assets and their connections related to ASDC models")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:model" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="related-lookup">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="TBD",uniqueProps="related-lookup-uuid",indexedProps="related-lookup-uuid",allowDirectRead="true",allowDirectWrite="false",container="related-lookups")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="related-lookup-uuid" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="source-node-type" type="xs:string"/>
-        <xs:element name="source-node-property" type="xs:string"/>
-        <xs:element name="target-node-type" type="xs:string"/>
-        <xs:element name="target-node-property" type="xs:string"/>
-        <xs:element name="property-collect-list" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="related-lookups">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:related-lookup" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="property-constraint">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="TBD",uniqueProps="property-constraint-uuid",indexedProps="property-constraint-uuid",allowDirectRead="true",allowDirectWrite="false",container="property-constraints")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="property-constraint-uuid" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="constraint-type" type="xs:string"/>
-        <xs:element name="property-name" type="xs:string"/>
-        <xs:element name="property-value" type="xs:string"/>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="property-constraints">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:property-constraint" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="named-query-element">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="TBD",uniqueProps="named-query-element-uuid",indexedProps="named-query-element-uuid",allowDirectRead="true",allowDirectWrite="false",container="named-query-elements")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="named-query-element-uuid" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="property-collect-list" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
-        <xs:element name="property-limit-desc" type="xs:string" minOccurs="0"/>
-        <xs:element name="do-not-output" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:named-query-elements" minOccurs="0"/>
-        <xs:element ref="tns:related-lookups" minOccurs="0"/>
-        <xs:element ref="tns:property-constraints" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="named-query-elements">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:named-query-element" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="named-query">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="TBD",nameProps="named-query-name",uniqueProps="named-query-uuid",indexedProps="named-query-uuid,named-query-name",container="named-queries",namespace="service-design-and-creation")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="named-query-uuid" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true)</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="named-query-name" type="xs:string"/>
-        <xs:element name="named-query-version" type="xs:string"/>
-        <xs:element name="required-input-params" minOccurs="0">
-          <xs:complexType>
-            <xs:annotation>
-              <xs:appinfo>
-                <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="TBD",nameProps="named-query-name",uniqueProps="named-query-uuid",indexedProps="named-query-uuid,named-query-name",container="named-queries",namespace="service-design-and-creation")</annox:annotate>
-              </xs:appinfo>
-            </xs:annotation>
-            <xs:sequence>
-              <xs:element name="required-input-param" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-            </xs:sequence>
-          </xs:complexType>
-        </xs:element>
-        <xs:element name="description" type="xs:string" minOccurs="0"/>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:named-query-elements" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="named-queries">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:named-query" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="service-design-and-creation">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Namespace for objects managed by ASDC")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:vnf-images" minOccurs="0"/>
-        <xs:element ref="tns:services" minOccurs="0"/>
-        <xs:element ref="tns:service-capabilities" minOccurs="0"/>
-        <xs:element ref="tns:models" minOccurs="0"/>
-        <xs:element ref="tns:named-queries" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="logical-link">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Logical links generally connect l-interfaces but are used to express logical connectivity between two points",indexedProps="link-name,persona-model-id,persona-model-version,widget-model-id,widget-model-version,link-id,prov-status,circuit-id,purpose",uniqueProps="link-id",nameProps="prov-status,circuit-id",container="logical-links",namespace="network")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="link-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="e.g., evc-name, or vnf-nameA_interface-nameA_vnf-nameZ_interface-nameZ")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="link-type" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Type of logical link, e.g., evc")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="speed-value" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Captures the numeric part of the speed")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="speed-units" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Captures the units corresponding to the speed")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ip-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="v4, v6, or ds for dual stack (should be openecomp-ip-version)")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="routing-protocol" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="For example, static or BGP")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="persona-model-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="persona-model-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="widget-model-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="widget-model-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="operational-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indication of operational status of the logical link.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="prov-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Trigger for operational monitoring of this VNF by BAU Service Assurance systems.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="link-role" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indication of the network use of the logical link.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="link-name2" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Alias or alternate name (CLCI or D1 name).")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="link-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="UUID of the logical-link, SDNC generates this.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="circuit-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Circuit id")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="purpose" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Reason for this entity, role it is playing")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="logical-links">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of logical connections")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:logical-link" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="class-of-service">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(indexedProps="cos",dependentOn="site-pair",container="classes-of-service")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="cos" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="unique identifier of probe")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="probe-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="identifier of probe")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="probe-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="type of probe")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="classes-of-service">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="class-of-service of probe")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:class-of-service" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="site-pair">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(indexedProps="site-pair-id",uniqueProps="site-pair-id",dependentOn="routing-instance",container="site-pairs")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="site-pair-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="unique identifier of probe")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="source-ip" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Prefix address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="destination-ip" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Prefix address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ip-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="ip version, v4, v6")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="destination-hostname" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Hostname of the destination equipment to which SLAs are measured against.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="destination-equip-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The type of destinatination equipment. Could be Router, UCPE, etc.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:classes-of-service" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="site-pairs">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="probe within a set")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:site-pair" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="routing-instance">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(indexedProps="routing-instance-id",uniqueProps="routing-instance-id",dependentOn="site-pair-set",container="routing-instances")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="routing-instance-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique id of routing instance")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="rpm-owner" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="rpm owner")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:site-pairs" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="routing-instances">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="set of probes related to generic-vnf routing instance")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:routing-instance" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="site-pair-set">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Set of instances for probes used to measure service level agreements",indexedProps="site-pair-set-id",uniqueProps="site-pair-set-id",container="site-pair-sets",namespace="network")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="site-pair-set-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique id of site pair set.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:routing-instances" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="site-pair-sets">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of sets of instances for probes related to generic-vnf")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:site-pair-set" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vpn-binding">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="VPN binding",nameProps="vpn-name,vpn-type",indexedProps="vpn-name,vpn-id,global-route-target,vpn-type",searchable="vpn-name",uniqueProps="vpn-id",container="vpn-bindings",namespace="network")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="vpn-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="VPN ID, globally unique within A&amp;AI")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vpn-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="VPN Name")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="global-route-target" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Number used to identify a VPN, globally unique in the network")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vpn-platform" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the platform associated with the VPN example AVPN, Mobility")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vpn-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Type of the vpn, should be taken from enumerated/valid values")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="route-distinguisher" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used to distinguish the distinct VPN routes of separate customers who connect to the provider in an MPLS network.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="route-target-role" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Role assigned to this route target")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="l3-networks relate to vpn-bindings")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vpn-bindings">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:vpn-binding" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vpls-pe">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="VPLS Provider Edge routers.",indexedProps="prov-status,equipment-name",container="vpls-pes",namespace="network")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="equipment-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true)</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="prov-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Trigger for operational monitoring of this VNF by BAU Service Assurance systems.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipv4-oam-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Address tail-f uses to configure vpe, also used for troubleshooting and is IP used for traps generated by VPE (v4-loopback0-ip-address).")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="equipment-role" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Client should send valid enumerated value, e.g., VPLS-PE.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vlan-id-outer" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Temporary location for stag to get to VCE")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:p-interfaces" minOccurs="0"/>
-        <xs:element ref="tns:lag-interfaces" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vpls-pes">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of VPLS Provider Edge routers")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:vpls-pe" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="multicast-configuration">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(indexedProps="multicast-configuration-id",uniqueProps="multicast-configuration-id",container="multicast-configurations",namespace="network")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="multicast-configuration-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique id of multicast configuration.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="multicast-protocol" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="protocol of multicast configuration")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="rp-type" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="rp type of multicast configuration")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="multicast-configurations">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="multicast configuration of generic-vnf ip-address")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:multicast-configuration" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="cvlan-tag-entry">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(dependentOn="port-group",indexedProps="cvlan-tag",container="cvlan-tags")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="cvlan-tag" type="xs:unsignedInt">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="See mis-na-virtualization-platform.yang")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="cvlan-tags">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:cvlan-tag-entry" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="port-group">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Used to capture the network interfaces of this VCE",nameProps="port-group-name",indexedProps="port-group-id,heat-stack-id,interface-id,interface-name,switch-name",dependentOn="vce",container="port-groups")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="interface-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique ID of the interface")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="neutron-network-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Neutron network id of this Interface")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="neutron-network-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Neutron network name of this Interface")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="interface-role" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Role assigned to this Interface, should use values as defined in OPENECOMP Yang models.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="port-group-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Unique ID for port group in vmware")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="port-group-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Likely to duplicate value of neutron network name")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="switch-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="DVS or standard switch name (should be non-null for port groups associated with DVS)")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="orchestration-status" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Orchestration status of this VNF, mastered by MSO")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="heat-stack-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Heat stack id corresponding to this instance, managed by MSO")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="mso-catalog-key" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Corresponds to the SDN-C catalog id used to configure this VCE")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:cvlan-tags" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="port-groups">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:port-group" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="license">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Metadata for license group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce,vpe",container="licenses")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="group-uuid" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique ID for the license group the resource belongs to, should be uuid.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-uuid" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique ID of a license resource. ")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Concurrency value")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="licenses">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Licenses to be allocated across resources, keyed by group-uuid and resource-uuid, related to license management")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:license" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="entitlement">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Metadata for entitlement group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce,vpe",container="entitlements")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="group-uuid" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique ID for the entitlement group the resource comes from, should be uuid.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-uuid" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique ID of an entitlement resource. ")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Concurrency value")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="entitlements">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Entitlements, keyed by group-uuid and resource-uuid, related to license management")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:entitlement" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vce">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Virtual Customer Edge Router, used specifically for Gamma.  This object is deprecated.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vces",namespace="network",extendsFrom="vnf")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="vnf-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique id of VNF.  This is unique across the graph.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vnf-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name of VNF.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vnf-name2" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Alternate name of VNF.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vnf-type" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded and clients should expect changes                  to occur in the future to this field as ASDC matures.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="service-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Unique identifier of service from ASDC.  Expect this to change as ASDC matures.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="regional-resource-zone" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Regional way of organizing pservers, source of truth should define values")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="prov-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Trigger for operational monitoring of this resource by Service Assurance systems.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="operational-state" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicator for whether the resource is considered operational")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="license-key" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="License key")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="equipment-role" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Network role being played by this VNF")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Orchestration status of this VNF, mastered by MSO")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="heat-stack-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Heat stack id corresponding to this instance, managed by MSO")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="mso-catalog-key" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Corresponds to the SDN-C catalog id used to configure this VCE")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vpe-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Unique ID of VPE connected to this VCE.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="v6-vce-wan-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Valid v6 IP address for the WAN Link on this router.  Implied length of /64.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipv4-oam-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Address tail-f uses to configure vce, also used for troubleshooting and is IP used for traps generated by VCE.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipv4-loopback0-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Loopback0 address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="entitlement-resource-uuid" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Entitlement resource uuid")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:port-groups" minOccurs="0"/>
-        <xs:element ref="tns:licenses" minOccurs="0"/>
-        <xs:element ref="tns:entitlements" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vces">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of Virtual Customer Edge Routers, used specifically for Gamma.  This object is deprecated.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:vce" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vpe">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Relationship-list must include related to info for complex.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,regional-resource-zone,prov-status,service-id",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vpes",namespace="network",extendsFrom="vnf")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="vnf-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique id of VNF.  This is unique across the graph.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vnf-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name of VNF.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vnf-name2" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Alternate name of VNF.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vnf-type" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded and clients should expect changes                  to occur in the future to this field as ASDC matures.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="service-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Unique identifier of service from ASDC")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="regional-resource-zone" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Regional way of organizing pservers, source of truth should define values")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="prov-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Trigger for operational monitoring of this resource by Service Assurance systems.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="operational-state" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicator for whether the resource is considered operational")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="license-key" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="License key")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="equipment-role" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Client should send valid enumerated value")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Orchestration status of this VNF, mastered by MSO")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="heat-stack-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Heat stack id corresponding to this instance, managed by MSO")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="mso-catalog-key" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Corresponds to the SDN-C catalog id used to configure this VCE")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipv4-oam-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Address tail-f uses to configure vpe, also used for troubleshooting and is IP used for traps generated by VPE (v4-loopback0-ip-address).")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipv4-oam-gateway-address-prefix-length" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Prefix length for oam-address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipv4-oam-gateway-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Gateway address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="v4-loopback0-ip-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Loopback0 address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vlan-id-outer" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Temporary location for stag to get to VCE")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="as-number" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="as-number of the VPE")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="summary-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="details regarding the vpe operation")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="encrypted-access-flag" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="indicates whether vpe access uses SSH")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:l-interfaces" minOccurs="0"/>
-        <xs:element ref="tns:lag-interfaces" minOccurs="0"/>
-        <xs:element ref="tns:licenses" minOccurs="0"/>
-        <xs:element ref="tns:entitlements" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vpes">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Virtual provider edge router. In 1504, A&amp;AI will populate this object through an M&amp;P and tool provided to operations.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:vpe" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vnfc">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(indexedProps="vnfc-name,prov-status,vnfc-type,vnfc-function-code,ipaddress-v4-oam-vip,in-maint,is-closed-loop-disabled,group-notation",searchable="vnfc-name",container="vnfcs",namespace="network")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="vnfc-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique ID of vnfc.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vnfc-function-code" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="function code")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vnfc-type" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="type")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="prov-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="prov status of this vnfc")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Orchestration status of this VNF, mastered by APP-C")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipaddress-v4-oam-vip" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Oam V4 vip address of this vnfc")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="in-maint" type="xs:boolean">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="is-closed-loop-disabled" type="xs:boolean">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether closed loop function is enabled on this node")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="group-notation" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Group notation of VNFC")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vnfcs">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="virtual network components associated with a vserver from application controller.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:vnfc" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="subnet">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(indexedProps="subnet-id,subnet-name",nameProps="subnet-name",uniqueProps="subnet-id",dependentOn="l3-network",container="subnets")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="subnet-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Subnet ID, should be UUID.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="subnet-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name associated with the subnet.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="neutron-subnet-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Neutron id of this subnet")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="gateway-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="gateway ip address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="network-start-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="network start address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="cidr-mask" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="cidr mask")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ip-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="ip version")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Orchestration status of this VNF, mastered by MSO")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="dhcp-enabled" type="xs:boolean">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="dhcp enabled")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="dhcp-start" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the start address reserved for use by dhcp")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="dhcp-end" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the last address reserved for use by dhcp")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="subnets">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:subnet" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="ctag-assignment">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(indexedProps="vlan-id-inner",dependentOn="l3-network",container="ctag-assignments")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="vlan-id-inner" type="xs:unsignedInt">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="id.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="ctag-assignments">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:ctag-assignment" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="segmentation-assignment">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Openstack segmentation assignment.",indexedProps="segmentation-id",dependentOn="l3-network",container="segmentation-assignments")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="segmentation-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Route Table Reference id, UUID assigned to this instance.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Concurrency value")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="segmentation-assignments">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of openstack segmentation assignments")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:segmentation-assignment" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="l3-network">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Generic network definition",nameProps="network-name",indexedProps="heat-stack-id,network-uuid,service-id,network-id,network-name,persona-model-id,persona-model-version,widget-model-id,widget-model-version,contrail-network-fqdn,network-role",searchable="network-name",uniqueProps="network-id",container="l3-networks",namespace="network")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="network-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Network ID, should be uuid. Unique across A&amp;AI.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="network-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name of the network, governed by some naming convention..")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="network-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Type of the network - who defines these values?")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="network-role" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Role the network plans - who defines these values?")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="network-technology" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Network technology - who defines these values?")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="neutron-network-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Neutron network id of this Interface")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="is-bound-to-vpn" type="xs:boolean">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="Set to true if bound to VPN")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="service-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Unique identifier of service from ASDC")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="network-role-instance" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="network role instance")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Orchestration status of this VNF, mastered by MSO")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="heat-stack-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Heat stack id corresponding to this instance, managed by MSO")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="mso-catalog-key" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Corresponds to the SDN-C catalog id used to configure this VCE")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="contrail-network-fqdn" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Contrail FQDN for the network")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="persona-model-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="persona-model-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="persona-model-customization-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="captures the id of all the configuration used to customize the resource for the service.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="widget-model-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="widget-model-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="physical-network-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name associated with the physical network.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="is-provider-network" type="xs:boolean">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="boolean indicatating whether or not network is a provider network.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="is-shared-network" type="xs:boolean">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="boolean indicatating whether or not network is a shared network.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="is-external-network" type="xs:boolean">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="boolean indicatating whether or not network is an external network.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:subnets" minOccurs="0"/>
-        <xs:element ref="tns:ctag-assignments" minOccurs="0"/>
-        <xs:element ref="tns:segmentation-assignments" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Relates to tenant (or is it a child of tenant), complex, service, vpn-binding")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="l3-networks">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:l3-network" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="network-policy">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(nameProps="network-policy-fqdn",indexedProps="network-policy-id,network-policy-fqdn",searchable="network-policy-fqdn",uniqueProps="network-policy-id",container="network-policies",namespace="network")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="network-policy-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="UUID representing unique key to this instance")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="network-policy-fqdn" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Contrail FQDN for the policy")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="heat-stack-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="ID for the openStack Heat instance")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="network-policies">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:network-policy" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vf-module">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="a deployment unit of VNFCs",indexedProps="vf-module-id,vf-module-name,heat-stack-id,persona-model-id,persona-model-version,widget-model-id,widget-model-version,contrail-service-instance-fqdn",searchable="vf-module-name",dependentOn="generic-vnf",container="vf-modules")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="vf-module-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique ID of vf-module.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vf-module-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name of vf-module")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="heat-stack-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Heat stack id corresponding to this instance.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="orchestration status of this vf-module, mastered by MSO")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="is-base-vf-module" type="xs:boolean">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is base vf module")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="persona-model-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="persona-model-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="persona-model-customization-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="captures the id of all the configuration used to customize the resource for the service.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="widget-model-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="widget-model-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="contrail-service-instance-fqdn" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the Contrail unique ID for a service-instance")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vf-modules">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of vf-modules, a deployment unit of VNFCs")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:vf-module" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="generic-vnf">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="General purpose VNF",nameProps="vnf-name",indexedProps="is-closed-loop-disabled,vnf-name2,vnf-type,heat-stack-id,in-maint,vnf-name,vnf-id,regional-resource-zone,prov-status,service-id,persona-model-id,persona-model-version,widget-model-id,widget-model-version",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="generic-vnfs",namespace="network",extendsFrom="vnf")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="vnf-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique id of VNF.  This is unique across the graph.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vnf-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name of VNF.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vnf-name2" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Alternate name of VNF.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vnf-type" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded and clients should expect changes                  to occur in the future to this field as ASDC matures.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="service-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Unique identifier of service from ASDC")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="regional-resource-zone" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Regional way of organizing pservers, source of truth should define values")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="prov-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Trigger for operational monitoring of this resource by Service Assurance systems.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="operational-state" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicator for whether the resource is considered operational")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="license-key" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="License key")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="equipment-role" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Client should send valid enumerated value")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Orchestration status of this VNF, used by MSO.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="heat-stack-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Heat stack id corresponding to this instance, managed by MSO")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="mso-catalog-key" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Corresponds to the SDN-C catalog id used to configure this VCE")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="management-option" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate
-                      target="field">@org.openecomp.aai.annotations.Metadata(description="identifier of managed by OPENECOMP or customer")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipv4-oam-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by generic-vnf.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipv4-loopback0-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="v4 Loopback0 address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="nm-lan-v6-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="v6 Loopback address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="management-v6-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="v6 management address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vcpu" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="number of vcpus ordered for this instance of VNF, used for VNFs with no vservers/flavors")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vcpu-units" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="units associated with vcpu, used for VNFs with no vservers/flavors")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vmemory" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="number of GB of memory ordered for this instance of VNF, used for VNFs with no vservers/flavors")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vmemory-units" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="units associated with vmemory, used for VNFs with no vservers/flavors")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vdisk" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="number of vdisks ordered for this instance of VNF, used for VNFs with no vservers/flavors")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vdisk-units" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="units associated with vdisk, used for VNFs with no vservers/flavors")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="in-maint" type="xs:boolean">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="is-closed-loop-disabled" type="xs:boolean">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether closed loop function is enabled on this node")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="summary-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="details regarding the generic-vnf operation")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="encrypted-access-flag" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="indicates whether generic-vnf access uses SSH")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="entitlement-assignment-group-uuid" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="UUID of the Entitlement group used for licensing VNFs")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="entitlement-resource-uuid" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="UUID of the specific entitlement resource")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="license-assignment-group-uuid" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="UUID of the license assignment group")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="license-key-uuid" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="UUID of the actual license resource")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="persona-model-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="persona-model-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="persona-model-customization-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="captures the id of all the configuration used to customize the resource for the service.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="widget-model-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="widget-model-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="as-number" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="as-number of the VNF")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="regional-resource-subzone" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="represents sub zone of the rr plane")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:l-interfaces" minOccurs="0"/>
-        <xs:element ref="tns:lag-interfaces" minOccurs="0"/>
-        <xs:element ref="tns:vf-modules" minOccurs="0"/>
-        <xs:element ref="tns:licenses" minOccurs="0"/>
-        <xs:element ref="tns:entitlements" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="generic-vnfs">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of VNFs")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:generic-vnf" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="lag-link">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="LAG links can connect lag-interfaces",indexedProps="link-name",container="lag-links",namespace="network")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="link-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Alphabetical concatenation of lag-interface names")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="lag-links">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of link aggregation connections")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:lag-link" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="newvce">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,prov-status,vnf-id2",searchable="vnf-id2,vnf-name,vnf-name2",uniqueProps="vnf-id2",container="newvces",namespace="network")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="vnf-id2" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique id of VNF, can't use same attribute name right now until we promote this new object")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vnf-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name of VNF.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vnf-name2" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Alternate name of VNF.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vnf-type" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded and clients should expect changes                  to occur in the future to this field as ASDC matures.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="prov-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Trigger for operational monitoring of this VNF by BAU Service Assurance systems.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="operational-state" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicator for whether the resource is considered operational")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="license-key" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="License key")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipv4-oam-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Address tail-f uses to configure vpe, also used for troubleshooting and is IP used for traps generated by VPE (v4-loopback0-ip-address).")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="equipment-role" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Client should send valid enumerated value, e.g., VPE.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipv4-loopback0-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="v4 Loopback0 address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Orchestration status of this VNF, mastered by MSO.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="heat-stack-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Heat stack id corresponding to this instance, managed by MSO")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="mso-catalog-key" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Corresponds to the SDN-C catalog id used to configure this VCE")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:l-interfaces" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="newvces">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:newvce" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="pnf">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="PNF represents a physical network function. typically equipment used in the D1 world. in 1607, this will be populated by SDN-C to represent a premises router that a uCPE connects to. But this can be used to represent any physical device that is not an OPENECOMP node or uCPE.",indexedProps="pnf-name,orchestration-status,inv-status",searchable="pnf-name",uniqueProps="pnf-name",container="pnfs",namespace="network")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="pnf-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="unique name of Physical Network Function.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="pnf-name2" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="name of Physical Network Function.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="pnf-name2-source" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="source of name2")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="pnf-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="id of pnf")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="equip-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Equipment type.  Source of truth should define valid values.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="equip-vendor" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Equipment vendor.  Source of truth should define valid values.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="equip-model" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Equipment model.  Source of truth should define valid values.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="management-option" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="identifier of managed by OPENECOMP or customer")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipaddress-v4-oam" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="ipv4-oam-address with new naming convention for IP addresses")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="sw-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="sw-version is the version of SW for the hosted application on the PNF.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="orchestration-status is the status of orchestration on the PNF.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="in-maint" type="xs:boolean">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="Used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="frame-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="ID of the physical frame (relay rack) where pnf is installed.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="serial-number" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Serial number of the device")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipaddress-v4-loopback-0" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="IPV4 Loopback 0 address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipaddress-v6-loopback-0" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="IPV6 Loopback 0 address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipaddress-v4-aim" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="IPV4 AIM address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipaddress-v6-aim" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="IPV6 AIM address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipaddress-v6-oam" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="IPV6 OAM address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="inv-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="CANOPI's inventory status.  Only set with values exactly as defined by CANOPI.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:p-interfaces" minOccurs="0"/>
-        <xs:element ref="tns:lag-interfaces" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="pnfs">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of Physical Network Functions.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:pnf" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="physical-link">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of physical connections, typically between p-interfaces",indexedProps="circuit-id,link-name",alternateKeys1="circuit-id",container="physical-links",namespace="network")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="link-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="e.g., hostnameA_p-connection_nameA_hostnameZ+p_connection-nameZ")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="speed-value" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Captures the numeric part of the speed")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="speed-units" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Captures the units corresponding to the speed")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="circuit-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Circuit it")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="dual-mode" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Dual access mode (e.g., primary, secondary")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="management-option" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="To provide information on who manages this circuit. A&amp;AI or 3rd party transport provider")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="service-provider-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name of the service Provider on this link.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="physical-links">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of physical connections, typically between p-interfaces")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:physical-link" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vig-server">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="vig-server contains information about a vig server used for IPSec-configuration. Populated by SDN-C from 1607",indexedProps="vig-address-type",dependentOn="ipsec-configuration",container="vig-servers")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="vig-address-type" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="indicates whether the VIG is for AVPN or INTERNET")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipaddress-v4-vig" type="xs:string" minOccurs="0" maxOccurs="unbounded">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="v4 IP of the vig server")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipaddress-v6-vig" type="xs:string" minOccurs="0" maxOccurs="unbounded">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="v6 IP of the vig server")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vig-servers">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:vig-server" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="ipsec-configuration">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="IPSec configuration node will contain various configuration data for the NMTE VNF. This node will have an edge to the generic-vnf (vnf type = TE). Starting 1607, this data will be populated by SDN-C",indexedProps="ipsec-configuration-id",uniqueProps="ipsec-configuration-id",container="ipsec-configurations",namespace="network")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="ipsec-configuration-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="UUID of this configuration")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="requested-vig-address-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicate the type of VIG server like AVPN, INTERNET, BOTH")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="requested-encryption-strength" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Encryption values like 3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="requested-dmz-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="OPENECOMP can offer a shared DMZ or a DMZ specific to a customer")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="shared-dmz-network-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Network address of shared DMZ")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="requested-customer-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="If the DMZ is a custom DMZ, this field will indicate the customer information")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ike-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="can be 1 or 2")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ikev1-authentication" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Contains values like md5, sha1, sha256, sha384")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ikev1-encryption" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Encyption values like 3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ikev1-dh-group" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Diffie-Hellman group like DH-GROUP2, DH-GROUP5, DH-GROUP14")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ikev1-am-group-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Group name defined in VIG for clients using aggressive mode")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ikev1-am-password" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="pre-shared key for the above group name ")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ikev1-sa-lifetime" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Lifetime for IKEv1 SA")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipsec-authentication" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="md5, sha1, sha256, sha384")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipsec-encryption" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipsec-sa-lifetime" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Life time for IPSec SA")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipsec-pfs" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="enable PFS or not")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="xauth-userid" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="user ID for xAuth, sm-user,ucpeHostName,nmteHostName")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="xauth-user-password" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Encrypted using the Juniper $9$ algorithm")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="dpd-interval" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The time between DPD probe")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="dpd-frequency" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Maximum number of DPD before claiming the tunnel is down")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:vig-servers" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="ipsec-configurations">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:ipsec-configuration" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="route-table-reference">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Openstack route table reference.",nameProps="route-table-reference-fqdn",uniqueProps="route-table-reference-id",indexedProps="route-table-reference-id,route-table-reference-fqdn",container="route-table-references",namespace="network")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="route-table-reference-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Route Table Reference id, UUID assigned to this instance.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="route-table-reference-fqdn" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="FQDN entry in the route table.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Concurrency value")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="route-table-references">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of openstack route table references")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:route-table-reference" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="instance-group">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="General mechanism for grouping instances",nameProps="description",uniqueProps="id",indexedProps="id,description,type,sub-type",container="instance-groups",namespace="network")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Instance Group ID, UUID assigned to this instance.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="description" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Descriptive text to help identify the usage of this instance-group")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="type" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Only valid value today is lower case ha for high availability")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="sub-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Valid values for ha type are [geo-activeactive, geo-activestandby, local-activeactive, local-activestandby]")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Concurrency value")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="instance-groups">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of openstack route table references")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:instance-group" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="network">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Namespace for network inventory resources.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:logical-links" minOccurs="0"/>
-        <xs:element ref="tns:site-pair-sets" minOccurs="0"/>
-        <xs:element ref="tns:vpn-bindings" minOccurs="0"/>
-        <xs:element ref="tns:vpls-pes" minOccurs="0"/>
-        <xs:element ref="tns:multicast-configurations" minOccurs="0"/>
-        <xs:element ref="tns:vces" minOccurs="0"/>
-        <xs:element ref="tns:vpes" minOccurs="0"/>
-        <xs:element ref="tns:vnfcs" minOccurs="0"/>
-        <xs:element ref="tns:l3-networks" minOccurs="0"/>
-        <xs:element ref="tns:network-policies" minOccurs="0"/>
-        <xs:element ref="tns:generic-vnfs" minOccurs="0"/>
-        <xs:element ref="tns:lag-links" minOccurs="0"/>
-        <xs:element ref="tns:newvces" minOccurs="0"/>
-        <xs:element ref="tns:pnfs" minOccurs="0"/>
-        <xs:element ref="tns:physical-links" minOccurs="0"/>
-        <xs:element ref="tns:ipsec-configurations" minOccurs="0"/>
-        <xs:element ref="tns:route-table-references" minOccurs="0"/>
-        <xs:element ref="tns:instance-groups" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="reserved-prop-names">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Internal map to define some reserved properties of a vertex",uniqueProps="aai-unique-key",indexedProps="aai-unique-key,source-of-truth,aai-node-type")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="last-mod-source-of-truth" type="xs:string" minOccurs="0"/>
-        <xs:element name="aai-node-type" type="xs:string" minOccurs="0"/>
-        <xs:element name="aai-created-ts" type="xs:unsignedInt" minOccurs="0"/>
-        <xs:element name="aai-unique-key" type="xs:string" minOccurs="0"/>
-        <xs:element name="aai-last-mod-ts" type="xs:unsignedInt" minOccurs="0"/>
-        <xs:element name="source-of-truth" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="edge-prop-names">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Internal map to define the properties of an edge and interpret the map EdgeRules",edgeInfo="edgeLabel,direction,multiplicityRule,isParent,usesResource,hasDelTarget,SVC-INFRA,SVC-INFRA-REV")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="edgeLabel" type="xs:string" minOccurs="0"/>
-        <xs:element name="direction" type="xs:string" minOccurs="0"/>
-        <xs:element name="multiplicityRule" type="xs:string" minOccurs="0"/>
-        <xs:element name="isParent" type="xs:boolean" minOccurs="0"/>
-        <xs:element name="usesResource" type="xs:boolean" minOccurs="0"/>
-        <xs:element name="hasDelTarget" type="xs:boolean" minOccurs="0"/>
-        <xs:element name="SVC-INFRA" type="xs:string" minOccurs="0"/>
-        <xs:element name="SVC-INFRA-REV" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="aai-internal">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:reserved-prop-names" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element ref="tns:edge-prop-names" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="inventory">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:search" minOccurs="0"/>
-        <xs:element ref="tns:actions" minOccurs="0"/>
-        <xs:element ref="tns:cloud-infrastructure" minOccurs="0"/>
-        <xs:element ref="tns:license-management" minOccurs="0"/>
-        <xs:element ref="tns:business" minOccurs="0"/>
-        <xs:element ref="tns:service-design-and-creation" minOccurs="0"/>
-        <xs:element ref="tns:network" minOccurs="0"/>
-        <xs:element ref="tns:aai-internal" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="notification-event-header">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="id" type="xs:string" minOccurs="0"/>
-        <xs:element name="timestamp" type="xs:string" minOccurs="0"/>
-        <xs:element name="source-name" type="xs:string" minOccurs="0"/>
-        <xs:element name="domain" type="xs:string" minOccurs="0"/>
-        <xs:element name="sequence-number" type="xs:string" minOccurs="0"/>
-        <xs:element name="severity" type="xs:string" minOccurs="0"/>
-        <xs:element name="event-type" type="xs:string" minOccurs="0"/>
-        <xs:element name="version" type="xs:string" minOccurs="0"/>
-        <xs:element name="action" type="xs:string" minOccurs="0"/>
-        <xs:element name="entity-type" type="xs:string" minOccurs="0"/>
-        <xs:element name="top-entity-type" type="xs:string" minOccurs="0"/>
-        <xs:element name="entity-link" type="xs:string" minOccurs="0"/>
-        <xs:element name="status" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="notification-event">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="cambria.partition" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:notification-event-header" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="query-parameters">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="QueryParameters for performing a named-query or model query")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:named-query" minOccurs="0"/>
-        <xs:element ref="tns:model" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="instance-filter">
-    <xs:complexType>
-      <xs:sequence/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="instance-filters">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="InstanceFilters for performing a named-query or model query")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:instance-filter" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="model-and-named-query-search">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="ModelAndNamedQuerySearch holds query-parameters and instance-properties for performing a named-query or model query")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:query-parameters" minOccurs="0"/>
-        <xs:element ref="tns:instance-filters" minOccurs="0"/>
-        <xs:element name="top-node-type" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="properties">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Property holder for query properties or instance properties")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="property-name" type="xs:string" minOccurs="0"/>
-        <xs:element name="property-value" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="extra-properties">
-    <xs:complexType>
-      <xs:sequence/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="inventory-response-item">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Inventory item for response list",container="inventory-response-items")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="model-name" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:extra-properties" minOccurs="0"/>
-        <xs:element ref="tns:inventory-response-items" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="inventory-response-items">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Container for inventory items in response list",container="response-list")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:inventory-response-item" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="response-list">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Response container for the results of a named-query or model query")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:inventory-response-items" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="extra-property">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="property-name" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vnf">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Abstract vnf class",indexedProps="vnf-id",uniqueProps="vnf-id",inheritors="vce,vpe,generic-vnf",isAbstract="true")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="vnf-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique id of VNF.  This is unique across the graph.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
+	<xs:element name="inventory-item-data">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="property-name" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="property-value" type="xs:string"
+					minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="inventory-item">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="inventory-item-type" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="inventory-item-link" type="xs:string"
+					minOccurs="0" />
+				<xs:element ref="tns:inventory-item-data" minOccurs="0"
+					maxOccurs="unbounded" />
+				<xs:element ref="tns:tagged-inventory-item-list"
+					minOccurs="0" maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="tagged-inventory-item-list">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:inventory-item" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="edge-tag-query-result">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:tagged-inventory-item-list"
+					minOccurs="0" maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="start-node-filter">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="property-name" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="property-value" type="xs:string"
+					minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="include-node-filter">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="include-node-type" type="xs:string"
+					minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="secondary-filter">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="property-name" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="filter-type" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="property-value" type="xs:string"
+					minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="edge-tag-query-request">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="edge-tag" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="result-detail" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="start-node-type" type="xs:string"
+					minOccurs="0" />
+				<xs:element ref="tns:start-node-filter" minOccurs="0"
+					maxOccurs="unbounded" />
+				<xs:element ref="tns:include-node-filter" minOccurs="0"
+					maxOccurs="unbounded" />
+				<xs:element ref="tns:secondary-filter" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="result-data">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="resource-type" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The
+								specific type of node in the A&amp;AI graph")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-link" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The
+								URL to the specific resource")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="search-results">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:result-data" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="relationship-data">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="relationship-key" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="A
+								keyword provided by A&amp;AI to indicate an attribute.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="relationship-value" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Value
+								of the attribute.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="related-to-property">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="property-key" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Key
+								part of a key/value pair")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="property-value" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Value
+								part of a key/value pair")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="relationship">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="related-to" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="A
+								keyword provided by A&amp;AI to indicate type of node.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="related-link" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL
+								to the object in A&amp;AI.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-data" minOccurs="0"
+					maxOccurs="unbounded" />
+				<xs:element ref="tns:related-to-property" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="relationship-list">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:relationship" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="oam-network">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="OAM
+						network, to be deprecated shortly. Do not use for new purposes.
+						",nameProps="network-name",indexedProps="cvlan-tag,network-uuid,network-name",dependentOn="cloud-region",container="oam-networks")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="network-uuid" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="UUID
+								of the network. Unique across a cloud-region")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="network-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name
+								of the network.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="cvlan-tag" type="xs:unsignedInt">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="cvlan-id")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipv4-oam-gateway-address"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for VNF firewall rule so customer cannot send customer traffic
+								over this oam network")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipv4-oam-gateway-address-prefix-length"
+					type="xs:int" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for VNF firewall rule so customer cannot send customer traffic
+								over this oam network")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="oam-networks">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of OAM networks, to be deprecated shortly. Do not use for new
+						purposes. ")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:oam-network" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="dvs-switch">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Digital
+						virtual switch metadata, used by SDN-C to configure VCEs. A&amp;AI
+						needs to receive this data from the PO deployment team and
+						administer it using the provisioningTool.sh into A&amp;AI.
+						",indexedProps="vcenter-url,switch-name",dependentOn="cloud-region",container="dvs-switches")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="switch-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="DVS
+								switch name")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vcenter-url" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL
+								used to reach the vcenter")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="dvs-switches">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of digital virtual switch metadata used for vmWare VCEs and
+						VPEs.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:dvs-switch" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="availability-zone">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Availability
+						zone, a collection of compute
+						hosts/pservers",indexedProps="availability-zone-name",dependentOn="cloud-region",container="availability-zones")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="availability-zone-name"
+					type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Name
+								of the availability zone. Unique across a cloud region")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="hypervisor-type" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Type
+								of hypervisor. Source of truth should define valid values.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="operational-state" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="State
+								that indicates whether the availability zone should be used,
+								etc. Source of truth should define valid values.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="az-and-dvs-switches">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:dvs-switches" minOccurs="0" />
+				<xs:element ref="tns:availability-zone" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="sdn-zone-response">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:oam-networks" minOccurs="0" />
+				<xs:element ref="tns:az-and-dvs-switches" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="search">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:edge-tag-query-result" minOccurs="0" />
+				<xs:element ref="tns:edge-tag-query-request"
+					minOccurs="0" />
+				<xs:element ref="tns:search-results" minOccurs="0" />
+				<xs:element ref="tns:sdn-zone-response" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="update-node-key">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="key-name" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="key-value" type="xs:string"
+					minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="action-data">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="property-name" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="property-value" type="xs:string"
+					minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="action">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="action-type" type="xs:string"
+					minOccurs="0" />
+				<xs:element ref="tns:action-data" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="update">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Serves
+						a PATCH like function. Does not enforce concurrency control. Clear
+						each usage with AAI team.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="update-node-type" type="xs:string" />
+				<xs:element ref="tns:update-node-key" minOccurs="0"
+					maxOccurs="unbounded" />
+				<xs:element name="update-node-uri" type="xs:string"
+					minOccurs="0" />
+				<xs:element ref="tns:action" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="key-data">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="key-name" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="key-value" type="xs:string"
+					minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="notify">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="event-id" type="xs:string" />
+				<xs:element name="node-type" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="event-trigger" type="xs:string"
+					minOccurs="0" />
+				<xs:element ref="tns:key-data" minOccurs="0"
+					maxOccurs="unbounded" />
+				<xs:element name="selflink" type="xs:string"
+					minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="actions">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="APIs
+						that are more action related than REST (e.g., notify, update).")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:update" minOccurs="0" />
+				<xs:element ref="tns:notify" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="ctag-pool">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="A
+						collection of C tags (vlan tags) grouped for a specific
+						purpose.",indexedProps="availability-zone-name",dependentOn="complex",container="ctag-pools")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="target-pe" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="The
+								Target provider edge router")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="availability-zone-name"
+					type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Name
+								of the availability zone")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ctag-pool-purpose" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Describes
+								what the intended purpose of this pool is.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ctag-values" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Comma
+								separated list of ctags")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="ctag-pools">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:ctag-pool" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="complex">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of physical locations that can house
+						cloud-regions.",indexedProps="identity-url,data-center-code,complex-name,physical-location-id",searchable="physical-location-id,data-center-code,complex-name,street1,street2,postal-code",uniqueProps="physical-location-id",container="complexes",namespace="cloud-infrastructure")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="physical-location-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique
+								identifier for physical location, e.g., CLLI")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="data-center-code" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Data
+								center code which can be an alternate way to identify a
+								complex")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="complex-name" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Gamma
+								complex name for LCP instance.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="identity-url" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL
+								of the keystone identity service")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="physical-location-type"
+					type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Type,
+								e.g., central office, data center.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="street1" type="xs:string" />
+				<xs:element name="street2" type="xs:string" minOccurs="0" />
+				<xs:element name="city" type="xs:string" />
+				<xs:element name="state" type="xs:string" minOccurs="0" />
+				<xs:element name="postal-code" type="xs:string" />
+				<xs:element name="country" type="xs:string" />
+				<xs:element name="region" type="xs:string" />
+				<xs:element name="latitude" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="longitude" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="elevation" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="lata" type="xs:string" minOccurs="0" />
+				<xs:element ref="tns:ctag-pools" minOccurs="0" />
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="complexes">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of physical locations that can house cloud-regions.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:complex" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="volume-group">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Persistent
+						block-level
+						storage.",indexedProps="volume-group-name,vnf-type,heat-stack-id,volume-group-id",searchable="volume-group-name",dependentOn="cloud-region",container="volume-groups")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="volume-group-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique
+								ID of volume-group.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="volume-group-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name
+								of the volume group.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="heat-stack-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Heat
+								stack id corresponding to this volume-group")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vnf-type" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="String
+								capturing type of vnf, that was intended to identify the ASDC
+								resource. This field has been overloaded and clients should
+								expect changes to occur in the future to this field as ASDC
+								matures.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="orchestration-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Orchestration
+								status of this volume-group")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="persona-model-customization-id"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="captures
+								the id of all the configuration used to customize the resource
+								for the service.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="volume-groups">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of persistent block-level storage.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:volume-group" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="volume">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Ephemeral
+						Block storage
+						volume.",indexedProps="volume-id",dependentOn="vserver",container="volumes")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="volume-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique
+								ID of block storage volume relative to the vserver.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="volume-selflink" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL
+								to endpoint where AAI can get more details")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="volumes">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of ephemeral Block storage volumes.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:volume" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="l3-interface-ipv4-address-list">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="IPv4
+						Address
+						Range",indexedProps="l3-interface-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="vlan,l-interface")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="l3-interface-ipv4-address"
+					type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="IP
+								address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="l3-interface-ipv4-prefix-length"
+					type="xs:unsignedInt" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Prefix
+								length, 32 for single address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vlan-id-inner" type="xs:unsignedInt"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Inner
+								VLAN tag")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vlan-id-outer" type="xs:unsignedInt"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Outer
+								VLAN tag")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="is-floating" type="xs:boolean"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicator
+								of fixed or floating address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="neutron-network-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Neutron
+								network id of the interface that address belongs to")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="neutron-subnet-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Neutron
+								id of subnet that address belongs to")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="l3-interface-ipv6-address-list">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="IPv6
+						Address
+						Range",indexedProps="l3-interface-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="vlan,l-interface")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="l3-interface-ipv6-address"
+					type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="IP
+								address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="l3-interface-ipv6-prefix-length"
+					type="xs:unsignedInt" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Prefix
+								length, 128 for single address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vlan-id-inner" type="xs:unsignedInt"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Inner
+								VLAN tag")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vlan-id-outer" type="xs:unsignedInt"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Outer
+								VLAN tag")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="is-floating" type="xs:boolean"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicator
+								of fixed or floating address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="neutron-network-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Neutron
+								network id of the interface that address belongs to")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="neutron-subnet-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Neutron
+								id of subnet that address belongs to")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vlan">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Definition
+						of
+						vlan",indexedProps="vlan-interface,vlan-id-inner,vpn-id",uniqueProps="vpn-id",dependentOn="l-interface",container="vlans")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="vlan-interface" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="String
+								that identifies the interface")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vlan-id-inner" type="xs:unsignedInt"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Inner
+								VLAN tag")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vlan-id-outer" type="xs:unsignedInt"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Outer
+								VLAN tag")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="speed-value" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Captures
+								the numeric part of the speed")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="speed-units" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Captures
+								the units corresponding to the speed")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vlan-description" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								to describe (the service associated with) the vlan")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="backdoor-connection" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Whether
+								customer is going to use this VLAN for backdoor connection to
+								another customer premise device.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vpn-id" type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This
+								indicates the customers VPN ID associated with this vlan")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+				<xs:element ref="tns:l3-interface-ipv4-address-list"
+					minOccurs="0" maxOccurs="unbounded" />
+				<xs:element ref="tns:l3-interface-ipv6-address-list"
+					minOccurs="0" maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vlans">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:vlan" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="sriov-vf">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="SR-IOV
+						Virtual Function (not to be confused with virtual network
+						function)",indexedProps="pci-id,vf-vlan-filter,vf-mac-filter,vf-vlan-strip,neutron-network-id",dependentOn="l-interface",container="sriov-vfs")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="pci-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="PCI
+								ID used to identify the sriov-vf")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vf-vlan-filter" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This
+								metadata provides option to specify list of VLAN filters applied
+								on VF to pass the traffic to VM.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vf-mac-filter" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="When
+								MAC filters are specified, VF-agent service configures VFs to do
+								MAC level filtering before the traffic is passed to VM.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vf-vlan-strip" type="xs:boolean"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="When
+								this field is set to true, VF will configured to strip the outer
+								TAG before the traffic is passed to VM.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vf-vlan-anti-spoof-check"
+					type="xs:boolean" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This
+								option ensures anti VLAN spoof checks are done at the VF level
+								to comply with security. The disable check will also be honored
+								per the VNF needs for trusted VMs.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vf-mac-anti-spoof-check"
+					type="xs:boolean" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This
+								option ensures anti MAC spoof checks are done at the VF level to
+								comply with security. The disable check will also be honored per
+								the VNF needs for trusted VMs.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vf-mirrors" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This
+								option defines the set of Mirror objects which essentially
+								mirrors the traffic from source to set of collector VNF Ports.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vf-broadcast-allow" type="xs:boolean"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This
+								option, if set to true, sets the VF in promiscuous mode and
+								allows all broadcast traffic to reach the VM")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vf-unknown-multicast-allow"
+					type="xs:boolean" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This
+								option, if set to true, sets the VF in promiscuous mode and
+								allows unknown multicast traffic to reach the VM")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vf-unknown-unicast-allow"
+					type="xs:boolean" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This
+								option, if set to true, sets the VF in promiscuous mode and
+								allows unknown unicast traffic to reach the VM")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vf-insert-stag" type="xs:boolean"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This
+								option, if set to true, instructs to insert outer tag after
+								traffic comes out of VM.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vf-link-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This
+								option is used to set the link status. Valid values as of 1607
+								are on, off, and auto.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="neutron-network-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Neutron
+								network id of the interface")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="sriov-vfs">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of SR-IOV Virtual Functions.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:sriov-vf" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="l-interface">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Logical
+						interfaces, e.g., a
+						vnic.",indexedProps="macaddr,interface-id,interface-name,network-name",dependentOn="generic-vnf,newvce,vpe,p-interface,vserver,lag-interface",container="l-interfaces")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="interface-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Name
+								given to the interface")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="interface-role" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="E.g.,
+								CUSTOMER, UPLINK, etc.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="v6-wan-link-ip" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Questionably
+								placed - v6 ip addr of this interface (is in vr-lan-interface
+								from Mary B.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="selflink" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL
+								to endpoint where AAI can get more details")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="interface-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="ID
+								of interface")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="macaddr" type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="MAC
+								address for the interface")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="network-name" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name
+								of the network")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="management-option" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Whether
+								A&amp;AI should be managing this interface of not. Could have
+								value like CUSTOMER")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="interface-description" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Human
+								friendly text regarding this interface.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:vlans" minOccurs="0" />
+				<xs:element ref="tns:sriov-vfs" minOccurs="0" />
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+				<xs:element ref="tns:l3-interface-ipv4-address-list"
+					minOccurs="0" maxOccurs="unbounded" />
+				<xs:element ref="tns:l3-interface-ipv6-address-list"
+					minOccurs="0" maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="l-interfaces">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of logical interfaces.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:l-interface" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vserver">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Virtual
+						Servers, aka virtual machine or
+						VM.",nameProps="vserver-name",indexedProps="is-closed-loop-disabled,prov-status,vserver-name,vserver-id,in-maint,vserver-name2",searchable="vserver-name,vserver-id,vserver-name2",dependentOn="tenant",container="vservers")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="vserver-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique
+								identifier for this vserver relative to its tenant")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vserver-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name
+								of vserver")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vserver-name2" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Alternative
+								name of vserver")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="prov-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Trigger
+								for operational monitoring of this resource by Service Assurance
+								systems.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vserver-selflink" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL
+								to endpoint where AAI can get more details")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="in-maint" type="xs:boolean">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="Used
+								to indicate whether or not this object is in maintenance mode
+								(maintenance mode = true). This field (in conjunction with
+								prov-status) is used to suppress alarms and vSCL on VNFs/VMs.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="is-closed-loop-disabled"
+					type="xs:boolean">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="Used
+								to indicate whether closed loop function is enabled on this
+								node")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:volumes" minOccurs="0" />
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+				<xs:element ref="tns:l-interfaces" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vservers">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of virtual Servers, aka virtual machines or VMs.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:vserver" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="tenant">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Openstack
+						tenant",nameProps="tenant-name",indexedProps="tenant-name,tenant-id",searchable="tenant-name,tenant-id",dependentOn="cloud-region",container="tenants")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="tenant-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique
+								id relative to the cloud-region.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="tenant-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Readable
+								name of tenant")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:vservers" minOccurs="0" />
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="tenants">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of openstack tenants.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:tenant" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="flavor">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Openstack
+						flavor.",nameProps="flavor-name",indexedProps="flavor-name,flavor-id",dependentOn="cloud-region",container="flavors")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="flavor-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Flavor
+								id, expected to be unique across cloud-region.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="flavor-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Flavor
+								name")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="flavor-vcpus" type="xs:int"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Number
+								of CPUs")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="flavor-ram" type="xs:int" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Amount
+								of memory")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="flavor-disk" type="xs:int"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Disk
+								space")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="flavor-ephemeral" type="xs:int"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Amount
+								of ephemeral disk space")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="flavor-swap" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="amount
+								of swap space allocation")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="flavor-is-public" type="xs:boolean"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="whether
+								flavor is available to all users or private to the tenant it was
+								created in.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="flavor-selflink" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL
+								to endpoint where AAI can get more details")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="flavor-disabled" type="xs:boolean"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Boolean
+								as to whether this flavor is no longer enabled")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="flavors">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of openstack flavors.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:flavor" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="group-assignment">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Openstack
+						group-assignment used to store exclusivity groups
+						(EG).",nameProps="group-name",indexedProps="group-id,group-type,group-name",dependentOn="cloud-region",container="group-assignments")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="group-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Group
+								id, expected to be unique across cloud-region.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="group-type" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Group
+								type - the type of group this instance refers to")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="group-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Group
+								name - name assigned to the group")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="group-description" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Group
+								description - description of the group")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="group-assignments">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of openstack group assignments")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:group-assignment" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="snapshot">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Openstack
+						snapshot",nameProps="snapshot-name",uniqueProps="snapshot-id",indexedProps="application,snapshot-name,application-vendor,snapshot-id,application-version,prev-snapshot-id",dependentOn="cloud-region",container="snapshots")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="snapshot-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Snapshot
+								id, this is the key UUID assoc associated in glance with the
+								snapshots.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="snapshot-name" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Snapshot
+								name")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="snapshot-architecture" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Operating
+								system architecture")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="snapshot-os-distro" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The
+								common name of the operating system distribution in lowercase")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="snapshot-os-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The
+								operating system version as specified by the distributor.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="application" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The
+								application that the image instantiates.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="application-vendor" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The
+								vendor of the application.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="application-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The
+								version of the application.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="snapshot-selflink" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL
+								to endpoint where AAI can get more details")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="prev-snapshot-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This
+								field contains the UUID of the previous snapshot (if any).")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="snapshots">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of openstack snapshots")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:snapshot" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="metadatum">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Key/value
+						pairs",indexedProps="metaname",dependentOn="tenant,image,service-instance,connector,model",container="metadata")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="metaname" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true)</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="metaval" type="xs:string" />
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="metadata">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of metadatum (key/value pairs)")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:metadatum" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="image">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Openstack
+						image.",nameProps="image-name",indexedProps="application,image-name,application-vendor,image-id,application-version",dependentOn="cloud-region",container="images")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="image-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Image
+								id, expected to be unique across cloud region")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="image-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Image
+								name")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="image-architecture" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Operating
+								system architecture.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="image-os-distro" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The
+								common name of the operating system distribution in lowercase")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="image-os-version" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The
+								operating system version as specified by the distributor.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="application" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The
+								application that the image instantiates.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="application-vendor" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The
+								vendor of the application.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="application-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The
+								version of the application.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="image-selflink" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL
+								to endpoint where AAI can get more details")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+				<xs:element ref="tns:metadata" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="images">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collectio
+						of Openstack images.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:image" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="availability-zones">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of availability zones")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:availability-zone" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="cloud-region">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="cloud-region
+						designates an installation of a cloud cluster or region or
+						instantiation. In AT&amp;Ts OPENECOMP cloud, this could be an LCP
+						or DCP. Cloud regions are uniquely identified by a composite key,
+						cloud-owner + cloud-region-id. The format of the cloud-owner is
+						vendor-cloudname and we will use OPENECOMP for AT&amp;T's
+						OPENECOMP.",indexedProps="cloud-owner,cloud-region-id,cloud-type,owner-defined-type",nameProps="owner-defined-type",container="cloud-regions",namespace="cloud-infrastructure")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="cloud-owner" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Identifies
+								the vendor and cloud name, e.g., OPENECOMP. First part of
+								composite key should be formatted as vendor-cloudname")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="cloud-region-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Identifier
+								used by the vendor for the region. Second part of composite
+								key")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="cloud-type" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Type
+								of the cloud (e.g., openstack)")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="owner-defined-type" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Cloud-owner
+								defined type indicator (e.g., DCP, LCP)")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="cloud-region-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Software
+								version employed at the site")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="identity-url" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL
+								of the keystone identity service")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="cloud-zone" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Zone
+								where the cloud is homed")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="complex-name" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="complex
+								name for cloud-region instance")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:volume-groups" minOccurs="0" />
+				<xs:element ref="tns:tenants" minOccurs="0" />
+				<xs:element ref="tns:flavors" minOccurs="0" />
+				<xs:element ref="tns:group-assignments" minOccurs="0" />
+				<xs:element ref="tns:snapshots" minOccurs="0" />
+				<xs:element ref="tns:images" minOccurs="0" />
+				<xs:element ref="tns:dvs-switches" minOccurs="0" />
+				<xs:element ref="tns:oam-networks" minOccurs="0" />
+				<xs:element ref="tns:availability-zones" minOccurs="0" />
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="cloud-regions">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(maximumDepth="0")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:cloud-region" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="network-profile">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Network
+						profile populated by SDN-GP for
+						SNMP",indexedProps="nm-profile-name",container="network-profiles",namespace="cloud-infrastructure")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="nm-profile-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique
+								name of network profile.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="community-string" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Encrypted
+								SNMP community string")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="network-profiles">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of network profiles")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:network-profile" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="p-interface">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Physical
+						interface (e.g.,
+						nic)",indexedProps="interface-name,prov-status",nameProps="prov-status",dependentOn="vpls-pe,pserver,pnf",container="p-interfaces")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="interface-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Name
+								that identifies the physical interface")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="speed-value" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Captures
+								the numeric part of the speed")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="speed-units" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Captures
+								the units corresponding to the speed")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="port-description" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Nature
+								of the services and connectivity on this port.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="equipment-identifier" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="CLEI
+								or other specification for p-interface hardware.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="interface-role" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Role
+								specification for p-interface hardware.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="interface-type" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicates
+								the physical properties of the interface.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="prov-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Trigger
+								for operational monitoring of this resource by Service Assurance
+								systems.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+				<xs:element ref="tns:l-interfaces" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="p-interfaces">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of physical interfaces.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:p-interface" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="lag-interface">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Link
+						aggregate
+						interface",indexedProps="interface-name,interface-id,interface-role",dependentOn="generic-vnf,pserver,vpe,vpls-pe,pnf",container="lag-interfaces")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="interface-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Name
+								that identifies the link aggregate interface")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="speed-value" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Captures
+								the numeric part of the speed")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="speed-units" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Captures
+								the units corresponding to the speed")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="interface-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="ID
+								of interface")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="interface-role" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Role
+								assigned to this Interface, should use values as defined in
+								OPENECOMP Yang
+								models.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="prov-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Trigger
+								for operational monitoring of this resource by Service Assurance
+								systems.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+				<xs:element ref="tns:l-interfaces" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="lag-interfaces">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of link aggregate interfaces.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:lag-interface" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="pserver">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Compute
+						host whose hostname must be unique and must exactly match what is
+						sent as a relationship to a
+						vserver.",nameProps="pserver-name2",indexedProps="hostname,in-maint,pserver-id,pserver-name2,inv-status",searchable="hostname,pserver-name2,pserver-id,ipv4-oam-address",container="pservers",namespace="cloud-infrastructure")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="hostname" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Value
+								from executing hostname on the compute node.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ptnii-equip-name" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="PTNII
+								name")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="number-of-cpus" type="xs:int"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Number
+								of cpus")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="disk-in-gigabytes" type="xs:int"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Disk
+								size, in GBs")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ram-in-megabytes" type="xs:int"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="RAM
+								size, in MBs")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="equip-type" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Equipment
+								type. Source of truth should define valid values.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="equip-vendor" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Equipment
+								vendor. Source of truth should define valid values.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="equip-model" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Equipment
+								model. Source of truth should define valid values.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="fqdn" type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Fully-qualified
+								domain name")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="pserver-selflink" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL
+								to endpoint where AAI can get more details")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipv4-oam-address" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								to configure device, also used for troubleshooting and is IP
+								used for traps generated by device.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="serial-number" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Serial
+								number, may be queried")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipaddress-v4-loopback-0"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="IPV4
+								Loopback 0 address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipaddress-v6-loopback-0"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="IPV6
+								Loopback 0 address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipaddress-v4-aim" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="IPV4
+								AIM address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipaddress-v6-aim" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="IPV6
+								AIM address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipaddress-v6-oam" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="IPV6
+								OAM address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="inv-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="CANOPI's
+								inventory status. Only set with values exactly as defined by
+								CANOPI.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="pserver-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="ID
+								of Pserver")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="internet-topology" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="internet
+								topology of Pserver")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="in-maint" type="xs:boolean">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="used
+								to indicate whether or not this object is in maintenance mode
+								(maintenance mode = true). This field (in conjunction with
+								prov-status) is used to suppress alarms and vSCL on VNFs/VMs.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="pserver-name2" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="alternative
+								pserver name")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="purpose" type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="purpose
+								of pserver")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+				<xs:element ref="tns:p-interfaces" minOccurs="0" />
+				<xs:element ref="tns:lag-interfaces" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="pservers">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of compute hosts.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:pserver" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="virtual-data-center">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Virtual
+						organization of cloud infrastructure elements in a data center
+						context",nameProps="vdc-name",indexedProps="vdc-name,vdc-id",container="virtual-data-centers",namespace="cloud-infrastructure")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="vdc-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique
+								ID of the vdc")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vdc-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name
+								of the virtual data center")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="virtual-data-centers">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Virtual
+						organization of cloud infrastructure elements in a data center
+						context")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:virtual-data-center" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="cloud-infrastructure">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Namespace
+						for cloud infrastructure.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:complexes" minOccurs="0" />
+				<xs:element ref="tns:cloud-regions" minOccurs="0" />
+				<xs:element ref="tns:network-profiles" minOccurs="0" />
+				<xs:element ref="tns:pservers" minOccurs="0" />
+				<xs:element ref="tns:virtual-data-centers" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="license-key-resource">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata
+						(nameProps="name",indexedProps="assignment-group-uuid,openecomp-uuid,name",uniqueProps="openecomp-uuid",container="license-key-resources",namespace="license-management")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="att-uuid" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true)</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="assignment-type" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="assignment-status" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="assignment-group-uuid" type="xs:string" />
+				<xs:element name="assignment-date" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="name" type="xs:string" minOccurs="0" />
+				<xs:element name="model-uuid" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="model-version" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="license-key" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="license-key-file-url" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="supplier-release-list" type="xs:string"
+					minOccurs="0" maxOccurs="unbounded" />
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="license-key-resources">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:license-key-resource" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="license-management">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:license-key-resources" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="connector">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of resource instances used to connect a variety of disparate
+						inventory
+						widgets",indexedProps="resource-instance-id,persona-model-id,persona-model-version,widget-model-id,widget-model-version",container="connectors",namespace="business")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="resource-instance-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique
+								id of resource instance.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="persona-model-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC model id for this resource or service model.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="persona-model-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC model version for this resource or service model.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="widget-model-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC data dictionary widget model. This maps directly to the
+								A&amp;AI widget.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="widget-model-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC data dictionary version of the widget model.This maps
+								directly to the A&amp;AI version of the widget.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+				<xs:element ref="tns:metadata" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="connectors">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of resource instances used to connect a variety of disparate
+						inventory widgets")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:connector" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="tunnel-xconnect">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Represents
+						the specifics of a tunnel cross connect piece of a resource that
+						gets separately
+						allotted",uniqueProps="id",indexedProps="id",dependentOn="allotted-resource",container="tunnel-xconnects")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Allotted
+								Resource id UUID assigned to this instance.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="bandwidth-up-wan1" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The
+								WAN uplink bandwidth for WAN1")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="bandwidth-down-wan1" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The
+								WAN downlink bandwidth for WAN1")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="bandwidth-up-wan2" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The
+								WAN uplink bandwidth for WAN2")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="bandwidth-down-wan2" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The
+								WAN downlink bandwidth for WAN2")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Concurrency
+								value")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="tunnel-xconnects">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="This
+						object is used to store the specific tunnel cross connect aspects
+						of an allotted resource")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:tunnel-xconnect" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="allotted-resource">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Represents
+						a slice or partial piece of a resource that gets separately
+						allotted",nameProps="description",uniqueProps="id",indexedProps="id,persona-model-id,persona-model-version",dependentOn="service-instance",container="allotted-resources")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Allotted
+								Resource id UUID assigned to this instance.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="description" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The
+								descriptive information assigned to this allotted resource
+								instance")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="selflink" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Link
+								back to more information in the controller")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="persona-model-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC model id for this resource or service model.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="persona-model-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC model version for this resource or service model.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Concurrency
+								value")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:tunnel-xconnects" minOccurs="0" />
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="allotted-resources">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="This
+						object is used to store slices of services being offered")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:allotted-resource" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="service-instance">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Instance
+						of a
+						service",indexedProps="service-instance-id,persona-model-id,persona-model-version,widget-model-id,widget-model-version,service-instance-name,service-instance-location-id",nameProps="service-instance-name",searchable="service-instance-id,service-instance-name",uniqueProps="service-instance-id",dependentOn="service-subscription",container="service-instances")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="service-instance-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Uniquely
+								identifies this instance of a service")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="service-instance-name" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This
+								field will store a name assigned to the service-instance.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="persona-model-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC model id for this resource or service model.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="persona-model-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC model version for this resource or service model.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="widget-model-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC data dictionary widget model. This maps directly to the
+								A&amp;AI widget.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="widget-model-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC data dictionary version of the widget model.This maps
+								directly to the A&amp;AI version of the widget.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="bandwidth-total" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicates
+								the total bandwidth to be used for this service.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="bandwidth-up-wan1" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="indicates
+								the upstream bandwidth this service will use on the WAN1 port of
+								the physical device.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="bandwidth-down-wan1" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="indicates
+								the downstream bandwidth this service will use on the WAN1 port
+								of the physical device.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="bandwidth-up-wan2" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="indicates
+								the upstream bandwidth this service will use on the WAN2 port of
+								the physical device.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="bandwidth-down-wan2" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="indicates
+								the downstream bandwidth this service will use on the WAN2 port
+								of the physical device.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vhn-portal-url" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL
+								customers will use to access the vHN Portal.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="operational-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Operational
+								status of the service-instance.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="service-instance-location-id"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="An
+								identifier that customers assign to the location where this
+								service is being used.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+				<xs:element ref="tns:metadata" minOccurs="0" />
+				<xs:element ref="tns:allotted-resources" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="service-instances">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of service instances")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:service-instance" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="service-subscription">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Object
+						that group service
+						instances.",indexedProps="service-type",dependentOn="customer",container="service-subscriptions")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="service-type" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Value
+								defined by orchestration to identify this service across
+								OPENECOMP.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="temp-ub-sub-account-id"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This
+								property will be deleted from A&amp;AI in the near future. Only
+								stop gap solution.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:service-instances" minOccurs="0" />
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="service-subscriptions">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of objects that group service instances.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:service-subscription" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="customer">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="customer
+						identifiers to provide linkage back to BSS
+						information.",nameProps="subscriber-name",indexedProps="subscriber-name,global-customer-id,subscriber-type",searchable="subscriber-name,global-customer-id",uniqueProps="global-customer-id,subscriber-name",alternateKeys1="subscriber-name",container="customers",namespace="business")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="global-customer-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Global
+								customer id used across OPENECOMP to uniquely identify
+								customer.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="subscriber-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Subscriber
+								name, an alternate way to retrieve a customer.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="subscriber-type" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Subscriber
+								type, a way to provide VID with only the INFRA
+								customers.",defaultValue="CUST")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:service-subscriptions" minOccurs="0" />
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="customers">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of customer identifiers to provide linkage back to BSS
+						information.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:customer" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="business">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Namespace
+						for business related constructs")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:connectors" minOccurs="0" />
+				<xs:element ref="tns:customers" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vnf-image">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Image
+						object that pertain to a VNF that doesn't have associated
+						vservers. This is a
+						kludge.",indexedProps="application,openecomp-uuid,application-vendor,application-version",uniqueProps="openecomp-uuid",container="vnf-images",namespace="service-design-and-creation")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="att-uuid" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique
+								ID of this asset")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="application" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The
+								application that the image instantiates.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="application-vendor" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The
+								vendor of the application.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="application-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The
+								version of the application.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="selflink" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL
+								to endpoint where AAI can get more details")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vnf-images">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of image objects that pertain to a VNF that doesn't have
+						associated vservers. This is a kludge.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:vnf-image" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="service">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Stand-in
+						for service model definitions. Likely to be deprecated in favor of
+						models from
+						ASDC.",indexedProps="service-description,service-id",container="services",namespace="service-design-and-creation")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="service-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="This
+								gets defined by others to provide a unique ID for the service,
+								we accept what is sent.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="service-description" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Description
+								of the service")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="service-selflink" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL
+								to endpoint where AAI can get more details")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="service-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="service
+								version")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="services">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of service model definitions. Likely to be deprecated in favor of
+						models from ASDC.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:service" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="service-capability">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Early
+						definition of server/resource pairings, likely to be replaced by
+						models. No new use should be made of
+						this.",indexedProps="service-type,vnf-type",container="service-capabilities",namespace="service-design-and-creation")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="service-type" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="This
+								gets defined by others to provide a unique ID for the service,
+								we accept what is sent.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vnf-type" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="String
+								capturing type of vnf, that was intended to identify the ASDC
+								resource. This field has been overloaded and clients should
+								expect changes to occur in the future to this field as ASDC
+								matures.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="service-capabilities">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of service capabilities.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:service-capability" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="element-choice-set">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="This
+						is how we would capture constraints defining allowed sets of
+						elements.",uniqueProps="element-choice-set-uuid",indexedProps="element-choice-set-uuid",allowDirectRead="true",allowDirectWrite="false",container="element-choice-sets")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="element-choice-set-uuid"
+					type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="element-choice-set-name"
+					type="xs:string" />
+				<xs:element name="cardinality" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0" />
+				<xs:element ref="tns:model-elements" minOccurs="0" />
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="element-choice-sets">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:element-choice-set" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="constrained-element-set">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="This
+						is how we would capture constraints defining allowed sets of
+						elements.",uniqueProps="constrained-element-set-uuid",indexedProps="constrained-element-set-uuid",allowDirectRead="true",allowDirectWrite="false",container="constrained-element-sets")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="constrained-element-set-uuid"
+					type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="constraint-type" type="xs:string" />
+				<xs:element name="check-type" type="xs:string" />
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0" />
+				<xs:element ref="tns:element-choice-sets" minOccurs="0" />
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="constrained-element-sets">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:constrained-element-set"
+					minOccurs="0" maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="model-constraint">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="This
+						is how we would capture constraints defining allowed sets of
+						elements.",uniqueProps="model-constraint-uuid",indexedProps="model-constraint-uuid",allowDirectRead="true",allowDirectWrite="false",container="model-constraints")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="model-constraint-uuid" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element
+					name="constrained-element-set-uuid-to-replace" type="xs:string" />
+				<xs:element ref="tns:constrained-element-sets"
+					minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="model-constraints">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:model-constraint" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="model-element">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Defines
+						how other models combine to make up a higher-level
+						model.",uniqueProps="model-element-uuid",indexedProps="model-element-uuid",allowDirectRead="true",allowDirectWrite="false",container="model-elements")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="model-element-uuid" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="new-data-del-flag" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicates
+								whether this element was created as part of instantiation from
+								this model")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="cardinality" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="How
+								many of this type of element are required/allowed")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="linkage-points" minOccurs="0">
+					<xs:complexType>
+						<xs:annotation>
+							<xs:appinfo>
+								<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Defines
+									how other models combine to make up a higher-level
+									model.",uniqueProps="model-element-uuid",indexedProps="model-element-uuid",allowDirectRead="true",allowDirectWrite="false",container="model-elements")</annox:annotate>
+							</xs:appinfo>
+						</xs:annotation>
+						<xs:sequence>
+							<xs:element name="linkage-point" type="xs:string"
+								minOccurs="0" maxOccurs="unbounded" />
+						</xs:sequence>
+					</xs:complexType>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:model-elements" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Defines
+								how other models combine to make up a higher-level model")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:model-constraints" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Describes
+								new constraints on this model element that are not part of that
+								model's definition")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="model-elements">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:model-element" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="model-ver">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Subgraph
+						definition provided by ASDC to describe a specific version of an
+						inventory asset and its connections related to ASDC
+						models",nameProps="model-name",indexedProps="model-version-id,model-name,model-version",uniqueProps="model-version-id",container="model-vers",namespace="service-design-and-creation")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="model-version-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique
+								identifier corresponding to one version of a model in ASDC")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="model-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name
+								of the model, which can change from version to version.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="model-version" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Version")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="model-description" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Description")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:model-elements" minOccurs="0" />
+				<xs:element ref="tns:metadata" minOccurs="0" />
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="model-vers">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:model-ver" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="model">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Subgraph
+						definition provided by ASDC to describe an inventory asset and its
+						connections related to ASDC models, independent of
+						version",nameProps="model-type",indexedProps="model-invariant-id,model-type",uniqueProps="model-invariant-id",container="models",namespace="service-design-and-creation")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="model-invariant-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique
+								identifier corresponding to the main definition of a model in
+								ASDC")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="model-type" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Type
+								of the model, e.g., service, resource, widget, etc.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:model-vers" minOccurs="0" />
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="models">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of subgraph definitions provided by ASDC to describe the inventory
+						assets and their connections related to ASDC models")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:model" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="related-lookup">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="TBD",uniqueProps="related-lookup-uuid",indexedProps="related-lookup-uuid",allowDirectRead="true",allowDirectWrite="false",container="related-lookups")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="related-lookup-uuid" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="source-node-type" type="xs:string" />
+				<xs:element name="source-node-property" type="xs:string" />
+				<xs:element name="target-node-type" type="xs:string" />
+				<xs:element name="target-node-property" type="xs:string" />
+				<xs:element name="property-collect-list" type="xs:string"
+					minOccurs="0" maxOccurs="unbounded" />
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0" />
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="related-lookups">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:related-lookup" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="property-constraint">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="TBD",uniqueProps="property-constraint-uuid",indexedProps="property-constraint-uuid",allowDirectRead="true",allowDirectWrite="false",container="property-constraints")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="property-constraint-uuid"
+					type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="constraint-type" type="xs:string" />
+				<xs:element name="property-name" type="xs:string" />
+				<xs:element name="property-value" type="xs:string" />
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="property-constraints">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:property-constraint" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="named-query-element">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="TBD",uniqueProps="named-query-element-uuid",indexedProps="named-query-element-uuid",allowDirectRead="true",allowDirectWrite="false",container="named-query-elements")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="named-query-element-uuid"
+					type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="property-collect-list" type="xs:string"
+					minOccurs="0" maxOccurs="unbounded" />
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="property-limit-desc" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="do-not-output" type="xs:string"
+					minOccurs="0" />
+				<xs:element ref="tns:named-query-elements" minOccurs="0" />
+				<xs:element ref="tns:related-lookups" minOccurs="0" />
+				<xs:element ref="tns:property-constraints" minOccurs="0" />
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="named-query-elements">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:named-query-element" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="named-query">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="TBD",nameProps="named-query-name",uniqueProps="named-query-uuid",indexedProps="named-query-uuid,named-query-name",container="named-queries",namespace="service-design-and-creation")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="named-query-uuid" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true)</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="named-query-name" type="xs:string" />
+				<xs:element name="named-query-version" type="xs:string" />
+				<xs:element name="required-input-params" minOccurs="0">
+					<xs:complexType>
+						<xs:annotation>
+							<xs:appinfo>
+								<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="TBD",nameProps="named-query-name",uniqueProps="named-query-uuid",indexedProps="named-query-uuid,named-query-name",container="named-queries",namespace="service-design-and-creation")</annox:annotate>
+							</xs:appinfo>
+						</xs:annotation>
+						<xs:sequence>
+							<xs:element name="required-input-param"
+								type="xs:string" minOccurs="0" maxOccurs="unbounded" />
+						</xs:sequence>
+					</xs:complexType>
+				</xs:element>
+				<xs:element name="description" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0" />
+				<xs:element ref="tns:named-query-elements" minOccurs="0" />
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="named-queries">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:named-query" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="service-design-and-creation">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Namespace
+						for objects managed by ASDC")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:vnf-images" minOccurs="0" />
+				<xs:element ref="tns:services" minOccurs="0" />
+				<xs:element ref="tns:service-capabilities" minOccurs="0" />
+				<xs:element ref="tns:models" minOccurs="0" />
+				<xs:element ref="tns:named-queries" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="logical-link">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Logical
+						links generally connect l-interfaces but are used to express
+						logical connectivity between two
+						points",indexedProps="link-name,persona-model-id,persona-model-version,widget-model-id,widget-model-version,link-id,prov-status,circuit-id,purpose",uniqueProps="link-id",nameProps="prov-status,circuit-id",container="logical-links",namespace="network")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="link-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="e.g.,
+								evc-name, or
+								vnf-nameA_interface-nameA_vnf-nameZ_interface-nameZ")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="link-type" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Type
+								of logical link, e.g., evc")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="speed-value" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Captures
+								the numeric part of the speed")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="speed-units" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Captures
+								the units corresponding to the speed")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ip-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="v4,
+								v6, or ds for dual stack (should be openecomp-ip-version)")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="routing-protocol" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="For
+								example, static or BGP")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="persona-model-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC model id for this resource or service model.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="persona-model-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC model version for this resource or service model.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="widget-model-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC data dictionary widget model. This maps directly to the
+								A&amp;AI widget.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="widget-model-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC data dictionary version of the widget model.This maps
+								directly to the A&amp;AI version of the widget.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="operational-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indication
+								of operational status of the logical link.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="prov-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Trigger
+								for operational monitoring of this VNF by BAU Service Assurance
+								systems.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="link-role" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indication
+								of the network use of the logical link.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="link-name2" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Alias
+								or alternate name (CLCI or D1 name).")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="link-id" type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="UUID
+								of the logical-link, SDNC generates this.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="circuit-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Circuit
+								id")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="purpose" type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Reason
+								for this entity, role it is playing")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="logical-links">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of logical connections")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:logical-link" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="class-of-service">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(indexedProps="cos",dependentOn="site-pair",container="classes-of-service")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="cos" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="unique
+								identifier of probe")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="probe-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="identifier
+								of probe")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="probe-type" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="type
+								of probe")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="classes-of-service">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="class-of-service
+						of probe")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:class-of-service" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="site-pair">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(indexedProps="site-pair-id",uniqueProps="site-pair-id",dependentOn="routing-instance",container="site-pairs")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="site-pair-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="unique
+								identifier of probe")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="source-ip" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Prefix
+								address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="destination-ip" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Prefix
+								address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ip-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="ip
+								version, v4, v6")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="destination-hostname" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Hostname
+								of the destination equipment to which SLAs are measured
+								against.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="destination-equip-type"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The
+								type of destinatination equipment. Could be Router, UCPE, etc.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:classes-of-service" minOccurs="0" />
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="site-pairs">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="probe
+						within a set")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:site-pair" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="routing-instance">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(indexedProps="routing-instance-id",uniqueProps="routing-instance-id",dependentOn="site-pair-set",container="routing-instances")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="routing-instance-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique
+								id of routing instance")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="rpm-owner" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="rpm
+								owner")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:site-pairs" minOccurs="0" />
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="routing-instances">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="set
+						of probes related to generic-vnf routing instance")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:routing-instance" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="site-pair-set">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Set
+						of instances for probes used to measure service level
+						agreements",indexedProps="site-pair-set-id",uniqueProps="site-pair-set-id",container="site-pair-sets",namespace="network")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="site-pair-set-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique
+								id of site pair set.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:routing-instances" minOccurs="0" />
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="site-pair-sets">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of sets of instances for probes related to generic-vnf")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:site-pair-set" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vpn-binding">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="VPN
+						binding",nameProps="vpn-name,vpn-type",indexedProps="vpn-name,vpn-id,global-route-target,vpn-type",searchable="vpn-name",uniqueProps="vpn-id",container="vpn-bindings",namespace="network")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="vpn-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="VPN
+								ID, globally unique within A&amp;AI")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vpn-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="VPN
+								Name")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="global-route-target" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Number
+								used to identify a VPN, globally unique in the network")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vpn-platform" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								platform associated with the VPN example AVPN, Mobility")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vpn-type" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Type
+								of the vpn, should be taken from enumerated/valid values")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="route-distinguisher" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								to distinguish the distinct VPN routes of separate customers who
+								connect to the provider in an MPLS network.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="route-target-role" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Role
+								assigned to this route target")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="l3-networks
+								relate to vpn-bindings")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vpn-bindings">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:vpn-binding" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vpls-pe">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="VPLS
+						Provider Edge
+						routers.",indexedProps="prov-status,equipment-name",container="vpls-pes",namespace="network")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="equipment-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true)</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="prov-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Trigger
+								for operational monitoring of this VNF by BAU Service Assurance
+								systems.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipv4-oam-address" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Address
+								tail-f uses to configure vpe, also used for troubleshooting and
+								is IP used for traps generated by VPE
+								(v4-loopback0-ip-address).")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="equipment-role" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Client
+								should send valid enumerated value, e.g., VPLS-PE.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vlan-id-outer" type="xs:unsignedInt"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Temporary
+								location for stag to get to VCE")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+				<xs:element ref="tns:p-interfaces" minOccurs="0" />
+				<xs:element ref="tns:lag-interfaces" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vpls-pes">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of VPLS Provider Edge routers")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:vpls-pe" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="multicast-configuration">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(indexedProps="multicast-configuration-id",uniqueProps="multicast-configuration-id",container="multicast-configurations",namespace="network")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="multicast-configuration-id"
+					type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique
+								id of multicast configuration.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="multicast-protocol" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="protocol
+								of multicast configuration")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="rp-type" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="rp
+								type of multicast configuration")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="multicast-configurations">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="multicast
+						configuration of generic-vnf ip-address")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:multicast-configuration"
+					minOccurs="0" maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="cvlan-tag-entry">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(dependentOn="port-group",indexedProps="cvlan-tag",container="cvlan-tags")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="cvlan-tag" type="xs:unsignedInt">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="See
+								mis-na-virtualization-platform.yang")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="cvlan-tags">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:cvlan-tag-entry" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="port-group">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Used
+						to capture the network interfaces of this
+						VCE",nameProps="port-group-name",indexedProps="port-group-id,heat-stack-id,interface-id,interface-name,switch-name",dependentOn="vce",container="port-groups")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="interface-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique
+								ID of the interface")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="neutron-network-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Neutron
+								network id of this Interface")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="neutron-network-name" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Neutron
+								network name of this Interface")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="interface-role" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Role
+								assigned to this Interface, should use values as defined in
+								OPENECOMP Yang models.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="port-group-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Unique
+								ID for port group in vmware")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="port-group-name" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Likely
+								to duplicate value of neutron network name")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="switch-name" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="DVS
+								or standard switch name (should be non-null for port groups
+								associated with DVS)")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="orchestration-status" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Orchestration
+								status of this VNF, mastered by MSO")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="heat-stack-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Heat
+								stack id corresponding to this instance, managed by MSO")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="mso-catalog-key" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Corresponds
+								to the SDN-C catalog id used to configure this VCE")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:cvlan-tags" minOccurs="0" />
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="port-groups">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:port-group" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="license">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Metadata
+						for license
+						group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce,vpe",container="licenses")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="group-uuid" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique
+								ID for the license group the resource belongs to, should be
+								uuid.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-uuid" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique
+								ID of a license resource. ")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Concurrency
+								value")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="licenses">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Licenses
+						to be allocated across resources, keyed by group-uuid and
+						resource-uuid, related to license management")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:license" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="entitlement">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Metadata
+						for entitlement
+						group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce,vpe",container="entitlements")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="group-uuid" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique
+								ID for the entitlement group the resource comes from, should be
+								uuid.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-uuid" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique
+								ID of an entitlement resource. ")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Concurrency
+								value")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="entitlements">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Entitlements,
+						keyed by group-uuid and resource-uuid, related to license
+						management")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:entitlement" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vce">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Virtual
+						Customer Edge Router, used specifically for Gamma. This object is
+						deprecated.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vces",namespace="network",extendsFrom="vnf")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="vnf-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique
+								id of VNF. This is unique across the graph.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vnf-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name
+								of VNF.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vnf-name2" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Alternate
+								name of VNF.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vnf-type" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="String
+								capturing type of vnf, that was intended to identify the ASDC
+								resource. This field has been overloaded and clients should
+								expect changes to occur in the future to this field as ASDC
+								matures.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="service-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Unique
+								identifier of service from ASDC. Expect this to change as ASDC
+								matures.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="regional-resource-zone"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Regional
+								way of organizing pservers, source of truth should define
+								values")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="prov-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Trigger
+								for operational monitoring of this resource by Service Assurance
+								systems.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="operational-state" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicator
+								for whether the resource is considered operational")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="license-key" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="License
+								key")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="equipment-role" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Network
+								role being played by this VNF")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="orchestration-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Orchestration
+								status of this VNF, mastered by MSO")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="heat-stack-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Heat
+								stack id corresponding to this instance, managed by MSO")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="mso-catalog-key" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Corresponds
+								to the SDN-C catalog id used to configure this VCE")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vpe-id" type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Unique
+								ID of VPE connected to this VCE.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="v6-vce-wan-address" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Valid
+								v6 IP address for the WAN Link on this router. Implied length of
+								/64.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipv4-oam-address" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Address
+								tail-f uses to configure vce, also used for troubleshooting and
+								is IP used for traps generated by VCE.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipv4-loopback0-address"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Loopback0
+								address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="entitlement-resource-uuid"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Entitlement
+								resource uuid")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:port-groups" minOccurs="0" />
+				<xs:element ref="tns:licenses" minOccurs="0" />
+				<xs:element ref="tns:entitlements" minOccurs="0" />
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vces">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of Virtual Customer Edge Routers, used specifically for Gamma.
+						This object is deprecated.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:vce" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vpe">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Relationship-list
+						must include related to info for
+						complex.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,regional-resource-zone,prov-status,service-id",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vpes",namespace="network",extendsFrom="vnf")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="vnf-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique
+								id of VNF. This is unique across the graph.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vnf-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name
+								of VNF.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vnf-name2" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Alternate
+								name of VNF.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vnf-type" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="String
+								capturing type of vnf, that was intended to identify the ASDC
+								resource. This field has been overloaded and clients should
+								expect changes to occur in the future to this field as ASDC
+								matures.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="service-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Unique
+								identifier of service from ASDC")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="regional-resource-zone"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Regional
+								way of organizing pservers, source of truth should define
+								values")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="prov-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Trigger
+								for operational monitoring of this resource by Service Assurance
+								systems.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="operational-state" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicator
+								for whether the resource is considered operational")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="license-key" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="License
+								key")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="equipment-role" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Client
+								should send valid enumerated value")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="orchestration-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Orchestration
+								status of this VNF, mastered by MSO")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="heat-stack-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Heat
+								stack id corresponding to this instance, managed by MSO")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="mso-catalog-key" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Corresponds
+								to the SDN-C catalog id used to configure this VCE")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipv4-oam-address" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Address
+								tail-f uses to configure vpe, also used for troubleshooting and
+								is IP used for traps generated by VPE
+								(v4-loopback0-ip-address).")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipv4-oam-gateway-address-prefix-length"
+					type="xs:int" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Prefix
+								length for oam-address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipv4-oam-gateway-address"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Gateway
+								address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="v4-loopback0-ip-address"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Loopback0
+								address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vlan-id-outer" type="xs:unsignedInt"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Temporary
+								location for stag to get to VCE")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="as-number" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="as-number
+								of the VPE")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="summary-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="details
+								regarding the vpe operation")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="encrypted-access-flag"
+					type="xs:boolean" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="indicates
+								whether vpe access uses SSH")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+				<xs:element ref="tns:l-interfaces" minOccurs="0" />
+				<xs:element ref="tns:lag-interfaces" minOccurs="0" />
+				<xs:element ref="tns:licenses" minOccurs="0" />
+				<xs:element ref="tns:entitlements" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vpes">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Virtual
+						provider edge router. In 1504, A&amp;AI will populate this object
+						through an M&amp;P and tool provided to operations.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:vpe" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vnfc">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(indexedProps="vnfc-name,prov-status,vnfc-type,vnfc-function-code,ipaddress-v4-oam-vip,in-maint,is-closed-loop-disabled,group-notation",searchable="vnfc-name",container="vnfcs",namespace="network")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="vnfc-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique
+								ID of vnfc.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vnfc-function-code" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="function
+								code")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vnfc-type" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="type")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="prov-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="prov
+								status of this vnfc")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="orchestration-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Orchestration
+								status of this VNF, mastered by APP-C")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipaddress-v4-oam-vip" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Oam
+								V4 vip address of this vnfc")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="in-maint" type="xs:boolean">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="used
+								to indicate whether or not this object is in maintenance mode
+								(maintenance mode = true)")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="is-closed-loop-disabled"
+					type="xs:boolean">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="used
+								to indicate whether closed loop function is enabled on this
+								node")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="group-notation" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Group
+								notation of VNFC")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vnfcs">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="virtual
+						network components associated with a vserver from application
+						controller.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:vnfc" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="subnet">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(indexedProps="subnet-id,subnet-name",nameProps="subnet-name",uniqueProps="subnet-id",dependentOn="l3-network",container="subnets")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="subnet-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Subnet
+								ID, should be UUID.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="subnet-name" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name
+								associated with the subnet.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="neutron-subnet-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Neutron
+								id of this subnet")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="gateway-address" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="gateway
+								ip address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="network-start-address" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="network
+								start address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="cidr-mask" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="cidr
+								mask")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ip-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="ip
+								version")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="orchestration-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Orchestration
+								status of this VNF, mastered by MSO")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="dhcp-enabled" type="xs:boolean">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="dhcp
+								enabled")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="dhcp-start" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								start address reserved for use by dhcp")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="dhcp-end" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								last address reserved for use by dhcp")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="subnets">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:subnet" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="ctag-assignment">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(indexedProps="vlan-id-inner",dependentOn="l3-network",container="ctag-assignments")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="vlan-id-inner" type="xs:unsignedInt">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="id.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="ctag-assignments">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:ctag-assignment" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="segmentation-assignment">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Openstack
+						segmentation
+						assignment.",indexedProps="segmentation-id",dependentOn="l3-network",container="segmentation-assignments")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="segmentation-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Route
+								Table Reference id, UUID assigned to this instance.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Concurrency
+								value")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="segmentation-assignments">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of openstack segmentation assignments")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:segmentation-assignment"
+					minOccurs="0" maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="l3-network">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Generic
+						network
+						definition",nameProps="network-name",indexedProps="heat-stack-id,network-uuid,service-id,network-id,network-name,persona-model-id,persona-model-version,widget-model-id,widget-model-version,contrail-network-fqdn,network-role",searchable="network-name",uniqueProps="network-id",container="l3-networks",namespace="network")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="network-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Network
+								ID, should be uuid. Unique across A&amp;AI.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="network-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name
+								of the network, governed by some naming convention..")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="network-type" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Type
+								of the network - who defines these values?")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="network-role" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Role
+								the network plans - who defines these values?")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="network-technology" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Network
+								technology - who defines these values?")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="neutron-network-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Neutron
+								network id of this Interface")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="is-bound-to-vpn" type="xs:boolean">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="Set
+								to true if bound to VPN")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="service-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Unique
+								identifier of service from ASDC")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="network-role-instance"
+					type="xs:unsignedInt" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="network
+								role instance")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="orchestration-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Orchestration
+								status of this VNF, mastered by MSO")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="heat-stack-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Heat
+								stack id corresponding to this instance, managed by MSO")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="mso-catalog-key" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Corresponds
+								to the SDN-C catalog id used to configure this VCE")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="contrail-network-fqdn" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Contrail
+								FQDN for the network")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="persona-model-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC model id for this resource or service model.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="persona-model-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC model version for this resource or service model.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="persona-model-customization-id"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="captures
+								the id of all the configuration used to customize the resource
+								for the service.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="widget-model-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC data dictionary widget model. This maps directly to the
+								A&amp;AI widget.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="widget-model-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC data dictionary version of the widget model.This maps
+								directly to the A&amp;AI version of the widget.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="physical-network-name" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name
+								associated with the physical network.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="is-provider-network" type="xs:boolean">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="boolean
+								indicatating whether or not network is a provider network.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="is-shared-network" type="xs:boolean">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="boolean
+								indicatating whether or not network is a shared network.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="is-external-network" type="xs:boolean">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="boolean
+								indicatating whether or not network is an external network.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:subnets" minOccurs="0" />
+				<xs:element ref="tns:ctag-assignments" minOccurs="0" />
+				<xs:element ref="tns:segmentation-assignments"
+					minOccurs="0" />
+				<xs:element ref="tns:relationship-list" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Relates
+								to tenant (or is it a child of tenant), complex, service,
+								vpn-binding")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="l3-networks">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:l3-network" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="network-policy">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(nameProps="network-policy-fqdn",indexedProps="network-policy-id,network-policy-fqdn",searchable="network-policy-fqdn",uniqueProps="network-policy-id",container="network-policies",namespace="network")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="network-policy-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="UUID
+								representing unique key to this instance")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="network-policy-fqdn" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Contrail
+								FQDN for the policy")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="heat-stack-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="ID
+								for the openStack Heat instance")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="network-policies">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:network-policy" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vf-module">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="a
+						deployment unit of
+						VNFCs",indexedProps="vf-module-id,vf-module-name,heat-stack-id,persona-model-id,persona-model-version,widget-model-id,widget-model-version,contrail-service-instance-fqdn",searchable="vf-module-name",dependentOn="generic-vnf",container="vf-modules")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="vf-module-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique
+								ID of vf-module.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vf-module-name" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name
+								of vf-module")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="heat-stack-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Heat
+								stack id corresponding to this instance.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="orchestration-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="orchestration
+								status of this vf-module, mastered by MSO")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="is-base-vf-module" type="xs:boolean">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="used
+								to indicate whether or not this object is base vf module")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="persona-model-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC model id for this resource or service model.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="persona-model-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC model version for this resource or service model.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="persona-model-customization-id"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="captures
+								the id of all the configuration used to customize the resource
+								for the service.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="widget-model-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC data dictionary widget model. This maps directly to the
+								A&amp;AI widget.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="widget-model-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC data dictionary version of the widget model.This maps
+								directly to the A&amp;AI version of the widget.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="contrail-service-instance-fqdn"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								Contrail unique ID for a service-instance")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vf-modules">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of vf-modules, a deployment unit of VNFCs")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:vf-module" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="generic-vnf">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="General
+						purpose
+						VNF",nameProps="vnf-name",indexedProps="is-closed-loop-disabled,vnf-name2,vnf-type,heat-stack-id,in-maint,vnf-name,vnf-id,regional-resource-zone,prov-status,service-id,persona-model-id,persona-model-version,widget-model-id,widget-model-version",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="generic-vnfs",namespace="network",extendsFrom="vnf")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="vnf-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique
+								id of VNF. This is unique across the graph.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vnf-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name
+								of VNF.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vnf-name2" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Alternate
+								name of VNF.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vnf-type" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="String
+								capturing type of vnf, that was intended to identify the ASDC
+								resource. This field has been overloaded and clients should
+								expect changes to occur in the future to this field as ASDC
+								matures.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="service-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Unique
+								identifier of service from ASDC")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="regional-resource-zone"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Regional
+								way of organizing pservers, source of truth should define
+								values")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="prov-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Trigger
+								for operational monitoring of this resource by Service Assurance
+								systems.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="operational-state" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicator
+								for whether the resource is considered operational")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="license-key" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="License
+								key")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="equipment-role" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Client
+								should send valid enumerated value")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="orchestration-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Orchestration
+								status of this VNF, used by MSO.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="heat-stack-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Heat
+								stack id corresponding to this instance, managed by MSO")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="mso-catalog-key" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Corresponds
+								to the SDN-C catalog id used to configure this VCE")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="management-option" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="identifier
+								of managed by OPENECOMP or customer")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipv4-oam-address" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Address
+								tail-f uses to configure generic-vnf, also used for
+								troubleshooting and is IP used for traps generated by
+								generic-vnf.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipv4-loopback0-address"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="v4
+								Loopback0 address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="nm-lan-v6-address" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="v6
+								Loopback address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="management-v6-address" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="v6
+								management address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vcpu" type="xs:unsignedInt"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="number
+								of vcpus ordered for this instance of VNF, used for VNFs with no
+								vservers/flavors")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vcpu-units" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="units
+								associated with vcpu, used for VNFs with no vservers/flavors")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vmemory" type="xs:unsignedInt"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="number
+								of GB of memory ordered for this instance of VNF, used for VNFs
+								with no vservers/flavors")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vmemory-units" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="units
+								associated with vmemory, used for VNFs with no
+								vservers/flavors")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vdisk" type="xs:unsignedInt"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="number
+								of vdisks ordered for this instance of VNF, used for VNFs with
+								no vservers/flavors")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vdisk-units" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="units
+								associated with vdisk, used for VNFs with no vservers/flavors")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="in-maint" type="xs:boolean">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="used
+								to indicate whether or not this object is in maintenance mode
+								(maintenance mode = true). This field (in conjunction with
+								prov-status) is used to suppress alarms and vSCL on VNFs/VMs.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="is-closed-loop-disabled"
+					type="xs:boolean">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="used
+								to indicate whether closed loop function is enabled on this
+								node")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="summary-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="details
+								regarding the generic-vnf operation")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="encrypted-access-flag"
+					type="xs:boolean" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="indicates
+								whether generic-vnf access uses SSH")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="entitlement-assignment-group-uuid"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="UUID
+								of the Entitlement group used for licensing VNFs")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="entitlement-resource-uuid"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="UUID
+								of the specific entitlement resource")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="license-assignment-group-uuid"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="UUID
+								of the license assignment group")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="license-key-uuid" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="UUID
+								of the actual license resource")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="persona-model-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC model id for this resource or service model.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="persona-model-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC model version for this resource or service model.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="persona-model-customization-id"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="captures
+								the id of all the configuration used to customize the resource
+								for the service.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="widget-model-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC data dictionary widget model. This maps directly to the
+								A&amp;AI widget.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="widget-model-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC data dictionary version of the widget model.This maps
+								directly to the A&amp;AI version of the widget.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="as-number" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="as-number
+								of the VNF")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="regional-resource-subzone"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="represents
+								sub zone of the rr plane")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+				<xs:element ref="tns:l-interfaces" minOccurs="0" />
+				<xs:element ref="tns:lag-interfaces" minOccurs="0" />
+				<xs:element ref="tns:vf-modules" minOccurs="0" />
+				<xs:element ref="tns:licenses" minOccurs="0" />
+				<xs:element ref="tns:entitlements" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="generic-vnfs">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of VNFs")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:generic-vnf" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="lag-link">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="LAG
+						links can connect
+						lag-interfaces",indexedProps="link-name",container="lag-links",namespace="network")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="link-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Alphabetical
+								concatenation of lag-interface names")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="lag-links">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of link aggregation connections")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:lag-link" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="newvce">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="This
+						object fills in the gaps from vce that were incorporated into
+						generic-vnf. This object will be retired with
+						vce.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,prov-status,vnf-id2",searchable="vnf-id2,vnf-name,vnf-name2",uniqueProps="vnf-id2",container="newvces",namespace="network")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="vnf-id2" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique
+								id of VNF, can't use same attribute name right now until we
+								promote this new object")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vnf-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name
+								of VNF.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vnf-name2" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Alternate
+								name of VNF.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vnf-type" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="String
+								capturing type of vnf, that was intended to identify the ASDC
+								resource. This field has been overloaded and clients should
+								expect changes to occur in the future to this field as ASDC
+								matures.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="prov-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Trigger
+								for operational monitoring of this VNF by BAU Service Assurance
+								systems.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="operational-state" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicator
+								for whether the resource is considered operational")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="license-key" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="License
+								key")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipv4-oam-address" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Address
+								tail-f uses to configure vpe, also used for troubleshooting and
+								is IP used for traps generated by VPE
+								(v4-loopback0-ip-address).")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="equipment-role" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Client
+								should send valid enumerated value, e.g., VPE.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipv4-loopback0-address"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="v4
+								Loopback0 address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="orchestration-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Orchestration
+								status of this VNF, mastered by MSO.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="heat-stack-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Heat
+								stack id corresponding to this instance, managed by MSO")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="mso-catalog-key" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Corresponds
+								to the SDN-C catalog id used to configure this VCE")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+				<xs:element ref="tns:l-interfaces" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="newvces">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="This
+						object fills in the gaps from vce that were incorporated into
+						generic-vnf. This object will be retired with vce.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:newvce" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="pnf">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="PNF
+						represents a physical network function. typically equipment used
+						in the D1 world. in 1607, this will be populated by SDN-C to
+						represent a premises router that a uCPE connects to. But this can
+						be used to represent any physical device that is not an OPENECOMP
+						node or
+						uCPE.",indexedProps="pnf-name,orchestration-status,inv-status",searchable="pnf-name",uniqueProps="pnf-name",container="pnfs",namespace="network")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="pnf-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="unique
+								name of Physical Network Function.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="pnf-name2" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="name
+								of Physical Network Function.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="pnf-name2-source" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="source
+								of name2")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="pnf-id" type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="id
+								of pnf")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="equip-type" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Equipment
+								type. Source of truth should define valid values.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="equip-vendor" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Equipment
+								vendor. Source of truth should define valid values.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="equip-model" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Equipment
+								model. Source of truth should define valid values.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="management-option" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="identifier
+								of managed by OPENECOMP or customer")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipaddress-v4-oam" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="ipv4-oam-address
+								with new naming convention for IP addresses")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="sw-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="sw-version
+								is the version of SW for the hosted application on the PNF.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="orchestration-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="orchestration-status
+								is the status of orchestration on the PNF.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="in-maint" type="xs:boolean">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="Used
+								to indicate whether or not this object is in maintenance mode
+								(maintenance mode = true). This field (in conjunction with
+								prov-status) is used to suppress alarms and vSCL on VNFs/VMs.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="frame-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="ID
+								of the physical frame (relay rack) where pnf is installed.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="serial-number" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Serial
+								number of the device")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipaddress-v4-loopback-0"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="IPV4
+								Loopback 0 address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipaddress-v6-loopback-0"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="IPV6
+								Loopback 0 address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipaddress-v4-aim" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="IPV4
+								AIM address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipaddress-v6-aim" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="IPV6
+								AIM address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipaddress-v6-oam" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="IPV6
+								OAM address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="inv-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="CANOPI's
+								inventory status. Only set with values exactly as defined by
+								CANOPI.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+				<xs:element ref="tns:p-interfaces" minOccurs="0" />
+				<xs:element ref="tns:lag-interfaces" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="pnfs">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of Physical Network Functions.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:pnf" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="physical-link">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of physical connections, typically between
+						p-interfaces",indexedProps="circuit-id,link-name",alternateKeys1="circuit-id",container="physical-links",namespace="network")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="link-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="e.g.,
+								hostnameA_p-connection_nameA_hostnameZ+p_connection-nameZ")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="speed-value" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Captures
+								the numeric part of the speed")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="speed-units" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Captures
+								the units corresponding to the speed")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="circuit-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Circuit
+								it")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="dual-mode" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Dual
+								access mode (e.g., primary, secondary")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="management-option" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="To
+								provide information on who manages this circuit. A&amp;AI or 3rd
+								party transport provider")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="service-provider-name" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name
+								of the service Provider on this link.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="physical-links">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of physical connections, typically between p-interfaces")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:physical-link" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vig-server">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="vig-server
+						contains information about a vig server used for
+						IPSec-configuration. Populated by SDN-C from
+						1607",indexedProps="vig-address-type",dependentOn="ipsec-configuration",container="vig-servers")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="vig-address-type" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="indicates
+								whether the VIG is for AVPN or INTERNET")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipaddress-v4-vig" type="xs:string"
+					minOccurs="0" maxOccurs="unbounded">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="v4
+								IP of the vig server")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipaddress-v6-vig" type="xs:string"
+					minOccurs="0" maxOccurs="unbounded">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="v6
+								IP of the vig server")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vig-servers">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:vig-server" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="ipsec-configuration">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="IPSec
+						configuration node will contain various configuration data for the
+						NMTE VNF. This node will have an edge to the generic-vnf (vnf type
+						= TE). Starting 1607, this data will be populated by
+						SDN-C",indexedProps="ipsec-configuration-id",uniqueProps="ipsec-configuration-id",container="ipsec-configurations",namespace="network")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="ipsec-configuration-id"
+					type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="UUID
+								of this configuration")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="requested-vig-address-type"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicate
+								the type of VIG server like AVPN, INTERNET, BOTH")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="requested-encryption-strength"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Encryption
+								values like 3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc,
+								aes-265-cbc")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="requested-dmz-type" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="OPENECOMP
+								can offer a shared DMZ or a DMZ specific to a customer")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="shared-dmz-network-address"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Network
+								address of shared DMZ")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="requested-customer-name"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="If
+								the DMZ is a custom DMZ, this field will indicate the customer
+								information")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ike-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="can
+								be 1 or 2")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ikev1-authentication" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Contains
+								values like md5, sha1, sha256, sha384")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ikev1-encryption" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Encyption
+								values like 3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc,
+								aes-265-cbc")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ikev1-dh-group" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Diffie-Hellman
+								group like DH-GROUP2, DH-GROUP5, DH-GROUP14")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ikev1-am-group-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Group
+								name defined in VIG for clients using aggressive mode")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ikev1-am-password" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="pre-shared
+								key for the above group name ")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ikev1-sa-lifetime" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Lifetime
+								for IKEv1 SA")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipsec-authentication" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="md5,
+								sha1, sha256, sha384")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipsec-encryption" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="3des-cbc,
+								des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipsec-sa-lifetime" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Life
+								time for IPSec SA")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipsec-pfs" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="enable
+								PFS or not")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="xauth-userid" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="user
+								ID for xAuth, sm-user,ucpeHostName,nmteHostName")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="xauth-user-password" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Encrypted
+								using the Juniper $9$ algorithm")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="dpd-interval" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The
+								time between DPD probe")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="dpd-frequency" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Maximum
+								number of DPD before claiming the tunnel is down")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+				<xs:element ref="tns:vig-servers" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="ipsec-configurations">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:ipsec-configuration" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="route-table-reference">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Openstack
+						route table
+						reference.",nameProps="route-table-reference-fqdn",uniqueProps="route-table-reference-id",indexedProps="route-table-reference-id,route-table-reference-fqdn",container="route-table-references",namespace="network")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="route-table-reference-id"
+					type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Route
+								Table Reference id, UUID assigned to this instance.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="route-table-reference-fqdn"
+					type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="FQDN
+								entry in the route table.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Concurrency
+								value")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="route-table-references">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of openstack route table references")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:route-table-reference" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="instance-group">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="General
+						mechanism for grouping
+						instances",nameProps="description",uniqueProps="id",indexedProps="id,description,type,sub-type",container="instance-groups",namespace="network")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Instance
+								Group ID, UUID assigned to this instance.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="description" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Descriptive
+								text to help identify the usage of this instance-group")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="type" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Only
+								valid value today is lower case ha for high availability")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="sub-type" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Valid
+								values for ha type are [geo-activeactive, geo-activestandby,
+								local-activeactive, local-activestandby]")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Concurrency
+								value")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="instance-groups">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of openstack route table references")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:instance-group" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="network">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Namespace
+						for network inventory resources.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:logical-links" minOccurs="0" />
+				<xs:element ref="tns:site-pair-sets" minOccurs="0" />
+				<xs:element ref="tns:vpn-bindings" minOccurs="0" />
+				<xs:element ref="tns:vpls-pes" minOccurs="0" />
+				<xs:element ref="tns:multicast-configurations"
+					minOccurs="0" />
+				<xs:element ref="tns:vces" minOccurs="0" />
+				<xs:element ref="tns:vpes" minOccurs="0" />
+				<xs:element ref="tns:vnfcs" minOccurs="0" />
+				<xs:element ref="tns:l3-networks" minOccurs="0" />
+				<xs:element ref="tns:network-policies" minOccurs="0" />
+				<xs:element ref="tns:generic-vnfs" minOccurs="0" />
+				<xs:element ref="tns:lag-links" minOccurs="0" />
+				<xs:element ref="tns:newvces" minOccurs="0" />
+				<xs:element ref="tns:pnfs" minOccurs="0" />
+				<xs:element ref="tns:physical-links" minOccurs="0" />
+				<xs:element ref="tns:ipsec-configurations" minOccurs="0" />
+				<xs:element ref="tns:route-table-references"
+					minOccurs="0" />
+				<xs:element ref="tns:instance-groups" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="reserved-prop-names">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Internal
+						map to define some reserved properties of a
+						vertex",uniqueProps="aai-unique-key",indexedProps="aai-unique-key,source-of-truth,aai-node-type")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="last-mod-source-of-truth"
+					type="xs:string" minOccurs="0" />
+				<xs:element name="aai-node-type" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="aai-created-ts" type="xs:unsignedInt"
+					minOccurs="0" />
+				<xs:element name="aai-unique-key" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="aai-last-mod-ts" type="xs:unsignedInt"
+					minOccurs="0" />
+				<xs:element name="source-of-truth" type="xs:string"
+					minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="edge-prop-names">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Internal
+						map to define the properties of an edge and interpret the map
+						EdgeRules",edgeInfo="edgeLabel,direction,multiplicityRule,isParent,usesResource,hasDelTarget,SVC-INFRA,SVC-INFRA-REV")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="edgeLabel" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="direction" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="multiplicityRule" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="isParent" type="xs:boolean"
+					minOccurs="0" />
+				<xs:element name="usesResource" type="xs:boolean"
+					minOccurs="0" />
+				<xs:element name="hasDelTarget" type="xs:boolean"
+					minOccurs="0" />
+				<xs:element name="SVC-INFRA" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="SVC-INFRA-REV" type="xs:string"
+					minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="aai-internal">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:reserved-prop-names" minOccurs="0"
+					maxOccurs="unbounded" />
+				<xs:element ref="tns:edge-prop-names" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="inventory">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:search" minOccurs="0" />
+				<xs:element ref="tns:actions" minOccurs="0" />
+				<xs:element ref="tns:cloud-infrastructure" minOccurs="0" />
+				<xs:element ref="tns:license-management" minOccurs="0" />
+				<xs:element ref="tns:business" minOccurs="0" />
+				<xs:element ref="tns:service-design-and-creation"
+					minOccurs="0" />
+				<xs:element ref="tns:network" minOccurs="0" />
+				<xs:element ref="tns:aai-internal" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="notification-event-header">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="id" type="xs:string" minOccurs="0" />
+				<xs:element name="timestamp" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="source-name" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="domain" type="xs:string" minOccurs="0" />
+				<xs:element name="sequence-number" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="severity" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="event-type" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="version" type="xs:string" minOccurs="0" />
+				<xs:element name="action" type="xs:string" minOccurs="0" />
+				<xs:element name="entity-type" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="top-entity-type" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="entity-link" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="status" type="xs:string" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="notification-event">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="cambria.partition" type="xs:string"
+					minOccurs="0" />
+				<xs:element ref="tns:notification-event-header"
+					minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="query-parameters">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="QueryParameters
+						for performing a named-query or model query")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:named-query" minOccurs="0" />
+				<xs:element ref="tns:model" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="instance-filter">
+		<xs:complexType>
+			<xs:sequence />
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="instance-filters">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="InstanceFilters
+						for performing a named-query or model query")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:instance-filter" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="model-and-named-query-search">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="ModelAndNamedQuerySearch
+						holds query-parameters and instance-properties for performing a
+						named-query or model query")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:query-parameters" minOccurs="0" />
+				<xs:element ref="tns:instance-filters" minOccurs="0" />
+				<xs:element name="top-node-type" type="xs:string"
+					minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="properties">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Property
+						holder for query properties or instance properties")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="property-name" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="property-value" type="xs:string"
+					minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="extra-properties">
+		<xs:complexType>
+			<xs:sequence />
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="inventory-response-item">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Inventory
+						item for response list",container="inventory-response-items")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="model-name" type="xs:string"
+					minOccurs="0" />
+				<xs:element ref="tns:extra-properties" minOccurs="0" />
+				<xs:element ref="tns:inventory-response-items"
+					minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="inventory-response-items">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Container
+						for inventory items in response list",container="response-list")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:inventory-response-item"
+					minOccurs="0" maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="response-list">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Response
+						container for the results of a named-query or model query")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:inventory-response-items"
+					minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="extra-property">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="property-name" type="xs:string"
+					minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vnf">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Abstract
+						vnf
+						class",indexedProps="vnf-id",uniqueProps="vnf-id",inheritors="vce,vpe,generic-vnf",isAbstract="true")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="vnf-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique
+								id of VNF. This is unique across the graph.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
 </xs:schema>
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/resources/aai_schema_v11.xsd b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/resources/aai_schema_v11.xsd
index 32655fd7c1..4ce1297629 100644
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/resources/aai_schema_v11.xsd
+++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/resources/aai_schema_v11.xsd
@@ -1,6751 +1,8486 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<xs:schema elementFormDefault="qualified" version="1.0" targetNamespace="http://org.onap.aai.inventory/v11" xmlns:tns="http://org.onap.aai.inventory/v11" xmlns:xs="http://www.w3.org/2001/XMLSchema"
-           xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-           jaxb:version="2.1"
-           xmlns:annox="http://annox.dev.java.net"
-           jaxb:extensionBindingPrefixes="annox">
+<xs:schema elementFormDefault="qualified" version="1.0"
+	targetNamespace="http://org.onap.aai.inventory/v11"
+	xmlns:tns="http://org.onap.aai.inventory/v11"
+	xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" jaxb:version="2.1"
+	xmlns:annox="http://annox.dev.java.net"
+	jaxb:extensionBindingPrefixes="annox">
 
-  <xs:element name="inventory-item-data">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="property-name" type="xs:string" minOccurs="0"/>
-        <xs:element name="property-value" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="inventory-item">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="inventory-item-type" type="xs:string" minOccurs="0"/>
-        <xs:element name="inventory-item-link" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:inventory-item-data" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element ref="tns:tagged-inventory-item-list" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="tagged-inventory-item-list">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:inventory-item" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="edge-tag-query-result">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:tagged-inventory-item-list" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="start-node-filter">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="property-name" type="xs:string" minOccurs="0"/>
-        <xs:element name="property-value" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="include-node-filter">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="include-node-type" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="secondary-filter">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="property-name" type="xs:string" minOccurs="0"/>
-        <xs:element name="filter-type" type="xs:string" minOccurs="0"/>
-        <xs:element name="property-value" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="edge-tag-query-request">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="edge-tag" type="xs:string" minOccurs="0"/>
-        <xs:element name="result-detail" type="xs:string" minOccurs="0"/>
-        <xs:element name="start-node-type" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:start-node-filter" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element ref="tns:include-node-filter" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element ref="tns:secondary-filter" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="result-data">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="resource-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The specific type of node in the A&amp;AI graph")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-link" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The URL to the specific resource")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="search-results">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:result-data" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="relationship-data">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="relationship-key" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="A keyword provided by A&amp;AI to indicate an attribute.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="relationship-value" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Value of the attribute.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="related-to-property">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="property-key" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Key part of a key/value pair")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="property-value" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Value part of a key/value pair")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="relationship">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="related-to" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="A keyword provided by A&amp;AI to indicate type of node.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="related-link" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL to the object in A&amp;AI.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-data" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element ref="tns:related-to-property" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="relationship-list">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:relationship" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="oam-network">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="OAM network, to be deprecated shortly.  Do not use for new purposes. ",nameProps="network-name",indexedProps="cvlan-tag,network-uuid,network-name",dependentOn="cloud-region",container="oam-networks")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="network-uuid" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="UUID of the network. Unique across a cloud-region")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="network-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name of the network.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="cvlan-tag" type="xs:unsignedInt">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="cvlan-id")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipv4-oam-gateway-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for VNF firewall rule so customer cannot send customer traffic over this oam network")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipv4-oam-gateway-address-prefix-length" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for VNF firewall rule so customer cannot send customer traffic over this oam network")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="oam-networks">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of OAM networks, to be deprecated shortly.  Do not use for new purposes. ")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:oam-network" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="dvs-switch">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Digital virtual switch metadata, used by SDN-C to configure VCEs.  A&amp;AI needs to receive this data from the PO deployment team and administer it using the provisioningTool.sh into A&amp;AI. ",indexedProps="vcenter-url,switch-name",dependentOn="cloud-region",container="dvs-switches")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="switch-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="DVS switch name")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vcenter-url" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL used to reach the vcenter")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="dvs-switches">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of digital virtual switch metadata used for vmWare VCEs and GenericVnfs.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:dvs-switch" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="availability-zone">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Availability zone, a collection of compute hosts/pservers",indexedProps="availability-zone-name",dependentOn="cloud-region",container="availability-zones")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="availability-zone-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Name of the availability zone.  Unique across a cloud region")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="hypervisor-type" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Type of hypervisor.  Source of truth should define valid values.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="operational-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="State that indicates whether the availability zone should be used, etc.  Source of truth should define valid values.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="az-and-dvs-switches">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:dvs-switches" minOccurs="0"/>
-        <xs:element ref="tns:availability-zone" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="sdn-zone-response">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:oam-networks" minOccurs="0"/>
-        <xs:element ref="tns:az-and-dvs-switches" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="search">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:edge-tag-query-result" minOccurs="0"/>
-        <xs:element ref="tns:edge-tag-query-request" minOccurs="0"/>
-        <xs:element ref="tns:search-results" minOccurs="0"/>
-        <xs:element ref="tns:sdn-zone-response" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="update-node-key">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="key-name" type="xs:string" minOccurs="0"/>
-        <xs:element name="key-value" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="action-data">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="property-name" type="xs:string" minOccurs="0"/>
-        <xs:element name="property-value" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="action">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="action-type" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:action-data" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="update">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Serves a PATCH like function.  Does not enforce concurrency control.  Clear each usage with AAI team.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="update-node-type" type="xs:string"/>
-        <xs:element ref="tns:update-node-key" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element name="update-node-uri" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:action" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="key-data">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="key-name" type="xs:string" minOccurs="0"/>
-        <xs:element name="key-value" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="notify">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="event-id" type="xs:string"/>
-        <xs:element name="node-type" type="xs:string" minOccurs="0"/>
-        <xs:element name="event-trigger" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:key-data" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element name="selflink" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="actions">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="APIs that are more action related than REST (e.g., notify, update).")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:update" minOccurs="0"/>
-        <xs:element ref="tns:notify" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="ctag-pool">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="A collection of C tags (vlan tags) grouped for a specific purpose.",indexedProps="availability-zone-name",dependentOn="complex",container="ctag-pools")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="target-pe" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="The Target provider edge router")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="availability-zone-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Name of the availability zone")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ctag-pool-purpose" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Describes what the intended purpose of this pool is.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ctag-values" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Comma separated list of ctags")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="ctag-pools">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:ctag-pool" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="complex">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of physical locations that can house cloud-regions.",indexedProps="identity-url,data-center-code,complex-name,physical-location-id",searchable="physical-location-id,data-center-code,complex-name,street1,street2,postal-code",uniqueProps="physical-location-id",container="complexes",namespace="cloud-infrastructure")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="physical-location-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique identifier for physical location, e.g., CLLI")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="data-center-code" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Data center code which can be an alternate way to identify a complex")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="complex-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Gamma complex name for LCP instance.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="identity-url" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL of the keystone identity service")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="physical-location-type" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Type, e.g., central office, data center.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="street1" type="xs:string"/>
-        <xs:element name="street2" type="xs:string" minOccurs="0"/>
-        <xs:element name="city" type="xs:string"/>
-        <xs:element name="state" type="xs:string" minOccurs="0"/>
-        <xs:element name="postal-code" type="xs:string"/>
-        <xs:element name="country" type="xs:string"/>
-        <xs:element name="region" type="xs:string"/>
-        <xs:element name="latitude" type="xs:string" minOccurs="0"/>
-        <xs:element name="longitude" type="xs:string" minOccurs="0"/>
-        <xs:element name="elevation" type="xs:string" minOccurs="0"/>
-        <xs:element name="lata" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:ctag-pools" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="complexes">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of physical locations that can house cloud-regions.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:complex" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="volume-group">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Persistent block-level storage.",indexedProps="volume-group-name,vnf-type,heat-stack-id,volume-group-id",searchable="volume-group-id,volume-group-name",dependentOn="cloud-region",container="volume-groups")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="volume-group-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique ID of volume-group.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="volume-group-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name of the volume group.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="heat-stack-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Heat stack id corresponding to this volume-group")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vnf-type" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Orchestration status of this volume-group")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-customization-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="captures the id of all the configuration used to customize the resource for the service.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vf-module-model-customization-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="helps relate the volume group to the vf-module whose components will require the volume group")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="volume-groups">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of persistent block-level storage.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:volume-group" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="volume">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Ephemeral Block storage volume.",indexedProps="volume-id",dependentOn="vserver",container="volumes")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="volume-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique ID of block storage volume relative to the vserver.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="volume-selflink" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="volumes">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of ephemeral Block storage volumes.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:volume" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="l3-interface-ipv4-address-list">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="IPv4 Address Range",indexedProps="l3-interface-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="vlan,l-interface")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="l3-interface-ipv4-address" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="IP address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="l3-interface-ipv4-prefix-length" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Prefix length, 32 for single address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vlan-id-inner" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Inner VLAN tag")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vlan-id-outer" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Outer VLAN tag")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="is-floating" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicator of fixed or floating address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="neutron-network-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Neutron network id of the interface that address belongs to")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="neutron-subnet-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Neutron id of subnet that address belongs to")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="l3-interface-ipv6-address-list">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="IPv6 Address Range",indexedProps="l3-interface-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="vlan,l-interface")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="l3-interface-ipv6-address" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="IP address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="l3-interface-ipv6-prefix-length" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Prefix length, 128 for single address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vlan-id-inner" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Inner VLAN tag")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vlan-id-outer" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Outer VLAN tag")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="is-floating" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicator of fixed or floating address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="neutron-network-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Neutron network id of the interface that address belongs to")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="neutron-subnet-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Neutron id of subnet that address belongs to")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vlan">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Definition of vlan",indexedProps="vlan-interface,vlan-id-inner,vpn-key",dependentOn="l-interface",container="vlans")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="vlan-interface" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="String that identifies the interface")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vlan-id-inner" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Inner VLAN tag")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vlan-id-outer" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Outer VLAN tag")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="speed-value" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Captures the numeric part of the speed")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="speed-units" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Captures the units corresponding to the speed")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vlan-description" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used to describe (the service associated with) the vlan")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="backdoor-connection" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Whether customer is going to use this VLAN for backdoor connection to another customer premise device.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vpn-key" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This indicates the customers VPN ID associated with this vlan")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Status of a vnf's vlan interface, on which the customer circuit resides, mastered by SDN-C.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="in-maint" type="xs:boolean">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="prov-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Prov Status of the VLAN configuration related to a logical interface. Valid values [PREPROV/NVTPROV/PROV].")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="is-ip-unnumbered" type="xs:boolean">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="Flag indicating the interface uses the IP Unnumbered configuration.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:l3-interface-ipv4-address-list" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element ref="tns:l3-interface-ipv6-address-list" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vlans">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:vlan" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="sriov-vf">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="SR-IOV Virtual Function (not to be confused with virtual network function)",indexedProps="pci-id,vf-vlan-filter,vf-mac-filter,vf-vlan-strip,neutron-network-id",dependentOn="l-interface",container="sriov-vfs")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="pci-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="PCI ID used to identify the sriov-vf")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vf-vlan-filter" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This metadata provides option to specify list of VLAN filters applied on VF to pass the traffic to VM.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vf-mac-filter" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="When MAC filters are specified, VF-agent service configures VFs to do MAC level filtering before the traffic is passed to VM.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vf-vlan-strip" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="When this field is set to true, VF will configured to strip the outer TAG before the traffic is passed to VM.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vf-vlan-anti-spoof-check" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This option ensures anti VLAN spoof checks are done at the VF level to comply with security. The disable check will also be honored per the VNF needs for trusted VMs.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vf-mac-anti-spoof-check" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This option ensures anti MAC spoof checks are done at the VF level to comply with security. The disable check will also be honored per the VNF needs for trusted VMs.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vf-mirrors" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This option defines the set of Mirror objects which essentially mirrors the traffic from source to set of collector VNF Ports.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vf-broadcast-allow" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This option, if set to true, sets the VF in promiscuous mode and allows all broadcast traffic to reach the VM")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vf-unknown-multicast-allow" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This option, if set to true, sets the VF in promiscuous mode and allows unknown multicast traffic to reach the VM")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vf-unknown-unicast-allow" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This option, if set to true, sets the VF in promiscuous mode and allows unknown unicast traffic to reach the VM")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vf-insert-stag" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This option, if set to true, instructs to insert outer tag after traffic comes out of VM.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vf-link-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This option is used to set the link status.  Valid values as of 1607 are on, off, and auto.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="neutron-network-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Neutron network id of the interface")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="sriov-vfs">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of SR-IOV Virtual Functions.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:sriov-vf" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="l-interface">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Logical interfaces, e.g., a vnic.",indexedProps="macaddr,interface-id,interface-name,network-name",dependentOn="generic-vnf,newvce,p-interface,vserver,lag-interface",container="l-interfaces")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="interface-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Name given to the interface")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="interface-role" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="E.g., CUSTOMER, UPLINK, etc.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="v6-wan-link-ip" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Questionably placed - v6 ip addr of this interface (is in vr-lan-interface from Mary B.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="selflink" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="interface-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="ID of interface")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="macaddr" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="MAC address for the interface")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="network-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name of the network")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="management-option" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Whether A&amp;AI should be managing this interface of not. Could have value like CUSTOMER")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="interface-description" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Human friendly text regarding this interface.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="is-port-mirrored" type="xs:boolean">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="boolean indicatating whether or not port is a mirrored.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="in-maint" type="xs:boolean">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="prov-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Prov Status of the logical interface. Valid values [PREPROV/NVTPROV/PROV].")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="is-ip-unnumbered" type="xs:boolean">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="Flag indicating the interface uses the IP Unnumbered configuration.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:vlans" minOccurs="0"/>
-        <xs:element ref="tns:sriov-vfs" minOccurs="0"/>
-        <xs:element ref="tns:l-interfaces" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:l3-interface-ipv4-address-list" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element ref="tns:l3-interface-ipv6-address-list" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="l-interfaces">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of logical interfaces.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:l-interface" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vserver">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Virtual Servers, aka virtual machine or VM.",nameProps="vserver-name",indexedProps="is-closed-loop-disabled,prov-status,vserver-name,vserver-id,in-maint,vserver-name2",searchable="vserver-id,vserver-name,vserver-name2",dependentOn="tenant",container="vservers")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="vserver-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique identifier for this vserver relative to its tenant")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vserver-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name of vserver")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vserver-name2" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Alternative name of vserver")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="prov-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Trigger for operational monitoring of this resource by Service Assurance systems.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vserver-selflink" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="in-maint" type="xs:boolean">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="Used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="is-closed-loop-disabled" type="xs:boolean">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="Used to indicate whether closed loop function is enabled on this node")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:volumes" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:l-interfaces" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vservers">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of virtual Servers, aka virtual machines or VMs.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:vserver" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="tenant">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Openstack tenant",nameProps="tenant-name",indexedProps="tenant-name,tenant-id,tenant-context",searchable="tenant-id,tenant-name",dependentOn="cloud-region",container="tenants")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="tenant-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique id relative to the cloud-region.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="tenant-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Readable name of tenant")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="tenant-context" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This field will store the tenant context.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:vservers" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="tenants">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of openstack tenants.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:tenant" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="flavor">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Openstack flavor.",nameProps="flavor-name",indexedProps="flavor-name,flavor-id",dependentOn="cloud-region",container="flavors")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="flavor-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Flavor id, expected to be unique across cloud-region.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="flavor-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Flavor name")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="flavor-vcpus" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Number of CPUs")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="flavor-ram" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Amount of memory")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="flavor-disk" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Disk space")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="flavor-ephemeral" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Amount of ephemeral disk space")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="flavor-swap" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="amount of swap space allocation")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="flavor-is-public" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="whether flavor is available to all users or private to the tenant it was created in.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="flavor-selflink" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="flavor-disabled" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Boolean as to whether this flavor is no longer enabled")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="flavors">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of openstack flavors.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:flavor" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="group-assignment">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Openstack group-assignment used to store exclusivity groups (EG).",nameProps="group-name",indexedProps="group-id,group-type,group-name",searchable="group-id,group-name",dependentOn="cloud-region",container="group-assignments")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="group-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Group id, expected to be unique across cloud-region.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="group-type" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Group type - the type of group this instance refers to")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="group-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Group name - name assigned to the group")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="group-description" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Group description - description of the group")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="group-assignments">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of openstack group assignments")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:group-assignment" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="snapshot">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Openstack snapshot",nameProps="snapshot-name",uniqueProps="snapshot-id",indexedProps="application,snapshot-name,application-vendor,snapshot-id,application-version,prev-snapshot-id",dependentOn="cloud-region",container="snapshots")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="snapshot-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Snapshot id, this is the key UUID assoc associated in glance with the snapshots.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="snapshot-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Snapshot name")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="snapshot-architecture" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Operating system architecture")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="snapshot-os-distro" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The common name of the operating system distribution in lowercase")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="snapshot-os-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The operating system version as specified by the distributor.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="application" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The application that the image instantiates.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="application-vendor" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The vendor of the application.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="application-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The version of the application.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="snapshot-selflink" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="prev-snapshot-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This field contains the UUID of the previous snapshot (if any).")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="snapshots">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of openstack snapshots")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:snapshot" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="metadatum">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Key/value pairs",indexedProps="metaname",dependentOn="tenant,image,service-instance,connector,model",container="metadata")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="metaname" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true)</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="metaval" type="xs:string"/>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="metadata">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of metadatum (key/value pairs)")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:metadatum" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="image">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Openstack image.",nameProps="image-name",indexedProps="application,image-name,application-vendor,image-id,application-version",dependentOn="cloud-region",container="images")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="image-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Image id, expected to be unique across cloud region")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="image-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Image name")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="image-architecture" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Operating system architecture.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="image-os-distro" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The common name of the operating system distribution in lowercase")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="image-os-version" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The operating system version as specified by the distributor.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="application" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The application that the image instantiates.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="application-vendor" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The vendor of the application.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="application-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The version of the application.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="image-selflink" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:metadata" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="images">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collectio of Openstack images.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:image" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="availability-zones">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of availability zones")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:availability-zone" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="cloud-region">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="cloud-region designates an installation of a cloud cluster or region or instantiation. In AT&amp;Ts AIC cloud, this could be an LCP or DCP. Cloud regions are uniquely identified by a composite key, cloud-owner + cloud-region-id. The format of the cloud-owner is vendor-cloudname and we will use att-aic for AT&amp;T's AIC.",indexedProps="cloud-owner,cloud-region-id,cloud-type,owner-defined-type",nameProps="owner-defined-type",container="cloud-regions",namespace="cloud-infrastructure")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="cloud-owner" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Identifies the vendor and cloud name, e.g., att-aic. First part of composite key should be formatted as vendor-cloudname")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="cloud-region-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Identifier used by the vendor for the region. Second part of composite key")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="cloud-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Type of the cloud (e.g., openstack)")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="owner-defined-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Cloud-owner defined type indicator (e.g., dcp, lcp)")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="cloud-region-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Software version employed at the site.  NOTE - THIS FIELD IS NOT KEPT UP TO DATE.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="identity-url" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL of the keystone identity service")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="cloud-zone" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Zone where the cloud is homed.  NOTE - THIS FIELD IS NOT CORRECTLY POPULATED.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="complex-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="complex name for cloud-region instance.  NOTE - THIS FIELD IS NOT CORRECTLY POPULATED.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="sriov-automation" type="xs:boolean">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="Whether the cloud region supports (true) or does not support (false) SR-IOV automation.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:volume-groups" minOccurs="0"/>
-        <xs:element ref="tns:tenants" minOccurs="0"/>
-        <xs:element ref="tns:flavors" minOccurs="0"/>
-        <xs:element ref="tns:group-assignments" minOccurs="0"/>
-        <xs:element ref="tns:snapshots" minOccurs="0"/>
-        <xs:element ref="tns:images" minOccurs="0"/>
-        <xs:element ref="tns:dvs-switches" minOccurs="0"/>
-        <xs:element ref="tns:oam-networks" minOccurs="0"/>
-        <xs:element ref="tns:availability-zones" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="cloud-regions">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(maximumDepth="0")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:cloud-region" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="network-profile">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Network profile populated by SDN-GP for SNMP",indexedProps="nm-profile-name",container="network-profiles",namespace="cloud-infrastructure")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="nm-profile-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique name of network profile.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="community-string" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Encrypted SNMP community string")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="network-profiles">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of network profiles")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:network-profile" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="sriov-pf">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="SR-IOV Physical Function",indexedProps="pf-pci-id",dependentOn="p-interface",container="sriov-pfs")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="pf-pci-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Identifier for the sriov-pf")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="sriov-pfs">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of SR-IOV Physical Functions.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:sriov-pf" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="p-interface">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Physical interface (e.g., nic)",indexedProps="interface-name,prov-status",nameProps="prov-status",dependentOn="vpls-pe,pserver,pnf",container="p-interfaces")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="interface-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Name that identifies the physical interface")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="speed-value" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Captures the numeric part of the speed")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="speed-units" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Captures the units corresponding to the speed")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="port-description" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Nature of the services and connectivity on this port.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="equipment-identifier" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="CLEI or other specification for p-interface hardware.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="interface-role" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Role specification for p-interface hardware.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="interface-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicates the physical properties of the interface.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="prov-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Trigger for operational monitoring of this resource by Service Assurance systems.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="in-maint" type="xs:boolean">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="inv-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="inventory status")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:sriov-pfs" minOccurs="0"/>
-        <xs:element ref="tns:l-interfaces" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="p-interfaces">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of physical interfaces.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:p-interface" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="lag-interface">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Link aggregate interface",indexedProps="interface-name,interface-id,interface-role",dependentOn="generic-vnf,pserver,vpls-pe,pnf",container="lag-interfaces")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="interface-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Name that identifies the link aggregate interface")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="interface-description" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Human friendly text regarding this interface.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="speed-value" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Captures the numeric part of the speed")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="speed-units" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Captures the units corresponding to the speed")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="interface-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="ID of interface")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="interface-role" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Role assigned to this Interface, should use values as defined in ECOMP Yang models.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="prov-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Trigger for operational monitoring of this resource by Service Assurance systems.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="in-maint" type="xs:boolean">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:l-interfaces" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="lag-interfaces">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of link aggregate interfaces.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:lag-interface" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="pserver">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Compute host whose hostname must be unique and must exactly match what is sent as a relationship to a vserver.",nameProps="pserver-name2",indexedProps="hostname,in-maint,pserver-id,pserver-name2,inv-status",searchable="hostname,pserver-name2,pserver-id,ipv4-oam-address",container="pservers",namespace="cloud-infrastructure")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="hostname" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Value from executing hostname on the compute node.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ptnii-equip-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="PTNII name")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="number-of-cpus" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Number of cpus")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="disk-in-gigabytes" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Disk size, in GBs")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ram-in-megabytes" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="RAM size, in MBs")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="equip-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Equipment type.  Source of truth should define valid values.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="equip-vendor" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Equipment vendor.  Source of truth should define valid values.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="equip-model" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Equipment model.  Source of truth should define valid values.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="fqdn" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Fully-qualified domain name")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="pserver-selflink" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipv4-oam-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used to configure device, also used for troubleshooting and is IP used for traps generated by device.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="serial-number" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Serial number, may be queried")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipaddress-v4-loopback-0" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="IPV4 Loopback 0 address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipaddress-v6-loopback-0" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="IPV6 Loopback 0 address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipaddress-v4-aim" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="IPV4 AIM address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipaddress-v6-aim" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="IPV6 AIM address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipaddress-v6-oam" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="IPV6 OAM address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="inv-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="CANOPI's inventory status.  Only set with values exactly as defined by CANOPI.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="pserver-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="ID of Pserver")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="internet-topology" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="internet topology of Pserver")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="in-maint" type="xs:boolean">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="pserver-name2" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="alternative pserver name")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="purpose" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="purpose of pserver")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="prov-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Prov Status of this device (not under canopi control) Valid values [PREPROV/NVTPROV/PROV]")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="management-option" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicates who owns and or manages the device.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="host-profile" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The host profile that defines the configuration of the pserver.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:p-interfaces" minOccurs="0"/>
-        <xs:element ref="tns:lag-interfaces" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="pservers">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of compute hosts.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:pserver" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="virtual-data-center">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Virtual organization of cloud infrastructure elements in a data center context",nameProps="vdc-name",indexedProps="vdc-name,vdc-id",container="virtual-data-centers",namespace="cloud-infrastructure")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="vdc-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique ID of the vdc")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vdc-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name of the virtual data center")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="virtual-data-centers">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Virtual organization of cloud infrastructure elements in a data center context")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:virtual-data-center" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="cloud-infrastructure">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Namespace for cloud infrastructure.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:complexes" minOccurs="0"/>
-        <xs:element ref="tns:cloud-regions" minOccurs="0"/>
-        <xs:element ref="tns:network-profiles" minOccurs="0"/>
-        <xs:element ref="tns:pservers" minOccurs="0"/>
-        <xs:element ref="tns:virtual-data-centers" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="license-key-resource">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="OBSOLETE OBJECT:  do not use",nameProps="name",indexedProps="assignment-group-uuid,att-uuid,name",uniqueProps="att-uuid",container="license-key-resources",namespace="license-management")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="att-uuid" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true)</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="assignment-type" type="xs:string" minOccurs="0"/>
-        <xs:element name="assignment-status" type="xs:string" minOccurs="0"/>
-        <xs:element name="assignment-group-uuid" type="xs:string"/>
-        <xs:element name="assignment-date" type="xs:string" minOccurs="0"/>
-        <xs:element name="name" type="xs:string" minOccurs="0"/>
-        <xs:element name="model-uuid" type="xs:string" minOccurs="0"/>
-        <xs:element name="model-version" type="xs:string" minOccurs="0"/>
-        <xs:element name="license-key" type="xs:string" minOccurs="0"/>
-        <xs:element name="license-key-file-url" type="xs:string" minOccurs="0"/>
-        <xs:element name="supplier-release-list" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="license-key-resources">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:license-key-resource" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="license-management">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:license-key-resources" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="connector">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of resource instances used to connect a variety of disparate inventory widgets",indexedProps="resource-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version",container="connectors",namespace="business")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="resource-instance-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique id of resource instance.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-version-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="persona-model-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="internal",dataCopy="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="widget-model-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="widget-model-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:metadata" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="connectors">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of resource instances used to connect a variety of disparate inventory widgets")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:connector" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="tunnel-xconnect">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Represents the specifics of a tunnel cross connect piece of a resource that gets separately allotted",uniqueProps="id",indexedProps="id",dependentOn="allotted-resource",container="tunnel-xconnects")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Allotted Resource id UUID assigned to this instance.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="bandwidth-up-wan1" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The WAN uplink bandwidth for WAN1")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="bandwidth-down-wan1" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The WAN downlink bandwidth for WAN1")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="bandwidth-up-wan2" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The WAN uplink bandwidth for WAN2")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="bandwidth-down-wan2" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The WAN downlink bandwidth for WAN2")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Concurrency value")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="tunnel-xconnects">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="This object is used to store the specific tunnel cross connect aspects of an allotted resource")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:tunnel-xconnect" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="allotted-resource">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Represents a slice or partial piece of a resource that gets separately allotted",nameProps="description",uniqueProps="id",indexedProps="id,model-invariant-id,model-version-id,type,role",dependentOn="service-instance",container="allotted-resources")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Allotted Resource id UUID assigned to this instance.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="description" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The descriptive information assigned to this allotted resource instance")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="selflink" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Link back to more information in the controller")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-version-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="persona-model-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="internal",dataCopy="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Concurrency value")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Orchestration status")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="operational-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicator for whether the resource is considered operational")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Generic description of the type of allotted resource.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="role" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="role in the network that this resource will be providing.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:tunnel-xconnects" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="allotted-resources">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="This object is used to store slices of services being offered")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:allotted-resource" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="service-instance">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Instance of a service",indexedProps="service-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,service-instance-name,service-instance-location-id,orchestration-status,environment-context,workload-context",nameProps="service-instance-name",searchable="service-instance-id,service-instance-name",uniqueProps="service-instance-id",dependentOn="service-subscription",container="service-instances")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="service-instance-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Uniquely identifies this instance of a service")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="service-instance-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This field will store a name assigned to the service-instance.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="service-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="String capturing type of service.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="service-role" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="String capturing the service role.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="environment-context" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This field will store the environment context assigned to the service-instance.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="workload-context" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This field will store the workload context assigned to the service-instance.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-version-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="persona-model-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="internal",dataCopy="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="widget-model-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="widget-model-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="bandwidth-total" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicates the total bandwidth to be used for this service.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="bandwidth-up-wan1" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="indicates the upstream bandwidth this service will use on the WAN1 port of the physical device.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="bandwidth-down-wan1" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="indicates the downstream bandwidth this service will use on the WAN1 port of the physical device.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="bandwidth-up-wan2" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="indicates the upstream bandwidth this service will use on the WAN2 port of the physical device.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="bandwidth-down-wan2" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="indicates the downstream bandwidth this service will use on the WAN2 port of the physical device.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vhn-portal-url" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL customers will use to access the vHN Portal.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="service-instance-location-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="An identifier that customers assign to the location where this service is being used.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="selflink" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Path to the controller object.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Orchestration status of this service.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:metadata" minOccurs="0"/>
-        <xs:element ref="tns:allotted-resources" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="service-instances">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of service instances")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:service-instance" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="service-subscription">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Object that group service instances.",indexedProps="service-type",dependentOn="customer",container="service-subscriptions",crossEntityReference="service-instance,service-type")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="service-type" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Value defined by orchestration to identify this service across ECOMP.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="temp-ub-sub-account-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This property will be deleted from A&amp;AI in the near future. Only stop gap solution.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:service-instances" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="service-subscriptions">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of objects that group service instances.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:service-subscription" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="customer">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="customer identifiers to provide linkage back to BSS information.",nameProps="subscriber-name",indexedProps="subscriber-name,global-customer-id,subscriber-type",searchable="global-customer-id,subscriber-name",uniqueProps="global-customer-id",container="customers",namespace="business")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="global-customer-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Global customer id used across ECOMP to uniquely identify customer.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="subscriber-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Subscriber name, an alternate way to retrieve a customer.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="subscriber-type" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Subscriber type, a way to provide VID with only the INFRA customers.",defaultValue="CUST")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:service-subscriptions" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="customers">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of customer identifiers to provide linkage back to BSS information.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:customer" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="business">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Namespace for business related constructs")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:connectors" minOccurs="0"/>
-        <xs:element ref="tns:customers" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vnf-image">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Image object that pertain to a VNF that doesn't have associated vservers.  This is a kludge.",indexedProps="application,vnf-image-uuid,application-vendor,application-version",uniqueProps="vnf-image-uuid",container="vnf-images",namespace="service-design-and-creation")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="vnf-image-uuid" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique ID of this asset")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="application" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The application that the image instantiates.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="application-vendor" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The vendor of the application.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="application-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The version of the application.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="selflink" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vnf-images">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of image objects that pertain to a VNF that doesn't have associated vservers.  This is a kludge.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:vnf-image" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="service">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Stand-in for service model definitions.  Likely to be deprecated in favor of models from ASDC.  Does not strictly map to ASDC services.",indexedProps="service-description,service-id",container="services",namespace="service-design-and-creation")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="service-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="This gets defined by others to provide a unique ID for the service, we accept what is sent.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="service-description" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Description of the service")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="service-selflink" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="service-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="service version")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="services">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of service model definitions.  Likely to be deprecated in favor of models from ASDC.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:service" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="service-capability">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Early definition of server/resource pairings, likely to be replaced by models.  No new use should be made of this.",indexedProps="service-type,vnf-type",container="service-capabilities",namespace="service-design-and-creation")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="service-type" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="This gets defined by others to provide a unique ID for the service, we accept what is sent.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vnf-type" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="service-capabilities">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of service capabilities.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:service-capability" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="element-choice-set">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="element-choice-set-uuid",indexedProps="element-choice-set-uuid",allowDirectRead="true",allowDirectWrite="false",container="element-choice-sets")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="element-choice-set-uuid" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="element-choice-set-name" type="xs:string"/>
-        <xs:element name="cardinality" type="xs:string" minOccurs="0"/>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:model-elements" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="element-choice-sets">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:element-choice-set" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="constrained-element-set">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="constrained-element-set-uuid",indexedProps="constrained-element-set-uuid",allowDirectRead="true",allowDirectWrite="false",container="constrained-element-sets")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="constrained-element-set-uuid" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="constraint-type" type="xs:string"/>
-        <xs:element name="check-type" type="xs:string"/>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:element-choice-sets" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="constrained-element-sets">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:constrained-element-set" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="model-constraint">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="model-constraint-uuid",indexedProps="model-constraint-uuid",allowDirectRead="true",allowDirectWrite="false",container="model-constraints")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="model-constraint-uuid" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="constrained-element-set-uuid-to-replace" type="xs:string"/>
-        <xs:element ref="tns:constrained-element-sets" minOccurs="0"/>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="model-constraints">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:model-constraint" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="model-element">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Defines how other models combine to make up a higher-level model.",uniqueProps="model-element-uuid",indexedProps="model-element-uuid",allowDirectRead="true",allowDirectWrite="false",container="model-elements")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="model-element-uuid" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="new-data-del-flag" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicates whether this element was created as part of instantiation from this model")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="cardinality" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="How many of this type of element are required/allowed")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="linkage-points" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:model-elements" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Defines how other models combine to make up a higher-level model")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:model-constraints" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Describes new constraints on this model element that are not part of that model's definition")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="model-elements">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:model-element" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="model-ver">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Subgraph definition provided by ASDC to describe a specific version of an inventory asset and its connections related to ASDC models",nameProps="model-name",indexedProps="model-version-id,model-name,model-version",uniqueProps="model-version-id",container="model-vers")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="model-version-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique identifier corresponding to one version of a model in ASDC")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name of the model, which can change from version to version.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-version" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Version")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-description" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Description")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:model-elements" minOccurs="0"/>
-        <xs:element ref="tns:metadata" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="model-vers">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:model-ver" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="model">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Subgraph definition provided by ASDC to describe an inventory asset and its connections related to ASDC models, independent of version",nameProps="model-type",indexedProps="model-invariant-id,model-type",uniqueProps="model-invariant-id",container="models",namespace="service-design-and-creation")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="model-invariant-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique identifier corresponding to the main definition of a model in ASDC")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-type" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Type of the model, e.g., service, resource, widget, etc.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:model-vers" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="models">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of subgraph definitions provided by ASDC to describe the inventory assets and their connections related to ASDC models")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:model" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="related-lookup">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="TBD",uniqueProps="related-lookup-uuid",indexedProps="related-lookup-uuid",allowDirectRead="true",allowDirectWrite="false",container="related-lookups")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="related-lookup-uuid" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="source-node-type" type="xs:string"/>
-        <xs:element name="source-node-property" type="xs:string"/>
-        <xs:element name="target-node-type" type="xs:string"/>
-        <xs:element name="target-node-property" type="xs:string"/>
-        <xs:element name="property-collect-list" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="related-lookups">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:related-lookup" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="property-constraint">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="TBD",uniqueProps="property-constraint-uuid",indexedProps="property-constraint-uuid",allowDirectRead="true",allowDirectWrite="false",container="property-constraints")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="property-constraint-uuid" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="constraint-type" type="xs:string"/>
-        <xs:element name="property-name" type="xs:string"/>
-        <xs:element name="property-value" type="xs:string"/>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="property-constraints">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:property-constraint" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="named-query-element">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="TBD",uniqueProps="named-query-element-uuid",indexedProps="named-query-element-uuid",allowDirectRead="true",allowDirectWrite="false",container="named-query-elements")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="named-query-element-uuid" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="property-collect-list" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
-        <xs:element name="property-limit-desc" type="xs:string" minOccurs="0"/>
-        <xs:element name="do-not-output" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:named-query-elements" minOccurs="0"/>
-        <xs:element ref="tns:related-lookups" minOccurs="0"/>
-        <xs:element ref="tns:property-constraints" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="named-query-elements">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:named-query-element" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="named-query">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="TBD",nameProps="named-query-name",uniqueProps="named-query-uuid",indexedProps="named-query-uuid,named-query-name",container="named-queries",namespace="service-design-and-creation")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="named-query-uuid" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true)</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="named-query-name" type="xs:string"/>
-        <xs:element name="named-query-version" type="xs:string"/>
-        <xs:element name="required-input-params" minOccurs="0">
-          <xs:complexType>
-            <xs:annotation>
-              <xs:appinfo>
-                <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="TBD",nameProps="named-query-name",uniqueProps="named-query-uuid",indexedProps="named-query-uuid,named-query-name",container="named-queries",namespace="service-design-and-creation")</annox:annotate>
-              </xs:appinfo>
-            </xs:annotation>
-            <xs:sequence>
-              <xs:element name="required-input-param" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-            </xs:sequence>
-          </xs:complexType>
-        </xs:element>
-        <xs:element name="description" type="xs:string" minOccurs="0"/>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:named-query-elements" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="named-queries">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:named-query" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="service-design-and-creation">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Namespace for objects managed by ASDC")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:vnf-images" minOccurs="0"/>
-        <xs:element ref="tns:services" minOccurs="0"/>
-        <xs:element ref="tns:service-capabilities" minOccurs="0"/>
-        <xs:element ref="tns:models" minOccurs="0"/>
-        <xs:element ref="tns:named-queries" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="logical-link">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Logical links generally connect l-interfaces but are used to express logical connectivity between two points",indexedProps="link-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,link-id,prov-status,circuit-id,purpose",uniqueProps="link-id",container="logical-links",namespace="network",searchable="link-name")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="link-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="e.g., evc-name, or vnf-nameA_interface-nameA_vnf-nameZ_interface-nameZ")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="in-maint" type="xs:boolean">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="link-type" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Type of logical link, e.g., evc")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="speed-value" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Captures the numeric part of the speed")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="speed-units" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Captures the units corresponding to the speed")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ip-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="v4, v6, or ds for dual stack (should be att-ip-version)")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="routing-protocol" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="For example, static or BGP")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-version-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="persona-model-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="internal",dataCopy="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="widget-model-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="widget-model-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="operational-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indication of operational status of the logical link.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="prov-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Trigger for operational monitoring of this VNF by BAU Service Assurance systems.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="link-role" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indication of the network use of the logical link.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="link-name2" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Alias or alternate name (CLCI or D1 name).")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="link-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="UUID of the logical-link, SDNC generates this.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="circuit-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Circuit id")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="purpose" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Reason for this entity, role it is playing")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="logical-links">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of logical connections")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:logical-link" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="class-of-service">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(indexedProps="cos",dependentOn="site-pair",container="classes-of-service")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="cos" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="unique identifier of probe")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="probe-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="identifier of probe")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="probe-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="type of probe")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="classes-of-service">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="class-of-service of probe")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:class-of-service" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="site-pair">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(indexedProps="site-pair-id",uniqueProps="site-pair-id",dependentOn="routing-instance",container="site-pairs")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="site-pair-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="unique identifier of probe")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="source-ip" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Prefix address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="destination-ip" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Prefix address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ip-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="ip version, v4, v6")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="destination-hostname" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Hostname of the destination equipment to which SLAs are measured against.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="destination-equip-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The type of destinatination equipment. Could be Router, UCPE, etc.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:classes-of-service" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="site-pairs">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="probe within a set")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:site-pair" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="routing-instance">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(indexedProps="routing-instance-id",dependentOn="site-pair-set",container="routing-instances")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="routing-instance-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique id of routing instance")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="rpm-owner" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="rpm owner")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:site-pairs" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="routing-instances">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="set of probes related to generic-vnf routing instance")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:routing-instance" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="site-pair-set">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Set of instances for probes used to measure service level agreements",indexedProps="site-pair-set-id",uniqueProps="site-pair-set-id",container="site-pair-sets",namespace="network")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="site-pair-set-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique id of site pair set.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:routing-instances" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="site-pair-sets">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of sets of instances for probes related to generic-vnf")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:site-pair-set" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="route-target">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Route target information",container="route-targets",dependentOn="vpn-binding",canBeLinked="true")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="global-route-target" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Number used to identify an RT, globally unique in the network")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="route-target-role" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Role assigned to this route target")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="route-targets">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of route target information")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:route-target" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vpn-binding">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="VPN binding",nameProps="vpn-name,vpn-type",indexedProps="vpn-name,vpn-id,vpn-type",searchable="vpn-id,vpn-name",uniqueProps="vpn-id",container="vpn-bindings",namespace="network")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="vpn-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="VPN ID, globally unique within A&amp;AI")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vpn-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="VPN Name")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vpn-platform" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the platform associated with the VPN example AVPN, Mobility")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vpn-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Type of the vpn, should be taken from enumerated/valid values")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vpn-region" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="region of customer vpn")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="customer-vpn-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="id for this customer vpn")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="route-distinguisher" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used to distinguish the distinct VPN routes of separate customers who connect to the provider in an MPLS network.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:route-targets" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="l3-networks relate to vpn-bindings")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vpn-bindings">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:vpn-binding" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vpls-pe">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="VPLS Provider Edge routers.",indexedProps="prov-status,equipment-name",container="vpls-pes",namespace="network")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="equipment-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true)</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="prov-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Trigger for operational monitoring of this VNF by BAU Service Assurance systems.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipv4-oam-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by GenericVnf (v4-loopback0-ip-address).")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="equipment-role" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Client should send valid enumerated value, e.g., VPLS-PE.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vlan-id-outer" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Temporary location for stag to get to VCE")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:p-interfaces" minOccurs="0"/>
-        <xs:element ref="tns:lag-interfaces" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vpls-pes">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of VPLS Provider Edge routers")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:vpls-pe" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="multicast-configuration">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(indexedProps="multicast-configuration-id",uniqueProps="multicast-configuration-id",container="multicast-configurations",namespace="network")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="multicast-configuration-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique id of multicast configuration.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="multicast-protocol" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="protocol of multicast configuration")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="rp-type" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="rp type of multicast configuration")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="multicast-configurations">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="multicast configuration of generic-vnf ip-address")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:multicast-configuration" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="cvlan-tag-entry">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(dependentOn="port-group",indexedProps="cvlan-tag",container="cvlan-tags")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="cvlan-tag" type="xs:unsignedInt">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="See mis-na-virtualization-platform.yang")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="cvlan-tags">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:cvlan-tag-entry" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="port-group">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Used to capture the network interfaces of this VCE",nameProps="port-group-name",indexedProps="port-group-id,heat-stack-id,interface-id,interface-name,switch-name",dependentOn="vce",container="port-groups")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="interface-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique ID of the interface")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="neutron-network-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Neutron network id of this Interface")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="neutron-network-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Neutron network name of this Interface")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="interface-role" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Role assigned to this Interface, should use values as defined in ECOMP Yang models.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="port-group-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Unique ID for port group in vmware")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="port-group-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Likely to duplicate value of neutron network name")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="switch-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="DVS or standard switch name (should be non-null for port groups associated with DVS)")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="orchestration-status" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Orchestration status of this VNF, mastered by MSO")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="heat-stack-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Heat stack id corresponding to this instance, managed by MSO")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="mso-catalog-key" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Corresponds to the SDN-C catalog id used to configure this VCE")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:cvlan-tags" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="port-groups">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:port-group" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="license">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Metadata for license group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce",container="licenses")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="group-uuid" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique ID for the license group the resource belongs to, should be uuid.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-uuid" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique ID of a license resource. ")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Concurrency value")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="licenses">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Licenses to be allocated across resources, keyed by group-uuid and resource-uuid, related to license management")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:license" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="entitlement">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Metadata for entitlement group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce",container="entitlements")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="group-uuid" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique ID for the entitlement group the resource comes from, should be uuid.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-uuid" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique ID of an entitlement resource. ")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Concurrency value")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="entitlements">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Entitlements, keyed by group-uuid and resource-uuid, related to license management")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:entitlement" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vce">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Virtual Customer Edge Router, used specifically for Gamma.  This object is deprecated.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vces",namespace="network",extendsFrom="vnf")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="vnf-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique id of VNF.  This is unique across the graph.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vnf-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name of VNF.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vnf-name2" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Alternate name of VNF.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vnf-type" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="service-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Unique identifier of service, does not strictly map to ASDC services, SOON TO BE DEPRECATED.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="regional-resource-zone" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Regional way of organizing pservers, source of truth should define values")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="prov-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Trigger for operational monitoring of this resource by Service Assurance systems.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="operational-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicator for whether the resource is considered operational")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="license-key" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="OBSOLETE -  do not use")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="equipment-role" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Network role being played by this VNF")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Orchestration status of this VNF, mastered by MSO")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="heat-stack-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Heat stack id corresponding to this instance, managed by MSO")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="mso-catalog-key" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Corresponds to the SDN-C catalog id used to configure this VCE")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vpe-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Unique ID of VPE connected to this VCE.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="v6-vce-wan-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Valid v6 IP address for the WAN Link on this router.  Implied length of /64.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipv4-oam-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Address tail-f uses to configure vce, also used for troubleshooting and is IP used for traps generated by VCE.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipv4-loopback0-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Loopback0 address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="entitlement-resource-uuid" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="OBSOLETE -  see child relationships")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:port-groups" minOccurs="0"/>
-        <xs:element ref="tns:licenses" minOccurs="0"/>
-        <xs:element ref="tns:entitlements" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vces">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of Virtual Customer Edge Routers, used specifically for Gamma.  This object is deprecated.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:vce" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vnfc">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(indexedProps="vnfc-name,prov-status,nfc-function,nfc-naming-code,ipaddress-v4-oam-vip,in-maint,is-closed-loop-disabled,group-notation,model-invariant-id,model-version-id",searchable="vnfc-name",container="vnfcs",namespace="network")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="vnfc-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique ID of vnfc.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="nfc-naming-code" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Short code that is used in naming instances of the item being modeled")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="nfc-function" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="English description of function that the specific resource deployment is providing. Assigned as part of the customization of a resource in a service")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="prov-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="prov status of this vnfc")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Orchestration status of this VNF, mastered by APP-C")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipaddress-v4-oam-vip" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Oam V4 vip address of this vnfc")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="in-maint" type="xs:boolean">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="is-closed-loop-disabled" type="xs:boolean">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether closed loop function is enabled on this node")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="group-notation" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Group notation of VNFC")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-version-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vnfcs">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="virtual network components associated with a vserver from application controller.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:vnfc" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="subnet">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(indexedProps="subnet-id,subnet-name",nameProps="subnet-name",uniqueProps="subnet-id",dependentOn="l3-network",container="subnets")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="subnet-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Subnet ID, should be UUID.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="subnet-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name associated with the subnet.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="neutron-subnet-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Neutron id of this subnet")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="gateway-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="gateway ip address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="network-start-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="network start address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="cidr-mask" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="cidr mask")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ip-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="ip version")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Orchestration status of this VNF, mastered by MSO")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="dhcp-enabled" type="xs:boolean">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="dhcp enabled")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="dhcp-start" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the start address reserved for use by dhcp")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="dhcp-end" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the last address reserved for use by dhcp")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="subnet-role" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="role of the subnet, referenced when assigning IPs")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="subnets">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:subnet" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="ctag-assignment">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(indexedProps="vlan-id-inner",dependentOn="l3-network",container="ctag-assignments")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="vlan-id-inner" type="xs:unsignedInt">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="id.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="ctag-assignments">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:ctag-assignment" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="segmentation-assignment">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Openstack segmentation assignment.",indexedProps="segmentation-id",dependentOn="l3-network",container="segmentation-assignments")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="segmentation-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Route Table Reference id, UUID assigned to this instance.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Concurrency value")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="segmentation-assignments">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of openstack segmentation assignments")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:segmentation-assignment" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="l3-network">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Generic network definition",nameProps="network-name",indexedProps="heat-stack-id,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role",searchable="network-id,network-name",uniqueProps="network-id",container="l3-networks",namespace="network")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="network-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Network ID, should be uuid. Unique across A&amp;AI.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="network-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name of the network, governed by some naming convention..")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="network-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Type of the network - who defines these values?")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="network-role" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Role the network plans - who defines these values?")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="network-technology" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Network technology - who defines these values?")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="neutron-network-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Neutron network id of this Interface")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="is-bound-to-vpn" type="xs:boolean">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="Set to true if bound to VPN")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="service-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Unique identifier of service from ASDC.  Does not strictly map to ASDC services.  SOON TO BE DEPRECATED")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="network-role-instance" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="network role instance")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Orchestration status of this VNF, mastered by MSO")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="heat-stack-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Heat stack id corresponding to this instance, managed by MSO")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="mso-catalog-key" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Corresponds to the SDN-C catalog id used to configure this VCE")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="contrail-network-fqdn" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Contrail FQDN for the network")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-version-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="persona-model-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="internal",dataCopy="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-customization-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="captures the id of all the configuration used to customize the resource for the service.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="widget-model-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="widget-model-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="physical-network-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name associated with the physical network.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="is-provider-network" type="xs:boolean">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="boolean indicatating whether or not network is a provider network.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="is-shared-network" type="xs:boolean">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="boolean indicatating whether or not network is a shared network.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="is-external-network" type="xs:boolean">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="boolean indicatating whether or not network is an external network.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="selflink" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Path to the controller object.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="operational-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicator for whether the resource is considered operational.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:subnets" minOccurs="0"/>
-        <xs:element ref="tns:ctag-assignments" minOccurs="0"/>
-        <xs:element ref="tns:segmentation-assignments" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Relates to tenant (or is it a child of tenant), complex, service, vpn-binding")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="l3-networks">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:l3-network" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="network-policy">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(nameProps="network-policy-fqdn",indexedProps="network-policy-id,network-policy-fqdn",searchable="network-policy-id,network-policy-fqdn",uniqueProps="network-policy-id",container="network-policies",namespace="network")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="network-policy-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="UUID representing unique key to this instance")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="network-policy-fqdn" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Contrail FQDN for the policy")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="heat-stack-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="ID for the openStack Heat instance")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="network-policies">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:network-policy" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vf-module">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="a deployment unit of VNFCs",indexedProps="vf-module-id,vf-module-name,heat-stack-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-service-instance-fqdn",searchable="vf-module-id,vf-module-name",dependentOn="generic-vnf",container="vf-modules")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="vf-module-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique ID of vf-module.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vf-module-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name of vf-module")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="heat-stack-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Heat stack id corresponding to this instance.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="orchestration status of this vf-module, mastered by MSO")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="is-base-vf-module" type="xs:boolean">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is base vf module")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-version-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="persona-model-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="internal",dataCopy="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-customization-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="captures the id of all the configuration used to customize the resource for the service.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="widget-model-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="widget-model-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="contrail-service-instance-fqdn" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the Contrail unique ID for a service-instance")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="module-index" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the index will track the number of modules of a given type that have been deployed in a VNF, starting with 0, and always choosing the lowest available digit")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="selflink" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Path to the controller object.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vf-modules">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of vf-modules, a deployment unit of VNFCs")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:vf-module" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="generic-vnf">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="General purpose VNF",nameProps="vnf-name",indexedProps="is-closed-loop-disabled,vnf-name2,vnf-type,heat-stack-id,in-maint,vnf-name,vnf-id,regional-resource-zone,prov-status,service-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,nf-type,nf-function,nf-naming-code,nf-role",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="generic-vnfs",namespace="network",extendsFrom="vnf",containsSuggestibleProps="true",suggestionAliases="VNFs")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="vnf-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique id of VNF.  This is unique across the graph.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vnf-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name of VNF.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vnf-name2" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Alternate name of VNF.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vnf-type" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="service-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Unique identifier of service, does not necessarily map to ASDC service models.  SOON TO BE DEPRECATED")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="regional-resource-zone" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Regional way of organizing pservers, source of truth should define values")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="prov-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Trigger for operational monitoring of this resource by Service Assurance systems.",suggestibleOnSearch="true")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="operational-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicator for whether the resource is considered operational.  Valid values are in-service-path and out-of-service-path.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="license-key" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="OBSOLETE -  do not use")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="equipment-role" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Client should send valid enumerated value")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Orchestration status of this VNF, used by MSO.",suggestibleOnSearch="true")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="heat-stack-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Heat stack id corresponding to this instance, managed by MSO")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="mso-catalog-key" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Corresponds to the SDN-C catalog id used to configure this VCE")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="management-option" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="identifier of managed by ATT or customer")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipv4-oam-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by generic-vnf.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipv4-loopback0-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="v4 Loopback0 address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="nm-lan-v6-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="v6 Loopback address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="management-v6-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="v6 management address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vcpu" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="number of vcpus ordered for this instance of VNF, used for VNFs with no vservers/flavors, to be used only by uCPE")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vcpu-units" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="units associated with vcpu, used for VNFs with no vservers/flavors, to be used only by uCPE")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vmemory" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="number of GB of memory ordered for this instance of VNF, used for VNFs with no vservers/flavors, to be used only by uCPE")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vmemory-units" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="units associated with vmemory, used for VNFs with no vservers/flavors, to be used only by uCPE")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vdisk" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="number of vdisks ordered for this instance of VNF, used for VNFs with no vservers/flavors, to be used only uCPE")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vdisk-units" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="units associated with vdisk, used for VNFs with no vservers/flavors, to be used only by uCPE")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="in-maint" type="xs:boolean">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="is-closed-loop-disabled" type="xs:boolean">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether closed loop function is enabled on this node")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="summary-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="details regarding the generic-vnf operation, PLEASE DISCONTINUE USE OF THIS FIELD.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="encrypted-access-flag" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="indicates whether generic-vnf access uses SSH")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="entitlement-assignment-group-uuid" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="UUID of the Entitlement group used for licensing VNFs, OBSOLETE -  See child relationships.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="entitlement-resource-uuid" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="UUID of the specific entitlement resource.  OBSOLETE -  See child relationships.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="license-assignment-group-uuid" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="UUID of the license assignment group.  OBSOLETE -  See child relationships.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="license-key-uuid" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="UUID of the actual license resource.  OBSOLETE -  See child relationships.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-version-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="persona-model-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="internal",dataCopy="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-customization-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="captures the id of all the configuration used to customize the resource for the service.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="widget-model-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="widget-model-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="as-number" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="as-number of the VNF")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="regional-resource-subzone" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="represents sub zone of the rr plane")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="nf-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Generic description of the type of NF",suggestibleOnSearch="true")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="nf-function" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="English description of Network function that the specific VNF deployment is providing")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="nf-role" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="role in the network that this model will be providing",suggestibleOnSearch="true")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="nf-naming-code" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="string assigned to this model used for naming purposes")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="selflink" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Path to the controller object.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipv4-oam-gateway-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Gateway address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipv4-oam-gateway-address-prefix-length" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Prefix length for oam-address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vlan-id-outer" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Temporary location for S-TAG to get to VCE")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="nm-profile-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Network Management profile of this VNF")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:l-interfaces" minOccurs="0"/>
-        <xs:element ref="tns:lag-interfaces" minOccurs="0"/>
-        <xs:element ref="tns:vf-modules" minOccurs="0"/>
-        <xs:element ref="tns:licenses" minOccurs="0"/>
-        <xs:element ref="tns:entitlements" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="generic-vnfs">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of VNFs")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:generic-vnf" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="lag-link">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="LAG links can connect lag-interfaces",indexedProps="link-name",container="lag-links",namespace="network")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="link-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Alphabetical concatenation of lag-interface names")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="lag-links">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of link aggregation connections")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:lag-link" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="newvce">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,prov-status,vnf-id2",searchable="vnf-id2,vnf-name,vnf-name2",uniqueProps="vnf-id2",container="newvces",namespace="network")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="vnf-id2" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique id of VNF, can't use same attribute name right now until we promote this new object")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vnf-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name of VNF.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vnf-name2" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Alternate name of VNF.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vnf-type" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="prov-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Trigger for operational monitoring of this VNF by BAU Service Assurance systems.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="operational-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicator for whether the resource is considered operational")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="license-key" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="OBSOLETE -  do not use")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipv4-oam-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by GenericVnf (v4-loopback0-ip-address).")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="equipment-role" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Client should send valid enumerated value.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipv4-loopback0-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="v4 Loopback0 address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Orchestration status of this VNF, mastered by MSO.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="heat-stack-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Heat stack id corresponding to this instance, managed by MSO")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="mso-catalog-key" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Corresponds to the SDN-C catalog id used to configure this VCE")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:l-interfaces" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="newvces">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:newvce" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="pnf">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="PNF represents a physical network function. typically equipment used in the D1 world. in 1607, this will be populated by SDN-C to represent a premises router that a uCPE connects to. But this can be used to represent any physical device that is not an AIC node or uCPE.",indexedProps="pnf-name,orchestration-status,inv-status",searchable="pnf-name",uniqueProps="pnf-name",container="pnfs",namespace="network")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="pnf-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="unique name of Physical Network Function.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="pnf-name2" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="name of Physical Network Function.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="pnf-name2-source" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="source of name2")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="pnf-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="id of pnf")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="equip-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Equipment type.  Source of truth should define valid values.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="equip-vendor" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Equipment vendor.  Source of truth should define valid values.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="equip-model" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Equipment model.  Source of truth should define valid values.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="management-option" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="identifier of managed by ATT or customer")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipaddress-v4-oam" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="ipv4-oam-address with new naming convention for IP addresses")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="sw-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="sw-version is the version of SW for the hosted application on the PNF.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="in-maint" type="xs:boolean">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="Used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="frame-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="ID of the physical frame (relay rack) where pnf is installed.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="serial-number" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Serial number of the device")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipaddress-v4-loopback-0" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="IPV4 Loopback 0 address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipaddress-v6-loopback-0" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="IPV6 Loopback 0 address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipaddress-v4-aim" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="IPV4 AIM address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipaddress-v6-aim" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="IPV6 AIM address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipaddress-v6-oam" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="IPV6 OAM address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="inv-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="CANOPI's inventory status.  Only set with values exactly as defined by CANOPI.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="prov-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Prov Status of this device (not under canopi control) Valid values [PREPROV/NVTPROV/PROV]")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="nf-role" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Nf Role is the role performed by this instance in the network.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:p-interfaces" minOccurs="0"/>
-        <xs:element ref="tns:lag-interfaces" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="pnfs">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of Physical Network Functions.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:pnf" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="physical-link">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of physical connections, typically between p-interfaces",indexedProps="circuit-id,link-name",alternateKeys1="circuit-id",container="physical-links",namespace="network",searchable="link-name,circuit-id")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="link-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="e.g., hostnameA_p-connection_nameA_hostnameZ+p_connection-nameZ")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="speed-value" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Captures the numeric part of the speed")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="speed-units" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Captures the units corresponding to the speed")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="circuit-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Circuit it")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="dual-mode" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Dual access mode (e.g., primary, secondary")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="management-option" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="To provide information on who manages this circuit. A&amp;AI or 3rd party transport provider")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="service-provider-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name of the service Provider on this link.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="physical-links">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of physical connections, typically between p-interfaces")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:physical-link" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vig-server">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="vig-server contains information about a vig server used for IPSec-configuration. Populated by SDN-C from 1607",indexedProps="vig-address-type",dependentOn="ipsec-configuration",container="vig-servers")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="vig-address-type" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="indicates whether the VIG is for AVPN or INTERNET")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipaddress-v4-vig" type="xs:string" minOccurs="0" maxOccurs="unbounded">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="v4 IP of the vig server")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipaddress-v6-vig" type="xs:string" minOccurs="0" maxOccurs="unbounded">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="v6 IP of the vig server")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vig-servers">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:vig-server" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="ipsec-configuration">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="IPSec configuration node will contain various configuration data for the NMTE VNF. This node will have an edge to the generic-vnf (vnf type = TE). Starting 1607, this data will be populated by SDN-C",indexedProps="ipsec-configuration-id",uniqueProps="ipsec-configuration-id",container="ipsec-configurations",namespace="network")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="ipsec-configuration-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="UUID of this configuration")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="requested-vig-address-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicate the type of VIG server like AVPN, INTERNET, BOTH")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="requested-encryption-strength" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Encryption values like 3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="requested-dmz-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="ATT can offer a shared DMZ or a DMZ specific to a customer")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="shared-dmz-network-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Network address of shared DMZ")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="requested-customer-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="If the DMZ is a custom DMZ, this field will indicate the customer information")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ike-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="can be 1 or 2")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ikev1-authentication" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Contains values like md5, sha1, sha256, sha384")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ikev1-encryption" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Encyption values like 3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ikev1-dh-group" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Diffie-Hellman group like DH-GROUP2, DH-GROUP5, DH-GROUP14")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ikev1-am-group-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Group name defined in VIG for clients using aggressive mode")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ikev1-am-password" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="pre-shared key for the above group name ")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ikev1-sa-lifetime" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Lifetime for IKEv1 SA")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipsec-authentication" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="md5, sha1, sha256, sha384")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipsec-encryption" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipsec-sa-lifetime" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Life time for IPSec SA")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipsec-pfs" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="enable PFS or not")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="xauth-userid" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="user ID for xAuth, sm-user,ucpeHostName,nmteHostName")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="xauth-user-password" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Encrypted using the Juniper $9$ algorithm")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="dpd-interval" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The time between DPD probe")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="dpd-frequency" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Maximum number of DPD before claiming the tunnel is down")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:vig-servers" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="ipsec-configurations">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:ipsec-configuration" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="route-table-reference">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Openstack route table reference.",nameProps="route-table-reference-fqdn",uniqueProps="route-table-reference-id",indexedProps="route-table-reference-id,route-table-reference-fqdn",container="route-table-references",namespace="network")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="route-table-reference-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Route Table Reference id, UUID assigned to this instance.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="route-table-reference-fqdn" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="FQDN entry in the route table.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Concurrency value")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="route-table-references">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of openstack route table references")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:route-table-reference" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="instance-group">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="General mechanism for grouping instances",nameProps="description",uniqueProps="id",searchable="id,description",indexedProps="id,description,type,sub-type",container="instance-groups",namespace="network")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="instance-group-role" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="role of the instance group.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="ASDC model id for this resource or service model.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-version-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="ASDC model version uid for this resource model.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Instance Group ID, UUID assigned to this instance.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="description" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Descriptive text to help identify the usage of this instance-group")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="type" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Only valid value today is lower case ha for high availability")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="sub-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Valid values for ha type are [geo-activeactive, geo-activestandby, local-activeactive, local-activestandby]")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Concurrency value")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="instance-groups">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of openstack route table references")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:instance-group" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="zone">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="A zone is a grouping of assets in a location homing to the same connections into the CBB",nameProps="zone-name",indexedProps="zone-id,design-type,zone-context",uniqueProps="zone-id",container="zones",namespace="network")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="zone-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Code assigned by AIC to the zone")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="zone-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="English name associated with the zone")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="design-type" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Design of zone [Medium/Large…]")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="zone-context" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Context of zone [production/test]")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Status of a zone.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Concurrency value")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="zones">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of zones")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:zone" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="network">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Namespace for network inventory resources.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:logical-links" minOccurs="0"/>
-        <xs:element ref="tns:site-pair-sets" minOccurs="0"/>
-        <xs:element ref="tns:vpn-bindings" minOccurs="0"/>
-        <xs:element ref="tns:vpls-pes" minOccurs="0"/>
-        <xs:element ref="tns:multicast-configurations" minOccurs="0"/>
-        <xs:element ref="tns:vces" minOccurs="0"/>
-        <xs:element ref="tns:vnfcs" minOccurs="0"/>
-        <xs:element ref="tns:l3-networks" minOccurs="0"/>
-        <xs:element ref="tns:network-policies" minOccurs="0"/>
-        <xs:element ref="tns:generic-vnfs" minOccurs="0"/>
-        <xs:element ref="tns:lag-links" minOccurs="0"/>
-        <xs:element ref="tns:newvces" minOccurs="0"/>
-        <xs:element ref="tns:pnfs" minOccurs="0"/>
-        <xs:element ref="tns:physical-links" minOccurs="0"/>
-        <xs:element ref="tns:ipsec-configurations" minOccurs="0"/>
-        <xs:element ref="tns:route-table-references" minOccurs="0"/>
-        <xs:element ref="tns:instance-groups" minOccurs="0"/>
-        <xs:element ref="tns:zones" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="reserved-prop-names">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Internal map to define some reserved properties of a vertex",uniqueProps="aai-unique-key",indexedProps="aai-unique-key,source-of-truth,aai-node-type,aai-uri")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="last-mod-source-of-truth" type="xs:string" minOccurs="0"/>
-        <xs:element name="aai-node-type" type="xs:string" minOccurs="0"/>
-        <xs:element name="aai-created-ts" type="xs:unsignedInt" minOccurs="0"/>
-        <xs:element name="aai-unique-key" type="xs:string" minOccurs="0"/>
-        <xs:element name="aai-last-mod-ts" type="xs:unsignedInt" minOccurs="0"/>
-        <xs:element name="source-of-truth" type="xs:string" minOccurs="0"/>
-        <xs:element name="aai-uri" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="edge-prop-names">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Internal map to define the properties of an edge and interpret the map EdgeRules",edgeInfo="edgeLabel,direction,multiplicityRule,isParent,usesResource,hasDelTarget,SVC-INFRA,SVC-INFRA-REV")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="edgeLabel" type="xs:string" minOccurs="0"/>
-        <xs:element name="direction" type="xs:string" minOccurs="0"/>
-        <xs:element name="multiplicityRule" type="xs:string" minOccurs="0"/>
-        <xs:element name="is-parent" type="xs:string" minOccurs="0"/>
-        <xs:element name="uses-resource" type="xs:string" minOccurs="0"/>
-        <xs:element name="has-del-target" type="xs:string" minOccurs="0"/>
-        <xs:element name="SVC-INFRA" type="xs:string" minOccurs="0"/>
-        <xs:element name="prevent-delete" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="aai-internal">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:reserved-prop-names" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element ref="tns:edge-prop-names" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="inventory">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:search" minOccurs="0"/>
-        <xs:element ref="tns:actions" minOccurs="0"/>
-        <xs:element ref="tns:cloud-infrastructure" minOccurs="0"/>
-        <xs:element ref="tns:license-management" minOccurs="0"/>
-        <xs:element ref="tns:business" minOccurs="0"/>
-        <xs:element ref="tns:service-design-and-creation" minOccurs="0"/>
-        <xs:element ref="tns:network" minOccurs="0"/>
-        <xs:element ref="tns:aai-internal" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="notification-event-header">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="id" type="xs:string" minOccurs="0"/>
-        <xs:element name="timestamp" type="xs:string" minOccurs="0"/>
-        <xs:element name="source-name" type="xs:string" minOccurs="0"/>
-        <xs:element name="domain" type="xs:string" minOccurs="0"/>
-        <xs:element name="sequence-number" type="xs:string" minOccurs="0"/>
-        <xs:element name="severity" type="xs:string" minOccurs="0"/>
-        <xs:element name="event-type" type="xs:string" minOccurs="0"/>
-        <xs:element name="version" type="xs:string" minOccurs="0"/>
-        <xs:element name="action" type="xs:string" minOccurs="0"/>
-        <xs:element name="entity-type" type="xs:string" minOccurs="0"/>
-        <xs:element name="top-entity-type" type="xs:string" minOccurs="0"/>
-        <xs:element name="entity-link" type="xs:string" minOccurs="0"/>
-        <xs:element name="status" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="notification-event">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="cambria.partition" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:notification-event-header" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="overloaded-model">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Allows for legacy POST of old-style and new-style models")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="model-invariant-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique identifier corresponding to the main definition of a model in ASDC")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-name-version-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique identifier corresponding to one version of a model in ASDC")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-type" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Type of the model, e.g., service, resource, widget, etc.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name of the model, which can change from version to version.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Invariant unique ID which does not change from version to version")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-version" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Version")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-description" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Description")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:model-vers" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="query-parameters">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="QueryParameters for performing a named-query or model query")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:named-query" minOccurs="0"/>
-        <xs:element ref="tns:overloaded-model" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="instance-filter">
-    <xs:complexType>
-      <xs:sequence/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="instance-filters">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="InstanceFilters for performing a named-query or model query")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:instance-filter" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="secondary-filt">
-    <xs:complexType>
-      <xs:sequence/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="secondary-filts">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="SecondaryFilts for performing a named-query or model query")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:secondary-filt" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="model-and-named-query-search">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="ModelAndNamedQuerySearch holds query-parameters and instance-properties for performing a named-query or model query")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:query-parameters" minOccurs="0"/>
-        <xs:element ref="tns:instance-filters" minOccurs="0"/>
-        <xs:element ref="tns:secondary-filts" minOccurs="0"/>
-        <xs:element name="top-node-type" type="xs:string" minOccurs="0"/>
-        <xs:element name="secondary-filter-cut-point" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="properties">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Property holder for query properties or instance properties")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="property-name" type="xs:string" minOccurs="0"/>
-        <xs:element name="property-value" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="extra-property">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="property-name" type="xs:string" minOccurs="0"/>
-        <xs:element name="property-value" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="extra-properties">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Extra properties for inventory item for response list")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:extra-property" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="inventory-response-item">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Inventory item for response list",container="inventory-response-items")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="model-name" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:extra-properties" minOccurs="0"/>
-        <xs:element ref="tns:inventory-response-items" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="inventory-response-items">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Container for inventory items in response list",container="response-list")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:inventory-response-item" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="response-list">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Response container for the results of a named-query or model query")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:inventory-response-items" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vnf">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Abstract vnf class",indexedProps="vnf-id",uniqueProps="vnf-id",inheritors="vce,generic-vnf",isAbstract="true")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="vnf-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique id of VNF.  This is unique across the graph.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
+	<xs:element name="inventory-item-data">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="property-name" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="property-value" type="xs:string"
+					minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="inventory-item">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="inventory-item-type" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="inventory-item-link" type="xs:string"
+					minOccurs="0" />
+				<xs:element ref="tns:inventory-item-data" minOccurs="0"
+					maxOccurs="unbounded" />
+				<xs:element ref="tns:tagged-inventory-item-list"
+					minOccurs="0" maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="tagged-inventory-item-list">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:inventory-item" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="edge-tag-query-result">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:tagged-inventory-item-list"
+					minOccurs="0" maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="start-node-filter">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="property-name" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="property-value" type="xs:string"
+					minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="include-node-filter">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="include-node-type" type="xs:string"
+					minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="secondary-filter">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="property-name" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="filter-type" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="property-value" type="xs:string"
+					minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="edge-tag-query-request">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="edge-tag" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="result-detail" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="start-node-type" type="xs:string"
+					minOccurs="0" />
+				<xs:element ref="tns:start-node-filter" minOccurs="0"
+					maxOccurs="unbounded" />
+				<xs:element ref="tns:include-node-filter" minOccurs="0"
+					maxOccurs="unbounded" />
+				<xs:element ref="tns:secondary-filter" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="result-data">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="resource-type" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The
+								specific type of node in the A&amp;AI graph")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-link" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The
+								URL to the specific resource")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="search-results">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:result-data" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="relationship-data">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="relationship-key" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="A
+								keyword provided by A&amp;AI to indicate an attribute.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="relationship-value" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Value
+								of the attribute.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="related-to-property">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="property-key" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Key
+								part of a key/value pair")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="property-value" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Value
+								part of a key/value pair")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="relationship">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="related-to" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="A
+								keyword provided by A&amp;AI to indicate type of node.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="related-link" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL
+								to the object in A&amp;AI.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-data" minOccurs="0"
+					maxOccurs="unbounded" />
+				<xs:element ref="tns:related-to-property" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="relationship-list">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:relationship" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="oam-network">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="OAM
+						network, to be deprecated shortly. Do not use for new purposes.
+						",nameProps="network-name",indexedProps="cvlan-tag,network-uuid,network-name",dependentOn="cloud-region",container="oam-networks")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="network-uuid" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="UUID
+								of the network. Unique across a cloud-region")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="network-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name
+								of the network.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="cvlan-tag" type="xs:unsignedInt">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="cvlan-id")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipv4-oam-gateway-address"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for VNF firewall rule so customer cannot send customer traffic
+								over this oam network")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipv4-oam-gateway-address-prefix-length"
+					type="xs:int" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for VNF firewall rule so customer cannot send customer traffic
+								over this oam network")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="oam-networks">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of OAM networks, to be deprecated shortly. Do not use for new
+						purposes. ")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:oam-network" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="dvs-switch">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Digital
+						virtual switch metadata, used by SDN-C to configure VCEs. A&amp;AI
+						needs to receive this data from the PO deployment team and
+						administer it using the provisioningTool.sh into A&amp;AI.
+						",indexedProps="vcenter-url,switch-name",dependentOn="cloud-region",container="dvs-switches")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="switch-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="DVS
+								switch name")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vcenter-url" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL
+								used to reach the vcenter")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="dvs-switches">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of digital virtual switch metadata used for vmWare VCEs and
+						GenericVnfs.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:dvs-switch" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="availability-zone">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Availability
+						zone, a collection of compute
+						hosts/pservers",indexedProps="availability-zone-name",dependentOn="cloud-region",container="availability-zones")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="availability-zone-name"
+					type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Name
+								of the availability zone. Unique across a cloud region")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="hypervisor-type" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Type
+								of hypervisor. Source of truth should define valid values.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="operational-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="State
+								that indicates whether the availability zone should be used,
+								etc. Source of truth should define valid values.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="az-and-dvs-switches">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:dvs-switches" minOccurs="0" />
+				<xs:element ref="tns:availability-zone" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="sdn-zone-response">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:oam-networks" minOccurs="0" />
+				<xs:element ref="tns:az-and-dvs-switches" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="search">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:edge-tag-query-result" minOccurs="0" />
+				<xs:element ref="tns:edge-tag-query-request"
+					minOccurs="0" />
+				<xs:element ref="tns:search-results" minOccurs="0" />
+				<xs:element ref="tns:sdn-zone-response" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="update-node-key">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="key-name" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="key-value" type="xs:string"
+					minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="action-data">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="property-name" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="property-value" type="xs:string"
+					minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="action">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="action-type" type="xs:string"
+					minOccurs="0" />
+				<xs:element ref="tns:action-data" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="update">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Serves
+						a PATCH like function. Does not enforce concurrency control. Clear
+						each usage with AAI team.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="update-node-type" type="xs:string" />
+				<xs:element ref="tns:update-node-key" minOccurs="0"
+					maxOccurs="unbounded" />
+				<xs:element name="update-node-uri" type="xs:string"
+					minOccurs="0" />
+				<xs:element ref="tns:action" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="key-data">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="key-name" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="key-value" type="xs:string"
+					minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="notify">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="event-id" type="xs:string" />
+				<xs:element name="node-type" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="event-trigger" type="xs:string"
+					minOccurs="0" />
+				<xs:element ref="tns:key-data" minOccurs="0"
+					maxOccurs="unbounded" />
+				<xs:element name="selflink" type="xs:string"
+					minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="actions">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="APIs
+						that are more action related than REST (e.g., notify, update).")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:update" minOccurs="0" />
+				<xs:element ref="tns:notify" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="ctag-pool">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="A
+						collection of C tags (vlan tags) grouped for a specific
+						purpose.",indexedProps="availability-zone-name",dependentOn="complex",container="ctag-pools")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="target-pe" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="The
+								Target provider edge router")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="availability-zone-name"
+					type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Name
+								of the availability zone")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ctag-pool-purpose" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Describes
+								what the intended purpose of this pool is.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ctag-values" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Comma
+								separated list of ctags")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="ctag-pools">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:ctag-pool" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="complex">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of physical locations that can house
+						cloud-regions.",indexedProps="identity-url,data-center-code,complex-name,physical-location-id",searchable="physical-location-id,data-center-code,complex-name,street1,street2,postal-code",uniqueProps="physical-location-id",container="complexes",namespace="cloud-infrastructure")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="physical-location-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique
+								identifier for physical location, e.g., CLLI")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="data-center-code" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Data
+								center code which can be an alternate way to identify a
+								complex")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="complex-name" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Gamma
+								complex name for LCP instance.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="identity-url" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL
+								of the keystone identity service")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="physical-location-type"
+					type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Type,
+								e.g., central office, data center.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="street1" type="xs:string" />
+				<xs:element name="street2" type="xs:string" minOccurs="0" />
+				<xs:element name="city" type="xs:string" />
+				<xs:element name="state" type="xs:string" minOccurs="0" />
+				<xs:element name="postal-code" type="xs:string" />
+				<xs:element name="country" type="xs:string" />
+				<xs:element name="region" type="xs:string" />
+				<xs:element name="latitude" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="longitude" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="elevation" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="lata" type="xs:string" minOccurs="0" />
+				<xs:element ref="tns:ctag-pools" minOccurs="0" />
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="complexes">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of physical locations that can house cloud-regions.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:complex" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="volume-group">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Persistent
+						block-level
+						storage.",indexedProps="volume-group-name,vnf-type,heat-stack-id,volume-group-id",searchable="volume-group-id,volume-group-name",dependentOn="cloud-region",container="volume-groups")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="volume-group-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique
+								ID of volume-group.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="volume-group-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name
+								of the volume group.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="heat-stack-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Heat
+								stack id corresponding to this volume-group")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vnf-type" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="String
+								capturing type of vnf, that was intended to identify the ASDC
+								resource. This field has been overloaded in service-specific
+								ways and clients should expect changes to occur in the future to
+								this field as ECOMP matures.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="orchestration-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Orchestration
+								status of this volume-group")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="model-customization-id"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="captures
+								the id of all the configuration used to customize the resource
+								for the service.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vf-module-model-customization-id"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="helps
+								relate the volume group to the vf-module whose components will
+								require the volume group")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="volume-groups">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of persistent block-level storage.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:volume-group" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="volume">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Ephemeral
+						Block storage
+						volume.",indexedProps="volume-id",dependentOn="vserver",container="volumes")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="volume-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique
+								ID of block storage volume relative to the vserver.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="volume-selflink" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL
+								to endpoint where AAI can get more details")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="volumes">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of ephemeral Block storage volumes.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:volume" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="l3-interface-ipv4-address-list">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="IPv4
+						Address
+						Range",indexedProps="l3-interface-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="vlan,l-interface")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="l3-interface-ipv4-address"
+					type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="IP
+								address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="l3-interface-ipv4-prefix-length"
+					type="xs:unsignedInt" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Prefix
+								length, 32 for single address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vlan-id-inner" type="xs:unsignedInt"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Inner
+								VLAN tag")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vlan-id-outer" type="xs:unsignedInt"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Outer
+								VLAN tag")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="is-floating" type="xs:boolean"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicator
+								of fixed or floating address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="neutron-network-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Neutron
+								network id of the interface that address belongs to")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="neutron-subnet-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Neutron
+								id of subnet that address belongs to")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="l3-interface-ipv6-address-list">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="IPv6
+						Address
+						Range",indexedProps="l3-interface-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="vlan,l-interface")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="l3-interface-ipv6-address"
+					type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="IP
+								address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="l3-interface-ipv6-prefix-length"
+					type="xs:unsignedInt" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Prefix
+								length, 128 for single address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vlan-id-inner" type="xs:unsignedInt"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Inner
+								VLAN tag")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vlan-id-outer" type="xs:unsignedInt"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Outer
+								VLAN tag")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="is-floating" type="xs:boolean"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicator
+								of fixed or floating address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="neutron-network-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Neutron
+								network id of the interface that address belongs to")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="neutron-subnet-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Neutron
+								id of subnet that address belongs to")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vlan">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Definition
+						of
+						vlan",indexedProps="vlan-interface,vlan-id-inner,vpn-key",dependentOn="l-interface",container="vlans")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="vlan-interface" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="String
+								that identifies the interface")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vlan-id-inner" type="xs:unsignedInt"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Inner
+								VLAN tag")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vlan-id-outer" type="xs:unsignedInt"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Outer
+								VLAN tag")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="speed-value" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Captures
+								the numeric part of the speed")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="speed-units" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Captures
+								the units corresponding to the speed")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vlan-description" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								to describe (the service associated with) the vlan")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="backdoor-connection" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Whether
+								customer is going to use this VLAN for backdoor connection to
+								another customer premise device.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vpn-key" type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This
+								indicates the customers VPN ID associated with this vlan")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="orchestration-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Status
+								of a vnf's vlan interface, on which the customer circuit
+								resides, mastered by SDN-C.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="in-maint" type="xs:boolean">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="used
+								to indicate whether or not this object is in maintenance mode
+								(maintenance mode = true)")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="prov-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Prov
+								Status of the VLAN configuration related to a logical interface.
+								Valid values [PREPROV/NVTPROV/PROV].")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="is-ip-unnumbered" type="xs:boolean">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="Flag
+								indicating the interface uses the IP Unnumbered configuration.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+				<xs:element ref="tns:l3-interface-ipv4-address-list"
+					minOccurs="0" maxOccurs="unbounded" />
+				<xs:element ref="tns:l3-interface-ipv6-address-list"
+					minOccurs="0" maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vlans">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:vlan" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="sriov-vf">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="SR-IOV
+						Virtual Function (not to be confused with virtual network
+						function)",indexedProps="pci-id,vf-vlan-filter,vf-mac-filter,vf-vlan-strip,neutron-network-id",dependentOn="l-interface",container="sriov-vfs")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="pci-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="PCI
+								ID used to identify the sriov-vf")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vf-vlan-filter" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This
+								metadata provides option to specify list of VLAN filters applied
+								on VF to pass the traffic to VM.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vf-mac-filter" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="When
+								MAC filters are specified, VF-agent service configures VFs to do
+								MAC level filtering before the traffic is passed to VM.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vf-vlan-strip" type="xs:boolean"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="When
+								this field is set to true, VF will configured to strip the outer
+								TAG before the traffic is passed to VM.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vf-vlan-anti-spoof-check"
+					type="xs:boolean" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This
+								option ensures anti VLAN spoof checks are done at the VF level
+								to comply with security. The disable check will also be honored
+								per the VNF needs for trusted VMs.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vf-mac-anti-spoof-check"
+					type="xs:boolean" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This
+								option ensures anti MAC spoof checks are done at the VF level to
+								comply with security. The disable check will also be honored per
+								the VNF needs for trusted VMs.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vf-mirrors" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This
+								option defines the set of Mirror objects which essentially
+								mirrors the traffic from source to set of collector VNF Ports.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vf-broadcast-allow" type="xs:boolean"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This
+								option, if set to true, sets the VF in promiscuous mode and
+								allows all broadcast traffic to reach the VM")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vf-unknown-multicast-allow"
+					type="xs:boolean" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This
+								option, if set to true, sets the VF in promiscuous mode and
+								allows unknown multicast traffic to reach the VM")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vf-unknown-unicast-allow"
+					type="xs:boolean" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This
+								option, if set to true, sets the VF in promiscuous mode and
+								allows unknown unicast traffic to reach the VM")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vf-insert-stag" type="xs:boolean"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This
+								option, if set to true, instructs to insert outer tag after
+								traffic comes out of VM.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vf-link-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This
+								option is used to set the link status. Valid values as of 1607
+								are on, off, and auto.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="neutron-network-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Neutron
+								network id of the interface")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="sriov-vfs">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of SR-IOV Virtual Functions.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:sriov-vf" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="l-interface">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Logical
+						interfaces, e.g., a
+						vnic.",indexedProps="macaddr,interface-id,interface-name,network-name",dependentOn="generic-vnf,newvce,p-interface,vserver,lag-interface",container="l-interfaces")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="interface-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Name
+								given to the interface")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="interface-role" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="E.g.,
+								CUSTOMER, UPLINK, etc.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="v6-wan-link-ip" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Questionably
+								placed - v6 ip addr of this interface (is in vr-lan-interface
+								from Mary B.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="selflink" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL
+								to endpoint where AAI can get more details")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="interface-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="ID
+								of interface")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="macaddr" type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="MAC
+								address for the interface")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="network-name" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name
+								of the network")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="management-option" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Whether
+								A&amp;AI should be managing this interface of not. Could have
+								value like CUSTOMER")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="interface-description" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Human
+								friendly text regarding this interface.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="is-port-mirrored" type="xs:boolean">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="boolean
+								indicatating whether or not port is a mirrored.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="in-maint" type="xs:boolean">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="used
+								to indicate whether or not this object is in maintenance mode
+								(maintenance mode = true)")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="prov-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Prov
+								Status of the logical interface. Valid values
+								[PREPROV/NVTPROV/PROV].")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="is-ip-unnumbered" type="xs:boolean">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="Flag
+								indicating the interface uses the IP Unnumbered configuration.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:vlans" minOccurs="0" />
+				<xs:element ref="tns:sriov-vfs" minOccurs="0" />
+				<xs:element ref="tns:l-interfaces" minOccurs="0" />
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+				<xs:element ref="tns:l3-interface-ipv4-address-list"
+					minOccurs="0" maxOccurs="unbounded" />
+				<xs:element ref="tns:l3-interface-ipv6-address-list"
+					minOccurs="0" maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="l-interfaces">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of logical interfaces.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:l-interface" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vserver">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Virtual
+						Servers, aka virtual machine or
+						VM.",nameProps="vserver-name",indexedProps="is-closed-loop-disabled,prov-status,vserver-name,vserver-id,in-maint,vserver-name2",searchable="vserver-id,vserver-name,vserver-name2",dependentOn="tenant",container="vservers")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="vserver-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique
+								identifier for this vserver relative to its tenant")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vserver-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name
+								of vserver")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vserver-name2" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Alternative
+								name of vserver")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="prov-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Trigger
+								for operational monitoring of this resource by Service Assurance
+								systems.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vserver-selflink" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL
+								to endpoint where AAI can get more details")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="in-maint" type="xs:boolean">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="Used
+								to indicate whether or not this object is in maintenance mode
+								(maintenance mode = true). This field (in conjunction with
+								prov-status) is used to suppress alarms and vSCL on VNFs/VMs.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="is-closed-loop-disabled"
+					type="xs:boolean">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="Used
+								to indicate whether closed loop function is enabled on this
+								node")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:volumes" minOccurs="0" />
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+				<xs:element ref="tns:l-interfaces" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vservers">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of virtual Servers, aka virtual machines or VMs.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:vserver" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="tenant">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Openstack
+						tenant",nameProps="tenant-name",indexedProps="tenant-name,tenant-id,tenant-context",searchable="tenant-id,tenant-name",dependentOn="cloud-region",container="tenants")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="tenant-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique
+								id relative to the cloud-region.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="tenant-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Readable
+								name of tenant")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="tenant-context" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This
+								field will store the tenant context.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:vservers" minOccurs="0" />
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="tenants">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of openstack tenants.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:tenant" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="flavor">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Openstack
+						flavor.",nameProps="flavor-name",indexedProps="flavor-name,flavor-id",dependentOn="cloud-region",container="flavors")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="flavor-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Flavor
+								id, expected to be unique across cloud-region.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="flavor-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Flavor
+								name")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="flavor-vcpus" type="xs:int"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Number
+								of CPUs")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="flavor-ram" type="xs:int" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Amount
+								of memory")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="flavor-disk" type="xs:int"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Disk
+								space")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="flavor-ephemeral" type="xs:int"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Amount
+								of ephemeral disk space")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="flavor-swap" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="amount
+								of swap space allocation")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="flavor-is-public" type="xs:boolean"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="whether
+								flavor is available to all users or private to the tenant it was
+								created in.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="flavor-selflink" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL
+								to endpoint where AAI can get more details")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="flavor-disabled" type="xs:boolean"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Boolean
+								as to whether this flavor is no longer enabled")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="flavors">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of openstack flavors.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:flavor" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="group-assignment">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Openstack
+						group-assignment used to store exclusivity groups
+						(EG).",nameProps="group-name",indexedProps="group-id,group-type,group-name",searchable="group-id,group-name",dependentOn="cloud-region",container="group-assignments")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="group-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Group
+								id, expected to be unique across cloud-region.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="group-type" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Group
+								type - the type of group this instance refers to")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="group-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Group
+								name - name assigned to the group")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="group-description" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Group
+								description - description of the group")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="group-assignments">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of openstack group assignments")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:group-assignment" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="snapshot">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Openstack
+						snapshot",nameProps="snapshot-name",uniqueProps="snapshot-id",indexedProps="application,snapshot-name,application-vendor,snapshot-id,application-version,prev-snapshot-id",dependentOn="cloud-region",container="snapshots")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="snapshot-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Snapshot
+								id, this is the key UUID assoc associated in glance with the
+								snapshots.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="snapshot-name" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Snapshot
+								name")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="snapshot-architecture" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Operating
+								system architecture")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="snapshot-os-distro" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The
+								common name of the operating system distribution in lowercase")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="snapshot-os-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The
+								operating system version as specified by the distributor.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="application" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The
+								application that the image instantiates.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="application-vendor" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The
+								vendor of the application.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="application-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The
+								version of the application.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="snapshot-selflink" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL
+								to endpoint where AAI can get more details")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="prev-snapshot-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This
+								field contains the UUID of the previous snapshot (if any).")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="snapshots">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of openstack snapshots")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:snapshot" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="metadatum">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Key/value
+						pairs",indexedProps="metaname",dependentOn="tenant,image,service-instance,connector,model",container="metadata")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="metaname" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true)</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="metaval" type="xs:string" />
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="metadata">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of metadatum (key/value pairs)")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:metadatum" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="image">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Openstack
+						image.",nameProps="image-name",indexedProps="application,image-name,application-vendor,image-id,application-version",dependentOn="cloud-region",container="images")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="image-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Image
+								id, expected to be unique across cloud region")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="image-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Image
+								name")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="image-architecture" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Operating
+								system architecture.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="image-os-distro" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The
+								common name of the operating system distribution in lowercase")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="image-os-version" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The
+								operating system version as specified by the distributor.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="application" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The
+								application that the image instantiates.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="application-vendor" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The
+								vendor of the application.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="application-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The
+								version of the application.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="image-selflink" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL
+								to endpoint where AAI can get more details")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+				<xs:element ref="tns:metadata" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="images">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collectio
+						of Openstack images.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:image" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="availability-zones">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of availability zones")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:availability-zone" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="cloud-region">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="cloud-region
+						designates an installation of a cloud cluster or region or
+						instantiation. In AT&amp;Ts AIC cloud, this could be an LCP or
+						DCP. Cloud regions are uniquely identified by a composite key,
+						cloud-owner + cloud-region-id. The format of the cloud-owner is
+						vendor-cloudname and we will use att-aic for AT&amp;T's
+						AIC.",indexedProps="cloud-owner,cloud-region-id,cloud-type,owner-defined-type",nameProps="owner-defined-type",container="cloud-regions",namespace="cloud-infrastructure")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="cloud-owner" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Identifies
+								the vendor and cloud name, e.g., att-aic. First part of
+								composite key should be formatted as vendor-cloudname")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="cloud-region-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Identifier
+								used by the vendor for the region. Second part of composite
+								key")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="cloud-type" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Type
+								of the cloud (e.g., openstack)")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="owner-defined-type" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Cloud-owner
+								defined type indicator (e.g., dcp, lcp)")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="cloud-region-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Software
+								version employed at the site. NOTE - THIS FIELD IS NOT KEPT UP
+								TO DATE.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="identity-url" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL
+								of the keystone identity service")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="cloud-zone" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Zone
+								where the cloud is homed. NOTE - THIS FIELD IS NOT CORRECTLY
+								POPULATED.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="complex-name" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="complex
+								name for cloud-region instance. NOTE - THIS FIELD IS NOT
+								CORRECTLY POPULATED.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="sriov-automation" type="xs:boolean">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="Whether
+								the cloud region supports (true) or does not support (false)
+								SR-IOV automation.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:volume-groups" minOccurs="0" />
+				<xs:element ref="tns:tenants" minOccurs="0" />
+				<xs:element ref="tns:flavors" minOccurs="0" />
+				<xs:element ref="tns:group-assignments" minOccurs="0" />
+				<xs:element ref="tns:snapshots" minOccurs="0" />
+				<xs:element ref="tns:images" minOccurs="0" />
+				<xs:element ref="tns:dvs-switches" minOccurs="0" />
+				<xs:element ref="tns:oam-networks" minOccurs="0" />
+				<xs:element ref="tns:availability-zones" minOccurs="0" />
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="cloud-regions">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(maximumDepth="0")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:cloud-region" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="network-profile">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Network
+						profile populated by SDN-GP for
+						SNMP",indexedProps="nm-profile-name",container="network-profiles",namespace="cloud-infrastructure")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="nm-profile-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique
+								name of network profile.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="community-string" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Encrypted
+								SNMP community string")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="network-profiles">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of network profiles")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:network-profile" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="sriov-pf">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="SR-IOV
+						Physical
+						Function",indexedProps="pf-pci-id",dependentOn="p-interface",container="sriov-pfs")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="pf-pci-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Identifier
+								for the sriov-pf")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="sriov-pfs">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of SR-IOV Physical Functions.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:sriov-pf" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="p-interface">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Physical
+						interface (e.g.,
+						nic)",indexedProps="interface-name,prov-status",nameProps="prov-status",dependentOn="vpls-pe,pserver,pnf",container="p-interfaces")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="interface-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Name
+								that identifies the physical interface")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="speed-value" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Captures
+								the numeric part of the speed")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="speed-units" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Captures
+								the units corresponding to the speed")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="port-description" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Nature
+								of the services and connectivity on this port.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="equipment-identifier" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="CLEI
+								or other specification for p-interface hardware.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="interface-role" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Role
+								specification for p-interface hardware.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="interface-type" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicates
+								the physical properties of the interface.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="prov-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Trigger
+								for operational monitoring of this resource by Service Assurance
+								systems.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="in-maint" type="xs:boolean">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="used
+								to indicate whether or not this object is in maintenance mode
+								(maintenance mode = true)")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="inv-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="inventory
+								status")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+				<xs:element ref="tns:sriov-pfs" minOccurs="0" />
+				<xs:element ref="tns:l-interfaces" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="p-interfaces">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of physical interfaces.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:p-interface" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="lag-interface">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Link
+						aggregate
+						interface",indexedProps="interface-name,interface-id,interface-role",dependentOn="generic-vnf,pserver,vpls-pe,pnf",container="lag-interfaces")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="interface-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Name
+								that identifies the link aggregate interface")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="interface-description" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Human
+								friendly text regarding this interface.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="speed-value" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Captures
+								the numeric part of the speed")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="speed-units" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Captures
+								the units corresponding to the speed")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="interface-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="ID
+								of interface")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="interface-role" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Role
+								assigned to this Interface, should use values as defined in
+								ECOMP Yang models.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="prov-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Trigger
+								for operational monitoring of this resource by Service Assurance
+								systems.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="in-maint" type="xs:boolean">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="used
+								to indicate whether or not this object is in maintenance mode
+								(maintenance mode = true)")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+				<xs:element ref="tns:l-interfaces" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="lag-interfaces">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of link aggregate interfaces.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:lag-interface" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="pserver">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Compute
+						host whose hostname must be unique and must exactly match what is
+						sent as a relationship to a
+						vserver.",nameProps="pserver-name2",indexedProps="hostname,in-maint,pserver-id,pserver-name2,inv-status",searchable="hostname,pserver-name2,pserver-id,ipv4-oam-address",container="pservers",namespace="cloud-infrastructure")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="hostname" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Value
+								from executing hostname on the compute node.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ptnii-equip-name" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="PTNII
+								name")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="number-of-cpus" type="xs:int"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Number
+								of cpus")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="disk-in-gigabytes" type="xs:int"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Disk
+								size, in GBs")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ram-in-megabytes" type="xs:int"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="RAM
+								size, in MBs")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="equip-type" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Equipment
+								type. Source of truth should define valid values.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="equip-vendor" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Equipment
+								vendor. Source of truth should define valid values.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="equip-model" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Equipment
+								model. Source of truth should define valid values.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="fqdn" type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Fully-qualified
+								domain name")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="pserver-selflink" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL
+								to endpoint where AAI can get more details")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipv4-oam-address" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								to configure device, also used for troubleshooting and is IP
+								used for traps generated by device.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="serial-number" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Serial
+								number, may be queried")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipaddress-v4-loopback-0"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="IPV4
+								Loopback 0 address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipaddress-v6-loopback-0"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="IPV6
+								Loopback 0 address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipaddress-v4-aim" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="IPV4
+								AIM address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipaddress-v6-aim" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="IPV6
+								AIM address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipaddress-v6-oam" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="IPV6
+								OAM address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="inv-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="CANOPI's
+								inventory status. Only set with values exactly as defined by
+								CANOPI.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="pserver-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="ID
+								of Pserver")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="internet-topology" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="internet
+								topology of Pserver")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="in-maint" type="xs:boolean">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="used
+								to indicate whether or not this object is in maintenance mode
+								(maintenance mode = true). This field (in conjunction with
+								prov-status) is used to suppress alarms and vSCL on VNFs/VMs.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="pserver-name2" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="alternative
+								pserver name")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="purpose" type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="purpose
+								of pserver")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="prov-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Prov
+								Status of this device (not under canopi control) Valid values
+								[PREPROV/NVTPROV/PROV]")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="management-option" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicates
+								who owns and or manages the device.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="host-profile" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The
+								host profile that defines the configuration of the pserver.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+				<xs:element ref="tns:p-interfaces" minOccurs="0" />
+				<xs:element ref="tns:lag-interfaces" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="pservers">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of compute hosts.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:pserver" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="virtual-data-center">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Virtual
+						organization of cloud infrastructure elements in a data center
+						context",nameProps="vdc-name",indexedProps="vdc-name,vdc-id",container="virtual-data-centers",namespace="cloud-infrastructure")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="vdc-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique
+								ID of the vdc")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vdc-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name
+								of the virtual data center")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="virtual-data-centers">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Virtual
+						organization of cloud infrastructure elements in a data center
+						context")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:virtual-data-center" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="cloud-infrastructure">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Namespace
+						for cloud infrastructure.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:complexes" minOccurs="0" />
+				<xs:element ref="tns:cloud-regions" minOccurs="0" />
+				<xs:element ref="tns:network-profiles" minOccurs="0" />
+				<xs:element ref="tns:pservers" minOccurs="0" />
+				<xs:element ref="tns:virtual-data-centers" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="license-key-resource">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="OBSOLETE
+						OBJECT: do not
+						use",nameProps="name",indexedProps="assignment-group-uuid,att-uuid,name",uniqueProps="att-uuid",container="license-key-resources",namespace="license-management")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="att-uuid" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true)</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="assignment-type" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="assignment-status" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="assignment-group-uuid" type="xs:string" />
+				<xs:element name="assignment-date" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="name" type="xs:string" minOccurs="0" />
+				<xs:element name="model-uuid" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="model-version" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="license-key" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="license-key-file-url" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="supplier-release-list" type="xs:string"
+					minOccurs="0" maxOccurs="unbounded" />
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="license-key-resources">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:license-key-resource" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="license-management">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:license-key-resources" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="connector">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of resource instances used to connect a variety of disparate
+						inventory
+						widgets",indexedProps="resource-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version",container="connectors",namespace="business")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="resource-instance-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique
+								id of resource instance.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="model-invariant-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC model id for this resource or service
+								model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="model-version-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC model version for this resource or service
+								model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="persona-model-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC model version for this resource or service
+								model.",visibility="internal",dataCopy="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="widget-model-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC data dictionary widget model. This maps directly to the
+								A&amp;AI widget.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="widget-model-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC data dictionary version of the widget model.This maps
+								directly to the A&amp;AI version of the widget.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+				<xs:element ref="tns:metadata" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="connectors">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of resource instances used to connect a variety of disparate
+						inventory widgets")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:connector" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="tunnel-xconnect">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Represents
+						the specifics of a tunnel cross connect piece of a resource that
+						gets separately
+						allotted",uniqueProps="id",indexedProps="id",dependentOn="allotted-resource",container="tunnel-xconnects")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Allotted
+								Resource id UUID assigned to this instance.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="bandwidth-up-wan1" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The
+								WAN uplink bandwidth for WAN1")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="bandwidth-down-wan1" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The
+								WAN downlink bandwidth for WAN1")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="bandwidth-up-wan2" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The
+								WAN uplink bandwidth for WAN2")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="bandwidth-down-wan2" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The
+								WAN downlink bandwidth for WAN2")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Concurrency
+								value")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="tunnel-xconnects">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="This
+						object is used to store the specific tunnel cross connect aspects
+						of an allotted resource")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:tunnel-xconnect" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="allotted-resource">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Represents
+						a slice or partial piece of a resource that gets separately
+						allotted",nameProps="description",uniqueProps="id",indexedProps="id,model-invariant-id,model-version-id,type,role",dependentOn="service-instance",container="allotted-resources")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Allotted
+								Resource id UUID assigned to this instance.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="description" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The
+								descriptive information assigned to this allotted resource
+								instance")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="selflink" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Link
+								back to more information in the controller")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="model-invariant-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC model id for this resource or service
+								model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="model-version-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC model version for this resource or service
+								model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="persona-model-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC model version for this resource or service
+								model.",visibility="internal",dataCopy="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Concurrency
+								value")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="orchestration-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Orchestration
+								status")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="operational-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicator
+								for whether the resource is considered operational")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="type" type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Generic
+								description of the type of allotted resource.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="role" type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="role
+								in the network that this resource will be providing.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:tunnel-xconnects" minOccurs="0" />
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="allotted-resources">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="This
+						object is used to store slices of services being offered")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:allotted-resource" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="service-instance">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Instance
+						of a
+						service",indexedProps="service-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,service-instance-name,service-instance-location-id,orchestration-status,environment-context,workload-context",nameProps="service-instance-name",searchable="service-instance-id,service-instance-name",uniqueProps="service-instance-id",dependentOn="service-subscription",container="service-instances")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="service-instance-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Uniquely
+								identifies this instance of a service")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="service-instance-name" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This
+								field will store a name assigned to the service-instance.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="service-type" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="String
+								capturing type of service.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="service-role" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="String
+								capturing the service role.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="environment-context" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This
+								field will store the environment context assigned to the
+								service-instance.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="workload-context" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This
+								field will store the workload context assigned to the
+								service-instance.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="model-invariant-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC model id for this resource or service
+								model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="model-version-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC model version for this resource or service
+								model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="persona-model-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC model version for this resource or service
+								model.",visibility="internal",dataCopy="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="widget-model-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC data dictionary widget model. This maps directly to the
+								A&amp;AI widget.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="widget-model-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC data dictionary version of the widget model.This maps
+								directly to the A&amp;AI version of the widget.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="bandwidth-total" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicates
+								the total bandwidth to be used for this service.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="bandwidth-up-wan1" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="indicates
+								the upstream bandwidth this service will use on the WAN1 port of
+								the physical device.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="bandwidth-down-wan1" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="indicates
+								the downstream bandwidth this service will use on the WAN1 port
+								of the physical device.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="bandwidth-up-wan2" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="indicates
+								the upstream bandwidth this service will use on the WAN2 port of
+								the physical device.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="bandwidth-down-wan2" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="indicates
+								the downstream bandwidth this service will use on the WAN2 port
+								of the physical device.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vhn-portal-url" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL
+								customers will use to access the vHN Portal.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="service-instance-location-id"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="An
+								identifier that customers assign to the location where this
+								service is being used.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="selflink" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Path
+								to the controller object.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="orchestration-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Orchestration
+								status of this service.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+				<xs:element ref="tns:metadata" minOccurs="0" />
+				<xs:element ref="tns:allotted-resources" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="service-instances">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of service instances")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:service-instance" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="service-subscription">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Object
+						that group service
+						instances.",indexedProps="service-type",dependentOn="customer",container="service-subscriptions",crossEntityReference="service-instance,service-type")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="service-type" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Value
+								defined by orchestration to identify this service across
+								ECOMP.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="temp-ub-sub-account-id"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This
+								property will be deleted from A&amp;AI in the near future. Only
+								stop gap solution.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:service-instances" minOccurs="0" />
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="service-subscriptions">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of objects that group service instances.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:service-subscription" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="customer">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="customer
+						identifiers to provide linkage back to BSS
+						information.",nameProps="subscriber-name",indexedProps="subscriber-name,global-customer-id,subscriber-type",searchable="global-customer-id,subscriber-name",uniqueProps="global-customer-id",container="customers",namespace="business")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="global-customer-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Global
+								customer id used across ECOMP to uniquely identify customer.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="subscriber-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Subscriber
+								name, an alternate way to retrieve a customer.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="subscriber-type" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Subscriber
+								type, a way to provide VID with only the INFRA
+								customers.",defaultValue="CUST")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:service-subscriptions" minOccurs="0" />
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="customers">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of customer identifiers to provide linkage back to BSS
+						information.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:customer" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="business">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Namespace
+						for business related constructs")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:connectors" minOccurs="0" />
+				<xs:element ref="tns:customers" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vnf-image">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Image
+						object that pertain to a VNF that doesn't have associated
+						vservers. This is a
+						kludge.",indexedProps="application,vnf-image-uuid,application-vendor,application-version",uniqueProps="vnf-image-uuid",container="vnf-images",namespace="service-design-and-creation")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="vnf-image-uuid" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique
+								ID of this asset")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="application" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The
+								application that the image instantiates.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="application-vendor" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The
+								vendor of the application.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="application-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The
+								version of the application.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="selflink" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL
+								to endpoint where AAI can get more details")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vnf-images">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of image objects that pertain to a VNF that doesn't have
+						associated vservers. This is a kludge.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:vnf-image" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="service">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Stand-in
+						for service model definitions. Likely to be deprecated in favor of
+						models from ASDC. Does not strictly map to ASDC
+						services.",indexedProps="service-description,service-id",container="services",namespace="service-design-and-creation")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="service-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="This
+								gets defined by others to provide a unique ID for the service,
+								we accept what is sent.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="service-description" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Description
+								of the service")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="service-selflink" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL
+								to endpoint where AAI can get more details")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="service-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="service
+								version")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="services">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of service model definitions. Likely to be deprecated in favor of
+						models from ASDC.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:service" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="service-capability">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Early
+						definition of server/resource pairings, likely to be replaced by
+						models. No new use should be made of
+						this.",indexedProps="service-type,vnf-type",container="service-capabilities",namespace="service-design-and-creation")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="service-type" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="This
+								gets defined by others to provide a unique ID for the service,
+								we accept what is sent.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vnf-type" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="String
+								capturing type of vnf, that was intended to identify the ASDC
+								resource. This field has been overloaded in service-specific
+								ways and clients should expect changes to occur in the future to
+								this field as ECOMP matures.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="service-capabilities">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of service capabilities.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:service-capability" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="element-choice-set">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="This
+						is how we would capture constraints defining allowed sets of
+						elements.",uniqueProps="element-choice-set-uuid",indexedProps="element-choice-set-uuid",allowDirectRead="true",allowDirectWrite="false",container="element-choice-sets")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="element-choice-set-uuid"
+					type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="element-choice-set-name"
+					type="xs:string" />
+				<xs:element name="cardinality" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0" />
+				<xs:element ref="tns:model-elements" minOccurs="0" />
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="element-choice-sets">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:element-choice-set" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="constrained-element-set">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="This
+						is how we would capture constraints defining allowed sets of
+						elements.",uniqueProps="constrained-element-set-uuid",indexedProps="constrained-element-set-uuid",allowDirectRead="true",allowDirectWrite="false",container="constrained-element-sets")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="constrained-element-set-uuid"
+					type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="constraint-type" type="xs:string" />
+				<xs:element name="check-type" type="xs:string" />
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0" />
+				<xs:element ref="tns:element-choice-sets" minOccurs="0" />
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="constrained-element-sets">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:constrained-element-set"
+					minOccurs="0" maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="model-constraint">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="This
+						is how we would capture constraints defining allowed sets of
+						elements.",uniqueProps="model-constraint-uuid",indexedProps="model-constraint-uuid",allowDirectRead="true",allowDirectWrite="false",container="model-constraints")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="model-constraint-uuid" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element
+					name="constrained-element-set-uuid-to-replace" type="xs:string" />
+				<xs:element ref="tns:constrained-element-sets"
+					minOccurs="0" />
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="model-constraints">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:model-constraint" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="model-element">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Defines
+						how other models combine to make up a higher-level
+						model.",uniqueProps="model-element-uuid",indexedProps="model-element-uuid",allowDirectRead="true",allowDirectWrite="false",container="model-elements")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="model-element-uuid" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="new-data-del-flag" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicates
+								whether this element was created as part of instantiation from
+								this model")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="cardinality" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="How
+								many of this type of element are required/allowed")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="linkage-points" type="xs:string"
+					minOccurs="0" maxOccurs="unbounded" />
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:model-elements" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Defines
+								how other models combine to make up a higher-level model")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:model-constraints" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Describes
+								new constraints on this model element that are not part of that
+								model's definition")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="model-elements">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:model-element" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="model-ver">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Subgraph
+						definition provided by ASDC to describe a specific version of an
+						inventory asset and its connections related to ASDC
+						models",nameProps="model-name",indexedProps="model-version-id,model-name,model-version",uniqueProps="model-version-id",container="model-vers")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="model-version-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique
+								identifier corresponding to one version of a model in ASDC")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="model-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name
+								of the model, which can change from version to version.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="model-version" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Version")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="model-description" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Description")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:model-elements" minOccurs="0" />
+				<xs:element ref="tns:metadata" minOccurs="0" />
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="model-vers">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:model-ver" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="model">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Subgraph
+						definition provided by ASDC to describe an inventory asset and its
+						connections related to ASDC models, independent of
+						version",nameProps="model-type",indexedProps="model-invariant-id,model-type",uniqueProps="model-invariant-id",container="models",namespace="service-design-and-creation")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="model-invariant-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique
+								identifier corresponding to the main definition of a model in
+								ASDC")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="model-type" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Type
+								of the model, e.g., service, resource, widget, etc.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:model-vers" minOccurs="0" />
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="models">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of subgraph definitions provided by ASDC to describe the inventory
+						assets and their connections related to ASDC models")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:model" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="related-lookup">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="TBD",uniqueProps="related-lookup-uuid",indexedProps="related-lookup-uuid",allowDirectRead="true",allowDirectWrite="false",container="related-lookups")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="related-lookup-uuid" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="source-node-type" type="xs:string" />
+				<xs:element name="source-node-property" type="xs:string" />
+				<xs:element name="target-node-type" type="xs:string" />
+				<xs:element name="target-node-property" type="xs:string" />
+				<xs:element name="property-collect-list" type="xs:string"
+					minOccurs="0" maxOccurs="unbounded" />
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0" />
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="related-lookups">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:related-lookup" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="property-constraint">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="TBD",uniqueProps="property-constraint-uuid",indexedProps="property-constraint-uuid",allowDirectRead="true",allowDirectWrite="false",container="property-constraints")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="property-constraint-uuid"
+					type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="constraint-type" type="xs:string" />
+				<xs:element name="property-name" type="xs:string" />
+				<xs:element name="property-value" type="xs:string" />
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="property-constraints">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:property-constraint" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="named-query-element">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="TBD",uniqueProps="named-query-element-uuid",indexedProps="named-query-element-uuid",allowDirectRead="true",allowDirectWrite="false",container="named-query-elements")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="named-query-element-uuid"
+					type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="property-collect-list" type="xs:string"
+					minOccurs="0" maxOccurs="unbounded" />
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="property-limit-desc" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="do-not-output" type="xs:string"
+					minOccurs="0" />
+				<xs:element ref="tns:named-query-elements" minOccurs="0" />
+				<xs:element ref="tns:related-lookups" minOccurs="0" />
+				<xs:element ref="tns:property-constraints" minOccurs="0" />
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="named-query-elements">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:named-query-element" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="named-query">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="TBD",nameProps="named-query-name",uniqueProps="named-query-uuid",indexedProps="named-query-uuid,named-query-name",container="named-queries",namespace="service-design-and-creation")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="named-query-uuid" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true)</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="named-query-name" type="xs:string" />
+				<xs:element name="named-query-version" type="xs:string" />
+				<xs:element name="required-input-params" minOccurs="0">
+					<xs:complexType>
+						<xs:annotation>
+							<xs:appinfo>
+								<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="TBD",nameProps="named-query-name",uniqueProps="named-query-uuid",indexedProps="named-query-uuid,named-query-name",container="named-queries",namespace="service-design-and-creation")</annox:annotate>
+							</xs:appinfo>
+						</xs:annotation>
+						<xs:sequence>
+							<xs:element name="required-input-param"
+								type="xs:string" minOccurs="0" maxOccurs="unbounded" />
+						</xs:sequence>
+					</xs:complexType>
+				</xs:element>
+				<xs:element name="description" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0" />
+				<xs:element ref="tns:named-query-elements" minOccurs="0" />
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="named-queries">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:named-query" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="service-design-and-creation">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Namespace
+						for objects managed by ASDC")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:vnf-images" minOccurs="0" />
+				<xs:element ref="tns:services" minOccurs="0" />
+				<xs:element ref="tns:service-capabilities" minOccurs="0" />
+				<xs:element ref="tns:models" minOccurs="0" />
+				<xs:element ref="tns:named-queries" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="logical-link">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Logical
+						links generally connect l-interfaces but are used to express
+						logical connectivity between two
+						points",indexedProps="link-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,link-id,prov-status,circuit-id,purpose",uniqueProps="link-id",container="logical-links",namespace="network",searchable="link-name")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="link-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="e.g.,
+								evc-name, or
+								vnf-nameA_interface-nameA_vnf-nameZ_interface-nameZ")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="in-maint" type="xs:boolean">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="used
+								to indicate whether or not this object is in maintenance mode
+								(maintenance mode = true). This field (in conjunction with
+								prov-status) is used to suppress alarms and vSCL on VNFs/VMs.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="link-type" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Type
+								of logical link, e.g., evc")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="speed-value" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Captures
+								the numeric part of the speed")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="speed-units" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Captures
+								the units corresponding to the speed")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ip-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="v4,
+								v6, or ds for dual stack (should be att-ip-version)")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="routing-protocol" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="For
+								example, static or BGP")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="model-invariant-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC model id for this resource or service
+								model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="model-version-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC model version for this resource or service
+								model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="persona-model-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC model version for this resource or service
+								model.",visibility="internal",dataCopy="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="widget-model-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC data dictionary widget model. This maps directly to the
+								A&amp;AI widget.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="widget-model-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC data dictionary version of the widget model.This maps
+								directly to the A&amp;AI version of the widget.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="operational-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indication
+								of operational status of the logical link.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="prov-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Trigger
+								for operational monitoring of this VNF by BAU Service Assurance
+								systems.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="link-role" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indication
+								of the network use of the logical link.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="link-name2" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Alias
+								or alternate name (CLCI or D1 name).")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="link-id" type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="UUID
+								of the logical-link, SDNC generates this.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="circuit-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Circuit
+								id")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="purpose" type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Reason
+								for this entity, role it is playing")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="logical-links">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of logical connections")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:logical-link" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="class-of-service">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(indexedProps="cos",dependentOn="site-pair",container="classes-of-service")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="cos" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="unique
+								identifier of probe")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="probe-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="identifier
+								of probe")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="probe-type" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="type
+								of probe")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="classes-of-service">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="class-of-service
+						of probe")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:class-of-service" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="site-pair">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(indexedProps="site-pair-id",uniqueProps="site-pair-id",dependentOn="routing-instance",container="site-pairs")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="site-pair-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="unique
+								identifier of probe")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="source-ip" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Prefix
+								address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="destination-ip" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Prefix
+								address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ip-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="ip
+								version, v4, v6")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="destination-hostname" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Hostname
+								of the destination equipment to which SLAs are measured
+								against.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="destination-equip-type"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The
+								type of destinatination equipment. Could be Router, UCPE, etc.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:classes-of-service" minOccurs="0" />
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="site-pairs">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="probe
+						within a set")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:site-pair" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="routing-instance">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(indexedProps="routing-instance-id",dependentOn="site-pair-set",container="routing-instances")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="routing-instance-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique
+								id of routing instance")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="rpm-owner" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="rpm
+								owner")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:site-pairs" minOccurs="0" />
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="routing-instances">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="set
+						of probes related to generic-vnf routing instance")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:routing-instance" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="site-pair-set">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Set
+						of instances for probes used to measure service level
+						agreements",indexedProps="site-pair-set-id",uniqueProps="site-pair-set-id",container="site-pair-sets",namespace="network")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="site-pair-set-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique
+								id of site pair set.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:routing-instances" minOccurs="0" />
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="site-pair-sets">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of sets of instances for probes related to generic-vnf")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:site-pair-set" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="route-target">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Route
+						target
+						information",container="route-targets",dependentOn="vpn-binding",canBeLinked="true")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="global-route-target" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Number
+								used to identify an RT, globally unique in the network")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="route-target-role" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Role
+								assigned to this route target")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="route-targets">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of route target information")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:route-target" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vpn-binding">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="VPN
+						binding",nameProps="vpn-name,vpn-type",indexedProps="vpn-name,vpn-id,vpn-type",searchable="vpn-id,vpn-name",uniqueProps="vpn-id",container="vpn-bindings",namespace="network")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="vpn-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="VPN
+								ID, globally unique within A&amp;AI")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vpn-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="VPN
+								Name")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vpn-platform" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								platform associated with the VPN example AVPN, Mobility")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vpn-type" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Type
+								of the vpn, should be taken from enumerated/valid values")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vpn-region" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="region
+								of customer vpn")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="customer-vpn-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="id
+								for this customer vpn")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="route-distinguisher" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								to distinguish the distinct VPN routes of separate customers who
+								connect to the provider in an MPLS network.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:route-targets" minOccurs="0" />
+				<xs:element ref="tns:relationship-list" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="l3-networks
+								relate to vpn-bindings")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vpn-bindings">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:vpn-binding" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vpls-pe">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="VPLS
+						Provider Edge
+						routers.",indexedProps="prov-status,equipment-name",container="vpls-pes",namespace="network")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="equipment-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true)</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="prov-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Trigger
+								for operational monitoring of this VNF by BAU Service Assurance
+								systems.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipv4-oam-address" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Address
+								tail-f uses to configure generic-vnf, also used for
+								troubleshooting and is IP used for traps generated by GenericVnf
+								(v4-loopback0-ip-address).")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="equipment-role" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Client
+								should send valid enumerated value, e.g., VPLS-PE.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vlan-id-outer" type="xs:unsignedInt"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Temporary
+								location for stag to get to VCE")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+				<xs:element ref="tns:p-interfaces" minOccurs="0" />
+				<xs:element ref="tns:lag-interfaces" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vpls-pes">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of VPLS Provider Edge routers")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:vpls-pe" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="multicast-configuration">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(indexedProps="multicast-configuration-id",uniqueProps="multicast-configuration-id",container="multicast-configurations",namespace="network")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="multicast-configuration-id"
+					type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique
+								id of multicast configuration.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="multicast-protocol" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="protocol
+								of multicast configuration")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="rp-type" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="rp
+								type of multicast configuration")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="multicast-configurations">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="multicast
+						configuration of generic-vnf ip-address")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:multicast-configuration"
+					minOccurs="0" maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="cvlan-tag-entry">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(dependentOn="port-group",indexedProps="cvlan-tag",container="cvlan-tags")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="cvlan-tag" type="xs:unsignedInt">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="See
+								mis-na-virtualization-platform.yang")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="cvlan-tags">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:cvlan-tag-entry" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="port-group">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Used
+						to capture the network interfaces of this
+						VCE",nameProps="port-group-name",indexedProps="port-group-id,heat-stack-id,interface-id,interface-name,switch-name",dependentOn="vce",container="port-groups")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="interface-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique
+								ID of the interface")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="neutron-network-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Neutron
+								network id of this Interface")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="neutron-network-name" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Neutron
+								network name of this Interface")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="interface-role" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Role
+								assigned to this Interface, should use values as defined in
+								ECOMP Yang models.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="port-group-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Unique
+								ID for port group in vmware")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="port-group-name" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Likely
+								to duplicate value of neutron network name")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="switch-name" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="DVS
+								or standard switch name (should be non-null for port groups
+								associated with DVS)")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="orchestration-status" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Orchestration
+								status of this VNF, mastered by MSO")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="heat-stack-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Heat
+								stack id corresponding to this instance, managed by MSO")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="mso-catalog-key" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Corresponds
+								to the SDN-C catalog id used to configure this VCE")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:cvlan-tags" minOccurs="0" />
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="port-groups">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:port-group" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="license">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Metadata
+						for license
+						group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce",container="licenses")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="group-uuid" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique
+								ID for the license group the resource belongs to, should be
+								uuid.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-uuid" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique
+								ID of a license resource. ")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Concurrency
+								value")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="licenses">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Licenses
+						to be allocated across resources, keyed by group-uuid and
+						resource-uuid, related to license management")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:license" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="entitlement">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Metadata
+						for entitlement
+						group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce",container="entitlements")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="group-uuid" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique
+								ID for the entitlement group the resource comes from, should be
+								uuid.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-uuid" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique
+								ID of an entitlement resource. ")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Concurrency
+								value")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="entitlements">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Entitlements,
+						keyed by group-uuid and resource-uuid, related to license
+						management")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:entitlement" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vce">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Virtual
+						Customer Edge Router, used specifically for Gamma. This object is
+						deprecated.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vces",namespace="network",extendsFrom="vnf")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="vnf-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique
+								id of VNF. This is unique across the graph.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vnf-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name
+								of VNF.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vnf-name2" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Alternate
+								name of VNF.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vnf-type" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="String
+								capturing type of vnf, that was intended to identify the ASDC
+								resource. This field has been overloaded in service-specific
+								ways and clients should expect changes to occur in the future to
+								this field as ECOMP matures.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="service-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Unique
+								identifier of service, does not strictly map to ASDC services,
+								SOON TO BE DEPRECATED.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="regional-resource-zone"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Regional
+								way of organizing pservers, source of truth should define
+								values")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="prov-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Trigger
+								for operational monitoring of this resource by Service Assurance
+								systems.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="operational-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicator
+								for whether the resource is considered operational")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="license-key" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="OBSOLETE
+								- do not use")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="equipment-role" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Network
+								role being played by this VNF")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="orchestration-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Orchestration
+								status of this VNF, mastered by MSO")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="heat-stack-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Heat
+								stack id corresponding to this instance, managed by MSO")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="mso-catalog-key" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Corresponds
+								to the SDN-C catalog id used to configure this VCE")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vpe-id" type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Unique
+								ID of VPE connected to this VCE.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="v6-vce-wan-address" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Valid
+								v6 IP address for the WAN Link on this router. Implied length of
+								/64.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipv4-oam-address" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Address
+								tail-f uses to configure vce, also used for troubleshooting and
+								is IP used for traps generated by VCE.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipv4-loopback0-address"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Loopback0
+								address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="entitlement-resource-uuid"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="OBSOLETE
+								- see child relationships")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:port-groups" minOccurs="0" />
+				<xs:element ref="tns:licenses" minOccurs="0" />
+				<xs:element ref="tns:entitlements" minOccurs="0" />
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vces">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of Virtual Customer Edge Routers, used specifically for Gamma.
+						This object is deprecated.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:vce" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vnfc">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(indexedProps="vnfc-name,prov-status,nfc-function,nfc-naming-code,ipaddress-v4-oam-vip,in-maint,is-closed-loop-disabled,group-notation,model-invariant-id,model-version-id",searchable="vnfc-name",container="vnfcs",namespace="network")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="vnfc-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique
+								ID of vnfc.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="nfc-naming-code" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Short
+								code that is used in naming instances of the item being
+								modeled")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="nfc-function" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="English
+								description of function that the specific resource deployment is
+								providing. Assigned as part of the customization of a resource
+								in a service")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="prov-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="prov
+								status of this vnfc")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="orchestration-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Orchestration
+								status of this VNF, mastered by APP-C")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipaddress-v4-oam-vip" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Oam
+								V4 vip address of this vnfc")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="in-maint" type="xs:boolean">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="used
+								to indicate whether or not this object is in maintenance mode
+								(maintenance mode = true)")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="is-closed-loop-disabled"
+					type="xs:boolean">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="used
+								to indicate whether closed loop function is enabled on this
+								node")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="group-notation" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Group
+								notation of VNFC")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="model-invariant-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC model id for this resource or service
+								model.",visibility="deployment",requires="model-version-id")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="model-version-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC model version for this resource or service
+								model.",visibility="deployment",requires="model-invariant-id")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vnfcs">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="virtual
+						network components associated with a vserver from application
+						controller.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:vnfc" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="subnet">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(indexedProps="subnet-id,subnet-name",nameProps="subnet-name",uniqueProps="subnet-id",dependentOn="l3-network",container="subnets")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="subnet-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Subnet
+								ID, should be UUID.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="subnet-name" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name
+								associated with the subnet.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="neutron-subnet-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Neutron
+								id of this subnet")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="gateway-address" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="gateway
+								ip address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="network-start-address" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="network
+								start address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="cidr-mask" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="cidr
+								mask")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ip-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="ip
+								version")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="orchestration-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Orchestration
+								status of this VNF, mastered by MSO")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="dhcp-enabled" type="xs:boolean">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="dhcp
+								enabled")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="dhcp-start" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								start address reserved for use by dhcp")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="dhcp-end" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								last address reserved for use by dhcp")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="subnet-role" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="role
+								of the subnet, referenced when assigning IPs")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="subnets">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:subnet" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="ctag-assignment">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(indexedProps="vlan-id-inner",dependentOn="l3-network",container="ctag-assignments")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="vlan-id-inner" type="xs:unsignedInt">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="id.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="ctag-assignments">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:ctag-assignment" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="segmentation-assignment">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Openstack
+						segmentation
+						assignment.",indexedProps="segmentation-id",dependentOn="l3-network",container="segmentation-assignments")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="segmentation-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Route
+								Table Reference id, UUID assigned to this instance.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Concurrency
+								value")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="segmentation-assignments">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of openstack segmentation assignments")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:segmentation-assignment"
+					minOccurs="0" maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="l3-network">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Generic
+						network
+						definition",nameProps="network-name",indexedProps="heat-stack-id,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role",searchable="network-id,network-name",uniqueProps="network-id",container="l3-networks",namespace="network")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="network-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Network
+								ID, should be uuid. Unique across A&amp;AI.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="network-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name
+								of the network, governed by some naming convention..")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="network-type" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Type
+								of the network - who defines these values?")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="network-role" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Role
+								the network plans - who defines these values?")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="network-technology" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Network
+								technology - who defines these values?")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="neutron-network-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Neutron
+								network id of this Interface")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="is-bound-to-vpn" type="xs:boolean">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="Set
+								to true if bound to VPN")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="service-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Unique
+								identifier of service from ASDC. Does not strictly map to ASDC
+								services. SOON TO BE DEPRECATED")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="network-role-instance"
+					type="xs:unsignedInt" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="network
+								role instance")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="orchestration-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Orchestration
+								status of this VNF, mastered by MSO")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="heat-stack-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Heat
+								stack id corresponding to this instance, managed by MSO")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="mso-catalog-key" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Corresponds
+								to the SDN-C catalog id used to configure this VCE")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="contrail-network-fqdn" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Contrail
+								FQDN for the network")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="model-invariant-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC model id for this resource or service
+								model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="model-version-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC model version for this resource or service
+								model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="persona-model-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC model version for this resource or service
+								model.",visibility="internal",dataCopy="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="model-customization-id"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="captures
+								the id of all the configuration used to customize the resource
+								for the service.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="widget-model-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC data dictionary widget model. This maps directly to the
+								A&amp;AI widget.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="widget-model-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC data dictionary version of the widget model.This maps
+								directly to the A&amp;AI version of the widget.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="physical-network-name" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name
+								associated with the physical network.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="is-provider-network" type="xs:boolean">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="boolean
+								indicatating whether or not network is a provider network.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="is-shared-network" type="xs:boolean">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="boolean
+								indicatating whether or not network is a shared network.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="is-external-network" type="xs:boolean">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="boolean
+								indicatating whether or not network is an external network.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="selflink" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Path
+								to the controller object.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="operational-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicator
+								for whether the resource is considered operational.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:subnets" minOccurs="0" />
+				<xs:element ref="tns:ctag-assignments" minOccurs="0" />
+				<xs:element ref="tns:segmentation-assignments"
+					minOccurs="0" />
+				<xs:element ref="tns:relationship-list" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Relates
+								to tenant (or is it a child of tenant), complex, service,
+								vpn-binding")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="l3-networks">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:l3-network" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="network-policy">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(nameProps="network-policy-fqdn",indexedProps="network-policy-id,network-policy-fqdn",searchable="network-policy-id,network-policy-fqdn",uniqueProps="network-policy-id",container="network-policies",namespace="network")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="network-policy-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="UUID
+								representing unique key to this instance")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="network-policy-fqdn" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Contrail
+								FQDN for the policy")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="heat-stack-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="ID
+								for the openStack Heat instance")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="network-policies">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:network-policy" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vf-module">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="a
+						deployment unit of
+						VNFCs",indexedProps="vf-module-id,vf-module-name,heat-stack-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-service-instance-fqdn",searchable="vf-module-id,vf-module-name",dependentOn="generic-vnf",container="vf-modules")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="vf-module-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique
+								ID of vf-module.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vf-module-name" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name
+								of vf-module")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="heat-stack-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Heat
+								stack id corresponding to this instance.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="orchestration-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="orchestration
+								status of this vf-module, mastered by MSO")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="is-base-vf-module" type="xs:boolean">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="used
+								to indicate whether or not this object is base vf module")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="model-invariant-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC model id for this resource or service
+								model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="model-version-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC model version for this resource or service
+								model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="persona-model-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC model version for this resource or service
+								model.",visibility="internal",dataCopy="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="model-customization-id"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="captures
+								the id of all the configuration used to customize the resource
+								for the service.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="widget-model-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC data dictionary widget model. This maps directly to the
+								A&amp;AI widget.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="widget-model-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC data dictionary version of the widget model.This maps
+								directly to the A&amp;AI version of the widget.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="contrail-service-instance-fqdn"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								Contrail unique ID for a service-instance")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="module-index" type="xs:int"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								index will track the number of modules of a given type that have
+								been deployed in a VNF, starting with 0, and always choosing the
+								lowest available digit")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="selflink" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Path
+								to the controller object.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vf-modules">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of vf-modules, a deployment unit of VNFCs")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:vf-module" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="generic-vnf">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="General
+						purpose
+						VNF",nameProps="vnf-name",indexedProps="is-closed-loop-disabled,vnf-name2,vnf-type,heat-stack-id,in-maint,vnf-name,vnf-id,regional-resource-zone,prov-status,service-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,nf-type,nf-function,nf-naming-code,nf-role",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="generic-vnfs",namespace="network",extendsFrom="vnf",containsSuggestibleProps="true",suggestionAliases="VNFs")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="vnf-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique
+								id of VNF. This is unique across the graph.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vnf-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name
+								of VNF.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vnf-name2" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Alternate
+								name of VNF.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vnf-type" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="String
+								capturing type of vnf, that was intended to identify the ASDC
+								resource. This field has been overloaded in service-specific
+								ways and clients should expect changes to occur in the future to
+								this field as ECOMP matures.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="service-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Unique
+								identifier of service, does not necessarily map to ASDC service
+								models. SOON TO BE DEPRECATED")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="regional-resource-zone"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Regional
+								way of organizing pservers, source of truth should define
+								values")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="prov-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Trigger
+								for operational monitoring of this resource by Service Assurance
+								systems.",suggestibleOnSearch="true")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="operational-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicator
+								for whether the resource is considered operational. Valid values
+								are in-service-path and out-of-service-path.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="license-key" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="OBSOLETE
+								- do not use")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="equipment-role" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Client
+								should send valid enumerated value")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="orchestration-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Orchestration
+								status of this VNF, used by MSO.",suggestibleOnSearch="true")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="heat-stack-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Heat
+								stack id corresponding to this instance, managed by MSO")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="mso-catalog-key" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Corresponds
+								to the SDN-C catalog id used to configure this VCE")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="management-option" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="identifier
+								of managed by ATT or customer")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipv4-oam-address" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Address
+								tail-f uses to configure generic-vnf, also used for
+								troubleshooting and is IP used for traps generated by
+								generic-vnf.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipv4-loopback0-address"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="v4
+								Loopback0 address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="nm-lan-v6-address" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="v6
+								Loopback address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="management-v6-address" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="v6
+								management address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vcpu" type="xs:unsignedInt"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="number
+								of vcpus ordered for this instance of VNF, used for VNFs with no
+								vservers/flavors, to be used only by uCPE")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vcpu-units" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="units
+								associated with vcpu, used for VNFs with no vservers/flavors, to
+								be used only by uCPE")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vmemory" type="xs:unsignedInt"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="number
+								of GB of memory ordered for this instance of VNF, used for VNFs
+								with no vservers/flavors, to be used only by uCPE")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vmemory-units" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="units
+								associated with vmemory, used for VNFs with no vservers/flavors,
+								to be used only by uCPE")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vdisk" type="xs:unsignedInt"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="number
+								of vdisks ordered for this instance of VNF, used for VNFs with
+								no vservers/flavors, to be used only uCPE")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vdisk-units" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="units
+								associated with vdisk, used for VNFs with no vservers/flavors,
+								to be used only by uCPE")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="in-maint" type="xs:boolean">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="used
+								to indicate whether or not this object is in maintenance mode
+								(maintenance mode = true). This field (in conjunction with
+								prov-status) is used to suppress alarms and vSCL on VNFs/VMs.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="is-closed-loop-disabled"
+					type="xs:boolean">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="used
+								to indicate whether closed loop function is enabled on this
+								node")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="summary-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="details
+								regarding the generic-vnf operation, PLEASE DISCONTINUE USE OF
+								THIS FIELD.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="encrypted-access-flag"
+					type="xs:boolean" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="indicates
+								whether generic-vnf access uses SSH")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="entitlement-assignment-group-uuid"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="UUID
+								of the Entitlement group used for licensing VNFs, OBSOLETE - See
+								child relationships.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="entitlement-resource-uuid"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="UUID
+								of the specific entitlement resource. OBSOLETE - See child
+								relationships.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="license-assignment-group-uuid"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="UUID
+								of the license assignment group. OBSOLETE - See child
+								relationships.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="license-key-uuid" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="UUID
+								of the actual license resource. OBSOLETE - See child
+								relationships.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="model-invariant-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC model id for this resource or service
+								model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="model-version-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC model version for this resource or service
+								model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="persona-model-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC model version for this resource or service
+								model.",visibility="internal",dataCopy="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="model-customization-id"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="captures
+								the id of all the configuration used to customize the resource
+								for the service.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="widget-model-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC data dictionary widget model. This maps directly to the
+								A&amp;AI widget.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="widget-model-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC data dictionary version of the widget model.This maps
+								directly to the A&amp;AI version of the widget.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="as-number" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="as-number
+								of the VNF")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="regional-resource-subzone"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="represents
+								sub zone of the rr plane")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="nf-type" type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Generic
+								description of the type of NF",suggestibleOnSearch="true")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="nf-function" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="English
+								description of Network function that the specific VNF deployment
+								is providing")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="nf-role" type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="role
+								in the network that this model will be
+								providing",suggestibleOnSearch="true")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="nf-naming-code" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="string
+								assigned to this model used for naming purposes")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="selflink" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Path
+								to the controller object.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipv4-oam-gateway-address"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Gateway
+								address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipv4-oam-gateway-address-prefix-length"
+					type="xs:int" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Prefix
+								length for oam-address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vlan-id-outer" type="xs:unsignedInt"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Temporary
+								location for S-TAG to get to VCE")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="nm-profile-name" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Network
+								Management profile of this VNF")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+				<xs:element ref="tns:l-interfaces" minOccurs="0" />
+				<xs:element ref="tns:lag-interfaces" minOccurs="0" />
+				<xs:element ref="tns:vf-modules" minOccurs="0" />
+				<xs:element ref="tns:licenses" minOccurs="0" />
+				<xs:element ref="tns:entitlements" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="generic-vnfs">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of VNFs")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:generic-vnf" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="lag-link">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="LAG
+						links can connect
+						lag-interfaces",indexedProps="link-name",container="lag-links",namespace="network")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="link-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Alphabetical
+								concatenation of lag-interface names")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="lag-links">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of link aggregation connections")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:lag-link" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="newvce">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="This
+						object fills in the gaps from vce that were incorporated into
+						generic-vnf. This object will be retired with
+						vce.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,prov-status,vnf-id2",searchable="vnf-id2,vnf-name,vnf-name2",uniqueProps="vnf-id2",container="newvces",namespace="network")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="vnf-id2" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique
+								id of VNF, can't use same attribute name right now until we
+								promote this new object")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vnf-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name
+								of VNF.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vnf-name2" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Alternate
+								name of VNF.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vnf-type" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="String
+								capturing type of vnf, that was intended to identify the ASDC
+								resource. This field has been overloaded in service-specific
+								ways and clients should expect changes to occur in the future to
+								this field as ECOMP matures.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="prov-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Trigger
+								for operational monitoring of this VNF by BAU Service Assurance
+								systems.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="operational-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicator
+								for whether the resource is considered operational")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="license-key" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="OBSOLETE
+								- do not use")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipv4-oam-address" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Address
+								tail-f uses to configure generic-vnf, also used for
+								troubleshooting and is IP used for traps generated by GenericVnf
+								(v4-loopback0-ip-address).")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="equipment-role" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Client
+								should send valid enumerated value.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipv4-loopback0-address"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="v4
+								Loopback0 address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="orchestration-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Orchestration
+								status of this VNF, mastered by MSO.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="heat-stack-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Heat
+								stack id corresponding to this instance, managed by MSO")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="mso-catalog-key" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Corresponds
+								to the SDN-C catalog id used to configure this VCE")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+				<xs:element ref="tns:l-interfaces" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="newvces">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="This
+						object fills in the gaps from vce that were incorporated into
+						generic-vnf. This object will be retired with vce.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:newvce" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="pnf">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="PNF
+						represents a physical network function. typically equipment used
+						in the D1 world. in 1607, this will be populated by SDN-C to
+						represent a premises router that a uCPE connects to. But this can
+						be used to represent any physical device that is not an AIC node
+						or
+						uCPE.",indexedProps="pnf-name,orchestration-status,inv-status",searchable="pnf-name",uniqueProps="pnf-name",container="pnfs",namespace="network")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="pnf-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="unique
+								name of Physical Network Function.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="pnf-name2" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="name
+								of Physical Network Function.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="pnf-name2-source" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="source
+								of name2")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="pnf-id" type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="id
+								of pnf")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="equip-type" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Equipment
+								type. Source of truth should define valid values.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="equip-vendor" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Equipment
+								vendor. Source of truth should define valid values.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="equip-model" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Equipment
+								model. Source of truth should define valid values.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="management-option" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="identifier
+								of managed by ATT or customer")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipaddress-v4-oam" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="ipv4-oam-address
+								with new naming convention for IP addresses")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="sw-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="sw-version
+								is the version of SW for the hosted application on the PNF.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="in-maint" type="xs:boolean">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="Used
+								to indicate whether or not this object is in maintenance mode
+								(maintenance mode = true). This field (in conjunction with
+								prov-status) is used to suppress alarms and vSCL on VNFs/VMs.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="frame-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="ID
+								of the physical frame (relay rack) where pnf is installed.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="serial-number" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Serial
+								number of the device")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipaddress-v4-loopback-0"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="IPV4
+								Loopback 0 address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipaddress-v6-loopback-0"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="IPV6
+								Loopback 0 address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipaddress-v4-aim" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="IPV4
+								AIM address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipaddress-v6-aim" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="IPV6
+								AIM address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipaddress-v6-oam" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="IPV6
+								OAM address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="inv-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="CANOPI's
+								inventory status. Only set with values exactly as defined by
+								CANOPI.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="prov-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Prov
+								Status of this device (not under canopi control) Valid values
+								[PREPROV/NVTPROV/PROV]")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="nf-role" type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Nf
+								Role is the role performed by this instance in the network.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+				<xs:element ref="tns:p-interfaces" minOccurs="0" />
+				<xs:element ref="tns:lag-interfaces" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="pnfs">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of Physical Network Functions.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:pnf" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="physical-link">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of physical connections, typically between
+						p-interfaces",indexedProps="circuit-id,link-name",alternateKeys1="circuit-id",container="physical-links",namespace="network",searchable="link-name,circuit-id")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="link-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="e.g.,
+								hostnameA_p-connection_nameA_hostnameZ+p_connection-nameZ")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="speed-value" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Captures
+								the numeric part of the speed")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="speed-units" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Captures
+								the units corresponding to the speed")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="circuit-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Circuit
+								it")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="dual-mode" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Dual
+								access mode (e.g., primary, secondary")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="management-option" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="To
+								provide information on who manages this circuit. A&amp;AI or 3rd
+								party transport provider")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="service-provider-name" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name
+								of the service Provider on this link.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="physical-links">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of physical connections, typically between p-interfaces")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:physical-link" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vig-server">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="vig-server
+						contains information about a vig server used for
+						IPSec-configuration. Populated by SDN-C from
+						1607",indexedProps="vig-address-type",dependentOn="ipsec-configuration",container="vig-servers")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="vig-address-type" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="indicates
+								whether the VIG is for AVPN or INTERNET")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipaddress-v4-vig" type="xs:string"
+					minOccurs="0" maxOccurs="unbounded">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="v4
+								IP of the vig server")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipaddress-v6-vig" type="xs:string"
+					minOccurs="0" maxOccurs="unbounded">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="v6
+								IP of the vig server")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vig-servers">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:vig-server" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="ipsec-configuration">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="IPSec
+						configuration node will contain various configuration data for the
+						NMTE VNF. This node will have an edge to the generic-vnf (vnf type
+						= TE). Starting 1607, this data will be populated by
+						SDN-C",indexedProps="ipsec-configuration-id",uniqueProps="ipsec-configuration-id",container="ipsec-configurations",namespace="network")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="ipsec-configuration-id"
+					type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="UUID
+								of this configuration")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="requested-vig-address-type"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicate
+								the type of VIG server like AVPN, INTERNET, BOTH")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="requested-encryption-strength"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Encryption
+								values like 3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc,
+								aes-265-cbc")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="requested-dmz-type" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="ATT
+								can offer a shared DMZ or a DMZ specific to a customer")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="shared-dmz-network-address"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Network
+								address of shared DMZ")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="requested-customer-name"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="If
+								the DMZ is a custom DMZ, this field will indicate the customer
+								information")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ike-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="can
+								be 1 or 2")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ikev1-authentication" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Contains
+								values like md5, sha1, sha256, sha384")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ikev1-encryption" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Encyption
+								values like 3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc,
+								aes-265-cbc")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ikev1-dh-group" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Diffie-Hellman
+								group like DH-GROUP2, DH-GROUP5, DH-GROUP14")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ikev1-am-group-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Group
+								name defined in VIG for clients using aggressive mode")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ikev1-am-password" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="pre-shared
+								key for the above group name ")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ikev1-sa-lifetime" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Lifetime
+								for IKEv1 SA")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipsec-authentication" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="md5,
+								sha1, sha256, sha384")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipsec-encryption" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="3des-cbc,
+								des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipsec-sa-lifetime" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Life
+								time for IPSec SA")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipsec-pfs" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="enable
+								PFS or not")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="xauth-userid" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="user
+								ID for xAuth, sm-user,ucpeHostName,nmteHostName")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="xauth-user-password" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Encrypted
+								using the Juniper $9$ algorithm")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="dpd-interval" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The
+								time between DPD probe")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="dpd-frequency" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Maximum
+								number of DPD before claiming the tunnel is down")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+				<xs:element ref="tns:vig-servers" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="ipsec-configurations">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:ipsec-configuration" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="route-table-reference">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Openstack
+						route table
+						reference.",nameProps="route-table-reference-fqdn",uniqueProps="route-table-reference-id",indexedProps="route-table-reference-id,route-table-reference-fqdn",container="route-table-references",namespace="network")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="route-table-reference-id"
+					type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Route
+								Table Reference id, UUID assigned to this instance.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="route-table-reference-fqdn"
+					type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="FQDN
+								entry in the route table.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Concurrency
+								value")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="route-table-references">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of openstack route table references")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:route-table-reference" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="instance-group">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="General
+						mechanism for grouping
+						instances",nameProps="description",uniqueProps="id",searchable="id,description",indexedProps="id,description,type,sub-type",container="instance-groups",namespace="network")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="instance-group-role" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="role
+								of the instance group.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="model-invariant-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="ASDC
+								model id for this resource or service model.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="model-version-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="ASDC
+								model version uid for this resource model.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Instance
+								Group ID, UUID assigned to this instance.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="description" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Descriptive
+								text to help identify the usage of this instance-group")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="type" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Only
+								valid value today is lower case ha for high availability")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="sub-type" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Valid
+								values for ha type are [geo-activeactive, geo-activestandby,
+								local-activeactive, local-activestandby]")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Concurrency
+								value")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="instance-groups">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of openstack route table references")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:instance-group" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="zone">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="A
+						zone is a grouping of assets in a location homing to the same
+						connections into the
+						CBB",nameProps="zone-name",indexedProps="zone-id,design-type,zone-context",uniqueProps="zone-id",container="zones",namespace="network")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="zone-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Code
+								assigned by AIC to the zone")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="zone-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="English
+								name associated with the zone")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="design-type" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Design
+								of zone [Medium/Large…]")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="zone-context" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Context
+								of zone [production/test]")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="status" type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Status
+								of a zone.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Concurrency
+								value")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="zones">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of zones")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:zone" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="network">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Namespace
+						for network inventory resources.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:logical-links" minOccurs="0" />
+				<xs:element ref="tns:site-pair-sets" minOccurs="0" />
+				<xs:element ref="tns:vpn-bindings" minOccurs="0" />
+				<xs:element ref="tns:vpls-pes" minOccurs="0" />
+				<xs:element ref="tns:multicast-configurations"
+					minOccurs="0" />
+				<xs:element ref="tns:vces" minOccurs="0" />
+				<xs:element ref="tns:vnfcs" minOccurs="0" />
+				<xs:element ref="tns:l3-networks" minOccurs="0" />
+				<xs:element ref="tns:network-policies" minOccurs="0" />
+				<xs:element ref="tns:generic-vnfs" minOccurs="0" />
+				<xs:element ref="tns:lag-links" minOccurs="0" />
+				<xs:element ref="tns:newvces" minOccurs="0" />
+				<xs:element ref="tns:pnfs" minOccurs="0" />
+				<xs:element ref="tns:physical-links" minOccurs="0" />
+				<xs:element ref="tns:ipsec-configurations" minOccurs="0" />
+				<xs:element ref="tns:route-table-references"
+					minOccurs="0" />
+				<xs:element ref="tns:instance-groups" minOccurs="0" />
+				<xs:element ref="tns:zones" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="reserved-prop-names">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Internal
+						map to define some reserved properties of a
+						vertex",uniqueProps="aai-unique-key",indexedProps="aai-unique-key,source-of-truth,aai-node-type,aai-uri")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="last-mod-source-of-truth"
+					type="xs:string" minOccurs="0" />
+				<xs:element name="aai-node-type" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="aai-created-ts" type="xs:unsignedInt"
+					minOccurs="0" />
+				<xs:element name="aai-unique-key" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="aai-last-mod-ts" type="xs:unsignedInt"
+					minOccurs="0" />
+				<xs:element name="source-of-truth" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="aai-uri" type="xs:string" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="edge-prop-names">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Internal
+						map to define the properties of an edge and interpret the map
+						EdgeRules",edgeInfo="edgeLabel,direction,multiplicityRule,isParent,usesResource,hasDelTarget,SVC-INFRA,SVC-INFRA-REV")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="edgeLabel" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="direction" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="multiplicityRule" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="is-parent" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="uses-resource" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="has-del-target" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="SVC-INFRA" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="prevent-delete" type="xs:string"
+					minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="aai-internal">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:reserved-prop-names" minOccurs="0"
+					maxOccurs="unbounded" />
+				<xs:element ref="tns:edge-prop-names" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="inventory">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:search" minOccurs="0" />
+				<xs:element ref="tns:actions" minOccurs="0" />
+				<xs:element ref="tns:cloud-infrastructure" minOccurs="0" />
+				<xs:element ref="tns:license-management" minOccurs="0" />
+				<xs:element ref="tns:business" minOccurs="0" />
+				<xs:element ref="tns:service-design-and-creation"
+					minOccurs="0" />
+				<xs:element ref="tns:network" minOccurs="0" />
+				<xs:element ref="tns:aai-internal" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="notification-event-header">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="id" type="xs:string" minOccurs="0" />
+				<xs:element name="timestamp" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="source-name" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="domain" type="xs:string" minOccurs="0" />
+				<xs:element name="sequence-number" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="severity" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="event-type" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="version" type="xs:string" minOccurs="0" />
+				<xs:element name="action" type="xs:string" minOccurs="0" />
+				<xs:element name="entity-type" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="top-entity-type" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="entity-link" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="status" type="xs:string" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="notification-event">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="cambria.partition" type="xs:string"
+					minOccurs="0" />
+				<xs:element ref="tns:notification-event-header"
+					minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="overloaded-model">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Allows
+						for legacy POST of old-style and new-style models")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="model-invariant-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique
+								identifier corresponding to the main definition of a model in
+								ASDC")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="model-name-version-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique
+								identifier corresponding to one version of a model in ASDC")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="model-type" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Type
+								of the model, e.g., service, resource, widget, etc.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="model-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name
+								of the model, which can change from version to version.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="model-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Invariant
+								unique ID which does not change from version to version")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="model-version" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Version")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="model-description" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Description")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:model-vers" minOccurs="0" />
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="query-parameters">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="QueryParameters
+						for performing a named-query or model query")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:named-query" minOccurs="0" />
+				<xs:element ref="tns:overloaded-model" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="instance-filter">
+		<xs:complexType>
+			<xs:sequence />
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="instance-filters">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="InstanceFilters
+						for performing a named-query or model query")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:instance-filter" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="secondary-filt">
+		<xs:complexType>
+			<xs:sequence />
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="secondary-filts">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="SecondaryFilts
+						for performing a named-query or model query")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:secondary-filt" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="model-and-named-query-search">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="ModelAndNamedQuerySearch
+						holds query-parameters and instance-properties for performing a
+						named-query or model query")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:query-parameters" minOccurs="0" />
+				<xs:element ref="tns:instance-filters" minOccurs="0" />
+				<xs:element ref="tns:secondary-filts" minOccurs="0" />
+				<xs:element name="top-node-type" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="secondary-filter-cut-point"
+					type="xs:string" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="properties">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Property
+						holder for query properties or instance properties")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="property-name" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="property-value" type="xs:string"
+					minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="extra-property">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="property-name" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="property-value" type="xs:string"
+					minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="extra-properties">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Extra
+						properties for inventory item for response list")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:extra-property" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="inventory-response-item">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Inventory
+						item for response list",container="inventory-response-items")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="model-name" type="xs:string"
+					minOccurs="0" />
+				<xs:element ref="tns:extra-properties" minOccurs="0" />
+				<xs:element ref="tns:inventory-response-items"
+					minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="inventory-response-items">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Container
+						for inventory items in response list",container="response-list")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:inventory-response-item"
+					minOccurs="0" maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="response-list">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Response
+						container for the results of a named-query or model query")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:inventory-response-items"
+					minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vnf">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Abstract
+						vnf
+						class",indexedProps="vnf-id",uniqueProps="vnf-id",inheritors="vce,generic-vnf",isAbstract="true")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="vnf-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique
+								id of VNF. This is unique across the graph.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
 </xs:schema>
\ No newline at end of file
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/resources/aai_schema_v9.xsd b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/resources/aai_schema_v9.xsd
index c73c583679..c362e6a2dd 100644
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/resources/aai_schema_v9.xsd
+++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/resources/aai_schema_v9.xsd
@@ -1,6303 +1,7889 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<xs:schema elementFormDefault="qualified" version="1.0" targetNamespace="http://org.openecomp.aai.inventory/v9" xmlns:tns="http://org.openecomp.aai.inventory/v9" xmlns:xs="http://www.w3.org/2001/XMLSchema"
-xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-    jaxb:version="2.1" 
-    xmlns:annox="http://annox.dev.java.net" 
-    jaxb:extensionBindingPrefixes="annox">
+<xs:schema elementFormDefault="qualified" version="1.0"
+	targetNamespace="http://org.openecomp.aai.inventory/v9"
+	xmlns:tns="http://org.openecomp.aai.inventory/v9"
+	xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" jaxb:version="2.1"
+	xmlns:annox="http://annox.dev.java.net"
+	jaxb:extensionBindingPrefixes="annox">
 
-  <xs:element name="inventory-item-data">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="property-name" type="xs:string" minOccurs="0"/>
-        <xs:element name="property-value" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="inventory-item">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="inventory-item-type" type="xs:string" minOccurs="0"/>
-        <xs:element name="inventory-item-link" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:inventory-item-data" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element ref="tns:tagged-inventory-item-list" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="tagged-inventory-item-list">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:inventory-item" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="edge-tag-query-result">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:tagged-inventory-item-list" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="start-node-filter">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="property-name" type="xs:string" minOccurs="0"/>
-        <xs:element name="property-value" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="include-node-filter">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="include-node-type" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="secondary-filter">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="property-name" type="xs:string" minOccurs="0"/>
-        <xs:element name="filter-type" type="xs:string" minOccurs="0"/>
-        <xs:element name="property-value" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="edge-tag-query-request">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="edge-tag" type="xs:string" minOccurs="0"/>
-        <xs:element name="result-detail" type="xs:string" minOccurs="0"/>
-        <xs:element name="start-node-type" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:start-node-filter" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element ref="tns:include-node-filter" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element ref="tns:secondary-filter" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="result-data">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="resource-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The specific type of node in the A&amp;AI graph")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-link" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The URL to the specific resource")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="search-results">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:result-data" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="relationship-data">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="relationship-key" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="A keyword provided by A&amp;AI to indicate an attribute.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="relationship-value" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Value of the attribute.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="related-to-property">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="property-key" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Key part of a key/value pair")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="property-value" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Value part of a key/value pair")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="relationship">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="related-to" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="A keyword provided by A&amp;AI to indicate type of node.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="related-link" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL to the object in A&amp;AI.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-data" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element ref="tns:related-to-property" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="relationship-list">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:relationship" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="oam-network">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="OAM network, to be deprecated shortly.  Do not use for new purposes. ",nameProps="network-name",indexedProps="cvlan-tag,network-uuid,network-name",dependentOn="cloud-region",container="oam-networks")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="network-uuid" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="UUID of the network. Unique across a cloud-region")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="network-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name of the network.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="cvlan-tag" type="xs:unsignedInt">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="cvlan-id")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipv4-oam-gateway-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for VNF firewall rule so customer cannot send customer traffic over this oam network")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipv4-oam-gateway-address-prefix-length" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for VNF firewall rule so customer cannot send customer traffic over this oam network")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="oam-networks">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of OAM networks, to be deprecated shortly.  Do not use for new purposes. ")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:oam-network" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="dvs-switch">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Digital virtual switch metadata, used by SDN-C to configure VCEs.  A&amp;AI needs to receive this data from the PO deployment team and administer it using the provisioningTool.sh into A&amp;AI. ",indexedProps="vcenter-url,switch-name",dependentOn="cloud-region",container="dvs-switches")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="switch-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="DVS switch name")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vcenter-url" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL used to reach the vcenter")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="dvs-switches">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of digital virtual switch metadata used for vmWare VCEs and VPEs.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:dvs-switch" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="availability-zone">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Availability zone, a collection of compute hosts/pservers",indexedProps="availability-zone-name",dependentOn="cloud-region",container="availability-zones")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="availability-zone-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Name of the availability zone.  Unique across a cloud region")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="hypervisor-type" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Type of hypervisor.  Source of truth should define valid values.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="operational-state" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="State that indicates whether the availability zone should be used, etc.  Source of truth should define valid values.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="az-and-dvs-switches">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:dvs-switches" minOccurs="0"/>
-        <xs:element ref="tns:availability-zone" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="sdn-zone-response">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:oam-networks" minOccurs="0"/>
-        <xs:element ref="tns:az-and-dvs-switches" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="search">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:edge-tag-query-result" minOccurs="0"/>
-        <xs:element ref="tns:edge-tag-query-request" minOccurs="0"/>
-        <xs:element ref="tns:search-results" minOccurs="0"/>
-        <xs:element ref="tns:sdn-zone-response" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="update-node-key">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="key-name" type="xs:string" minOccurs="0"/>
-        <xs:element name="key-value" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="action-data">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="property-name" type="xs:string" minOccurs="0"/>
-        <xs:element name="property-value" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="action">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="action-type" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:action-data" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="update">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Serves a PATCH like function.  Does not enforce concurrency control.  Clear each usage with AAI team.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="update-node-type" type="xs:string"/>
-        <xs:element ref="tns:update-node-key" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element name="update-node-uri" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:action" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="key-data">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="key-name" type="xs:string" minOccurs="0"/>
-        <xs:element name="key-value" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="notify">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="event-id" type="xs:string"/>
-        <xs:element name="node-type" type="xs:string" minOccurs="0"/>
-        <xs:element name="event-trigger" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:key-data" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element name="selflink" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="actions">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="APIs that are more action related than REST (e.g., notify, update).")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:update" minOccurs="0"/>
-        <xs:element ref="tns:notify" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="ctag-pool">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="A collection of C tags (vlan tags) grouped for a specific purpose.",indexedProps="availability-zone-name",dependentOn="complex",container="ctag-pools")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="target-pe" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="The Target provider edge router")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="availability-zone-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Name of the availability zone")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ctag-pool-purpose" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Describes what the intended purpose of this pool is.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ctag-values" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Comma separated list of ctags")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="ctag-pools">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:ctag-pool" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="complex">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of physical locations that can house cloud-regions.",indexedProps="identity-url,data-center-code,complex-name,physical-location-id",searchable="physical-location-id,data-center-code,complex-name,street1,street2,postal-code",uniqueProps="physical-location-id",container="complexes",namespace="cloud-infrastructure")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="physical-location-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique identifier for physical location, e.g., CLLI")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="data-center-code" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Data center code which can be an alternate way to identify a complex")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="complex-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Gamma complex name for LCP instance.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="identity-url" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL of the keystone identity service")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="physical-location-type" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Type, e.g., central office, data center.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="street1" type="xs:string"/>
-        <xs:element name="street2" type="xs:string" minOccurs="0"/>
-        <xs:element name="city" type="xs:string"/>
-        <xs:element name="state" type="xs:string" minOccurs="0"/>
-        <xs:element name="postal-code" type="xs:string"/>
-        <xs:element name="country" type="xs:string"/>
-        <xs:element name="region" type="xs:string"/>
-        <xs:element name="latitude" type="xs:string" minOccurs="0"/>
-        <xs:element name="longitude" type="xs:string" minOccurs="0"/>
-        <xs:element name="elevation" type="xs:string" minOccurs="0"/>
-        <xs:element name="lata" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:ctag-pools" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="complexes">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of physical locations that can house cloud-regions.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:complex" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="volume-group">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Persistent block-level storage.",indexedProps="volume-group-name,vnf-type,heat-stack-id,volume-group-id",searchable="volume-group-name",dependentOn="cloud-region",container="volume-groups")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="volume-group-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique ID of volume-group.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="volume-group-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name of the volume group.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="heat-stack-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Heat stack id corresponding to this volume-group")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vnf-type" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded and clients should expect changes                  to occur in the future to this field as ASDC matures.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Orchestration status of this volume-group")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="persona-model-customization-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="captures the id of all the configuration used to customize the resource for the service.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="volume-groups">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of persistent block-level storage.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:volume-group" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="volume">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Ephemeral Block storage volume.",indexedProps="volume-id",dependentOn="vserver",container="volumes")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="volume-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique ID of block storage volume relative to the vserver.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="volume-selflink" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="volumes">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of ephemeral Block storage volumes.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:volume" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="l3-interface-ipv4-address-list">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="IPv4 Address Range",indexedProps="l3-interface-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="vlan,l-interface")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="l3-interface-ipv4-address" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="IP address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="l3-interface-ipv4-prefix-length" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Prefix length, 32 for single address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vlan-id-inner" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Inner VLAN tag")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vlan-id-outer" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Outer VLAN tag")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="is-floating" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicator of fixed or floating address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="neutron-network-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Neutron network id of the interface that address belongs to")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="neutron-subnet-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Neutron id of subnet that address belongs to")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="l3-interface-ipv6-address-list">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="IPv6 Address Range",indexedProps="l3-interface-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="vlan,l-interface")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="l3-interface-ipv6-address" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="IP address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="l3-interface-ipv6-prefix-length" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Prefix length, 128 for single address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vlan-id-inner" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Inner VLAN tag")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vlan-id-outer" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Outer VLAN tag")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="is-floating" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicator of fixed or floating address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="neutron-network-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Neutron network id of the interface that address belongs to")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="neutron-subnet-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Neutron id of subnet that address belongs to")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vlan">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Definition of vlan",indexedProps="vlan-interface,vlan-id-inner,vpn-id",uniqueProps="vpn-id",dependentOn="l-interface",container="vlans")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="vlan-interface" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="String that identifies the interface")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vlan-id-inner" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Inner VLAN tag")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vlan-id-outer" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Outer VLAN tag")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="speed-value" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Captures the numeric part of the speed")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="speed-units" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Captures the units corresponding to the speed")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vlan-description" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used to describe (the service associated with) the vlan")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="backdoor-connection" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Whether customer is going to use this VLAN for backdoor connection to another customer premise device.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vpn-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This indicates the customers VPN ID associated with this vlan")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:l3-interface-ipv4-address-list" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element ref="tns:l3-interface-ipv6-address-list" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vlans">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:vlan" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="sriov-vf">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="SR-IOV Virtual Function (not to be confused with virtual network function)",indexedProps="pci-id,vf-vlan-filter,vf-mac-filter,vf-vlan-strip,neutron-network-id",dependentOn="l-interface",container="sriov-vfs")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="pci-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="PCI ID used to identify the sriov-vf")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vf-vlan-filter" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This metadata provides option to specify list of VLAN filters applied on VF to pass the traffic to VM.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vf-mac-filter" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="When MAC filters are specified, VF-agent service configures VFs to do MAC level filtering before the traffic is passed to VM.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vf-vlan-strip" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="When this field is set to true, VF will configured to strip the outer TAG before the traffic is passed to VM.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vf-vlan-anti-spoof-check" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This option ensures anti VLAN spoof checks are done at the VF level to comply with security. The disable check will also be honored per the VNF needs for trusted VMs.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vf-mac-anti-spoof-check" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This option ensures anti MAC spoof checks are done at the VF level to comply with security. The disable check will also be honored per the VNF needs for trusted VMs.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vf-mirrors" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This option defines the set of Mirror objects which essentially mirrors the traffic from source to set of collector VNF Ports.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vf-broadcast-allow" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This option, if set to true, sets the VF in promiscuous mode and allows all broadcast traffic to reach the VM")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vf-unknown-multicast-allow" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This option, if set to true, sets the VF in promiscuous mode and allows unknown multicast traffic to reach the VM")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vf-unknown-unicast-allow" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This option, if set to true, sets the VF in promiscuous mode and allows unknown unicast traffic to reach the VM")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vf-insert-stag" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This option, if set to true, instructs to insert outer tag after traffic comes out of VM.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vf-link-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This option is used to set the link status.  Valid values as of 1607 are on, off, and auto.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="neutron-network-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Neutron network id of the interface")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="sriov-vfs">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of SR-IOV Virtual Functions.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:sriov-vf" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="l-interface">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Logical interfaces, e.g., a vnic.",indexedProps="macaddr,interface-id,interface-name,network-name",dependentOn="generic-vnf,newvce,vpe,p-interface,vserver,lag-interface",container="l-interfaces")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="interface-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Name given to the interface")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="interface-role" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="E.g., CUSTOMER, UPLINK, etc.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="v6-wan-link-ip" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Questionably placed - v6 ip addr of this interface (is in vr-lan-interface from Mary B.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="selflink" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="interface-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="ID of interface")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="macaddr" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="MAC address for the interface")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="network-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name of the network")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="management-option" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Whether A&amp;AI should be managing this interface of not. Could have value like CUSTOMER")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="interface-description" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Human friendly text regarding this interface.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:vlans" minOccurs="0"/>
-        <xs:element ref="tns:sriov-vfs" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:l3-interface-ipv4-address-list" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element ref="tns:l3-interface-ipv6-address-list" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="l-interfaces">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of logical interfaces.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:l-interface" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vserver">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Virtual Servers, aka virtual machine or VM.",nameProps="vserver-name",indexedProps="is-closed-loop-disabled,prov-status,vserver-name,vserver-id,in-maint,vserver-name2",searchable="vserver-name,vserver-id,vserver-name2",dependentOn="tenant",container="vservers")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="vserver-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique identifier for this vserver relative to its tenant")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vserver-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name of vserver")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vserver-name2" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Alternative name of vserver")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="prov-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Trigger for operational monitoring of this resource by Service Assurance systems.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vserver-selflink" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="in-maint" type="xs:boolean">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="Used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="is-closed-loop-disabled" type="xs:boolean">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="Used to indicate whether closed loop function is enabled on this node")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:volumes" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:l-interfaces" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vservers">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of virtual Servers, aka virtual machines or VMs.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:vserver" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="tenant">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Openstack tenant",nameProps="tenant-name",indexedProps="tenant-name,tenant-id",searchable="tenant-name,tenant-id",dependentOn="cloud-region",container="tenants")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="tenant-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique id relative to the cloud-region.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="tenant-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Readable name of tenant")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:vservers" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="tenants">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of openstack tenants.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:tenant" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="flavor">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Openstack flavor.",nameProps="flavor-name",indexedProps="flavor-name,flavor-id",dependentOn="cloud-region",container="flavors")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="flavor-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Flavor id, expected to be unique across cloud-region.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="flavor-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Flavor name")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="flavor-vcpus" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Number of CPUs")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="flavor-ram" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Amount of memory")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="flavor-disk" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Disk space")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="flavor-ephemeral" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Amount of ephemeral disk space")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="flavor-swap" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="amount of swap space allocation")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="flavor-is-public" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="whether flavor is available to all users or private to the tenant it was created in.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="flavor-selflink" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="flavor-disabled" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Boolean as to whether this flavor is no longer enabled")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="flavors">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of openstack flavors.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:flavor" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="group-assignment">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Openstack group-assignment used to store exclusivity groups (EG).",nameProps="group-name",indexedProps="group-id,group-type,group-name",dependentOn="cloud-region",container="group-assignments")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="group-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Group id, expected to be unique across cloud-region.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="group-type" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Group type - the type of group this instance refers to")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="group-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Group name - name assigned to the group")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="group-description" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Group description - description of the group")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="group-assignments">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of openstack group assignments")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:group-assignment" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="snapshot">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Openstack snapshot",nameProps="snapshot-name",uniqueProps="snapshot-id",indexedProps="application,snapshot-name,application-vendor,snapshot-id,application-version,prev-snapshot-id",dependentOn="cloud-region",container="snapshots")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="snapshot-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Snapshot id, this is the key UUID assoc associated in glance with the snapshots.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="snapshot-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Snapshot name")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="snapshot-architecture" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Operating system architecture")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="snapshot-os-distro" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The common name of the operating system distribution in lowercase")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="snapshot-os-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The operating system version as specified by the distributor.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="application" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The application that the image instantiates.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="application-vendor" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The vendor of the application.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="application-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The version of the application.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="snapshot-selflink" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="prev-snapshot-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This field contains the UUID of the previous snapshot (if any).")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="snapshots">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of openstack snapshots")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:snapshot" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="metadatum">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Key/value pairs",indexedProps="metaname",dependentOn="tenant,image,service-instance,connector,model",container="metadata")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="metaname" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true)</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="metaval" type="xs:string"/>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="metadata">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of metadatum (key/value pairs)")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:metadatum" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="image">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Openstack image.",nameProps="image-name",indexedProps="application,image-name,application-vendor,image-id,application-version",dependentOn="cloud-region",container="images")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="image-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Image id, expected to be unique across cloud region")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="image-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Image name")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="image-architecture" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Operating system architecture.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="image-os-distro" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The common name of the operating system distribution in lowercase")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="image-os-version" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The operating system version as specified by the distributor.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="application" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The application that the image instantiates.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="application-vendor" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The vendor of the application.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="application-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The version of the application.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="image-selflink" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:metadata" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="images">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collectio of Openstack images.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:image" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="availability-zones">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of availability zones")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:availability-zone" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="cloud-region">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="cloud-region designates an installation of a cloud cluster or region or instantiation. In AT&amp;Ts openecomp cloud, this could be an LCP or DCP. Cloud regions are uniquely identified by a composite key, cloud-owner + cloud-region-id. The format of the cloud-owner is vendor-cloudname and we will use openecomp-openecomp for AT&amp;T's openecomp.",indexedProps="cloud-owner,cloud-region-id,cloud-type,owner-defined-type",nameProps="owner-defined-type",container="cloud-regions",namespace="cloud-infrastructure")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="cloud-owner" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Identifies the vendor and cloud name, e.g., openecomp-openecomp. First part of composite key should be formatted as vendor-cloudname")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="cloud-region-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Identifier used by the vendor for the region. Second part of composite key")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="cloud-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Type of the cloud (e.g., openstack)")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="owner-defined-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Cloud-owner defined type indicator (e.g., DCP, LCP)")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="cloud-region-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Software version employed at the site")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="identity-url" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL of the keystone identity service")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="cloud-zone" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Zone where the cloud is homed")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="complex-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="complex name for cloud-region instance")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:volume-groups" minOccurs="0"/>
-        <xs:element ref="tns:tenants" minOccurs="0"/>
-        <xs:element ref="tns:flavors" minOccurs="0"/>
-        <xs:element ref="tns:group-assignments" minOccurs="0"/>
-        <xs:element ref="tns:snapshots" minOccurs="0"/>
-        <xs:element ref="tns:images" minOccurs="0"/>
-        <xs:element ref="tns:dvs-switches" minOccurs="0"/>
-        <xs:element ref="tns:oam-networks" minOccurs="0"/>
-        <xs:element ref="tns:availability-zones" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="cloud-regions">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(maximumDepth="0")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:cloud-region" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="network-profile">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Network profile populated by SDN-GP for SNMP",indexedProps="nm-profile-name",container="network-profiles",namespace="cloud-infrastructure")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="nm-profile-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique name of network profile.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="community-string" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Encrypted SNMP community string")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="network-profiles">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of network profiles")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:network-profile" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="p-interface">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Physical interface (e.g., nic)",indexedProps="interface-name,prov-status",nameProps="prov-status",dependentOn="vpls-pe,pserver,pnf",container="p-interfaces")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="interface-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Name that identifies the physical interface")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="speed-value" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Captures the numeric part of the speed")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="speed-units" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Captures the units corresponding to the speed")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="port-description" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Nature of the services and connectivity on this port.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="equipment-identifier" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="CLEI or other specification for p-interface hardware.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="interface-role" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Role specification for p-interface hardware.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="interface-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicates the physical properties of the interface.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="prov-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Trigger for operational monitoring of this resource by Service Assurance systems.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:l-interfaces" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="p-interfaces">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of physical interfaces.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:p-interface" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="lag-interface">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Link aggregate interface",indexedProps="interface-name,interface-id,interface-role",dependentOn="generic-vnf,pserver,vpe,vpls-pe,pnf",container="lag-interfaces")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="interface-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Name that identifies the link aggregate interface")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="speed-value" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Captures the numeric part of the speed")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="speed-units" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Captures the units corresponding to the speed")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="interface-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="ID of interface")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="interface-role" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Role assigned to this Interface, should use values as defined in OPENECOMP Yang models.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="prov-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Trigger for operational monitoring of this resource by Service Assurance systems.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:l-interfaces" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="lag-interfaces">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of link aggregate interfaces.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:lag-interface" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="pserver">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Compute host whose hostname must be unique and must exactly match what is sent as a relationship to a vserver.",nameProps="pserver-name2",indexedProps="hostname,in-maint,pserver-id,pserver-name2,inv-status",searchable="hostname,pserver-name2,pserver-id,ipv4-oam-address",container="pservers",namespace="cloud-infrastructure")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="hostname" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Value from executing hostname on the compute node.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ptnii-equip-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="PTNII name")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="number-of-cpus" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Number of cpus")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="disk-in-gigabytes" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Disk size, in GBs")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ram-in-megabytes" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="RAM size, in MBs")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="equip-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Equipment type.  Source of truth should define valid values.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="equip-vendor" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Equipment vendor.  Source of truth should define valid values.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="equip-model" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Equipment model.  Source of truth should define valid values.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="fqdn" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Fully-qualified domain name")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="pserver-selflink" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipv4-oam-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used to configure device, also used for troubleshooting and is IP used for traps generated by device.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="serial-number" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Serial number, may be queried")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipaddress-v4-loopback-0" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="IPV4 Loopback 0 address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipaddress-v6-loopback-0" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="IPV6 Loopback 0 address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipaddress-v4-aim" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="IPV4 AIM address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipaddress-v6-aim" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="IPV6 AIM address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipaddress-v6-oam" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="IPV6 OAM address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="inv-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="CANOPI's inventory status.  Only set with values exactly as defined by CANOPI.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="pserver-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="ID of Pserver")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="internet-topology" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="internet topology of Pserver")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="in-maint" type="xs:boolean">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="pserver-name2" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="alternative pserver name")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="purpose" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="purpose of pserver")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:p-interfaces" minOccurs="0"/>
-        <xs:element ref="tns:lag-interfaces" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="pservers">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of compute hosts.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:pserver" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="virtual-data-center">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Virtual organization of cloud infrastructure elements in a data center context",nameProps="vdc-name",indexedProps="vdc-name,vdc-id",container="virtual-data-centers",namespace="cloud-infrastructure")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="vdc-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique ID of the vdc")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vdc-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name of the virtual data center")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="virtual-data-centers">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Virtual organization of cloud infrastructure elements in a data center context")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:virtual-data-center" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="cloud-infrastructure">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Namespace for cloud infrastructure.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:complexes" minOccurs="0"/>
-        <xs:element ref="tns:cloud-regions" minOccurs="0"/>
-        <xs:element ref="tns:network-profiles" minOccurs="0"/>
-        <xs:element ref="tns:pservers" minOccurs="0"/>
-        <xs:element ref="tns:virtual-data-centers" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="license-key-resource">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(nameProps="name",indexedProps="assignment-group-uuid,openecomp-uuid,name",uniqueProps="openecomp-uuid",container="license-key-resources",namespace="license-management")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="att-uuid" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true)</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="assignment-type" type="xs:string" minOccurs="0"/>
-        <xs:element name="assignment-status" type="xs:string" minOccurs="0"/>
-        <xs:element name="assignment-group-uuid" type="xs:string"/>
-        <xs:element name="assignment-date" type="xs:string" minOccurs="0"/>
-        <xs:element name="name" type="xs:string" minOccurs="0"/>
-        <xs:element name="model-uuid" type="xs:string" minOccurs="0"/>
-        <xs:element name="model-version" type="xs:string" minOccurs="0"/>
-        <xs:element name="license-key" type="xs:string" minOccurs="0"/>
-        <xs:element name="license-key-file-url" type="xs:string" minOccurs="0"/>
-        <xs:element name="supplier-release-list" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="license-key-resources">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:license-key-resource" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="license-management">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:license-key-resources" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="connector">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of resource instances used to connect a variety of disparate inventory widgets",indexedProps="resource-instance-id,persona-model-id,persona-model-version,widget-model-id,widget-model-version",container="connectors",namespace="business")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="resource-instance-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique id of resource instance.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="persona-model-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="persona-model-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="widget-model-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="widget-model-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:metadata" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="connectors">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of resource instances used to connect a variety of disparate inventory widgets")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:connector" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="tunnel-xconnect">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Represents the specifics of a tunnel cross connect piece of a resource that gets separately allotted",uniqueProps="id",indexedProps="id",dependentOn="allotted-resource",container="tunnel-xconnects")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Allotted Resource id UUID assigned to this instance.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="bandwidth-up-wan1" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The WAN uplink bandwidth for WAN1")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="bandwidth-down-wan1" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The WAN downlink bandwidth for WAN1")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="bandwidth-up-wan2" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The WAN uplink bandwidth for WAN2")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="bandwidth-down-wan2" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The WAN downlink bandwidth for WAN2")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Concurrency value")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="tunnel-xconnects">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="This object is used to store the specific tunnel cross connect aspects of an allotted resource")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:tunnel-xconnect" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="allotted-resource">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Represents a slice or partial piece of a resource that gets separately allotted",nameProps="description",uniqueProps="id",indexedProps="id,persona-model-id,persona-model-version",dependentOn="service-instance",container="allotted-resources")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Allotted Resource id UUID assigned to this instance.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="description" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The descriptive information assigned to this allotted resource instance")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="selflink" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Link back to more information in the controller")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="persona-model-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="persona-model-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Concurrency value")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:tunnel-xconnects" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="allotted-resources">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="This object is used to store slices of services being offered")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:allotted-resource" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="service-instance">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Instance of a service",indexedProps="service-instance-id,persona-model-id,persona-model-version,widget-model-id,widget-model-version,service-instance-name,service-instance-location-id",nameProps="service-instance-name",searchable="service-instance-id,service-instance-name",uniqueProps="service-instance-id",dependentOn="service-subscription",container="service-instances")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="service-instance-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Uniquely identifies this instance of a service")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="service-instance-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This field will store a name assigned to the service-instance.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="persona-model-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="persona-model-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="widget-model-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="widget-model-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="bandwidth-total" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicates the total bandwidth to be used for this service.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="bandwidth-up-wan1" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="indicates the upstream bandwidth this service will use on the WAN1 port of the physical device.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="bandwidth-down-wan1" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="indicates the downstream bandwidth this service will use on the WAN1 port of the physical device.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="bandwidth-up-wan2" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="indicates the upstream bandwidth this service will use on the WAN2 port of the physical device.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="bandwidth-down-wan2" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="indicates the downstream bandwidth this service will use on the WAN2 port of the physical device.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vhn-portal-url" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL customers will use to access the vHN Portal.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="operational-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Operational status of the service-instance.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="service-instance-location-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="An identifier that customers assign to the location where this service is being used.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:metadata" minOccurs="0"/>
-        <xs:element ref="tns:allotted-resources" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="service-instances">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of service instances")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:service-instance" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="service-subscription">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Object that group service instances.",indexedProps="service-type",dependentOn="customer",container="service-subscriptions")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="service-type" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Value defined by orchestration to identify this service across OPENECOMP.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="temp-ub-sub-account-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This property will be deleted from A&amp;AI in the near future. Only stop gap solution.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:service-instances" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="service-subscriptions">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of objects that group service instances.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:service-subscription" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="customer">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="customer identifiers to provide linkage back to BSS information.",nameProps="subscriber-name",indexedProps="subscriber-name,global-customer-id,subscriber-type",searchable="subscriber-name,global-customer-id",uniqueProps="global-customer-id,subscriber-name",alternateKeys1="subscriber-name",container="customers",namespace="business")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="global-customer-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Global customer id used across OPENECOMP to uniquely identify customer.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="subscriber-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Subscriber name, an alternate way to retrieve a customer.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="subscriber-type" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Subscriber type, a way to provide VID with only the INFRA customers.",defaultValue="CUST")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:service-subscriptions" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="customers">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of customer identifiers to provide linkage back to BSS information.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:customer" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="business">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Namespace for business related constructs")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:connectors" minOccurs="0"/>
-        <xs:element ref="tns:customers" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vnf-image">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Image object that pertain to a VNF that doesn't have associated vservers.  This is a kludge.",indexedProps="application,openecomp-uuid,application-vendor,application-version",uniqueProps="openecomp-uuid",container="vnf-images",namespace="service-design-and-creation")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="att-uuid" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique ID of this asset")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="application" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The application that the image instantiates.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="application-vendor" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The vendor of the application.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="application-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The version of the application.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="selflink" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vnf-images">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of image objects that pertain to a VNF that doesn't have associated vservers.  This is a kludge.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:vnf-image" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="service">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Stand-in for service model definitions.  Likely to be deprecated in favor of models from ASDC.",indexedProps="service-description,service-id",container="services",namespace="service-design-and-creation")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="service-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="This gets defined by others to provide a unique ID for the service, we accept what is sent.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="service-description" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Description of the service")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="service-selflink" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="service-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="service version")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="services">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of service model definitions.  Likely to be deprecated in favor of models from ASDC.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:service" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="service-capability">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Early definition of server/resource pairings, likely to be replaced by models.  No new use should be made of this.",indexedProps="service-type,vnf-type",container="service-capabilities",namespace="service-design-and-creation")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="service-type" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="This gets defined by others to provide a unique ID for the service, we accept what is sent.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vnf-type" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded and clients should expect changes                  to occur in the future to this field as ASDC matures.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="service-capabilities">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of service capabilities.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:service-capability" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="element-choice-set">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="element-choice-set-uuid",indexedProps="element-choice-set-uuid",allowDirectRead="true",allowDirectWrite="false",container="element-choice-sets")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="element-choice-set-uuid" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="element-choice-set-name" type="xs:string"/>
-        <xs:element name="cardinality" type="xs:string" minOccurs="0"/>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:model-elements" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="element-choice-sets">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:element-choice-set" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="constrained-element-set">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="constrained-element-set-uuid",indexedProps="constrained-element-set-uuid",allowDirectRead="true",allowDirectWrite="false",container="constrained-element-sets")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="constrained-element-set-uuid" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="constraint-type" type="xs:string"/>
-        <xs:element name="check-type" type="xs:string"/>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:element-choice-sets" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="constrained-element-sets">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:constrained-element-set" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="model-constraint">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="model-constraint-uuid",indexedProps="model-constraint-uuid",allowDirectRead="true",allowDirectWrite="false",container="model-constraints")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="model-constraint-uuid" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="constrained-element-set-uuid-to-replace" type="xs:string"/>
-        <xs:element ref="tns:constrained-element-sets" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="model-constraints">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:model-constraint" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="model-element">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Defines how other models combine to make up a higher-level model.",uniqueProps="model-element-uuid",indexedProps="model-element-uuid",allowDirectRead="true",allowDirectWrite="false",container="model-elements")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="model-element-uuid" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="new-data-del-flag" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicates whether this element was created as part of instantiation from this model")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="cardinality" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="How many of this type of element are required/allowed")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="linkage-points" minOccurs="0">
-          <xs:complexType>
-            <xs:annotation>
-              <xs:appinfo>
-                <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Defines how other models combine to make up a higher-level model.",uniqueProps="model-element-uuid",indexedProps="model-element-uuid",allowDirectRead="true",allowDirectWrite="false",container="model-elements")</annox:annotate>
-              </xs:appinfo>
-            </xs:annotation>
-            <xs:sequence>
-              <xs:element name="linkage-point" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-            </xs:sequence>
-          </xs:complexType>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:model-elements" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Defines how other models combine to make up a higher-level model")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:model-constraints" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Describes new constraints on this model element that are not part of that model's definition")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="model-elements">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:model-element" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="model-ver">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Subgraph definition provided by ASDC to describe a specific version of an inventory asset and its connections related to ASDC models",nameProps="model-name",indexedProps="model-version-id,model-name,model-version",uniqueProps="model-version-id",container="model-vers",namespace="service-design-and-creation")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="model-version-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique identifier corresponding to one version of a model in ASDC")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name of the model, which can change from version to version.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-version" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Version")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-description" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Description")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:model-elements" minOccurs="0"/>
-        <xs:element ref="tns:metadata" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="model-vers">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:model-ver" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="model">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Subgraph definition provided by ASDC to describe an inventory asset and its connections related to ASDC models, independent of version",nameProps="model-type",indexedProps="model-invariant-id,model-type",uniqueProps="model-invariant-id",container="models",namespace="service-design-and-creation")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="model-invariant-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique identifier corresponding to the main definition of a model in ASDC")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="model-type" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Type of the model, e.g., service, resource, widget, etc.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:model-vers" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="models">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of subgraph definitions provided by ASDC to describe the inventory assets and their connections related to ASDC models")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:model" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="related-lookup">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="TBD",uniqueProps="related-lookup-uuid",indexedProps="related-lookup-uuid",allowDirectRead="true",allowDirectWrite="false",container="related-lookups")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="related-lookup-uuid" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="source-node-type" type="xs:string"/>
-        <xs:element name="source-node-property" type="xs:string"/>
-        <xs:element name="target-node-type" type="xs:string"/>
-        <xs:element name="target-node-property" type="xs:string"/>
-        <xs:element name="property-collect-list" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="related-lookups">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:related-lookup" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="property-constraint">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="TBD",uniqueProps="property-constraint-uuid",indexedProps="property-constraint-uuid",allowDirectRead="true",allowDirectWrite="false",container="property-constraints")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="property-constraint-uuid" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="constraint-type" type="xs:string"/>
-        <xs:element name="property-name" type="xs:string"/>
-        <xs:element name="property-value" type="xs:string"/>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="property-constraints">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:property-constraint" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="named-query-element">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="TBD",uniqueProps="named-query-element-uuid",indexedProps="named-query-element-uuid",allowDirectRead="true",allowDirectWrite="false",container="named-query-elements")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="named-query-element-uuid" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="property-collect-list" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
-        <xs:element name="property-limit-desc" type="xs:string" minOccurs="0"/>
-        <xs:element name="do-not-output" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:named-query-elements" minOccurs="0"/>
-        <xs:element ref="tns:related-lookups" minOccurs="0"/>
-        <xs:element ref="tns:property-constraints" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="named-query-elements">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:named-query-element" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="named-query">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="TBD",nameProps="named-query-name",uniqueProps="named-query-uuid",indexedProps="named-query-uuid,named-query-name",container="named-queries",namespace="service-design-and-creation")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="named-query-uuid" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true)</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="named-query-name" type="xs:string"/>
-        <xs:element name="named-query-version" type="xs:string"/>
-        <xs:element name="required-input-params" minOccurs="0">
-          <xs:complexType>
-            <xs:annotation>
-              <xs:appinfo>
-                <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="TBD",nameProps="named-query-name",uniqueProps="named-query-uuid",indexedProps="named-query-uuid,named-query-name",container="named-queries",namespace="service-design-and-creation")</annox:annotate>
-              </xs:appinfo>
-            </xs:annotation>
-            <xs:sequence>
-              <xs:element name="required-input-param" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-            </xs:sequence>
-          </xs:complexType>
-        </xs:element>
-        <xs:element name="description" type="xs:string" minOccurs="0"/>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:named-query-elements" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="named-queries">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:named-query" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="service-design-and-creation">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Namespace for objects managed by ASDC")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:vnf-images" minOccurs="0"/>
-        <xs:element ref="tns:services" minOccurs="0"/>
-        <xs:element ref="tns:service-capabilities" minOccurs="0"/>
-        <xs:element ref="tns:models" minOccurs="0"/>
-        <xs:element ref="tns:named-queries" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="logical-link">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Logical links generally connect l-interfaces but are used to express logical connectivity between two points",indexedProps="link-name,persona-model-id,persona-model-version,widget-model-id,widget-model-version,link-id,prov-status,circuit-id,purpose",uniqueProps="link-id",nameProps="prov-status,circuit-id",container="logical-links",namespace="network")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="link-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="e.g., evc-name, or vnf-nameA_interface-nameA_vnf-nameZ_interface-nameZ")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="link-type" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Type of logical link, e.g., evc")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="speed-value" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Captures the numeric part of the speed")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="speed-units" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Captures the units corresponding to the speed")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ip-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="v4, v6, or ds for dual stack (should be openecomp-ip-version)")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="routing-protocol" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="For example, static or BGP")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="persona-model-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="persona-model-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="widget-model-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="widget-model-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="operational-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indication of operational status of the logical link.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="prov-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Trigger for operational monitoring of this VNF by BAU Service Assurance systems.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="link-role" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indication of the network use of the logical link.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="link-name2" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Alias or alternate name (CLCI or D1 name).")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="link-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="UUID of the logical-link, SDNC generates this.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="circuit-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Circuit id")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="purpose" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Reason for this entity, role it is playing")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="logical-links">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of logical connections")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:logical-link" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="class-of-service">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(indexedProps="cos",dependentOn="site-pair",container="classes-of-service")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="cos" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="unique identifier of probe")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="probe-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="identifier of probe")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="probe-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="type of probe")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="classes-of-service">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="class-of-service of probe")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:class-of-service" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="site-pair">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(indexedProps="site-pair-id",uniqueProps="site-pair-id",dependentOn="routing-instance",container="site-pairs")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="site-pair-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="unique identifier of probe")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="source-ip" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Prefix address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="destination-ip" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Prefix address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ip-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="ip version, v4, v6")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="destination-hostname" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Hostname of the destination equipment to which SLAs are measured against.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="destination-equip-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The type of destinatination equipment. Could be Router, UCPE, etc.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:classes-of-service" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="site-pairs">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="probe within a set")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:site-pair" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="routing-instance">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(indexedProps="routing-instance-id",uniqueProps="routing-instance-id",dependentOn="site-pair-set",container="routing-instances")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="routing-instance-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique id of routing instance")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="rpm-owner" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="rpm owner")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:site-pairs" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="routing-instances">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="set of probes related to generic-vnf routing instance")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:routing-instance" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="site-pair-set">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Set of instances for probes used to measure service level agreements",indexedProps="site-pair-set-id",uniqueProps="site-pair-set-id",container="site-pair-sets",namespace="network")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="site-pair-set-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique id of site pair set.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:routing-instances" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="site-pair-sets">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of sets of instances for probes related to generic-vnf")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:site-pair-set" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vpn-binding">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="VPN binding",nameProps="vpn-name,vpn-type",indexedProps="vpn-name,vpn-id,global-route-target,vpn-type",searchable="vpn-name",uniqueProps="vpn-id",container="vpn-bindings",namespace="network")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="vpn-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="VPN ID, globally unique within A&amp;AI")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vpn-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="VPN Name")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="global-route-target" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Number used to identify a VPN, globally unique in the network")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vpn-platform" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the platform associated with the VPN example AVPN, Mobility")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vpn-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Type of the vpn, should be taken from enumerated/valid values")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="route-distinguisher" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used to distinguish the distinct VPN routes of separate customers who connect to the provider in an MPLS network.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="route-target-role" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Role assigned to this route target")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="l3-networks relate to vpn-bindings")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vpn-bindings">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:vpn-binding" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vpls-pe">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="VPLS Provider Edge routers.",indexedProps="prov-status,equipment-name",container="vpls-pes",namespace="network")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="equipment-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true)</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="prov-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Trigger for operational monitoring of this VNF by BAU Service Assurance systems.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipv4-oam-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Address tail-f uses to configure vpe, also used for troubleshooting and is IP used for traps generated by VPE (v4-loopback0-ip-address).")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="equipment-role" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Client should send valid enumerated value, e.g., VPLS-PE.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vlan-id-outer" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Temporary location for stag to get to VCE")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:p-interfaces" minOccurs="0"/>
-        <xs:element ref="tns:lag-interfaces" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vpls-pes">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of VPLS Provider Edge routers")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:vpls-pe" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="multicast-configuration">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(indexedProps="multicast-configuration-id",uniqueProps="multicast-configuration-id",container="multicast-configurations",namespace="network")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="multicast-configuration-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique id of multicast configuration.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="multicast-protocol" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="protocol of multicast configuration")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="rp-type" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="rp type of multicast configuration")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="multicast-configurations">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="multicast configuration of generic-vnf ip-address")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:multicast-configuration" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="cvlan-tag-entry">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(dependentOn="port-group",indexedProps="cvlan-tag",container="cvlan-tags")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="cvlan-tag" type="xs:unsignedInt">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="See mis-na-virtualization-platform.yang")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="cvlan-tags">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:cvlan-tag-entry" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="port-group">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Used to capture the network interfaces of this VCE",nameProps="port-group-name",indexedProps="port-group-id,heat-stack-id,interface-id,interface-name,switch-name",dependentOn="vce",container="port-groups")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="interface-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique ID of the interface")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="neutron-network-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Neutron network id of this Interface")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="neutron-network-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Neutron network name of this Interface")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="interface-role" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Role assigned to this Interface, should use values as defined in OPENECOMP Yang models.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="port-group-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Unique ID for port group in vmware")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="port-group-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Likely to duplicate value of neutron network name")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="switch-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="DVS or standard switch name (should be non-null for port groups associated with DVS)")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="orchestration-status" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Orchestration status of this VNF, mastered by MSO")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="heat-stack-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Heat stack id corresponding to this instance, managed by MSO")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="mso-catalog-key" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Corresponds to the SDN-C catalog id used to configure this VCE")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:cvlan-tags" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="port-groups">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:port-group" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="license">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Metadata for license group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce,vpe",container="licenses")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="group-uuid" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique ID for the license group the resource belongs to, should be uuid.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-uuid" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique ID of a license resource. ")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Concurrency value")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="licenses">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Licenses to be allocated across resources, keyed by group-uuid and resource-uuid, related to license management")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:license" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="entitlement">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Metadata for entitlement group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce,vpe",container="entitlements")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="group-uuid" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique ID for the entitlement group the resource comes from, should be uuid.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-uuid" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique ID of an entitlement resource. ")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Concurrency value")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="entitlements">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Entitlements, keyed by group-uuid and resource-uuid, related to license management")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:entitlement" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vce">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Virtual Customer Edge Router, used specifically for Gamma.  This object is deprecated.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vces",namespace="network",extendsFrom="vnf")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="vnf-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique id of VNF.  This is unique across the graph.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vnf-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name of VNF.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vnf-name2" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Alternate name of VNF.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vnf-type" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded and clients should expect changes                  to occur in the future to this field as ASDC matures.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="service-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Unique identifier of service from ASDC.  Expect this to change as ASDC matures.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="regional-resource-zone" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Regional way of organizing pservers, source of truth should define values")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="prov-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Trigger for operational monitoring of this resource by Service Assurance systems.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="operational-state" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicator for whether the resource is considered operational")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="license-key" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="License key")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="equipment-role" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Network role being played by this VNF")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Orchestration status of this VNF, mastered by MSO")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="heat-stack-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Heat stack id corresponding to this instance, managed by MSO")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="mso-catalog-key" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Corresponds to the SDN-C catalog id used to configure this VCE")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vpe-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Unique ID of VPE connected to this VCE.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="v6-vce-wan-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Valid v6 IP address for the WAN Link on this router.  Implied length of /64.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipv4-oam-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Address tail-f uses to configure vce, also used for troubleshooting and is IP used for traps generated by VCE.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipv4-loopback0-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Loopback0 address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="entitlement-resource-uuid" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Entitlement resource uuid")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:port-groups" minOccurs="0"/>
-        <xs:element ref="tns:licenses" minOccurs="0"/>
-        <xs:element ref="tns:entitlements" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vces">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of Virtual Customer Edge Routers, used specifically for Gamma.  This object is deprecated.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:vce" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vpe">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Relationship-list must include related to info for complex.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,regional-resource-zone,prov-status,service-id",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vpes",namespace="network",extendsFrom="vnf")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="vnf-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique id of VNF.  This is unique across the graph.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vnf-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name of VNF.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vnf-name2" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Alternate name of VNF.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vnf-type" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded and clients should expect changes                  to occur in the future to this field as ASDC matures.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="service-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Unique identifier of service from ASDC")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="regional-resource-zone" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Regional way of organizing pservers, source of truth should define values")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="prov-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Trigger for operational monitoring of this resource by Service Assurance systems.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="operational-state" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicator for whether the resource is considered operational")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="license-key" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="License key")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="equipment-role" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Client should send valid enumerated value")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Orchestration status of this VNF, mastered by MSO")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="heat-stack-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Heat stack id corresponding to this instance, managed by MSO")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="mso-catalog-key" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Corresponds to the SDN-C catalog id used to configure this VCE")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipv4-oam-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Address tail-f uses to configure vpe, also used for troubleshooting and is IP used for traps generated by VPE (v4-loopback0-ip-address).")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipv4-oam-gateway-address-prefix-length" type="xs:int" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Prefix length for oam-address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipv4-oam-gateway-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Gateway address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="v4-loopback0-ip-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Loopback0 address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vlan-id-outer" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Temporary location for stag to get to VCE")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="as-number" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="as-number of the VPE")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="summary-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="details regarding the vpe operation")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="encrypted-access-flag" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="indicates whether vpe access uses SSH")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:l-interfaces" minOccurs="0"/>
-        <xs:element ref="tns:lag-interfaces" minOccurs="0"/>
-        <xs:element ref="tns:licenses" minOccurs="0"/>
-        <xs:element ref="tns:entitlements" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vpes">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Virtual provider edge router. In 1504, A&amp;AI will populate this object through an M&amp;P and tool provided to operations.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:vpe" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vnfc">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(indexedProps="vnfc-name,prov-status,vnfc-type,vnfc-function-code,ipaddress-v4-oam-vip,in-maint,is-closed-loop-disabled,group-notation",searchable="vnfc-name",container="vnfcs",namespace="network")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="vnfc-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique ID of vnfc.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vnfc-function-code" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="function code")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vnfc-type" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="type")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="prov-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="prov status of this vnfc")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Orchestration status of this VNF, mastered by APP-C")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipaddress-v4-oam-vip" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Oam V4 vip address of this vnfc")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="in-maint" type="xs:boolean">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="is-closed-loop-disabled" type="xs:boolean">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether closed loop function is enabled on this node")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="group-notation" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Group notation of VNFC")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vnfcs">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="virtual network components associated with a vserver from application controller.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:vnfc" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="subnet">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(indexedProps="subnet-id,subnet-name",nameProps="subnet-name",uniqueProps="subnet-id",dependentOn="l3-network",container="subnets")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="subnet-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Subnet ID, should be UUID.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="subnet-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name associated with the subnet.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="neutron-subnet-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Neutron id of this subnet")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="gateway-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="gateway ip address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="network-start-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="network start address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="cidr-mask" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="cidr mask")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ip-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="ip version")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Orchestration status of this VNF, mastered by MSO")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="dhcp-enabled" type="xs:boolean">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="dhcp enabled")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="dhcp-start" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the start address reserved for use by dhcp")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="dhcp-end" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the last address reserved for use by dhcp")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="subnets">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:subnet" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="ctag-assignment">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(indexedProps="vlan-id-inner",dependentOn="l3-network",container="ctag-assignments")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="vlan-id-inner" type="xs:unsignedInt">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="id.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="ctag-assignments">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:ctag-assignment" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="segmentation-assignment">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Openstack segmentation assignment.",indexedProps="segmentation-id",dependentOn="l3-network",container="segmentation-assignments")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="segmentation-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Route Table Reference id, UUID assigned to this instance.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Concurrency value")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="segmentation-assignments">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of openstack segmentation assignments")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:segmentation-assignment" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="l3-network">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Generic network definition",nameProps="network-name",indexedProps="heat-stack-id,network-uuid,service-id,network-id,network-name,persona-model-id,persona-model-version,widget-model-id,widget-model-version,contrail-network-fqdn,network-role",searchable="network-name",uniqueProps="network-id",container="l3-networks",namespace="network")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="network-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Network ID, should be uuid. Unique across A&amp;AI.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="network-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name of the network, governed by some naming convention..")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="network-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Type of the network - who defines these values?")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="network-role" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Role the network plans - who defines these values?")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="network-technology" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Network technology - who defines these values?")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="neutron-network-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Neutron network id of this Interface")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="is-bound-to-vpn" type="xs:boolean">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="Set to true if bound to VPN")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="service-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Unique identifier of service from ASDC")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="network-role-instance" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="network role instance")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Orchestration status of this VNF, mastered by MSO")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="heat-stack-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Heat stack id corresponding to this instance, managed by MSO")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="mso-catalog-key" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Corresponds to the SDN-C catalog id used to configure this VCE")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="contrail-network-fqdn" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Contrail FQDN for the network")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="persona-model-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="persona-model-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="persona-model-customization-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="captures the id of all the configuration used to customize the resource for the service.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="widget-model-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="widget-model-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="physical-network-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name associated with the physical network.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="is-provider-network" type="xs:boolean">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="boolean indicatating whether or not network is a provider network.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="is-shared-network" type="xs:boolean">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="boolean indicatating whether or not network is a shared network.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="is-external-network" type="xs:boolean">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="boolean indicatating whether or not network is an external network.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:subnets" minOccurs="0"/>
-        <xs:element ref="tns:ctag-assignments" minOccurs="0"/>
-        <xs:element ref="tns:segmentation-assignments" minOccurs="0"/>
-        <xs:element ref="tns:relationship-list" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Relates to tenant (or is it a child of tenant), complex, service, vpn-binding")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="l3-networks">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:l3-network" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="network-policy">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(nameProps="network-policy-fqdn",indexedProps="network-policy-id,network-policy-fqdn",searchable="network-policy-fqdn",uniqueProps="network-policy-id",container="network-policies",namespace="network")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="network-policy-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="UUID representing unique key to this instance")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="network-policy-fqdn" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Contrail FQDN for the policy")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="heat-stack-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="ID for the openStack Heat instance")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="network-policies">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:network-policy" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vf-module">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="a deployment unit of VNFCs",indexedProps="vf-module-id,vf-module-name,heat-stack-id,persona-model-id,persona-model-version,widget-model-id,widget-model-version,contrail-service-instance-fqdn",searchable="vf-module-name",dependentOn="generic-vnf",container="vf-modules")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="vf-module-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique ID of vf-module.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vf-module-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name of vf-module")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="heat-stack-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Heat stack id corresponding to this instance.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="orchestration status of this vf-module, mastered by MSO")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="is-base-vf-module" type="xs:boolean">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is base vf module")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="persona-model-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="persona-model-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="persona-model-customization-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="captures the id of all the configuration used to customize the resource for the service.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="widget-model-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="widget-model-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="contrail-service-instance-fqdn" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the Contrail unique ID for a service-instance")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vf-modules">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of vf-modules, a deployment unit of VNFCs")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:vf-module" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="generic-vnf">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="General purpose VNF",nameProps="vnf-name",indexedProps="is-closed-loop-disabled,vnf-name2,vnf-type,heat-stack-id,in-maint,vnf-name,vnf-id,regional-resource-zone,prov-status,service-id,persona-model-id,persona-model-version,widget-model-id,widget-model-version",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="generic-vnfs",namespace="network",extendsFrom="vnf")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="vnf-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique id of VNF.  This is unique across the graph.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vnf-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name of VNF.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vnf-name2" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Alternate name of VNF.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vnf-type" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded and clients should expect changes                  to occur in the future to this field as ASDC matures.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="service-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Unique identifier of service from ASDC")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="regional-resource-zone" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Regional way of organizing pservers, source of truth should define values")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="prov-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Trigger for operational monitoring of this resource by Service Assurance systems.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="operational-state" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicator for whether the resource is considered operational")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="license-key" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="License key")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="equipment-role" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Client should send valid enumerated value")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Orchestration status of this VNF, used by MSO.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="heat-stack-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Heat stack id corresponding to this instance, managed by MSO")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="mso-catalog-key" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Corresponds to the SDN-C catalog id used to configure this VCE")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="management-option" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="identifier of managed by openecomp or customer")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipv4-oam-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by generic-vnf.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipv4-loopback0-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="v4 Loopback0 address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="nm-lan-v6-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="v6 Loopback address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="management-v6-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="v6 management address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vcpu" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="number of vcpus ordered for this instance of VNF, used for VNFs with no vservers/flavors")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vcpu-units" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="units associated with vcpu, used for VNFs with no vservers/flavors")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vmemory" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="number of GB of memory ordered for this instance of VNF, used for VNFs with no vservers/flavors")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vmemory-units" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="units associated with vmemory, used for VNFs with no vservers/flavors")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vdisk" type="xs:unsignedInt" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="number of vdisks ordered for this instance of VNF, used for VNFs with no vservers/flavors")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vdisk-units" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="units associated with vdisk, used for VNFs with no vservers/flavors")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="in-maint" type="xs:boolean">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="is-closed-loop-disabled" type="xs:boolean">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether closed loop function is enabled on this node")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="summary-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="details regarding the generic-vnf operation")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="encrypted-access-flag" type="xs:boolean" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="indicates whether generic-vnf access uses SSH")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="entitlement-assignment-group-uuid" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="UUID of the Entitlement group used for licensing VNFs")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="entitlement-resource-uuid" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="UUID of the specific entitlement resource")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="license-assignment-group-uuid" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="UUID of the license assignment group")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="license-key-uuid" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="UUID of the actual license resource")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="persona-model-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="persona-model-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="persona-model-customization-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="captures the id of all the configuration used to customize the resource for the service.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="widget-model-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="widget-model-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="as-number" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="as-number of the VNF")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="regional-resource-subzone" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="represents sub zone of the rr plane")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:l-interfaces" minOccurs="0"/>
-        <xs:element ref="tns:lag-interfaces" minOccurs="0"/>
-        <xs:element ref="tns:vf-modules" minOccurs="0"/>
-        <xs:element ref="tns:licenses" minOccurs="0"/>
-        <xs:element ref="tns:entitlements" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="generic-vnfs">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of VNFs")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:generic-vnf" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="lag-link">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="LAG links can connect lag-interfaces",indexedProps="link-name",container="lag-links",namespace="network")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="link-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Alphabetical concatenation of lag-interface names")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="lag-links">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of link aggregation connections")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:lag-link" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="newvce">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,prov-status,vnf-id2",searchable="vnf-id2,vnf-name,vnf-name2",uniqueProps="vnf-id2",container="newvces",namespace="network")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="vnf-id2" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique id of VNF, can't use same attribute name right now until we promote this new object")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vnf-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name of VNF.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vnf-name2" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Alternate name of VNF.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="vnf-type" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded and clients should expect changes                  to occur in the future to this field as ASDC matures.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="prov-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Trigger for operational monitoring of this VNF by BAU Service Assurance systems.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="operational-state" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicator for whether the resource is considered operational")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="license-key" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="License key")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipv4-oam-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Address tail-f uses to configure vpe, also used for troubleshooting and is IP used for traps generated by VPE (v4-loopback0-ip-address).")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="equipment-role" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Client should send valid enumerated value, e.g., VPE.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipv4-loopback0-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="v4 Loopback0 address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Orchestration status of this VNF, mastered by MSO.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="heat-stack-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Heat stack id corresponding to this instance, managed by MSO")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="mso-catalog-key" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Corresponds to the SDN-C catalog id used to configure this VCE")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:l-interfaces" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="newvces">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:newvce" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="pnf">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="PNF represents a physical network function. typically equipment used in the D1 world. in 1607, this will be populated by SDN-C to represent a premises router that a uCPE connects to. But this can be used to represent any physical device that is not an openecomp node or uCPE.",indexedProps="pnf-name,orchestration-status,inv-status",searchable="pnf-name",uniqueProps="pnf-name",container="pnfs",namespace="network")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="pnf-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="unique name of Physical Network Function.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="pnf-name2" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="name of Physical Network Function.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="pnf-name2-source" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="source of name2")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="pnf-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="id of pnf")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="equip-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Equipment type.  Source of truth should define valid values.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="equip-vendor" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Equipment vendor.  Source of truth should define valid values.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="equip-model" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Equipment model.  Source of truth should define valid values.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="management-option" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="identifier of managed by openecomp or customer")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipaddress-v4-oam" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="ipv4-oam-address with new naming convention for IP addresses")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="sw-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="sw-version is the version of SW for the hosted application on the PNF.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="orchestration-status is the status of orchestration on the PNF.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="in-maint" type="xs:boolean">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="Used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="frame-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="ID of the physical frame (relay rack) where pnf is installed.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="serial-number" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Serial number of the device")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipaddress-v4-loopback-0" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="IPV4 Loopback 0 address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipaddress-v6-loopback-0" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="IPV6 Loopback 0 address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipaddress-v4-aim" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="IPV4 AIM address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipaddress-v6-aim" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="IPV6 AIM address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipaddress-v6-oam" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="IPV6 OAM address")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="inv-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="CANOPI's inventory status.  Only set with values exactly as defined by CANOPI.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:p-interfaces" minOccurs="0"/>
-        <xs:element ref="tns:lag-interfaces" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="pnfs">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of Physical Network Functions.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:pnf" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="physical-link">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of physical connections, typically between p-interfaces",indexedProps="circuit-id,link-name",alternateKeys1="circuit-id",container="physical-links",namespace="network")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="link-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="e.g., hostnameA_p-connection_nameA_hostnameZ+p_connection-nameZ")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="speed-value" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Captures the numeric part of the speed")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="speed-units" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Captures the units corresponding to the speed")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="circuit-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Circuit it")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="dual-mode" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Dual access mode (e.g., primary, secondary")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="management-option" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="To provide information on who manages this circuit. A&amp;AI or 3rd party transport provider")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="service-provider-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name of the service Provider on this link.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="physical-links">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of physical connections, typically between p-interfaces")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:physical-link" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vig-server">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="vig-server contains information about a vig server used for IPSec-configuration. Populated by SDN-C from 1607",indexedProps="vig-address-type",dependentOn="ipsec-configuration",container="vig-servers")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="vig-address-type" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="indicates whether the VIG is for AVPN or INTERNET")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipaddress-v4-vig" type="xs:string" minOccurs="0" maxOccurs="unbounded">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="v4 IP of the vig server")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipaddress-v6-vig" type="xs:string" minOccurs="0" maxOccurs="unbounded">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="v6 IP of the vig server")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vig-servers">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:vig-server" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="ipsec-configuration">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="IPSec configuration node will contain various configuration data for the NMTE VNF. This node will have an edge to the generic-vnf (vnf type = TE). Starting 1607, this data will be populated by SDN-C",indexedProps="ipsec-configuration-id",uniqueProps="ipsec-configuration-id",container="ipsec-configurations",namespace="network")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="ipsec-configuration-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="UUID of this configuration")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="requested-vig-address-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicate the type of VIG server like AVPN, INTERNET, BOTH")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="requested-encryption-strength" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Encryption values like 3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="requested-dmz-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="openecomp can offer a shared DMZ or a DMZ specific to a customer")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="shared-dmz-network-address" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Network address of shared DMZ")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="requested-customer-name" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="If the DMZ is a custom DMZ, this field will indicate the customer information")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ike-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="can be 1 or 2")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ikev1-authentication" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Contains values like md5, sha1, sha256, sha384")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ikev1-encryption" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Encyption values like 3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ikev1-dh-group" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Diffie-Hellman group like DH-GROUP2, DH-GROUP5, DH-GROUP14")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ikev1-am-group-id" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Group name defined in VIG for clients using aggressive mode")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ikev1-am-password" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="pre-shared key for the above group name ")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ikev1-sa-lifetime" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Lifetime for IKEv1 SA")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipsec-authentication" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="md5, sha1, sha256, sha384")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipsec-encryption" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipsec-sa-lifetime" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Life time for IPSec SA")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="ipsec-pfs" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="enable PFS or not")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="xauth-userid" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="user ID for xAuth, sm-user,ucpeHostName,nmteHostName")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="xauth-user-password" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Encrypted using the Juniper $9$ algorithm")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="dpd-interval" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The time between DPD probe")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="dpd-frequency" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Maximum number of DPD before claiming the tunnel is down")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-        <xs:element ref="tns:vig-servers" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="ipsec-configurations">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:ipsec-configuration" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="route-table-reference">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Openstack route table reference.",nameProps="route-table-reference-fqdn",uniqueProps="route-table-reference-id",indexedProps="route-table-reference-id,route-table-reference-fqdn",container="route-table-references",namespace="network")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="route-table-reference-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Route Table Reference id, UUID assigned to this instance.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="route-table-reference-fqdn" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="FQDN entry in the route table.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Concurrency value")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="route-table-references">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of openstack route table references")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:route-table-reference" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="instance-group">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="General mechanism for grouping instances",nameProps="description",uniqueProps="id",indexedProps="id,description,type,sub-type",container="instance-groups",namespace="network")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Instance Group ID, UUID assigned to this instance.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="description" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Descriptive text to help identify the usage of this instance-group")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="type" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Only valid value today is lower case ha for high availability")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="sub-type" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Valid values for ha type are [geo-activeactive, geo-activestandby, local-activeactive, local-activestandby]")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Concurrency value")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="instance-groups">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of openstack route table references")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:instance-group" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="network">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Namespace for network inventory resources.")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:logical-links" minOccurs="0"/>
-        <xs:element ref="tns:site-pair-sets" minOccurs="0"/>
-        <xs:element ref="tns:vpn-bindings" minOccurs="0"/>
-        <xs:element ref="tns:vpls-pes" minOccurs="0"/>
-        <xs:element ref="tns:multicast-configurations" minOccurs="0"/>
-        <xs:element ref="tns:vces" minOccurs="0"/>
-        <xs:element ref="tns:vpes" minOccurs="0"/>
-        <xs:element ref="tns:vnfcs" minOccurs="0"/>
-        <xs:element ref="tns:l3-networks" minOccurs="0"/>
-        <xs:element ref="tns:network-policies" minOccurs="0"/>
-        <xs:element ref="tns:generic-vnfs" minOccurs="0"/>
-        <xs:element ref="tns:lag-links" minOccurs="0"/>
-        <xs:element ref="tns:newvces" minOccurs="0"/>
-        <xs:element ref="tns:pnfs" minOccurs="0"/>
-        <xs:element ref="tns:physical-links" minOccurs="0"/>
-        <xs:element ref="tns:ipsec-configurations" minOccurs="0"/>
-        <xs:element ref="tns:route-table-references" minOccurs="0"/>
-        <xs:element ref="tns:instance-groups" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="reserved-prop-names">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Internal map to define some reserved properties of a vertex",uniqueProps="aai-unique-key",indexedProps="aai-unique-key,source-of-truth,aai-node-type")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="last-mod-source-of-truth" type="xs:string" minOccurs="0"/>
-        <xs:element name="aai-node-type" type="xs:string" minOccurs="0"/>
-        <xs:element name="aai-created-ts" type="xs:unsignedInt" minOccurs="0"/>
-        <xs:element name="aai-unique-key" type="xs:string" minOccurs="0"/>
-        <xs:element name="aai-last-mod-ts" type="xs:unsignedInt" minOccurs="0"/>
-        <xs:element name="source-of-truth" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="edge-prop-names">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Internal map to define the properties of an edge and interpret the map EdgeRules",edgeInfo="edgeLabel,direction,multiplicityRule,isParent,usesResource,hasDelTarget,SVC-INFRA,SVC-INFRA-REV")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="edgeLabel" type="xs:string" minOccurs="0"/>
-        <xs:element name="direction" type="xs:string" minOccurs="0"/>
-        <xs:element name="multiplicityRule" type="xs:string" minOccurs="0"/>
-        <xs:element name="isParent" type="xs:boolean" minOccurs="0"/>
-        <xs:element name="usesResource" type="xs:boolean" minOccurs="0"/>
-        <xs:element name="hasDelTarget" type="xs:boolean" minOccurs="0"/>
-        <xs:element name="SVC-INFRA" type="xs:string" minOccurs="0"/>
-        <xs:element name="SVC-INFRA-REV" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="aai-internal">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:reserved-prop-names" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element ref="tns:edge-prop-names" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="inventory">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:search" minOccurs="0"/>
-        <xs:element ref="tns:actions" minOccurs="0"/>
-        <xs:element ref="tns:cloud-infrastructure" minOccurs="0"/>
-        <xs:element ref="tns:license-management" minOccurs="0"/>
-        <xs:element ref="tns:business" minOccurs="0"/>
-        <xs:element ref="tns:service-design-and-creation" minOccurs="0"/>
-        <xs:element ref="tns:network" minOccurs="0"/>
-        <xs:element ref="tns:aai-internal" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="notification-event-header">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="id" type="xs:string" minOccurs="0"/>
-        <xs:element name="timestamp" type="xs:string" minOccurs="0"/>
-        <xs:element name="source-name" type="xs:string" minOccurs="0"/>
-        <xs:element name="domain" type="xs:string" minOccurs="0"/>
-        <xs:element name="sequence-number" type="xs:string" minOccurs="0"/>
-        <xs:element name="severity" type="xs:string" minOccurs="0"/>
-        <xs:element name="event-type" type="xs:string" minOccurs="0"/>
-        <xs:element name="version" type="xs:string" minOccurs="0"/>
-        <xs:element name="action" type="xs:string" minOccurs="0"/>
-        <xs:element name="entity-type" type="xs:string" minOccurs="0"/>
-        <xs:element name="top-entity-type" type="xs:string" minOccurs="0"/>
-        <xs:element name="entity-link" type="xs:string" minOccurs="0"/>
-        <xs:element name="status" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="notification-event">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="cambria.partition" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:notification-event-header" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="query-parameters">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="QueryParameters for performing a named-query or model query")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:named-query" minOccurs="0"/>
-        <xs:element ref="tns:model" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="instance-filter">
-    <xs:complexType>
-      <xs:sequence/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="instance-filters">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="InstanceFilters for performing a named-query or model query")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:instance-filter" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="model-and-named-query-search">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="ModelAndNamedQuerySearch holds query-parameters and instance-properties for performing a named-query or model query")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:query-parameters" minOccurs="0"/>
-        <xs:element ref="tns:instance-filters" minOccurs="0"/>
-        <xs:element name="top-node-type" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="properties">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Property holder for query properties or instance properties")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="property-name" type="xs:string" minOccurs="0"/>
-        <xs:element name="property-value" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="extra-properties">
-    <xs:complexType>
-      <xs:sequence/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="inventory-response-item">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Inventory item for response list",container="inventory-response-items")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="model-name" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:extra-properties" minOccurs="0"/>
-        <xs:element ref="tns:inventory-response-items" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="inventory-response-items">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Container for inventory items in response list",container="response-list")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:inventory-response-item" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="response-list">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Response container for the results of a named-query or model query")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element ref="tns:inventory-response-items" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="extra-property">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="property-name" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="vnf">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Abstract vnf class",indexedProps="vnf-id",uniqueProps="vnf-id",inheritors="vce,vpe,generic-vnf",isAbstract="true")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="vnf-id" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique id of VNF.  This is unique across the graph.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
+	<xs:element name="inventory-item-data">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="property-name" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="property-value" type="xs:string"
+					minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="inventory-item">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="inventory-item-type" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="inventory-item-link" type="xs:string"
+					minOccurs="0" />
+				<xs:element ref="tns:inventory-item-data" minOccurs="0"
+					maxOccurs="unbounded" />
+				<xs:element ref="tns:tagged-inventory-item-list"
+					minOccurs="0" maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="tagged-inventory-item-list">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:inventory-item" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="edge-tag-query-result">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:tagged-inventory-item-list"
+					minOccurs="0" maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="start-node-filter">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="property-name" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="property-value" type="xs:string"
+					minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="include-node-filter">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="include-node-type" type="xs:string"
+					minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="secondary-filter">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="property-name" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="filter-type" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="property-value" type="xs:string"
+					minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="edge-tag-query-request">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="edge-tag" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="result-detail" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="start-node-type" type="xs:string"
+					minOccurs="0" />
+				<xs:element ref="tns:start-node-filter" minOccurs="0"
+					maxOccurs="unbounded" />
+				<xs:element ref="tns:include-node-filter" minOccurs="0"
+					maxOccurs="unbounded" />
+				<xs:element ref="tns:secondary-filter" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="result-data">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="resource-type" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The
+								specific type of node in the A&amp;AI graph")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-link" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The
+								URL to the specific resource")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="search-results">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:result-data" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="relationship-data">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="relationship-key" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="A
+								keyword provided by A&amp;AI to indicate an attribute.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="relationship-value" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Value
+								of the attribute.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="related-to-property">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="property-key" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Key
+								part of a key/value pair")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="property-value" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Value
+								part of a key/value pair")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="relationship">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="related-to" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="A
+								keyword provided by A&amp;AI to indicate type of node.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="related-link" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL
+								to the object in A&amp;AI.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-data" minOccurs="0"
+					maxOccurs="unbounded" />
+				<xs:element ref="tns:related-to-property" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="relationship-list">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:relationship" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="oam-network">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="OAM
+						network, to be deprecated shortly. Do not use for new purposes.
+						",nameProps="network-name",indexedProps="cvlan-tag,network-uuid,network-name",dependentOn="cloud-region",container="oam-networks")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="network-uuid" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="UUID
+								of the network. Unique across a cloud-region")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="network-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name
+								of the network.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="cvlan-tag" type="xs:unsignedInt">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="cvlan-id")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipv4-oam-gateway-address"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for VNF firewall rule so customer cannot send customer traffic
+								over this oam network")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipv4-oam-gateway-address-prefix-length"
+					type="xs:int" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for VNF firewall rule so customer cannot send customer traffic
+								over this oam network")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="oam-networks">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of OAM networks, to be deprecated shortly. Do not use for new
+						purposes. ")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:oam-network" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="dvs-switch">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Digital
+						virtual switch metadata, used by SDN-C to configure VCEs. A&amp;AI
+						needs to receive this data from the PO deployment team and
+						administer it using the provisioningTool.sh into A&amp;AI.
+						",indexedProps="vcenter-url,switch-name",dependentOn="cloud-region",container="dvs-switches")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="switch-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="DVS
+								switch name")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vcenter-url" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL
+								used to reach the vcenter")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="dvs-switches">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of digital virtual switch metadata used for vmWare VCEs and
+						VPEs.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:dvs-switch" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="availability-zone">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Availability
+						zone, a collection of compute
+						hosts/pservers",indexedProps="availability-zone-name",dependentOn="cloud-region",container="availability-zones")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="availability-zone-name"
+					type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Name
+								of the availability zone. Unique across a cloud region")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="hypervisor-type" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Type
+								of hypervisor. Source of truth should define valid values.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="operational-state" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="State
+								that indicates whether the availability zone should be used,
+								etc. Source of truth should define valid values.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="az-and-dvs-switches">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:dvs-switches" minOccurs="0" />
+				<xs:element ref="tns:availability-zone" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="sdn-zone-response">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:oam-networks" minOccurs="0" />
+				<xs:element ref="tns:az-and-dvs-switches" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="search">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:edge-tag-query-result" minOccurs="0" />
+				<xs:element ref="tns:edge-tag-query-request"
+					minOccurs="0" />
+				<xs:element ref="tns:search-results" minOccurs="0" />
+				<xs:element ref="tns:sdn-zone-response" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="update-node-key">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="key-name" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="key-value" type="xs:string"
+					minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="action-data">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="property-name" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="property-value" type="xs:string"
+					minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="action">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="action-type" type="xs:string"
+					minOccurs="0" />
+				<xs:element ref="tns:action-data" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="update">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Serves
+						a PATCH like function. Does not enforce concurrency control. Clear
+						each usage with AAI team.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="update-node-type" type="xs:string" />
+				<xs:element ref="tns:update-node-key" minOccurs="0"
+					maxOccurs="unbounded" />
+				<xs:element name="update-node-uri" type="xs:string"
+					minOccurs="0" />
+				<xs:element ref="tns:action" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="key-data">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="key-name" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="key-value" type="xs:string"
+					minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="notify">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="event-id" type="xs:string" />
+				<xs:element name="node-type" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="event-trigger" type="xs:string"
+					minOccurs="0" />
+				<xs:element ref="tns:key-data" minOccurs="0"
+					maxOccurs="unbounded" />
+				<xs:element name="selflink" type="xs:string"
+					minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="actions">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="APIs
+						that are more action related than REST (e.g., notify, update).")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:update" minOccurs="0" />
+				<xs:element ref="tns:notify" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="ctag-pool">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="A
+						collection of C tags (vlan tags) grouped for a specific
+						purpose.",indexedProps="availability-zone-name",dependentOn="complex",container="ctag-pools")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="target-pe" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="The
+								Target provider edge router")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="availability-zone-name"
+					type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Name
+								of the availability zone")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ctag-pool-purpose" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Describes
+								what the intended purpose of this pool is.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ctag-values" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Comma
+								separated list of ctags")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="ctag-pools">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:ctag-pool" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="complex">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of physical locations that can house
+						cloud-regions.",indexedProps="identity-url,data-center-code,complex-name,physical-location-id",searchable="physical-location-id,data-center-code,complex-name,street1,street2,postal-code",uniqueProps="physical-location-id",container="complexes",namespace="cloud-infrastructure")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="physical-location-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique
+								identifier for physical location, e.g., CLLI")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="data-center-code" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Data
+								center code which can be an alternate way to identify a
+								complex")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="complex-name" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Gamma
+								complex name for LCP instance.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="identity-url" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL
+								of the keystone identity service")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="physical-location-type"
+					type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Type,
+								e.g., central office, data center.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="street1" type="xs:string" />
+				<xs:element name="street2" type="xs:string" minOccurs="0" />
+				<xs:element name="city" type="xs:string" />
+				<xs:element name="state" type="xs:string" minOccurs="0" />
+				<xs:element name="postal-code" type="xs:string" />
+				<xs:element name="country" type="xs:string" />
+				<xs:element name="region" type="xs:string" />
+				<xs:element name="latitude" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="longitude" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="elevation" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="lata" type="xs:string" minOccurs="0" />
+				<xs:element ref="tns:ctag-pools" minOccurs="0" />
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="complexes">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of physical locations that can house cloud-regions.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:complex" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="volume-group">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Persistent
+						block-level
+						storage.",indexedProps="volume-group-name,vnf-type,heat-stack-id,volume-group-id",searchable="volume-group-name",dependentOn="cloud-region",container="volume-groups")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="volume-group-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique
+								ID of volume-group.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="volume-group-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name
+								of the volume group.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="heat-stack-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Heat
+								stack id corresponding to this volume-group")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vnf-type" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="String
+								capturing type of vnf, that was intended to identify the ASDC
+								resource. This field has been overloaded and clients should
+								expect changes to occur in the future to this field as ASDC
+								matures.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="orchestration-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Orchestration
+								status of this volume-group")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="persona-model-customization-id"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="captures
+								the id of all the configuration used to customize the resource
+								for the service.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="volume-groups">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of persistent block-level storage.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:volume-group" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="volume">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Ephemeral
+						Block storage
+						volume.",indexedProps="volume-id",dependentOn="vserver",container="volumes")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="volume-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique
+								ID of block storage volume relative to the vserver.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="volume-selflink" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL
+								to endpoint where AAI can get more details")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="volumes">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of ephemeral Block storage volumes.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:volume" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="l3-interface-ipv4-address-list">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="IPv4
+						Address
+						Range",indexedProps="l3-interface-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="vlan,l-interface")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="l3-interface-ipv4-address"
+					type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="IP
+								address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="l3-interface-ipv4-prefix-length"
+					type="xs:unsignedInt" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Prefix
+								length, 32 for single address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vlan-id-inner" type="xs:unsignedInt"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Inner
+								VLAN tag")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vlan-id-outer" type="xs:unsignedInt"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Outer
+								VLAN tag")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="is-floating" type="xs:boolean"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicator
+								of fixed or floating address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="neutron-network-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Neutron
+								network id of the interface that address belongs to")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="neutron-subnet-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Neutron
+								id of subnet that address belongs to")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="l3-interface-ipv6-address-list">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="IPv6
+						Address
+						Range",indexedProps="l3-interface-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="vlan,l-interface")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="l3-interface-ipv6-address"
+					type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="IP
+								address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="l3-interface-ipv6-prefix-length"
+					type="xs:unsignedInt" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Prefix
+								length, 128 for single address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vlan-id-inner" type="xs:unsignedInt"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Inner
+								VLAN tag")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vlan-id-outer" type="xs:unsignedInt"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Outer
+								VLAN tag")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="is-floating" type="xs:boolean"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicator
+								of fixed or floating address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="neutron-network-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Neutron
+								network id of the interface that address belongs to")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="neutron-subnet-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Neutron
+								id of subnet that address belongs to")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vlan">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Definition
+						of
+						vlan",indexedProps="vlan-interface,vlan-id-inner,vpn-id",uniqueProps="vpn-id",dependentOn="l-interface",container="vlans")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="vlan-interface" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="String
+								that identifies the interface")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vlan-id-inner" type="xs:unsignedInt"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Inner
+								VLAN tag")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vlan-id-outer" type="xs:unsignedInt"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Outer
+								VLAN tag")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="speed-value" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Captures
+								the numeric part of the speed")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="speed-units" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Captures
+								the units corresponding to the speed")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vlan-description" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								to describe (the service associated with) the vlan")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="backdoor-connection" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Whether
+								customer is going to use this VLAN for backdoor connection to
+								another customer premise device.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vpn-id" type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This
+								indicates the customers VPN ID associated with this vlan")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+				<xs:element ref="tns:l3-interface-ipv4-address-list"
+					minOccurs="0" maxOccurs="unbounded" />
+				<xs:element ref="tns:l3-interface-ipv6-address-list"
+					minOccurs="0" maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vlans">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:vlan" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="sriov-vf">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="SR-IOV
+						Virtual Function (not to be confused with virtual network
+						function)",indexedProps="pci-id,vf-vlan-filter,vf-mac-filter,vf-vlan-strip,neutron-network-id",dependentOn="l-interface",container="sriov-vfs")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="pci-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="PCI
+								ID used to identify the sriov-vf")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vf-vlan-filter" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This
+								metadata provides option to specify list of VLAN filters applied
+								on VF to pass the traffic to VM.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vf-mac-filter" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="When
+								MAC filters are specified, VF-agent service configures VFs to do
+								MAC level filtering before the traffic is passed to VM.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vf-vlan-strip" type="xs:boolean"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="When
+								this field is set to true, VF will configured to strip the outer
+								TAG before the traffic is passed to VM.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vf-vlan-anti-spoof-check"
+					type="xs:boolean" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This
+								option ensures anti VLAN spoof checks are done at the VF level
+								to comply with security. The disable check will also be honored
+								per the VNF needs for trusted VMs.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vf-mac-anti-spoof-check"
+					type="xs:boolean" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This
+								option ensures anti MAC spoof checks are done at the VF level to
+								comply with security. The disable check will also be honored per
+								the VNF needs for trusted VMs.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vf-mirrors" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This
+								option defines the set of Mirror objects which essentially
+								mirrors the traffic from source to set of collector VNF Ports.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vf-broadcast-allow" type="xs:boolean"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This
+								option, if set to true, sets the VF in promiscuous mode and
+								allows all broadcast traffic to reach the VM")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vf-unknown-multicast-allow"
+					type="xs:boolean" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This
+								option, if set to true, sets the VF in promiscuous mode and
+								allows unknown multicast traffic to reach the VM")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vf-unknown-unicast-allow"
+					type="xs:boolean" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This
+								option, if set to true, sets the VF in promiscuous mode and
+								allows unknown unicast traffic to reach the VM")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vf-insert-stag" type="xs:boolean"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This
+								option, if set to true, instructs to insert outer tag after
+								traffic comes out of VM.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vf-link-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This
+								option is used to set the link status. Valid values as of 1607
+								are on, off, and auto.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="neutron-network-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Neutron
+								network id of the interface")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="sriov-vfs">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of SR-IOV Virtual Functions.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:sriov-vf" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="l-interface">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Logical
+						interfaces, e.g., a
+						vnic.",indexedProps="macaddr,interface-id,interface-name,network-name",dependentOn="generic-vnf,newvce,vpe,p-interface,vserver,lag-interface",container="l-interfaces")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="interface-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Name
+								given to the interface")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="interface-role" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="E.g.,
+								CUSTOMER, UPLINK, etc.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="v6-wan-link-ip" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Questionably
+								placed - v6 ip addr of this interface (is in vr-lan-interface
+								from Mary B.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="selflink" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL
+								to endpoint where AAI can get more details")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="interface-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="ID
+								of interface")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="macaddr" type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="MAC
+								address for the interface")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="network-name" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name
+								of the network")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="management-option" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Whether
+								A&amp;AI should be managing this interface of not. Could have
+								value like CUSTOMER")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="interface-description" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Human
+								friendly text regarding this interface.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:vlans" minOccurs="0" />
+				<xs:element ref="tns:sriov-vfs" minOccurs="0" />
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+				<xs:element ref="tns:l3-interface-ipv4-address-list"
+					minOccurs="0" maxOccurs="unbounded" />
+				<xs:element ref="tns:l3-interface-ipv6-address-list"
+					minOccurs="0" maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="l-interfaces">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of logical interfaces.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:l-interface" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vserver">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Virtual
+						Servers, aka virtual machine or
+						VM.",nameProps="vserver-name",indexedProps="is-closed-loop-disabled,prov-status,vserver-name,vserver-id,in-maint,vserver-name2",searchable="vserver-name,vserver-id,vserver-name2",dependentOn="tenant",container="vservers")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="vserver-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique
+								identifier for this vserver relative to its tenant")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vserver-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name
+								of vserver")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vserver-name2" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Alternative
+								name of vserver")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="prov-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Trigger
+								for operational monitoring of this resource by Service Assurance
+								systems.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vserver-selflink" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL
+								to endpoint where AAI can get more details")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="in-maint" type="xs:boolean">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="Used
+								to indicate whether or not this object is in maintenance mode
+								(maintenance mode = true). This field (in conjunction with
+								prov-status) is used to suppress alarms and vSCL on VNFs/VMs.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="is-closed-loop-disabled"
+					type="xs:boolean">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="Used
+								to indicate whether closed loop function is enabled on this
+								node")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:volumes" minOccurs="0" />
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+				<xs:element ref="tns:l-interfaces" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vservers">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of virtual Servers, aka virtual machines or VMs.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:vserver" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="tenant">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Openstack
+						tenant",nameProps="tenant-name",indexedProps="tenant-name,tenant-id",searchable="tenant-name,tenant-id",dependentOn="cloud-region",container="tenants")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="tenant-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique
+								id relative to the cloud-region.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="tenant-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Readable
+								name of tenant")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:vservers" minOccurs="0" />
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="tenants">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of openstack tenants.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:tenant" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="flavor">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Openstack
+						flavor.",nameProps="flavor-name",indexedProps="flavor-name,flavor-id",dependentOn="cloud-region",container="flavors")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="flavor-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Flavor
+								id, expected to be unique across cloud-region.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="flavor-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Flavor
+								name")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="flavor-vcpus" type="xs:int"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Number
+								of CPUs")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="flavor-ram" type="xs:int" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Amount
+								of memory")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="flavor-disk" type="xs:int"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Disk
+								space")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="flavor-ephemeral" type="xs:int"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Amount
+								of ephemeral disk space")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="flavor-swap" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="amount
+								of swap space allocation")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="flavor-is-public" type="xs:boolean"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="whether
+								flavor is available to all users or private to the tenant it was
+								created in.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="flavor-selflink" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL
+								to endpoint where AAI can get more details")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="flavor-disabled" type="xs:boolean"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Boolean
+								as to whether this flavor is no longer enabled")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="flavors">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of openstack flavors.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:flavor" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="group-assignment">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Openstack
+						group-assignment used to store exclusivity groups
+						(EG).",nameProps="group-name",indexedProps="group-id,group-type,group-name",dependentOn="cloud-region",container="group-assignments")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="group-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Group
+								id, expected to be unique across cloud-region.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="group-type" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Group
+								type - the type of group this instance refers to")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="group-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Group
+								name - name assigned to the group")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="group-description" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Group
+								description - description of the group")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="group-assignments">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of openstack group assignments")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:group-assignment" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="snapshot">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Openstack
+						snapshot",nameProps="snapshot-name",uniqueProps="snapshot-id",indexedProps="application,snapshot-name,application-vendor,snapshot-id,application-version,prev-snapshot-id",dependentOn="cloud-region",container="snapshots")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="snapshot-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Snapshot
+								id, this is the key UUID assoc associated in glance with the
+								snapshots.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="snapshot-name" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Snapshot
+								name")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="snapshot-architecture" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Operating
+								system architecture")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="snapshot-os-distro" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The
+								common name of the operating system distribution in lowercase")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="snapshot-os-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The
+								operating system version as specified by the distributor.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="application" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The
+								application that the image instantiates.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="application-vendor" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The
+								vendor of the application.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="application-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The
+								version of the application.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="snapshot-selflink" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL
+								to endpoint where AAI can get more details")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="prev-snapshot-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This
+								field contains the UUID of the previous snapshot (if any).")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="snapshots">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of openstack snapshots")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:snapshot" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="metadatum">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Key/value
+						pairs",indexedProps="metaname",dependentOn="tenant,image,service-instance,connector,model",container="metadata")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="metaname" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true)</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="metaval" type="xs:string" />
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="metadata">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of metadatum (key/value pairs)")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:metadatum" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="image">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Openstack
+						image.",nameProps="image-name",indexedProps="application,image-name,application-vendor,image-id,application-version",dependentOn="cloud-region",container="images")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="image-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Image
+								id, expected to be unique across cloud region")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="image-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Image
+								name")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="image-architecture" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Operating
+								system architecture.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="image-os-distro" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The
+								common name of the operating system distribution in lowercase")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="image-os-version" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The
+								operating system version as specified by the distributor.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="application" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The
+								application that the image instantiates.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="application-vendor" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The
+								vendor of the application.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="application-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The
+								version of the application.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="image-selflink" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL
+								to endpoint where AAI can get more details")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+				<xs:element ref="tns:metadata" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="images">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collectio
+						of Openstack images.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:image" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="availability-zones">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of availability zones")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:availability-zone" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="cloud-region">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="cloud-region
+						designates an installation of a cloud cluster or region or
+						instantiation. In AT&amp;Ts openecomp cloud, this could be an LCP
+						or DCP. Cloud regions are uniquely identified by a composite key,
+						cloud-owner + cloud-region-id. The format of the cloud-owner is
+						vendor-cloudname and we will use openecomp-openecomp for
+						AT&amp;T's
+						openecomp.",indexedProps="cloud-owner,cloud-region-id,cloud-type,owner-defined-type",nameProps="owner-defined-type",container="cloud-regions",namespace="cloud-infrastructure")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="cloud-owner" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Identifies
+								the vendor and cloud name, e.g., openecomp-openecomp. First part
+								of composite key should be formatted as vendor-cloudname")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="cloud-region-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Identifier
+								used by the vendor for the region. Second part of composite
+								key")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="cloud-type" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Type
+								of the cloud (e.g., openstack)")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="owner-defined-type" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Cloud-owner
+								defined type indicator (e.g., DCP, LCP)")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="cloud-region-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Software
+								version employed at the site")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="identity-url" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL
+								of the keystone identity service")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="cloud-zone" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Zone
+								where the cloud is homed")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="complex-name" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="complex
+								name for cloud-region instance")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:volume-groups" minOccurs="0" />
+				<xs:element ref="tns:tenants" minOccurs="0" />
+				<xs:element ref="tns:flavors" minOccurs="0" />
+				<xs:element ref="tns:group-assignments" minOccurs="0" />
+				<xs:element ref="tns:snapshots" minOccurs="0" />
+				<xs:element ref="tns:images" minOccurs="0" />
+				<xs:element ref="tns:dvs-switches" minOccurs="0" />
+				<xs:element ref="tns:oam-networks" minOccurs="0" />
+				<xs:element ref="tns:availability-zones" minOccurs="0" />
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="cloud-regions">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(maximumDepth="0")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:cloud-region" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="network-profile">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Network
+						profile populated by SDN-GP for
+						SNMP",indexedProps="nm-profile-name",container="network-profiles",namespace="cloud-infrastructure")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="nm-profile-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique
+								name of network profile.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="community-string" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Encrypted
+								SNMP community string")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="network-profiles">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of network profiles")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:network-profile" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="p-interface">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Physical
+						interface (e.g.,
+						nic)",indexedProps="interface-name,prov-status",nameProps="prov-status",dependentOn="vpls-pe,pserver,pnf",container="p-interfaces")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="interface-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Name
+								that identifies the physical interface")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="speed-value" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Captures
+								the numeric part of the speed")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="speed-units" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Captures
+								the units corresponding to the speed")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="port-description" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Nature
+								of the services and connectivity on this port.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="equipment-identifier" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="CLEI
+								or other specification for p-interface hardware.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="interface-role" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Role
+								specification for p-interface hardware.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="interface-type" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicates
+								the physical properties of the interface.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="prov-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Trigger
+								for operational monitoring of this resource by Service Assurance
+								systems.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+				<xs:element ref="tns:l-interfaces" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="p-interfaces">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of physical interfaces.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:p-interface" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="lag-interface">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Link
+						aggregate
+						interface",indexedProps="interface-name,interface-id,interface-role",dependentOn="generic-vnf,pserver,vpe,vpls-pe,pnf",container="lag-interfaces")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="interface-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Name
+								that identifies the link aggregate interface")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="speed-value" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Captures
+								the numeric part of the speed")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="speed-units" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Captures
+								the units corresponding to the speed")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="interface-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="ID
+								of interface")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="interface-role" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Role
+								assigned to this Interface, should use values as defined in
+								OPENECOMP Yang models.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="prov-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Trigger
+								for operational monitoring of this resource by Service Assurance
+								systems.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+				<xs:element ref="tns:l-interfaces" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="lag-interfaces">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of link aggregate interfaces.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:lag-interface" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="pserver">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Compute
+						host whose hostname must be unique and must exactly match what is
+						sent as a relationship to a
+						vserver.",nameProps="pserver-name2",indexedProps="hostname,in-maint,pserver-id,pserver-name2,inv-status",searchable="hostname,pserver-name2,pserver-id,ipv4-oam-address",container="pservers",namespace="cloud-infrastructure")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="hostname" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Value
+								from executing hostname on the compute node.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ptnii-equip-name" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="PTNII
+								name")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="number-of-cpus" type="xs:int"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Number
+								of cpus")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="disk-in-gigabytes" type="xs:int"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Disk
+								size, in GBs")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ram-in-megabytes" type="xs:int"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="RAM
+								size, in MBs")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="equip-type" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Equipment
+								type. Source of truth should define valid values.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="equip-vendor" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Equipment
+								vendor. Source of truth should define valid values.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="equip-model" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Equipment
+								model. Source of truth should define valid values.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="fqdn" type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Fully-qualified
+								domain name")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="pserver-selflink" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL
+								to endpoint where AAI can get more details")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipv4-oam-address" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								to configure device, also used for troubleshooting and is IP
+								used for traps generated by device.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="serial-number" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Serial
+								number, may be queried")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipaddress-v4-loopback-0"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="IPV4
+								Loopback 0 address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipaddress-v6-loopback-0"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="IPV6
+								Loopback 0 address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipaddress-v4-aim" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="IPV4
+								AIM address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipaddress-v6-aim" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="IPV6
+								AIM address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipaddress-v6-oam" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="IPV6
+								OAM address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="inv-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="CANOPI's
+								inventory status. Only set with values exactly as defined by
+								CANOPI.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="pserver-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="ID
+								of Pserver")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="internet-topology" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="internet
+								topology of Pserver")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="in-maint" type="xs:boolean">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="used
+								to indicate whether or not this object is in maintenance mode
+								(maintenance mode = true). This field (in conjunction with
+								prov-status) is used to suppress alarms and vSCL on VNFs/VMs.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="pserver-name2" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="alternative
+								pserver name")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="purpose" type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="purpose
+								of pserver")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+				<xs:element ref="tns:p-interfaces" minOccurs="0" />
+				<xs:element ref="tns:lag-interfaces" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="pservers">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of compute hosts.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:pserver" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="virtual-data-center">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Virtual
+						organization of cloud infrastructure elements in a data center
+						context",nameProps="vdc-name",indexedProps="vdc-name,vdc-id",container="virtual-data-centers",namespace="cloud-infrastructure")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="vdc-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique
+								ID of the vdc")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vdc-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name
+								of the virtual data center")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="virtual-data-centers">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Virtual
+						organization of cloud infrastructure elements in a data center
+						context")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:virtual-data-center" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="cloud-infrastructure">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Namespace
+						for cloud infrastructure.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:complexes" minOccurs="0" />
+				<xs:element ref="tns:cloud-regions" minOccurs="0" />
+				<xs:element ref="tns:network-profiles" minOccurs="0" />
+				<xs:element ref="tns:pservers" minOccurs="0" />
+				<xs:element ref="tns:virtual-data-centers" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="license-key-resource">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(nameProps="name",indexedProps="assignment-group-uuid,openecomp-uuid,name",uniqueProps="openecomp-uuid",container="license-key-resources",namespace="license-management")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="att-uuid" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true)</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="assignment-type" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="assignment-status" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="assignment-group-uuid" type="xs:string" />
+				<xs:element name="assignment-date" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="name" type="xs:string" minOccurs="0" />
+				<xs:element name="model-uuid" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="model-version" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="license-key" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="license-key-file-url" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="supplier-release-list" type="xs:string"
+					minOccurs="0" maxOccurs="unbounded" />
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="license-key-resources">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:license-key-resource" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="license-management">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:license-key-resources" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="connector">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of resource instances used to connect a variety of disparate
+						inventory
+						widgets",indexedProps="resource-instance-id,persona-model-id,persona-model-version,widget-model-id,widget-model-version",container="connectors",namespace="business")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="resource-instance-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique
+								id of resource instance.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="persona-model-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC model id for this resource or service model.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="persona-model-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC model version for this resource or service model.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="widget-model-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC data dictionary widget model. This maps directly to the
+								A&amp;AI widget.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="widget-model-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC data dictionary version of the widget model.This maps
+								directly to the A&amp;AI version of the widget.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+				<xs:element ref="tns:metadata" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="connectors">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of resource instances used to connect a variety of disparate
+						inventory widgets")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:connector" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="tunnel-xconnect">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Represents
+						the specifics of a tunnel cross connect piece of a resource that
+						gets separately
+						allotted",uniqueProps="id",indexedProps="id",dependentOn="allotted-resource",container="tunnel-xconnects")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Allotted
+								Resource id UUID assigned to this instance.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="bandwidth-up-wan1" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The
+								WAN uplink bandwidth for WAN1")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="bandwidth-down-wan1" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The
+								WAN downlink bandwidth for WAN1")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="bandwidth-up-wan2" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The
+								WAN uplink bandwidth for WAN2")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="bandwidth-down-wan2" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The
+								WAN downlink bandwidth for WAN2")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Concurrency
+								value")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="tunnel-xconnects">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="This
+						object is used to store the specific tunnel cross connect aspects
+						of an allotted resource")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:tunnel-xconnect" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="allotted-resource">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Represents
+						a slice or partial piece of a resource that gets separately
+						allotted",nameProps="description",uniqueProps="id",indexedProps="id,persona-model-id,persona-model-version",dependentOn="service-instance",container="allotted-resources")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Allotted
+								Resource id UUID assigned to this instance.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="description" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The
+								descriptive information assigned to this allotted resource
+								instance")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="selflink" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Link
+								back to more information in the controller")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="persona-model-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC model id for this resource or service model.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="persona-model-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC model version for this resource or service model.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Concurrency
+								value")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:tunnel-xconnects" minOccurs="0" />
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="allotted-resources">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="This
+						object is used to store slices of services being offered")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:allotted-resource" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="service-instance">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Instance
+						of a
+						service",indexedProps="service-instance-id,persona-model-id,persona-model-version,widget-model-id,widget-model-version,service-instance-name,service-instance-location-id",nameProps="service-instance-name",searchable="service-instance-id,service-instance-name",uniqueProps="service-instance-id",dependentOn="service-subscription",container="service-instances")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="service-instance-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Uniquely
+								identifies this instance of a service")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="service-instance-name" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This
+								field will store a name assigned to the service-instance.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="persona-model-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC model id for this resource or service model.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="persona-model-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC model version for this resource or service model.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="widget-model-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC data dictionary widget model. This maps directly to the
+								A&amp;AI widget.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="widget-model-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC data dictionary version of the widget model.This maps
+								directly to the A&amp;AI version of the widget.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="bandwidth-total" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicates
+								the total bandwidth to be used for this service.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="bandwidth-up-wan1" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="indicates
+								the upstream bandwidth this service will use on the WAN1 port of
+								the physical device.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="bandwidth-down-wan1" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="indicates
+								the downstream bandwidth this service will use on the WAN1 port
+								of the physical device.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="bandwidth-up-wan2" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="indicates
+								the upstream bandwidth this service will use on the WAN2 port of
+								the physical device.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="bandwidth-down-wan2" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="indicates
+								the downstream bandwidth this service will use on the WAN2 port
+								of the physical device.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vhn-portal-url" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL
+								customers will use to access the vHN Portal.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="operational-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Operational
+								status of the service-instance.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="service-instance-location-id"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="An
+								identifier that customers assign to the location where this
+								service is being used.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+				<xs:element ref="tns:metadata" minOccurs="0" />
+				<xs:element ref="tns:allotted-resources" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="service-instances">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of service instances")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:service-instance" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="service-subscription">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Object
+						that group service
+						instances.",indexedProps="service-type",dependentOn="customer",container="service-subscriptions")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="service-type" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Value
+								defined by orchestration to identify this service across
+								OPENECOMP.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="temp-ub-sub-account-id"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This
+								property will be deleted from A&amp;AI in the near future. Only
+								stop gap solution.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:service-instances" minOccurs="0" />
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="service-subscriptions">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of objects that group service instances.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:service-subscription" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="customer">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="customer
+						identifiers to provide linkage back to BSS
+						information.",nameProps="subscriber-name",indexedProps="subscriber-name,global-customer-id,subscriber-type",searchable="subscriber-name,global-customer-id",uniqueProps="global-customer-id,subscriber-name",alternateKeys1="subscriber-name",container="customers",namespace="business")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="global-customer-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Global
+								customer id used across OPENECOMP to uniquely identify
+								customer.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="subscriber-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Subscriber
+								name, an alternate way to retrieve a customer.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="subscriber-type" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Subscriber
+								type, a way to provide VID with only the INFRA
+								customers.",defaultValue="CUST")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:service-subscriptions" minOccurs="0" />
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="customers">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of customer identifiers to provide linkage back to BSS
+						information.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:customer" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="business">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Namespace
+						for business related constructs")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:connectors" minOccurs="0" />
+				<xs:element ref="tns:customers" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vnf-image">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Image
+						object that pertain to a VNF that doesn't have associated
+						vservers. This is a
+						kludge.",indexedProps="application,openecomp-uuid,application-vendor,application-version",uniqueProps="openecomp-uuid",container="vnf-images",namespace="service-design-and-creation")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="att-uuid" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique
+								ID of this asset")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="application" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The
+								application that the image instantiates.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="application-vendor" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The
+								vendor of the application.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="application-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The
+								version of the application.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="selflink" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL
+								to endpoint where AAI can get more details")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vnf-images">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of image objects that pertain to a VNF that doesn't have
+						associated vservers. This is a kludge.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:vnf-image" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="service">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Stand-in
+						for service model definitions. Likely to be deprecated in favor of
+						models from
+						ASDC.",indexedProps="service-description,service-id",container="services",namespace="service-design-and-creation")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="service-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="This
+								gets defined by others to provide a unique ID for the service,
+								we accept what is sent.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="service-description" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Description
+								of the service")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="service-selflink" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL
+								to endpoint where AAI can get more details")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="service-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="service
+								version")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="services">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of service model definitions. Likely to be deprecated in favor of
+						models from ASDC.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:service" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="service-capability">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Early
+						definition of server/resource pairings, likely to be replaced by
+						models. No new use should be made of
+						this.",indexedProps="service-type,vnf-type",container="service-capabilities",namespace="service-design-and-creation")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="service-type" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="This
+								gets defined by others to provide a unique ID for the service,
+								we accept what is sent.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vnf-type" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="String
+								capturing type of vnf, that was intended to identify the ASDC
+								resource. This field has been overloaded and clients should
+								expect changes to occur in the future to this field as ASDC
+								matures.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="service-capabilities">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of service capabilities.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:service-capability" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="element-choice-set">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="This
+						is how we would capture constraints defining allowed sets of
+						elements.",uniqueProps="element-choice-set-uuid",indexedProps="element-choice-set-uuid",allowDirectRead="true",allowDirectWrite="false",container="element-choice-sets")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="element-choice-set-uuid"
+					type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="element-choice-set-name"
+					type="xs:string" />
+				<xs:element name="cardinality" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0" />
+				<xs:element ref="tns:model-elements" minOccurs="0" />
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="element-choice-sets">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:element-choice-set" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="constrained-element-set">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="This
+						is how we would capture constraints defining allowed sets of
+						elements.",uniqueProps="constrained-element-set-uuid",indexedProps="constrained-element-set-uuid",allowDirectRead="true",allowDirectWrite="false",container="constrained-element-sets")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="constrained-element-set-uuid"
+					type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="constraint-type" type="xs:string" />
+				<xs:element name="check-type" type="xs:string" />
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0" />
+				<xs:element ref="tns:element-choice-sets" minOccurs="0" />
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="constrained-element-sets">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:constrained-element-set"
+					minOccurs="0" maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="model-constraint">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="This
+						is how we would capture constraints defining allowed sets of
+						elements.",uniqueProps="model-constraint-uuid",indexedProps="model-constraint-uuid",allowDirectRead="true",allowDirectWrite="false",container="model-constraints")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="model-constraint-uuid" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element
+					name="constrained-element-set-uuid-to-replace" type="xs:string" />
+				<xs:element ref="tns:constrained-element-sets"
+					minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="model-constraints">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:model-constraint" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="model-element">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Defines
+						how other models combine to make up a higher-level
+						model.",uniqueProps="model-element-uuid",indexedProps="model-element-uuid",allowDirectRead="true",allowDirectWrite="false",container="model-elements")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="model-element-uuid" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="new-data-del-flag" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicates
+								whether this element was created as part of instantiation from
+								this model")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="cardinality" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="How
+								many of this type of element are required/allowed")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="linkage-points" minOccurs="0">
+					<xs:complexType>
+						<xs:annotation>
+							<xs:appinfo>
+								<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Defines
+									how other models combine to make up a higher-level
+									model.",uniqueProps="model-element-uuid",indexedProps="model-element-uuid",allowDirectRead="true",allowDirectWrite="false",container="model-elements")</annox:annotate>
+							</xs:appinfo>
+						</xs:annotation>
+						<xs:sequence>
+							<xs:element name="linkage-point" type="xs:string"
+								minOccurs="0" maxOccurs="unbounded" />
+						</xs:sequence>
+					</xs:complexType>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:model-elements" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Defines
+								how other models combine to make up a higher-level model")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:model-constraints" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Describes
+								new constraints on this model element that are not part of that
+								model's definition")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="model-elements">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:model-element" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="model-ver">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Subgraph
+						definition provided by ASDC to describe a specific version of an
+						inventory asset and its connections related to ASDC
+						models",nameProps="model-name",indexedProps="model-version-id,model-name,model-version",uniqueProps="model-version-id",container="model-vers",namespace="service-design-and-creation")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="model-version-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique
+								identifier corresponding to one version of a model in ASDC")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="model-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name
+								of the model, which can change from version to version.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="model-version" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Version")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="model-description" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Description")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:model-elements" minOccurs="0" />
+				<xs:element ref="tns:metadata" minOccurs="0" />
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="model-vers">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:model-ver" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="model">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Subgraph
+						definition provided by ASDC to describe an inventory asset and its
+						connections related to ASDC models, independent of
+						version",nameProps="model-type",indexedProps="model-invariant-id,model-type",uniqueProps="model-invariant-id",container="models",namespace="service-design-and-creation")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="model-invariant-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique
+								identifier corresponding to the main definition of a model in
+								ASDC")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="model-type" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Type
+								of the model, e.g., service, resource, widget, etc.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:model-vers" minOccurs="0" />
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="models">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of subgraph definitions provided by ASDC to describe the inventory
+						assets and their connections related to ASDC models")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:model" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="related-lookup">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="TBD",uniqueProps="related-lookup-uuid",indexedProps="related-lookup-uuid",allowDirectRead="true",allowDirectWrite="false",container="related-lookups")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="related-lookup-uuid" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="source-node-type" type="xs:string" />
+				<xs:element name="source-node-property" type="xs:string" />
+				<xs:element name="target-node-type" type="xs:string" />
+				<xs:element name="target-node-property" type="xs:string" />
+				<xs:element name="property-collect-list" type="xs:string"
+					minOccurs="0" maxOccurs="unbounded" />
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0" />
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="related-lookups">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:related-lookup" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="property-constraint">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="TBD",uniqueProps="property-constraint-uuid",indexedProps="property-constraint-uuid",allowDirectRead="true",allowDirectWrite="false",container="property-constraints")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="property-constraint-uuid"
+					type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="constraint-type" type="xs:string" />
+				<xs:element name="property-name" type="xs:string" />
+				<xs:element name="property-value" type="xs:string" />
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="property-constraints">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:property-constraint" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="named-query-element">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="TBD",uniqueProps="named-query-element-uuid",indexedProps="named-query-element-uuid",allowDirectRead="true",allowDirectWrite="false",container="named-query-elements")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="named-query-element-uuid"
+					type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="property-collect-list" type="xs:string"
+					minOccurs="0" maxOccurs="unbounded" />
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="property-limit-desc" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="do-not-output" type="xs:string"
+					minOccurs="0" />
+				<xs:element ref="tns:named-query-elements" minOccurs="0" />
+				<xs:element ref="tns:related-lookups" minOccurs="0" />
+				<xs:element ref="tns:property-constraints" minOccurs="0" />
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="named-query-elements">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:named-query-element" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="named-query">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="TBD",nameProps="named-query-name",uniqueProps="named-query-uuid",indexedProps="named-query-uuid,named-query-name",container="named-queries",namespace="service-design-and-creation")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="named-query-uuid" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true)</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="named-query-name" type="xs:string" />
+				<xs:element name="named-query-version" type="xs:string" />
+				<xs:element name="required-input-params" minOccurs="0">
+					<xs:complexType>
+						<xs:annotation>
+							<xs:appinfo>
+								<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="TBD",nameProps="named-query-name",uniqueProps="named-query-uuid",indexedProps="named-query-uuid,named-query-name",container="named-queries",namespace="service-design-and-creation")</annox:annotate>
+							</xs:appinfo>
+						</xs:annotation>
+						<xs:sequence>
+							<xs:element name="required-input-param"
+								type="xs:string" minOccurs="0" maxOccurs="unbounded" />
+						</xs:sequence>
+					</xs:complexType>
+				</xs:element>
+				<xs:element name="description" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0" />
+				<xs:element ref="tns:named-query-elements" minOccurs="0" />
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="named-queries">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:named-query" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="service-design-and-creation">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Namespace
+						for objects managed by ASDC")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:vnf-images" minOccurs="0" />
+				<xs:element ref="tns:services" minOccurs="0" />
+				<xs:element ref="tns:service-capabilities" minOccurs="0" />
+				<xs:element ref="tns:models" minOccurs="0" />
+				<xs:element ref="tns:named-queries" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="logical-link">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Logical
+						links generally connect l-interfaces but are used to express
+						logical connectivity between two
+						points",indexedProps="link-name,persona-model-id,persona-model-version,widget-model-id,widget-model-version,link-id,prov-status,circuit-id,purpose",uniqueProps="link-id",nameProps="prov-status,circuit-id",container="logical-links",namespace="network")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="link-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="e.g.,
+								evc-name, or
+								vnf-nameA_interface-nameA_vnf-nameZ_interface-nameZ")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="link-type" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Type
+								of logical link, e.g., evc")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="speed-value" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Captures
+								the numeric part of the speed")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="speed-units" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Captures
+								the units corresponding to the speed")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ip-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="v4,
+								v6, or ds for dual stack (should be openecomp-ip-version)")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="routing-protocol" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="For
+								example, static or BGP")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="persona-model-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC model id for this resource or service model.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="persona-model-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC model version for this resource or service model.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="widget-model-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC data dictionary widget model. This maps directly to the
+								A&amp;AI widget.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="widget-model-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC data dictionary version of the widget model.This maps
+								directly to the A&amp;AI version of the widget.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="operational-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indication
+								of operational status of the logical link.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="prov-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Trigger
+								for operational monitoring of this VNF by BAU Service Assurance
+								systems.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="link-role" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indication
+								of the network use of the logical link.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="link-name2" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Alias
+								or alternate name (CLCI or D1 name).")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="link-id" type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="UUID
+								of the logical-link, SDNC generates this.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="circuit-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Circuit
+								id")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="purpose" type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Reason
+								for this entity, role it is playing")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="logical-links">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of logical connections")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:logical-link" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="class-of-service">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(indexedProps="cos",dependentOn="site-pair",container="classes-of-service")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="cos" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="unique
+								identifier of probe")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="probe-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="identifier
+								of probe")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="probe-type" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="type
+								of probe")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="classes-of-service">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="class-of-service
+						of probe")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:class-of-service" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="site-pair">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(indexedProps="site-pair-id",uniqueProps="site-pair-id",dependentOn="routing-instance",container="site-pairs")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="site-pair-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="unique
+								identifier of probe")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="source-ip" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Prefix
+								address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="destination-ip" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Prefix
+								address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ip-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="ip
+								version, v4, v6")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="destination-hostname" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Hostname
+								of the destination equipment to which SLAs are measured
+								against.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="destination-equip-type"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The
+								type of destinatination equipment. Could be Router, UCPE, etc.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:classes-of-service" minOccurs="0" />
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="site-pairs">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="probe
+						within a set")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:site-pair" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="routing-instance">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(indexedProps="routing-instance-id",uniqueProps="routing-instance-id",dependentOn="site-pair-set",container="routing-instances")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="routing-instance-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique
+								id of routing instance")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="rpm-owner" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="rpm
+								owner")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:site-pairs" minOccurs="0" />
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="routing-instances">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="set
+						of probes related to generic-vnf routing instance")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:routing-instance" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="site-pair-set">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Set
+						of instances for probes used to measure service level
+						agreements",indexedProps="site-pair-set-id",uniqueProps="site-pair-set-id",container="site-pair-sets",namespace="network")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="site-pair-set-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique
+								id of site pair set.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:routing-instances" minOccurs="0" />
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="site-pair-sets">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of sets of instances for probes related to generic-vnf")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:site-pair-set" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vpn-binding">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="VPN
+						binding",nameProps="vpn-name,vpn-type",indexedProps="vpn-name,vpn-id,global-route-target,vpn-type",searchable="vpn-name",uniqueProps="vpn-id",container="vpn-bindings",namespace="network")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="vpn-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="VPN
+								ID, globally unique within A&amp;AI")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vpn-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="VPN
+								Name")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="global-route-target" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Number
+								used to identify a VPN, globally unique in the network")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vpn-platform" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								platform associated with the VPN example AVPN, Mobility")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vpn-type" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Type
+								of the vpn, should be taken from enumerated/valid values")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="route-distinguisher" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								to distinguish the distinct VPN routes of separate customers who
+								connect to the provider in an MPLS network.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="route-target-role" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Role
+								assigned to this route target")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="l3-networks
+								relate to vpn-bindings")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vpn-bindings">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:vpn-binding" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vpls-pe">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="VPLS
+						Provider Edge
+						routers.",indexedProps="prov-status,equipment-name",container="vpls-pes",namespace="network")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="equipment-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true)</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="prov-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Trigger
+								for operational monitoring of this VNF by BAU Service Assurance
+								systems.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipv4-oam-address" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Address
+								tail-f uses to configure vpe, also used for troubleshooting and
+								is IP used for traps generated by VPE
+								(v4-loopback0-ip-address).")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="equipment-role" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Client
+								should send valid enumerated value, e.g., VPLS-PE.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vlan-id-outer" type="xs:unsignedInt"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Temporary
+								location for stag to get to VCE")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+				<xs:element ref="tns:p-interfaces" minOccurs="0" />
+				<xs:element ref="tns:lag-interfaces" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vpls-pes">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of VPLS Provider Edge routers")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:vpls-pe" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="multicast-configuration">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(indexedProps="multicast-configuration-id",uniqueProps="multicast-configuration-id",container="multicast-configurations",namespace="network")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="multicast-configuration-id"
+					type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique
+								id of multicast configuration.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="multicast-protocol" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="protocol
+								of multicast configuration")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="rp-type" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="rp
+								type of multicast configuration")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="multicast-configurations">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="multicast
+						configuration of generic-vnf ip-address")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:multicast-configuration"
+					minOccurs="0" maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="cvlan-tag-entry">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(dependentOn="port-group",indexedProps="cvlan-tag",container="cvlan-tags")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="cvlan-tag" type="xs:unsignedInt">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="See
+								mis-na-virtualization-platform.yang")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="cvlan-tags">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:cvlan-tag-entry" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="port-group">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Used
+						to capture the network interfaces of this
+						VCE",nameProps="port-group-name",indexedProps="port-group-id,heat-stack-id,interface-id,interface-name,switch-name",dependentOn="vce",container="port-groups")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="interface-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique
+								ID of the interface")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="neutron-network-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Neutron
+								network id of this Interface")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="neutron-network-name" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Neutron
+								network name of this Interface")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="interface-role" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Role
+								assigned to this Interface, should use values as defined in
+								OPENECOMP Yang models.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="port-group-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Unique
+								ID for port group in vmware")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="port-group-name" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Likely
+								to duplicate value of neutron network name")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="switch-name" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="DVS
+								or standard switch name (should be non-null for port groups
+								associated with DVS)")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="orchestration-status" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Orchestration
+								status of this VNF, mastered by MSO")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="heat-stack-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Heat
+								stack id corresponding to this instance, managed by MSO")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="mso-catalog-key" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Corresponds
+								to the SDN-C catalog id used to configure this VCE")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:cvlan-tags" minOccurs="0" />
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="port-groups">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:port-group" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="license">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Metadata
+						for license
+						group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce,vpe",container="licenses")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="group-uuid" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique
+								ID for the license group the resource belongs to, should be
+								uuid.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-uuid" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique
+								ID of a license resource. ")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Concurrency
+								value")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="licenses">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Licenses
+						to be allocated across resources, keyed by group-uuid and
+						resource-uuid, related to license management")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:license" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="entitlement">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Metadata
+						for entitlement
+						group.",indexedProps="group-uuid,resource-uuid",dependentOn="generic-vnf,vce,vpe",container="entitlements")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="group-uuid" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique
+								ID for the entitlement group the resource comes from, should be
+								uuid.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-uuid" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique
+								ID of an entitlement resource. ")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Concurrency
+								value")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="entitlements">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Entitlements,
+						keyed by group-uuid and resource-uuid, related to license
+						management")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:entitlement" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vce">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Virtual
+						Customer Edge Router, used specifically for Gamma. This object is
+						deprecated.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vces",namespace="network",extendsFrom="vnf")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="vnf-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique
+								id of VNF. This is unique across the graph.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vnf-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name
+								of VNF.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vnf-name2" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Alternate
+								name of VNF.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vnf-type" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="String
+								capturing type of vnf, that was intended to identify the ASDC
+								resource. This field has been overloaded and clients should
+								expect changes to occur in the future to this field as ASDC
+								matures.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="service-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Unique
+								identifier of service from ASDC. Expect this to change as ASDC
+								matures.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="regional-resource-zone"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Regional
+								way of organizing pservers, source of truth should define
+								values")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="prov-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Trigger
+								for operational monitoring of this resource by Service Assurance
+								systems.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="operational-state" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicator
+								for whether the resource is considered operational")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="license-key" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="License
+								key")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="equipment-role" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Network
+								role being played by this VNF")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="orchestration-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Orchestration
+								status of this VNF, mastered by MSO")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="heat-stack-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Heat
+								stack id corresponding to this instance, managed by MSO")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="mso-catalog-key" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Corresponds
+								to the SDN-C catalog id used to configure this VCE")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vpe-id" type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Unique
+								ID of VPE connected to this VCE.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="v6-vce-wan-address" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Valid
+								v6 IP address for the WAN Link on this router. Implied length of
+								/64.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipv4-oam-address" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Address
+								tail-f uses to configure vce, also used for troubleshooting and
+								is IP used for traps generated by VCE.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipv4-loopback0-address"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Loopback0
+								address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="entitlement-resource-uuid"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Entitlement
+								resource uuid")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:port-groups" minOccurs="0" />
+				<xs:element ref="tns:licenses" minOccurs="0" />
+				<xs:element ref="tns:entitlements" minOccurs="0" />
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vces">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of Virtual Customer Edge Routers, used specifically for Gamma.
+						This object is deprecated.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:vce" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vpe">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Relationship-list
+						must include related to info for
+						complex.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,regional-resource-zone,prov-status,service-id",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vpes",namespace="network",extendsFrom="vnf")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="vnf-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique
+								id of VNF. This is unique across the graph.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vnf-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name
+								of VNF.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vnf-name2" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Alternate
+								name of VNF.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vnf-type" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="String
+								capturing type of vnf, that was intended to identify the ASDC
+								resource. This field has been overloaded and clients should
+								expect changes to occur in the future to this field as ASDC
+								matures.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="service-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Unique
+								identifier of service from ASDC")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="regional-resource-zone"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Regional
+								way of organizing pservers, source of truth should define
+								values")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="prov-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Trigger
+								for operational monitoring of this resource by Service Assurance
+								systems.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="operational-state" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicator
+								for whether the resource is considered operational")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="license-key" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="License
+								key")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="equipment-role" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Client
+								should send valid enumerated value")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="orchestration-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Orchestration
+								status of this VNF, mastered by MSO")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="heat-stack-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Heat
+								stack id corresponding to this instance, managed by MSO")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="mso-catalog-key" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Corresponds
+								to the SDN-C catalog id used to configure this VCE")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipv4-oam-address" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Address
+								tail-f uses to configure vpe, also used for troubleshooting and
+								is IP used for traps generated by VPE
+								(v4-loopback0-ip-address).")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipv4-oam-gateway-address-prefix-length"
+					type="xs:int" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Prefix
+								length for oam-address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipv4-oam-gateway-address"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Gateway
+								address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="v4-loopback0-ip-address"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Loopback0
+								address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vlan-id-outer" type="xs:unsignedInt"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Temporary
+								location for stag to get to VCE")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="as-number" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="as-number
+								of the VPE")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="summary-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="details
+								regarding the vpe operation")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="encrypted-access-flag"
+					type="xs:boolean" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="indicates
+								whether vpe access uses SSH")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+				<xs:element ref="tns:l-interfaces" minOccurs="0" />
+				<xs:element ref="tns:lag-interfaces" minOccurs="0" />
+				<xs:element ref="tns:licenses" minOccurs="0" />
+				<xs:element ref="tns:entitlements" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vpes">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Virtual
+						provider edge router. In 1504, A&amp;AI will populate this object
+						through an M&amp;P and tool provided to operations.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:vpe" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vnfc">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(indexedProps="vnfc-name,prov-status,vnfc-type,vnfc-function-code,ipaddress-v4-oam-vip,in-maint,is-closed-loop-disabled,group-notation",searchable="vnfc-name",container="vnfcs",namespace="network")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="vnfc-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique
+								ID of vnfc.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vnfc-function-code" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="function
+								code")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vnfc-type" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="type")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="prov-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="prov
+								status of this vnfc")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="orchestration-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Orchestration
+								status of this VNF, mastered by APP-C")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipaddress-v4-oam-vip" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Oam
+								V4 vip address of this vnfc")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="in-maint" type="xs:boolean">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="used
+								to indicate whether or not this object is in maintenance mode
+								(maintenance mode = true)")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="is-closed-loop-disabled"
+					type="xs:boolean">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="used
+								to indicate whether closed loop function is enabled on this
+								node")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="group-notation" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Group
+								notation of VNFC")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vnfcs">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="virtual
+						network components associated with a vserver from application
+						controller.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:vnfc" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="subnet">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(indexedProps="subnet-id,subnet-name",nameProps="subnet-name",uniqueProps="subnet-id",dependentOn="l3-network",container="subnets")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="subnet-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Subnet
+								ID, should be UUID.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="subnet-name" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name
+								associated with the subnet.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="neutron-subnet-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Neutron
+								id of this subnet")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="gateway-address" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="gateway
+								ip address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="network-start-address" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="network
+								start address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="cidr-mask" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="cidr
+								mask")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ip-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="ip
+								version")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="orchestration-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Orchestration
+								status of this VNF, mastered by MSO")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="dhcp-enabled" type="xs:boolean">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="dhcp
+								enabled")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="dhcp-start" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								start address reserved for use by dhcp")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="dhcp-end" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								last address reserved for use by dhcp")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="subnets">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:subnet" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="ctag-assignment">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(indexedProps="vlan-id-inner",dependentOn="l3-network",container="ctag-assignments")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="vlan-id-inner" type="xs:unsignedInt">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="id.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="ctag-assignments">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:ctag-assignment" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="segmentation-assignment">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Openstack
+						segmentation
+						assignment.",indexedProps="segmentation-id",dependentOn="l3-network",container="segmentation-assignments")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="segmentation-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Route
+								Table Reference id, UUID assigned to this instance.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Concurrency
+								value")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="segmentation-assignments">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of openstack segmentation assignments")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:segmentation-assignment"
+					minOccurs="0" maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="l3-network">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Generic
+						network
+						definition",nameProps="network-name",indexedProps="heat-stack-id,network-uuid,service-id,network-id,network-name,persona-model-id,persona-model-version,widget-model-id,widget-model-version,contrail-network-fqdn,network-role",searchable="network-name",uniqueProps="network-id",container="l3-networks",namespace="network")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="network-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Network
+								ID, should be uuid. Unique across A&amp;AI.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="network-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name
+								of the network, governed by some naming convention..")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="network-type" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Type
+								of the network - who defines these values?")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="network-role" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Role
+								the network plans - who defines these values?")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="network-technology" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Network
+								technology - who defines these values?")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="neutron-network-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Neutron
+								network id of this Interface")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="is-bound-to-vpn" type="xs:boolean">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="Set
+								to true if bound to VPN")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="service-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Unique
+								identifier of service from ASDC")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="network-role-instance"
+					type="xs:unsignedInt" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="network
+								role instance")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="orchestration-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Orchestration
+								status of this VNF, mastered by MSO")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="heat-stack-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Heat
+								stack id corresponding to this instance, managed by MSO")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="mso-catalog-key" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Corresponds
+								to the SDN-C catalog id used to configure this VCE")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="contrail-network-fqdn" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Contrail
+								FQDN for the network")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="persona-model-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC model id for this resource or service model.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="persona-model-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC model version for this resource or service model.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="persona-model-customization-id"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="captures
+								the id of all the configuration used to customize the resource
+								for the service.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="widget-model-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC data dictionary widget model. This maps directly to the
+								A&amp;AI widget.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="widget-model-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC data dictionary version of the widget model.This maps
+								directly to the A&amp;AI version of the widget.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="physical-network-name" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name
+								associated with the physical network.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="is-provider-network" type="xs:boolean">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="boolean
+								indicatating whether or not network is a provider network.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="is-shared-network" type="xs:boolean">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="boolean
+								indicatating whether or not network is a shared network.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="is-external-network" type="xs:boolean">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="boolean
+								indicatating whether or not network is an external network.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:subnets" minOccurs="0" />
+				<xs:element ref="tns:ctag-assignments" minOccurs="0" />
+				<xs:element ref="tns:segmentation-assignments"
+					minOccurs="0" />
+				<xs:element ref="tns:relationship-list" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Relates
+								to tenant (or is it a child of tenant), complex, service,
+								vpn-binding")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="l3-networks">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:l3-network" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="network-policy">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(nameProps="network-policy-fqdn",indexedProps="network-policy-id,network-policy-fqdn",searchable="network-policy-fqdn",uniqueProps="network-policy-id",container="network-policies",namespace="network")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="network-policy-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="UUID
+								representing unique key to this instance")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="network-policy-fqdn" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Contrail
+								FQDN for the policy")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="heat-stack-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="ID
+								for the openStack Heat instance")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="network-policies">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:network-policy" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vf-module">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="a
+						deployment unit of
+						VNFCs",indexedProps="vf-module-id,vf-module-name,heat-stack-id,persona-model-id,persona-model-version,widget-model-id,widget-model-version,contrail-service-instance-fqdn",searchable="vf-module-name",dependentOn="generic-vnf",container="vf-modules")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="vf-module-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique
+								ID of vf-module.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vf-module-name" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name
+								of vf-module")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="heat-stack-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Heat
+								stack id corresponding to this instance.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="orchestration-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="orchestration
+								status of this vf-module, mastered by MSO")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="is-base-vf-module" type="xs:boolean">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="used
+								to indicate whether or not this object is base vf module")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="persona-model-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC model id for this resource or service model.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="persona-model-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC model version for this resource or service model.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="persona-model-customization-id"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="captures
+								the id of all the configuration used to customize the resource
+								for the service.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="widget-model-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC data dictionary widget model. This maps directly to the
+								A&amp;AI widget.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="widget-model-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC data dictionary version of the widget model.This maps
+								directly to the A&amp;AI version of the widget.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="contrail-service-instance-fqdn"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								Contrail unique ID for a service-instance")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vf-modules">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of vf-modules, a deployment unit of VNFCs")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:vf-module" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="generic-vnf">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="General
+						purpose
+						VNF",nameProps="vnf-name",indexedProps="is-closed-loop-disabled,vnf-name2,vnf-type,heat-stack-id,in-maint,vnf-name,vnf-id,regional-resource-zone,prov-status,service-id,persona-model-id,persona-model-version,widget-model-id,widget-model-version",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="generic-vnfs",namespace="network",extendsFrom="vnf")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="vnf-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique
+								id of VNF. This is unique across the graph.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vnf-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name
+								of VNF.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vnf-name2" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Alternate
+								name of VNF.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vnf-type" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="String
+								capturing type of vnf, that was intended to identify the ASDC
+								resource. This field has been overloaded and clients should
+								expect changes to occur in the future to this field as ASDC
+								matures.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="service-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Unique
+								identifier of service from ASDC")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="regional-resource-zone"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Regional
+								way of organizing pservers, source of truth should define
+								values")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="prov-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Trigger
+								for operational monitoring of this resource by Service Assurance
+								systems.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="operational-state" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicator
+								for whether the resource is considered operational")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="license-key" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="License
+								key")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="equipment-role" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Client
+								should send valid enumerated value")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="orchestration-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Orchestration
+								status of this VNF, used by MSO.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="heat-stack-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Heat
+								stack id corresponding to this instance, managed by MSO")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="mso-catalog-key" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Corresponds
+								to the SDN-C catalog id used to configure this VCE")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="management-option" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="identifier
+								of managed by openecomp or customer")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipv4-oam-address" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Address
+								tail-f uses to configure generic-vnf, also used for
+								troubleshooting and is IP used for traps generated by
+								generic-vnf.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipv4-loopback0-address"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="v4
+								Loopback0 address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="nm-lan-v6-address" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="v6
+								Loopback address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="management-v6-address" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="v6
+								management address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vcpu" type="xs:unsignedInt"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="number
+								of vcpus ordered for this instance of VNF, used for VNFs with no
+								vservers/flavors")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vcpu-units" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="units
+								associated with vcpu, used for VNFs with no vservers/flavors")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vmemory" type="xs:unsignedInt"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="number
+								of GB of memory ordered for this instance of VNF, used for VNFs
+								with no vservers/flavors")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vmemory-units" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="units
+								associated with vmemory, used for VNFs with no
+								vservers/flavors")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vdisk" type="xs:unsignedInt"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="number
+								of vdisks ordered for this instance of VNF, used for VNFs with
+								no vservers/flavors")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vdisk-units" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="units
+								associated with vdisk, used for VNFs with no vservers/flavors")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="in-maint" type="xs:boolean">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="used
+								to indicate whether or not this object is in maintenance mode
+								(maintenance mode = true). This field (in conjunction with
+								prov-status) is used to suppress alarms and vSCL on VNFs/VMs.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="is-closed-loop-disabled"
+					type="xs:boolean">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="used
+								to indicate whether closed loop function is enabled on this
+								node")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="summary-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="details
+								regarding the generic-vnf operation")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="encrypted-access-flag"
+					type="xs:boolean" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="indicates
+								whether generic-vnf access uses SSH")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="entitlement-assignment-group-uuid"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="UUID
+								of the Entitlement group used for licensing VNFs")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="entitlement-resource-uuid"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="UUID
+								of the specific entitlement resource")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="license-assignment-group-uuid"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="UUID
+								of the license assignment group")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="license-key-uuid" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="UUID
+								of the actual license resource")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="persona-model-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC model id for this resource or service model.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="persona-model-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC model version for this resource or service model.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="persona-model-customization-id"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="captures
+								the id of all the configuration used to customize the resource
+								for the service.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="widget-model-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC data dictionary widget model. This maps directly to the
+								A&amp;AI widget.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="widget-model-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the
+								ASDC data dictionary version of the widget model.This maps
+								directly to the A&amp;AI version of the widget.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="as-number" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="as-number
+								of the VNF")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="regional-resource-subzone"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="represents
+								sub zone of the rr plane")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+				<xs:element ref="tns:l-interfaces" minOccurs="0" />
+				<xs:element ref="tns:lag-interfaces" minOccurs="0" />
+				<xs:element ref="tns:vf-modules" minOccurs="0" />
+				<xs:element ref="tns:licenses" minOccurs="0" />
+				<xs:element ref="tns:entitlements" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="generic-vnfs">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of VNFs")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:generic-vnf" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="lag-link">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="LAG
+						links can connect
+						lag-interfaces",indexedProps="link-name",container="lag-links",namespace="network")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="link-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Alphabetical
+								concatenation of lag-interface names")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="lag-links">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of link aggregation connections")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:lag-link" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="newvce">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="This
+						object fills in the gaps from vce that were incorporated into
+						generic-vnf. This object will be retired with
+						vce.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,prov-status,vnf-id2",searchable="vnf-id2,vnf-name,vnf-name2",uniqueProps="vnf-id2",container="newvces",namespace="network")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="vnf-id2" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique
+								id of VNF, can't use same attribute name right now until we
+								promote this new object")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vnf-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name
+								of VNF.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vnf-name2" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Alternate
+								name of VNF.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="vnf-type" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="String
+								capturing type of vnf, that was intended to identify the ASDC
+								resource. This field has been overloaded and clients should
+								expect changes to occur in the future to this field as ASDC
+								matures.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="prov-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Trigger
+								for operational monitoring of this VNF by BAU Service Assurance
+								systems.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="operational-state" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicator
+								for whether the resource is considered operational")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="license-key" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="License
+								key")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipv4-oam-address" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Address
+								tail-f uses to configure vpe, also used for troubleshooting and
+								is IP used for traps generated by VPE
+								(v4-loopback0-ip-address).")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="equipment-role" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Client
+								should send valid enumerated value, e.g., VPE.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipv4-loopback0-address"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="v4
+								Loopback0 address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="orchestration-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Orchestration
+								status of this VNF, mastered by MSO.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="heat-stack-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Heat
+								stack id corresponding to this instance, managed by MSO")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="mso-catalog-key" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Corresponds
+								to the SDN-C catalog id used to configure this VCE")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+				<xs:element ref="tns:l-interfaces" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="newvces">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="This
+						object fills in the gaps from vce that were incorporated into
+						generic-vnf. This object will be retired with vce.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:newvce" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="pnf">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="PNF
+						represents a physical network function. typically equipment used
+						in the D1 world. in 1607, this will be populated by SDN-C to
+						represent a premises router that a uCPE connects to. But this can
+						be used to represent any physical device that is not an openecomp
+						node or
+						uCPE.",indexedProps="pnf-name,orchestration-status,inv-status",searchable="pnf-name",uniqueProps="pnf-name",container="pnfs",namespace="network")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="pnf-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="unique
+								name of Physical Network Function.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="pnf-name2" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="name
+								of Physical Network Function.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="pnf-name2-source" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="source
+								of name2")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="pnf-id" type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="id
+								of pnf")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="equip-type" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Equipment
+								type. Source of truth should define valid values.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="equip-vendor" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Equipment
+								vendor. Source of truth should define valid values.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="equip-model" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Equipment
+								model. Source of truth should define valid values.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="management-option" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="identifier
+								of managed by openecomp or customer")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipaddress-v4-oam" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="ipv4-oam-address
+								with new naming convention for IP addresses")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="sw-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="sw-version
+								is the version of SW for the hosted application on the PNF.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="orchestration-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="orchestration-status
+								is the status of orchestration on the PNF.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="in-maint" type="xs:boolean">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="Used
+								to indicate whether or not this object is in maintenance mode
+								(maintenance mode = true). This field (in conjunction with
+								prov-status) is used to suppress alarms and vSCL on VNFs/VMs.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="frame-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="ID
+								of the physical frame (relay rack) where pnf is installed.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="serial-number" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Serial
+								number of the device")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipaddress-v4-loopback-0"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="IPV4
+								Loopback 0 address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipaddress-v6-loopback-0"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="IPV6
+								Loopback 0 address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipaddress-v4-aim" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="IPV4
+								AIM address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipaddress-v6-aim" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="IPV6
+								AIM address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipaddress-v6-oam" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="IPV6
+								OAM address")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="inv-status" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="CANOPI's
+								inventory status. Only set with values exactly as defined by
+								CANOPI.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+				<xs:element ref="tns:p-interfaces" minOccurs="0" />
+				<xs:element ref="tns:lag-interfaces" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="pnfs">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of Physical Network Functions.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:pnf" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="physical-link">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of physical connections, typically between
+						p-interfaces",indexedProps="circuit-id,link-name",alternateKeys1="circuit-id",container="physical-links",namespace="network")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="link-name" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="e.g.,
+								hostnameA_p-connection_nameA_hostnameZ+p_connection-nameZ")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="speed-value" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Captures
+								the numeric part of the speed")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="speed-units" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Captures
+								the units corresponding to the speed")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="circuit-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Circuit
+								it")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="dual-mode" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Dual
+								access mode (e.g., primary, secondary")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="management-option" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="To
+								provide information on who manages this circuit. A&amp;AI or 3rd
+								party transport provider")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="service-provider-name" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name
+								of the service Provider on this link.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="physical-links">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of physical connections, typically between p-interfaces")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:physical-link" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vig-server">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="vig-server
+						contains information about a vig server used for
+						IPSec-configuration. Populated by SDN-C from
+						1607",indexedProps="vig-address-type",dependentOn="ipsec-configuration",container="vig-servers")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="vig-address-type" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="indicates
+								whether the VIG is for AVPN or INTERNET")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipaddress-v4-vig" type="xs:string"
+					minOccurs="0" maxOccurs="unbounded">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="v4
+								IP of the vig server")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipaddress-v6-vig" type="xs:string"
+					minOccurs="0" maxOccurs="unbounded">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="v6
+								IP of the vig server")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vig-servers">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:vig-server" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="ipsec-configuration">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="IPSec
+						configuration node will contain various configuration data for the
+						NMTE VNF. This node will have an edge to the generic-vnf (vnf type
+						= TE). Starting 1607, this data will be populated by
+						SDN-C",indexedProps="ipsec-configuration-id",uniqueProps="ipsec-configuration-id",container="ipsec-configurations",namespace="network")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="ipsec-configuration-id"
+					type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="UUID
+								of this configuration")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="requested-vig-address-type"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicate
+								the type of VIG server like AVPN, INTERNET, BOTH")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="requested-encryption-strength"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Encryption
+								values like 3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc,
+								aes-265-cbc")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="requested-dmz-type" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="openecomp
+								can offer a shared DMZ or a DMZ specific to a customer")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="shared-dmz-network-address"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Network
+								address of shared DMZ")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="requested-customer-name"
+					type="xs:string" minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="If
+								the DMZ is a custom DMZ, this field will indicate the customer
+								information")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ike-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="can
+								be 1 or 2")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ikev1-authentication" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Contains
+								values like md5, sha1, sha256, sha384")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ikev1-encryption" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Encyption
+								values like 3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc,
+								aes-265-cbc")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ikev1-dh-group" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Diffie-Hellman
+								group like DH-GROUP2, DH-GROUP5, DH-GROUP14")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ikev1-am-group-id" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Group
+								name defined in VIG for clients using aggressive mode")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ikev1-am-password" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="pre-shared
+								key for the above group name ")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ikev1-sa-lifetime" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Lifetime
+								for IKEv1 SA")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipsec-authentication" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="md5,
+								sha1, sha256, sha384")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipsec-encryption" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="3des-cbc,
+								des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipsec-sa-lifetime" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Life
+								time for IPSec SA")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ipsec-pfs" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="enable
+								PFS or not")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="xauth-userid" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="user
+								ID for xAuth, sm-user,ucpeHostName,nmteHostName")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="xauth-user-password" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Encrypted
+								using the Juniper $9$ algorithm")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="dpd-interval" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The
+								time between DPD probe")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="dpd-frequency" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Maximum
+								number of DPD before claiming the tunnel is down")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used
+								for optimistic concurrency. Must be empty on create, valid on
+								update and delete.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+				<xs:element ref="tns:vig-servers" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="ipsec-configurations">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:ipsec-configuration" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="route-table-reference">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Openstack
+						route table
+						reference.",nameProps="route-table-reference-fqdn",uniqueProps="route-table-reference-id",indexedProps="route-table-reference-id,route-table-reference-fqdn",container="route-table-references",namespace="network")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="route-table-reference-id"
+					type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Route
+								Table Reference id, UUID assigned to this instance.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="route-table-reference-fqdn"
+					type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="FQDN
+								entry in the route table.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Concurrency
+								value")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="route-table-references">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of openstack route table references")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:route-table-reference" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="instance-group">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="General
+						mechanism for grouping
+						instances",nameProps="description",uniqueProps="id",indexedProps="id,description,type,sub-type",container="instance-groups",namespace="network")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Instance
+								Group ID, UUID assigned to this instance.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="description" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Descriptive
+								text to help identify the usage of this instance-group")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="type" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Only
+								valid value today is lower case ha for high availability")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="sub-type" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Valid
+								values for ha type are [geo-activeactive, geo-activestandby,
+								local-activeactive, local-activestandby]")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="resource-version" type="xs:string"
+					minOccurs="0">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Concurrency
+								value")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="tns:relationship-list" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="instance-groups">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection
+						of openstack route table references")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:instance-group" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="network">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Namespace
+						for network inventory resources.")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:logical-links" minOccurs="0" />
+				<xs:element ref="tns:site-pair-sets" minOccurs="0" />
+				<xs:element ref="tns:vpn-bindings" minOccurs="0" />
+				<xs:element ref="tns:vpls-pes" minOccurs="0" />
+				<xs:element ref="tns:multicast-configurations"
+					minOccurs="0" />
+				<xs:element ref="tns:vces" minOccurs="0" />
+				<xs:element ref="tns:vpes" minOccurs="0" />
+				<xs:element ref="tns:vnfcs" minOccurs="0" />
+				<xs:element ref="tns:l3-networks" minOccurs="0" />
+				<xs:element ref="tns:network-policies" minOccurs="0" />
+				<xs:element ref="tns:generic-vnfs" minOccurs="0" />
+				<xs:element ref="tns:lag-links" minOccurs="0" />
+				<xs:element ref="tns:newvces" minOccurs="0" />
+				<xs:element ref="tns:pnfs" minOccurs="0" />
+				<xs:element ref="tns:physical-links" minOccurs="0" />
+				<xs:element ref="tns:ipsec-configurations" minOccurs="0" />
+				<xs:element ref="tns:route-table-references"
+					minOccurs="0" />
+				<xs:element ref="tns:instance-groups" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="reserved-prop-names">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Internal
+						map to define some reserved properties of a
+						vertex",uniqueProps="aai-unique-key",indexedProps="aai-unique-key,source-of-truth,aai-node-type")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="last-mod-source-of-truth"
+					type="xs:string" minOccurs="0" />
+				<xs:element name="aai-node-type" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="aai-created-ts" type="xs:unsignedInt"
+					minOccurs="0" />
+				<xs:element name="aai-unique-key" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="aai-last-mod-ts" type="xs:unsignedInt"
+					minOccurs="0" />
+				<xs:element name="source-of-truth" type="xs:string"
+					minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="edge-prop-names">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Internal
+						map to define the properties of an edge and interpret the map
+						EdgeRules",edgeInfo="edgeLabel,direction,multiplicityRule,isParent,usesResource,hasDelTarget,SVC-INFRA,SVC-INFRA-REV")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="edgeLabel" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="direction" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="multiplicityRule" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="isParent" type="xs:boolean"
+					minOccurs="0" />
+				<xs:element name="usesResource" type="xs:boolean"
+					minOccurs="0" />
+				<xs:element name="hasDelTarget" type="xs:boolean"
+					minOccurs="0" />
+				<xs:element name="SVC-INFRA" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="SVC-INFRA-REV" type="xs:string"
+					minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="aai-internal">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:reserved-prop-names" minOccurs="0"
+					maxOccurs="unbounded" />
+				<xs:element ref="tns:edge-prop-names" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="inventory">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:search" minOccurs="0" />
+				<xs:element ref="tns:actions" minOccurs="0" />
+				<xs:element ref="tns:cloud-infrastructure" minOccurs="0" />
+				<xs:element ref="tns:license-management" minOccurs="0" />
+				<xs:element ref="tns:business" minOccurs="0" />
+				<xs:element ref="tns:service-design-and-creation"
+					minOccurs="0" />
+				<xs:element ref="tns:network" minOccurs="0" />
+				<xs:element ref="tns:aai-internal" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="notification-event-header">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="id" type="xs:string" minOccurs="0" />
+				<xs:element name="timestamp" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="source-name" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="domain" type="xs:string" minOccurs="0" />
+				<xs:element name="sequence-number" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="severity" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="event-type" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="version" type="xs:string" minOccurs="0" />
+				<xs:element name="action" type="xs:string" minOccurs="0" />
+				<xs:element name="entity-type" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="top-entity-type" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="entity-link" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="status" type="xs:string" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="notification-event">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="cambria.partition" type="xs:string"
+					minOccurs="0" />
+				<xs:element ref="tns:notification-event-header"
+					minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="query-parameters">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="QueryParameters
+						for performing a named-query or model query")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:named-query" minOccurs="0" />
+				<xs:element ref="tns:model" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="instance-filter">
+		<xs:complexType>
+			<xs:sequence />
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="instance-filters">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="InstanceFilters
+						for performing a named-query or model query")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:instance-filter" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="model-and-named-query-search">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="ModelAndNamedQuerySearch
+						holds query-parameters and instance-properties for performing a
+						named-query or model query")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:query-parameters" minOccurs="0" />
+				<xs:element ref="tns:instance-filters" minOccurs="0" />
+				<xs:element name="top-node-type" type="xs:string"
+					minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="properties">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Property
+						holder for query properties or instance properties")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="property-name" type="xs:string"
+					minOccurs="0" />
+				<xs:element name="property-value" type="xs:string"
+					minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="extra-properties">
+		<xs:complexType>
+			<xs:sequence />
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="inventory-response-item">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Inventory
+						item for response list",container="inventory-response-items")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="model-name" type="xs:string"
+					minOccurs="0" />
+				<xs:element ref="tns:extra-properties" minOccurs="0" />
+				<xs:element ref="tns:inventory-response-items"
+					minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="inventory-response-items">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Container
+						for inventory items in response list",container="response-list")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:inventory-response-item"
+					minOccurs="0" maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="response-list">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Response
+						container for the results of a named-query or model query")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element ref="tns:inventory-response-items"
+					minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="extra-property">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="property-name" type="xs:string"
+					minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="vnf">
+		<xs:complexType>
+			<xs:annotation>
+				<xs:appinfo>
+					<annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Abstract
+						vnf
+						class",indexedProps="vnf-id",uniqueProps="vnf-id",inheritors="vce,vpe,generic-vnf",isAbstract="true")</annox:annotate>
+				</xs:appinfo>
+			</xs:annotation>
+			<xs:sequence>
+				<xs:element name="vnf-id" type="xs:string">
+					<xs:annotation>
+						<xs:appinfo>
+							<annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique
+								id of VNF. This is unique across the graph.")</annox:annotate>
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:element>
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
 </xs:schema>
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/pom.xml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/pom.xml
index 8732a25b06..6e8c4d11e3 100644
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/pom.xml
+++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/pom.xml
@@ -1,120 +1,121 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
 
-    <name>onap-sdc-artifact-generator-core</name>
-    <artifactId>onap-sdc-artifact-generator-core</artifactId>
+	<name>onap-sdc-artifact-generator-core</name>
+	<artifactId>onap-sdc-artifact-generator-core</artifactId>
 
-    <parent>
-        <artifactId>onap-common-lib</artifactId>
-        <groupId>org.onap.sdc.common</groupId>
-        <version>1.3.0-SNAPSHOT</version>
-        <relativePath>../../</relativePath>
-    </parent>
+	<parent>
+		<artifactId>onap-common-lib</artifactId>
+		<groupId>org.onap.sdc.common</groupId>
+		<version>1.3.0-SNAPSHOT</version>
+		<relativePath>../../</relativePath>
+	</parent>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.aspectj</groupId>
-            <artifactId>aspectjrt</artifactId>
-            <version>${aspectj.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>${slf4j.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <version>${logback.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-core</artifactId>
-            <version>${logback.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.dataformat</groupId>
-            <artifactId>jackson-dataformat-yaml</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
-            <version>${commons.codec.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.openecomp.sdc</groupId>
-            <artifactId>openecomp-sdc-logging-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.openecomp.sdc</groupId>
-            <artifactId>openecomp-sdc-logging-core</artifactId>
-            <version>${project.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.sdc.common</groupId>
-            <artifactId>onap-sdc-artifact-generator-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
-            <scope>test</scope>
-            <version>${testng.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>${commons.io.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.reflections</groupId>
-            <artifactId>reflections</artifactId>
-            <version>${org.reflections.version}</version>
-        </dependency>
-    </dependencies>
-    <build>
-        <pluginManagement>
-            <plugins>
+	<dependencies>
+		<dependency>
+			<groupId>org.aspectj</groupId>
+			<artifactId>aspectjrt</artifactId>
+			<version>${aspectj.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>${slf4j.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-classic</artifactId>
+			<version>${logback.version}</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-core</artifactId>
+			<version>${logback.version}</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+			<version>${jackson.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.dataformat</groupId>
+			<artifactId>jackson-dataformat-yaml</artifactId>
+			<version>${jackson.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-codec</groupId>
+			<artifactId>commons-codec</artifactId>
+			<version>${commons.codec.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.openecomp.sdc</groupId>
+			<artifactId>openecomp-sdc-logging-api</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.openecomp.sdc</groupId>
+			<artifactId>openecomp-sdc-logging-core</artifactId>
+			<version>${project.version}</version>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.onap.sdc.common</groupId>
+			<artifactId>onap-sdc-artifact-generator-api</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.testng</groupId>
+			<artifactId>testng</artifactId>
+			<scope>test</scope>
+			<version>${testng.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+			<version>${commons.io.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.reflections</groupId>
+			<artifactId>reflections</artifactId>
+			<version>${org.reflections.version}</version>
+		</dependency>
+	</dependencies>
+	<build>
+		<pluginManagement>
+			<plugins>
 
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>aspectj-maven-plugin</artifactId>
-                    <version>1.8</version>
-                    <!-- new configuration is here -->
-                    <configuration>
-                        <complianceLevel>1.8</complianceLevel>
-                        <source>1.8</source>
-                        <target>1.8</target>
-                    </configuration>
-                    <executions>
-                        <execution>
-                            <goals>
-                                <goal>compile</goal>
-                            </goals>
-                            <phase>test-compile</phase>
-                        </execution>
-                    </executions>
-                </plugin>
-            </plugins>
-        </pluginManagement>
+				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>aspectj-maven-plugin</artifactId>
+					<version>1.8</version>
+					<!-- new configuration is here -->
+					<configuration>
+						<complianceLevel>1.8</complianceLevel>
+						<source>1.8</source>
+						<target>1.8</target>
+					</configuration>
+					<executions>
+						<execution>
+							<goals>
+								<goal>compile</goal>
+							</goals>
+							<phase>test-compile</phase>
+						</execution>
+					</executions>
+				</plugin>
+			</plugins>
+		</pluginManagement>
 
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>aspectj-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
+		<plugins>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>aspectj-maven-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
 </project>
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/main/java/org/onap/sdc/generator/GeneratorManager.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/main/java/org/onap/sdc/generator/GeneratorManager.java
index e0049bd719..92314418f3 100644
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/main/java/org/onap/sdc/generator/GeneratorManager.java
+++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/main/java/org/onap/sdc/generator/GeneratorManager.java
@@ -20,8 +20,6 @@
 
 package org.onap.sdc.generator;
 
-import static org.onap.sdc.generator.util.ArtifactGeneratorUtil.logError;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.onap.sdc.generator.data.ArtifactType;
 import org.onap.sdc.generator.data.GeneratorConfiguration;
@@ -33,6 +31,8 @@ import org.openecomp.sdc.logging.api.Logger;
 import org.openecomp.sdc.logging.api.LoggerFactory;
 import org.reflections.Reflections;
 
+import static org.onap.sdc.generator.util.ArtifactGeneratorUtil.logError;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/main/java/org/onap/sdc/generator/MockArtifactGenerator.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/main/java/org/onap/sdc/generator/MockArtifactGenerator.java
index 9753c26a03..6babf721dc 100644
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/main/java/org/onap/sdc/generator/MockArtifactGenerator.java
+++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/main/java/org/onap/sdc/generator/MockArtifactGenerator.java
@@ -20,12 +20,8 @@
 
 package org.onap.sdc.generator;
 
-import org.onap.sdc.generator.data.GenerationData;
+import org.onap.sdc.generator.data.*;
 import org.onap.sdc.generator.intf.ArtifactGenerator;
-import org.onap.sdc.generator.data.Artifact;
-import org.onap.sdc.generator.data.ArtifactType;
-import org.onap.sdc.generator.data.GeneratorUtil;
-import org.onap.sdc.generator.data.GroupType;
 import org.onap.sdc.generator.intf.Generator;
 
 import java.util.Date;
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/main/java/org/onap/sdc/generator/aai/AaiArtifactGenerator.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/main/java/org/onap/sdc/generator/aai/AaiArtifactGenerator.java
index 995d0846be..1f8b537bec 100644
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/main/java/org/onap/sdc/generator/aai/AaiArtifactGenerator.java
+++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/main/java/org/onap/sdc/generator/aai/AaiArtifactGenerator.java
@@ -20,35 +20,18 @@
 
 package org.onap.sdc.generator.aai;
 
-import static org.onap.sdc.generator.util.ArtifactGeneratorUtil.logError;
-
-import org.onap.sdc.generator.aai.model.AllotedResource;
-import org.onap.sdc.generator.aai.model.ProvidingService;
-import org.onap.sdc.generator.aai.model.Resource;
-import org.onap.sdc.generator.aai.model.Service;
-import org.onap.sdc.generator.aai.model.Widget;
+import org.onap.sdc.generator.aai.model.*;
 import org.onap.sdc.generator.aai.tosca.GroupDefinition;
+import org.onap.sdc.generator.aai.tosca.NodeTemplate;
+import org.onap.sdc.generator.aai.tosca.ToscaTemplate;
 import org.onap.sdc.generator.aai.types.ModelType;
-import org.onap.sdc.generator.data.AdditionalParams;
-import org.onap.sdc.generator.data.ArtifactType;
-import org.onap.sdc.generator.data.GenerationData;
-import org.onap.sdc.generator.data.GeneratorConstants;
-import org.onap.sdc.generator.data.GroupType;
-import org.onap.sdc.generator.data.WidgetConfigurationUtil;
+import org.onap.sdc.generator.data.*;
 import org.onap.sdc.generator.intf.ArtifactGenerator;
 import org.onap.sdc.generator.intf.Generator;
+import org.onap.sdc.generator.logging.annotations.Audit;
 import org.onap.sdc.generator.util.ArtifactGeneratorUtil;
 import org.openecomp.sdc.logging.api.Logger;
 import org.openecomp.sdc.logging.api.LoggerFactory;
-import org.onap.sdc.generator.aai.model.L3NetworkWidget;
-import org.onap.sdc.generator.aai.model.Model;
-import org.onap.sdc.generator.aai.model.TunnelXconnectWidget;
-import org.onap.sdc.generator.aai.model.VfModule;
-import org.onap.sdc.generator.aai.tosca.NodeTemplate;
-import org.onap.sdc.generator.aai.tosca.ToscaTemplate;
-import org.onap.sdc.generator.data.Artifact;
-import org.onap.sdc.generator.data.GeneratorUtil;
-import org.onap.sdc.generator.logging.annotations.Audit;
 import org.slf4j.MDC;
 
 import java.io.File;
@@ -64,6 +47,8 @@ import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
 
+import static org.onap.sdc.generator.util.ArtifactGeneratorUtil.logError;
+
 @Generator(artifactType = ArtifactType.AAI)
 public class AaiArtifactGenerator implements ArtifactGenerator {
 
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/main/java/org/onap/sdc/generator/aai/AaiModelGeneratorImpl.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/main/java/org/onap/sdc/generator/aai/AaiModelGeneratorImpl.java
index 4a4f9f0923..fcb0deb66b 100644
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/main/java/org/onap/sdc/generator/aai/AaiModelGeneratorImpl.java
+++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/main/java/org/onap/sdc/generator/aai/AaiModelGeneratorImpl.java
@@ -20,28 +20,21 @@
 
 package org.onap.sdc.generator.aai;
 
-import org.openecomp.sdc.logging.api.Logger;
-import org.openecomp.sdc.logging.api.LoggerFactory;
 import org.onap.sdc.generator.aai.model.Resource;
 import org.onap.sdc.generator.aai.model.Service;
 import org.onap.sdc.generator.aai.model.Widget;
-import org.onap.sdc.generator.aai.xml.Model;
-import org.onap.sdc.generator.aai.xml.ModelElement;
-import org.onap.sdc.generator.aai.xml.ModelElements;
-import org.onap.sdc.generator.aai.xml.ModelVer;
-import org.onap.sdc.generator.aai.xml.ModelVers;
-import org.onap.sdc.generator.aai.xml.Relationship;
-import org.onap.sdc.generator.aai.xml.RelationshipData;
-import org.onap.sdc.generator.aai.xml.RelationshipList;
+import org.onap.sdc.generator.aai.xml.*;
 import org.onap.sdc.generator.logging.annotations.Metrics;
+import org.openecomp.sdc.logging.api.Logger;
+import org.openecomp.sdc.logging.api.LoggerFactory;
 import org.w3c.dom.DOMException;
 
-import java.io.StringWriter;
-import java.util.List;
-import java.util.Set;
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Marshaller;
+import java.io.StringWriter;
+import java.util.List;
+import java.util.Set;
 
 /**
  * Implementation of the {@link AaiModelGenerator} which generates the XML models from the
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/main/java/org/onap/sdc/generator/impl/ArtifactGenerationServiceImpl.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/main/java/org/onap/sdc/generator/impl/ArtifactGenerationServiceImpl.java
index 42975478fe..d6a934d58a 100644
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/main/java/org/onap/sdc/generator/impl/ArtifactGenerationServiceImpl.java
+++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/main/java/org/onap/sdc/generator/impl/ArtifactGenerationServiceImpl.java
@@ -20,23 +20,23 @@
 
 package org.onap.sdc.generator.impl;
 
-import static org.onap.sdc.generator.util.ArtifactGeneratorUtil.logError;
-
-import org.onap.sdc.generator.data.GeneratorConstants;
-import org.onap.sdc.generator.util.ArtifactGeneratorUtil;
-import org.openecomp.sdc.logging.api.Logger;
-import org.openecomp.sdc.logging.api.LoggerFactory;
 import org.onap.sdc.generator.GeneratorManager;
 import org.onap.sdc.generator.GeneratorTask;
 import org.onap.sdc.generator.data.Artifact;
 import org.onap.sdc.generator.data.GenerationData;
+import org.onap.sdc.generator.data.GeneratorConstants;
 import org.onap.sdc.generator.intf.ArtifactGenerator;
 import org.onap.sdc.generator.service.ArtifactGenerationService;
+import org.onap.sdc.generator.util.ArtifactGeneratorUtil;
+import org.openecomp.sdc.logging.api.Logger;
+import org.openecomp.sdc.logging.api.LoggerFactory;
 
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ForkJoinPool;
 
+import static org.onap.sdc.generator.util.ArtifactGeneratorUtil.logError;
+
 /**
  * Artifact Generation Service implementation class.
  */
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/main/java/org/onap/sdc/generator/util/ArtifactGeneratorUtil.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/main/java/org/onap/sdc/generator/util/ArtifactGeneratorUtil.java
index 8e6e2c0829..afb61f873b 100644
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/main/java/org/onap/sdc/generator/util/ArtifactGeneratorUtil.java
+++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/main/java/org/onap/sdc/generator/util/ArtifactGeneratorUtil.java
@@ -20,70 +20,12 @@
 
 package org.onap.sdc.generator.util;
 
-import static org.onap.sdc.generator.data.GeneratorConstants.BEGIN_TIMESTAMP;
-import static org.onap.sdc.generator.data.GeneratorConstants.BE_FQDN;
-import static org.onap.sdc.generator.data.GeneratorConstants.CATEGORY_LOG_LEVEL;
-import static org.onap.sdc.generator.data.GeneratorConstants.CLIENT_IP;
-import static org.onap.sdc.generator.data.GeneratorConstants.ELAPSED_TIME;
-import static org.onap.sdc.generator.data.GeneratorConstants.END_TIMESTAMP;
-import static org.onap.sdc.generator.data.GeneratorConstants.ERROR_CATEGORY;
-import static org.onap.sdc.generator.data.GeneratorConstants.ERROR_CODE;
-import static org.onap.sdc.generator.data.GeneratorConstants.ERROR_DESCRIPTION;
-import static org.onap.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_CONFIGFILE_NOT_FOUND;
-import static org.onap.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_CONFIGLOCATION_NOT_FOUND;
-import static org.onap.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_CONFIGLPROP_NOT_FOUND;
-import static org.onap.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_PROVIDING_SERVICE_METADATA_MISSING;
-import static org.onap.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_PROVIDING_SERVICE_MISSING;
-import static org.onap.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_ERROR_INVALID_ID;
-import static org.onap.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_ERROR_INVALID_RESOURCE_VERSION_IN_SERVICE_TOSCA;
-import static org.onap.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_ERROR_INVALID_TOSCA_MSG;
-import static org.onap.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_ERROR_MANDATORY_METADATA_DEFINITION_MSG;
-import static org.onap.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_ERROR_MISSING_RESOURCE_TOSCA;
-import static org.onap.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_ERROR_MISSING_SERVICE_TOSCA_MSG;
-import static org.onap.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_ERROR_MISSING_SERVICE_VERSION;
-import static org.onap.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_ERROR_NULL_RESOURCE_VERSION_IN_SERVICE_TOSCA;
-import static org.onap.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_INVALID_SERVICE_VERSION;
-import static org.onap.sdc.generator.data.GeneratorConstants.GENERATOR_ERROR_ARTIFACT_GENERATION_FAILED_MSG;
-import static org.onap.sdc.generator.data.GeneratorConstants.GENERATOR_ERROR_INVALID_CLIENT_CONFIGURATION_MSG;
-import static org.onap.sdc.generator.data.GeneratorConstants.GENERATOR_PARTNER_NAME;
-import static org.onap.sdc.generator.data.GeneratorConstants.INSTANCE_UUID;
-import static org.onap.sdc.generator.data.GeneratorConstants.LOCAL_ADDR;
-import static org.onap.sdc.generator.data.GeneratorConstants.MDC_SDC_INSTANCE_UUID;
-import static org.onap.sdc.generator.data.GeneratorConstants.PARTNER_NAME;
-import static org.onap.sdc.generator.data.GeneratorConstants.REMOTE_HOST;
-import static org.onap.sdc.generator.data.GeneratorConstants.REQUEST_ID;
-import static org.onap.sdc.generator.data.GeneratorConstants.RESPONSE_CODE;
-import static org.onap.sdc.generator.data.GeneratorConstants.RESPONSE_DESCRIPTION;
-import static org.onap.sdc.generator.data.GeneratorConstants.SERVICE_INSTANCE_ID;
-import static org.onap.sdc.generator.data.GeneratorConstants.SERVICE_METRIC_BEGIN_TIMESTAMP;
-import static org.onap.sdc.generator.data.GeneratorConstants.SERVICE_NAME;
-import static org.onap.sdc.generator.data.GeneratorConstants.STATUS_CODE;
-import static org.onap.sdc.generator.data.GeneratorConstants.TARGET_ENTITY;
-import static org.onap.sdc.generator.data.GeneratorConstants.TARGET_SERVICE_NAME;
-import static org.onap.sdc.generator.logging.ArtifactGeneratorLogResponseCode.INTERNAL_SERVER_ERROR;
-import static org.onap.sdc.generator.logging.ArtifactGeneratorLogResponseCode.INVALID_CLIENT_CONFIGURATION;
-import static org.onap.sdc.generator.logging.ArtifactGeneratorLogResponseCode.INVALID_ID_VALUE;
-import static org.onap.sdc.generator.logging.ArtifactGeneratorLogResponseCode.INVALID_RESOURCE_VERSION;
-import static org.onap.sdc.generator.logging.ArtifactGeneratorLogResponseCode.INVALID_SERVICE_VERSION;
-import static org.onap.sdc.generator.logging.ArtifactGeneratorLogResponseCode.INVALID_TOSCA_YAML;
-import static org.onap.sdc.generator.logging.ArtifactGeneratorLogResponseCode.MANDATORY_ATTRIBUTE_MISSING;
-import static org.onap.sdc.generator.logging.ArtifactGeneratorLogResponseCode.MISSING_CONFIG_PROPERTIES_FILE;
-import static org.onap.sdc.generator.logging.ArtifactGeneratorLogResponseCode.MISSING_PRO_SERVICE;
-import static org.onap.sdc.generator.logging.ArtifactGeneratorLogResponseCode.MISSING_PRO_SERVICE_METADATA;
-import static org.onap.sdc.generator.logging.ArtifactGeneratorLogResponseCode.MISSING_RESOURCE_VERSION;
-import static org.onap.sdc.generator.logging.ArtifactGeneratorLogResponseCode.MISSING_SERVICE_VERSION;
-import static org.onap.sdc.generator.logging.ArtifactGeneratorLogResponseCode.MISSING_SYSTME_PROPERY_CONFIGURATION;
-import static org.onap.sdc.generator.logging.ArtifactGeneratorLogResponseCode.MISSING_WIDGET_CONFIGURATION;
-import static org.onap.sdc.generator.logging.ArtifactGeneratorLogResponseCode.RESOURCE_TOSCA_MISSING;
-import static org.onap.sdc.generator.logging.ArtifactGeneratorLogResponseCode.SERVICE_TOSCA_MISSING;
-import static org.onap.sdc.generator.logging.ArtifactGeneratorLogResponseCode.UNABLE_TO_GENERATE_ARTIFACT;
-
-import org.openecomp.sdc.logging.api.Logger;
-import org.openecomp.sdc.logging.api.LoggerFactory;
 import org.onap.sdc.generator.data.Artifact;
 import org.onap.sdc.generator.logging.ArtifactGeneratorLogResponseCode;
 import org.onap.sdc.generator.logging.CategoryLogLevel;
 import org.onap.sdc.generator.logging.StatusCode;
+import org.openecomp.sdc.logging.api.Logger;
+import org.openecomp.sdc.logging.api.LoggerFactory;
 import org.slf4j.MDC;
 
 import java.io.PrintWriter;
@@ -95,6 +37,9 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.TimeZone;
 
+import static org.onap.sdc.generator.data.GeneratorConstants.*;
+import static org.onap.sdc.generator.logging.ArtifactGeneratorLogResponseCode.*;
+
 
 public class ArtifactGeneratorUtil {
 
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/java/org/onap/sdc/generator/ArtifactGenerationServiceTest.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/java/org/onap/sdc/generator/ArtifactGenerationServiceTest.java
index e6f1abd796..2599d550ef 100644
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/java/org/onap/sdc/generator/ArtifactGenerationServiceTest.java
+++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/java/org/onap/sdc/generator/ArtifactGenerationServiceTest.java
@@ -52,6 +52,7 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+
 import java.net.URL;
 import java.util.*;
 import javax.xml.bind.JAXBContext;
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/logback.xml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/logback.xml
index 68438967b1..dc427cdf3f 100644
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/logback.xml
+++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/test/resources/logback.xml
@@ -1,51 +1,59 @@
 <configuration scan="true" scanPeriod="3 seconds">
 
-    <property name="logDir" value="logs"/>
-    <property name="componentName" value="COMMON"/>
-    <property name="OPENECOMP-subcomponent-name" value="ARTIFACT_GENERATOR"/>
-
-    <property name="defaultPattern"
-              value="%msg%n"/>
-
-    <!--<property name="MetricsLogPattern" value="%X{BeginTimestamp}|%X{EndTimestamp}|%X{RequestId}|%X{ServiceInstanceId}|%thread|%X{ServerName}|%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDescription}|%X{InstanceUUID}|%X{CategoryLogLevel}|%X{Severity}|%X{ServerIPAddress}|%X{ElapsedTime}|%X{ServerFQDN}|%X{ClientIP}|%logger%n" />
-    <property name="AuditLogPattern" value="%X{BeginTimestamp}|%X{EndTimestamp}|%X{RequestId}|%X{ServiceInstanceId}|%thread|%X{ServerName}|%X{ServiceName}|%X{PartnerName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDescription}|%X{InstanceUUID}|%X{CategoryLogLevel}|%X{Severity}|%X{ServerIPAddress}|%X{ElapsedTime}|%X{ServerFQDN}|%X{ClientIP}%n" />
-    <property name="ErrorLogPattern" value="%d{yyyy-MM-dd'T'HH:mm:ss.SSS, GMT}|%X{RequestId}|%thread|%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%X{ErrorCategory}|%X{ErrorCode}|%X{ErrorDescription}|%msg%n"/>
-    <property name="DebugLogPattern" value="%d{yyyy-MM-dd'T'HH:mm:ss.SSS, GMT}|%X{RequestId}||%logger|%msg%n"/>-->
-
-    <!-- new pattern -->
-    <property name="default-log-pattern"
-              value="%d{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%X{BeginTimestamp}|%X{EndTimestamp}|%X{uuid}|%X{serviceInstanceID}|%thread|%X{ServerName}|%X{ServiceName}|${OPENECOMP-subcomponent-name}|%X{userId}|%X{TargetEntity}|%X{TargetServiceName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDescription}|%X{InstanceUUID}|%X{ErrorCategory}|%X{ErrorCode}|%X{ErrorDescription}|%X{level}|%X{alarmSeverity}|%X{localAddr}|%X{ElapsedTime}|%X{beFqdn}|%X{remoteAddr}|%logger{35}|%X{timer}|ActivityType=&lt;%M&gt;, Desc=&lt;%msg&gt;%n"/>
-
-    <property name="logDirectory" value="${logDir}/${componentName}"/>
-
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>${defaultPattern}</pattern>
-        </encoder>
-    </appender>
-
-    <appender name="DISPATCHER" class="ch.qos.logback.classic.sift.SiftingAppender">
-        <discriminator class="org.openecomp.core.logging.logback.EventTypeDiscriminator"/>
-        <sift>
-            <appender name="${eventType}" class="ch.qos.logback.core.rolling.RollingFileAppender">
-                <file>${logDirectory}/${eventType}.log</file>
-                <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-                    <fileNamePattern>${logDirectory}/${eventType}.%i.log.zip</fileNamePattern>
-                    <minIndex>1</minIndex>
-                    <maxIndex>9</maxIndex>
-                </rollingPolicy>
-                <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-                    <maxFileSize>5MB</maxFileSize>
-                </triggeringPolicy>
-                <encoder>
-                    <pattern>${default-log-pattern}</pattern>
-                </encoder>
-            </appender>
-        </sift>
-    </appender>
-
-    <root level="DEBUG">
-        <appender-ref ref="DISPATCHER"/>
-    </root>
+	<property name="logDir" value="logs" />
+	<property name="componentName" value="COMMON" />
+	<property name="OPENECOMP-subcomponent-name"
+		value="ARTIFACT_GENERATOR" />
+
+	<property name="defaultPattern" value="%msg%n" />
+
+	<!--<property name="MetricsLogPattern" value="%X{BeginTimestamp}|%X{EndTimestamp}|%X{RequestId}|%X{ServiceInstanceId}|%thread|%X{ServerName}|%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDescription}|%X{InstanceUUID}|%X{CategoryLogLevel}|%X{Severity}|%X{ServerIPAddress}|%X{ElapsedTime}|%X{ServerFQDN}|%X{ClientIP}|%logger%n" 
+		/> <property name="AuditLogPattern" value="%X{BeginTimestamp}|%X{EndTimestamp}|%X{RequestId}|%X{ServiceInstanceId}|%thread|%X{ServerName}|%X{ServiceName}|%X{PartnerName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDescription}|%X{InstanceUUID}|%X{CategoryLogLevel}|%X{Severity}|%X{ServerIPAddress}|%X{ElapsedTime}|%X{ServerFQDN}|%X{ClientIP}%n" 
+		/> <property name="ErrorLogPattern" value="%d{yyyy-MM-dd'T'HH:mm:ss.SSS, 
+		GMT}|%X{RequestId}|%thread|%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%X{ErrorCategory}|%X{ErrorCode}|%X{ErrorDescription}|%msg%n"/> 
+		<property name="DebugLogPattern" value="%d{yyyy-MM-dd'T'HH:mm:ss.SSS, GMT}|%X{RequestId}||%logger|%msg%n"/> -->
+
+	<!-- new pattern -->
+	<property name="default-log-pattern"
+		value="%d{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%X{BeginTimestamp}|%X{EndTimestamp}|%X{uuid}|%X{serviceInstanceID}|%thread|%X{ServerName}|%X{ServiceName}|${OPENECOMP-subcomponent-name}|%X{userId}|%X{TargetEntity}|%X{TargetServiceName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDescription}|%X{InstanceUUID}|%X{ErrorCategory}|%X{ErrorCode}|%X{ErrorDescription}|%X{level}|%X{alarmSeverity}|%X{localAddr}|%X{ElapsedTime}|%X{beFqdn}|%X{remoteAddr}|%logger{35}|%X{timer}|ActivityType=&lt;%M&gt;, Desc=&lt;%msg&gt;%n" />
+
+	<property name="logDirectory"
+		value="${logDir}/${componentName}" />
+
+	<appender name="STDOUT"
+		class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<pattern>${defaultPattern}</pattern>
+		</encoder>
+	</appender>
+
+	<appender name="DISPATCHER"
+		class="ch.qos.logback.classic.sift.SiftingAppender">
+		<discriminator
+			class="org.openecomp.core.logging.logback.EventTypeDiscriminator" />
+		<sift>
+			<appender name="${eventType}"
+				class="ch.qos.logback.core.rolling.RollingFileAppender">
+				<file>${logDirectory}/${eventType}.log</file>
+				<rollingPolicy
+					class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
+					<fileNamePattern>${logDirectory}/${eventType}.%i.log.zip</fileNamePattern>
+					<minIndex>1</minIndex>
+					<maxIndex>9</maxIndex>
+				</rollingPolicy>
+				<triggeringPolicy
+					class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+					<maxFileSize>5MB</maxFileSize>
+				</triggeringPolicy>
+				<encoder>
+					<pattern>${default-log-pattern}</pattern>
+				</encoder>
+			</appender>
+		</sift>
+	</appender>
+
+	<root level="DEBUG">
+		<appender-ref ref="DISPATCHER" />
+	</root>
 
 </configuration>
\ No newline at end of file
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/pom.xml b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/pom.xml
index e3818934f4..1b33108237 100644
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/pom.xml
+++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/pom.xml
@@ -1,61 +1,61 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
 
-    <artifactId>onap-sdc-artifact-generator-test</artifactId>
+	<artifactId>onap-sdc-artifact-generator-test</artifactId>
 
-    <parent>
-        <artifactId>onap-common-lib</artifactId>
-        <groupId>org.onap.sdc.common</groupId>
-        <version>1.3.0-SNAPSHOT</version>
-        <relativePath>../../</relativePath>
-    </parent>
+	<parent>
+		<artifactId>onap-common-lib</artifactId>
+		<groupId>org.onap.sdc.common</groupId>
+		<version>1.3.0-SNAPSHOT</version>
+		<relativePath>../../</relativePath>
+	</parent>
 
-    <build>
-        <plugins>
-            <!-- any other plugins -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>${mvn.shade.version}</version>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <artifactSet>
-                                <excludes>
-                                    <exclude>com.google.guava:*</exclude>
-                                </excludes>
-                            </artifactSet>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
+	<build>
+		<plugins>
+			<!-- any other plugins -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-shade-plugin</artifactId>
+				<version>${mvn.shade.version}</version>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<goals>
+							<goal>shade</goal>
+						</goals>
+						<configuration>
+							<artifactSet>
+								<excludes>
+									<exclude>com.google.guava:*</exclude>
+								</excludes>
+							</artifactSet>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
 
 
-    <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>${junit.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.sdc.common</groupId>
-            <artifactId>onap-sdc-artifact-generator-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.sdc.common</groupId>
-            <artifactId>onap-sdc-artifact-generator-core</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
+	<dependencies>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>${junit.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.onap.sdc.common</groupId>
+			<artifactId>onap-sdc-artifact-generator-api</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.onap.sdc.common</groupId>
+			<artifactId>onap-sdc-artifact-generator-core</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+	</dependencies>
 
 </project>
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/java/org/onap/sdc/generator/ArtifactGenerationServiceTest.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/java/org/onap/sdc/generator/ArtifactGenerationServiceTest.java
index c8a915df4e..426308c540 100644
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/java/org/onap/sdc/generator/ArtifactGenerationServiceTest.java
+++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-test/src/main/java/org/onap/sdc/generator/ArtifactGenerationServiceTest.java
@@ -20,6 +20,7 @@
 
 package org.onap.sdc.generator;
 
+import org.junit.Assert;
 import org.onap.sdc.generator.aai.model.*;
 import org.onap.sdc.generator.aai.model.Service;
 import org.onap.sdc.generator.aai.tosca.GroupDefinition;
diff --git a/common/onap-sdc-artifact-generator-lib/pom.xml b/common/onap-sdc-artifact-generator-lib/pom.xml
index fbe9e9ac7f..380b0c55dd 100644
--- a/common/onap-sdc-artifact-generator-lib/pom.xml
+++ b/common/onap-sdc-artifact-generator-lib/pom.xml
@@ -1,24 +1,25 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
 
-    <name>onap-sdc-artifact-generator-lib</name>
-    <groupId>org.onap.sdc.common</groupId>
-    <artifactId>onap-sdc-artifact-generator-lib</artifactId>
-    <packaging>pom</packaging>
+	<name>onap-sdc-artifact-generator-lib</name>
+	<groupId>org.onap.sdc.common</groupId>
+	<artifactId>onap-sdc-artifact-generator-lib</artifactId>
+	<packaging>pom</packaging>
 
-    <parent>
-        <groupId>org.onap.sdc.common</groupId>
-        <artifactId>onap-common-lib</artifactId>
-        <version>1.3.0-SNAPSHOT</version>
-        <relativePath>..</relativePath>
-    </parent>
+	<parent>
+		<groupId>org.onap.sdc.common</groupId>
+		<artifactId>onap-common-lib</artifactId>
+		<version>1.3.0-SNAPSHOT</version>
+		<relativePath>..</relativePath>
+	</parent>
 
 
-    <modules>
-        <module>onap-sdc-artifact-generator-api</module>
-        <module>onap-sdc-artifact-generator-core</module>
-        <module>onap-sdc-artifact-generator-test</module>
-    </modules>
+	<modules>
+		<module>onap-sdc-artifact-generator-api</module>
+		<module>onap-sdc-artifact-generator-core</module>
+		<module>onap-sdc-artifact-generator-test</module>
+	</modules>
 
 </project>
diff --git a/common/onap-tosca-datatype/pom.xml b/common/onap-tosca-datatype/pom.xml
index c52013daaa..73b77bb722 100644
--- a/common/onap-tosca-datatype/pom.xml
+++ b/common/onap-tosca-datatype/pom.xml
@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.onap.sdc.common</groupId>
-    <artifactId>onap-tosca-datatype</artifactId>
+	<groupId>org.onap.sdc.common</groupId>
+	<artifactId>onap-tosca-datatype</artifactId>
 
-    <parent>
-        <artifactId>onap-common-lib</artifactId>
-        <groupId>org.onap.sdc.common</groupId>
-        <version>1.3.0-SNAPSHOT</version>
-        <relativePath>..</relativePath>
-    </parent>
+	<parent>
+		<artifactId>onap-common-lib</artifactId>
+		<groupId>org.onap.sdc.common</groupId>
+		<version>1.3.0-SNAPSHOT</version>
+		<relativePath>..</relativePath>
+	</parent>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.yaml</groupId>
-            <artifactId>snakeyaml</artifactId>
-            <version>1.17</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-collections4</artifactId>
-            <version>${commons.collections.version}</version>
-        </dependency>
-    </dependencies>
+	<dependencies>
+		<dependency>
+			<groupId>org.yaml</groupId>
+			<artifactId>snakeyaml</artifactId>
+			<version>1.17</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-collections4</artifactId>
+			<version>${commons.collections.version}</version>
+		</dependency>
+	</dependencies>
 </project>
diff --git a/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/PropertyType.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/PropertyType.java
index cc861d2c54..aaaae31f4e 100644
--- a/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/PropertyType.java
+++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/PropertyType.java
@@ -15,12 +15,7 @@
  */
 
 package org.onap.sdc.tosca.datatypes.model;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 public enum PropertyType {
 
diff --git a/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/heatextend/AnnotationType.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/heatextend/AnnotationType.java
index f2d124ac18..e4a6c5a977 100644
--- a/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/heatextend/AnnotationType.java
+++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/heatextend/AnnotationType.java
@@ -16,9 +16,9 @@
 
     package org.onap.sdc.tosca.datatypes.model.heatextend;
 
-    import org.onap.sdc.tosca.datatypes.model.PropertyDefinition;
+import org.onap.sdc.tosca.datatypes.model.PropertyDefinition;
 
-    import java.util.Map;
+import java.util.Map;
 
     public class AnnotationType {
 
diff --git a/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/heatextend/ParameterDefinitionExt.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/heatextend/ParameterDefinitionExt.java
index dccb200148..ae3cc35986 100644
--- a/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/heatextend/ParameterDefinitionExt.java
+++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/datatypes/model/heatextend/ParameterDefinitionExt.java
@@ -17,6 +17,7 @@
 package org.onap.sdc.tosca.datatypes.model.heatextend;
 
 import org.onap.sdc.tosca.datatypes.model.ParameterDefinition;
+
 import java.util.Map;
 
 public class ParameterDefinitionExt extends ParameterDefinition {
diff --git a/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/services/YamlUtil.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/services/YamlUtil.java
index 4030d3acd1..cd19ff9ec0 100644
--- a/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/services/YamlUtil.java
+++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/services/YamlUtil.java
@@ -32,11 +32,7 @@ import org.yaml.snakeyaml.representer.Representer;
 import java.beans.IntrospectionException;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.AbstractMap;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 /**
  * The type Yaml util.
diff --git a/common/pom.xml b/common/pom.xml
index f1f1a7394c..bac8f3a83e 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -1,391 +1,384 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.onap.sdc.common</groupId>
-    <name>onap-common-lib</name>
-    <artifactId>onap-common-lib</artifactId>
-    <packaging>pom</packaging>
+	<groupId>org.onap.sdc.common</groupId>
+	<name>onap-common-lib</name>
+	<artifactId>onap-common-lib</artifactId>
+	<packaging>pom</packaging>
 
-    <parent>
-        <groupId>org.openecomp.sdc</groupId>
-        <artifactId>sdc-onboarding</artifactId>
-        <version>1.3.0-SNAPSHOT</version>
-        <relativePath>../onboarding</relativePath>
-    </parent>
+	<parent>
+		<groupId>org.openecomp.sdc</groupId>
+		<artifactId>sdc-onboarding</artifactId>
+		<version>1.3.0-SNAPSHOT</version>
+		<relativePath>../onboarding</relativePath>
+	</parent>
 
-    <properties>
-        <aspectj.version>1.8.7</aspectj.version>
-    </properties>
+	<properties>
+		<aspectj.version>1.8.7</aspectj.version>
+	</properties>
 
-    <modules>
-        <module>onap-sdc-artifact-generator-lib</module>
-        <module>onap-common-configuration-management</module>
-        <module>onap-tosca-datatype</module>
-    </modules>
+	<modules>
+		<module>onap-sdc-artifact-generator-lib</module>
+		<module>onap-common-configuration-management</module>
+		<module>onap-tosca-datatype</module>
+	</modules>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>${slf4j-api.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <version>${logback.version}</version>
-        </dependency>
+	<dependencies>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>${slf4j-api.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-classic</artifactId>
+			<version>${logback.version}</version>
+		</dependency>
 
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-core</artifactId>
-            <version>${logback.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.dataformat</groupId>
-            <artifactId>jackson-dataformat-yaml</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
-            <version>${commons.codec.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.datastax.cassandra</groupId>
-            <artifactId>cassandra-driver-core</artifactId>
-            <version>${datastax.cassandra.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.datastax.cassandra</groupId>
-            <artifactId>cassandra-driver-mapping</artifactId>
-            <version>${datastax.cassandra.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>javax.ws.rs</groupId>
-            <artifactId>javax.ws.rs-api</artifactId>
-            <version>${ws.rs.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.google.code.gson</groupId>
-            <artifactId>gson</artifactId>
-            <version>${gson.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
-            <version>${testng.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>${junit.version}</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
+		<dependency>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-core</artifactId>
+			<version>${logback.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+			<version>${jackson.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.dataformat</groupId>
+			<artifactId>jackson-dataformat-yaml</artifactId>
+			<version>${jackson.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-codec</groupId>
+			<artifactId>commons-codec</artifactId>
+			<version>${commons.codec.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.datastax.cassandra</groupId>
+			<artifactId>cassandra-driver-core</artifactId>
+			<version>${datastax.cassandra.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.datastax.cassandra</groupId>
+			<artifactId>cassandra-driver-mapping</artifactId>
+			<version>${datastax.cassandra.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>javax.ws.rs</groupId>
+			<artifactId>javax.ws.rs-api</artifactId>
+			<version>${ws.rs.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.google.code.gson</groupId>
+			<artifactId>gson</artifactId>
+			<version>${gson.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.testng</groupId>
+			<artifactId>testng</artifactId>
+			<version>${testng.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>${junit.version}</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-api</artifactId>
-                <version>${slf4j.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.aspectj</groupId>
-                <artifactId>aspectjrt</artifactId>
-                <version>${aspectj.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>javax.servlet</groupId>
-                <artifactId>javax.servlet-api</artifactId>
-                <version>${servlet-api.version}</version>
-                <scope>provided</scope>
-            </dependency>
-            <!-- https://mvnrepository.com/artifact/commons-beanutils/commons-beanutils -->
-            <dependency>
-                <groupId>commons-beanutils</groupId>
-                <artifactId>commons-beanutils</artifactId>
-                <version>${commons.beanutils.version}</version>
-            </dependency>
-            <!-- https://mvnrepository.com/artifact/com.beust/jcommander -->
-            <dependency>
-                <groupId>com.beust</groupId>
-                <artifactId>jcommander</artifactId>
-                <version>${jcommander.version}</version>
-            </dependency>
-            <!-- https://mvnrepository.com/artifact/commons-digester/commons-digester -->
-            <dependency>
-                <groupId>commons-digester</groupId>
-                <artifactId>commons-digester</artifactId>
-                <version>${commons.digester.version}</version>
-            </dependency>
-            <!-- https://mvnrepository.com/artifact/org.beanshell/bsh -->
-            <dependency>
-                <groupId>org.beanshell</groupId>
-                <artifactId>bsh</artifactId>
-                <version>${bsh.version}</version>
-            </dependency>
-            <!-- https://mvnrepository.com/artifact/com.google.code.findbugs/annotations -->
-            <dependency>
-                <groupId>com.google.code.findbugs</groupId>
-                <artifactId>annotations</artifactId>
-                <version>3.0.1u2</version>
-            </dependency>
-            <!-- https://mvnrepository.com/artifact/cglib/cglib-nodep -->
-            <dependency>
-                <groupId>cglib</groupId>
-                <artifactId>cglib-nodep</artifactId>
-                <version>${cglib.nodep.version}</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.slf4j</groupId>
+				<artifactId>slf4j-api</artifactId>
+				<version>${slf4j.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.aspectj</groupId>
+				<artifactId>aspectjrt</artifactId>
+				<version>${aspectj.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>javax.servlet</groupId>
+				<artifactId>javax.servlet-api</artifactId>
+				<version>${servlet-api.version}</version>
+				<scope>provided</scope>
+			</dependency>
+			<!-- https://mvnrepository.com/artifact/commons-beanutils/commons-beanutils -->
+			<dependency>
+				<groupId>commons-beanutils</groupId>
+				<artifactId>commons-beanutils</artifactId>
+				<version>${commons.beanutils.version}</version>
+			</dependency>
+			<!-- https://mvnrepository.com/artifact/com.beust/jcommander -->
+			<dependency>
+				<groupId>com.beust</groupId>
+				<artifactId>jcommander</artifactId>
+				<version>${jcommander.version}</version>
+			</dependency>
+			<!-- https://mvnrepository.com/artifact/commons-digester/commons-digester -->
+			<dependency>
+				<groupId>commons-digester</groupId>
+				<artifactId>commons-digester</artifactId>
+				<version>${commons.digester.version}</version>
+			</dependency>
+			<!-- https://mvnrepository.com/artifact/org.beanshell/bsh -->
+			<dependency>
+				<groupId>org.beanshell</groupId>
+				<artifactId>bsh</artifactId>
+				<version>${bsh.version}</version>
+			</dependency>
+			<!-- https://mvnrepository.com/artifact/com.google.code.findbugs/annotations -->
+			<dependency>
+				<groupId>com.google.code.findbugs</groupId>
+				<artifactId>annotations</artifactId>
+				<version>3.0.1u2</version>
+			</dependency>
+			<!-- https://mvnrepository.com/artifact/cglib/cglib-nodep -->
+			<dependency>
+				<groupId>cglib</groupId>
+				<artifactId>cglib-nodep</artifactId>
+				<version>${cglib.nodep.version}</version>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
 
-    <build>
-        <plugins>
+	<build>
+		<plugins>
 
-            <!-- ================================================== -->
-            <!-- Set the JDK compiler version.                      -->
-            <!-- ================================================== -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>${mvn.compiler.version}</version>
-                <inherited>true</inherited>
-                <executions>
-                    <execution>
-                        <id>default-compile</id>
-                        <configuration>
-                            <skipMain>${skipMainSourceCompile}</skipMain>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>default-testCompile</id>
-                        <configuration>
-                            <skip>${skipTestSourceCompile}</skip>
-                        </configuration>
-                    </execution>
-                </executions>
-                <configuration>
-                    <source>${java.source}</source>
-                    <target>${java.target}</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.openecomp.sdc.onboarding</groupId>
-                <artifactId>artifact-copy-plugin</artifactId>
-                <version>${project.version}</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>init-artifact-helper</goal>
-                            <goal>calibrate-artifact-helper</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <groupId>org.openecomp.sdc</groupId>
-                    <artifactId>build-data-installer</artifactId>
-                    <version>${project.version}</version>
-                    <artifactHelper>
-                        <project>${project}</project>
-                        <session>${session}</session>
-                        <unicornRoot>org.openecomp.sdc:sdc-onboarding/target/build-data</unicornRoot>
-                    </artifactHelper>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.openecomp.sdc.onboarding</groupId>
-                <artifactId>compile-helper-plugin</artifactId>
-                <version>${project.version}</version>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.openecomp.sdc.onboarding</groupId>
-                        <artifactId>pmd-helper-plugin</artifactId>
-                        <version>${project.version}</version>
-                    </dependency>
-                </dependencies>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>init-helper</goal>
-                            <goal>pre-compile-helper</goal>
-                            <goal>post-compile-helper</goal>
-                            <goal>pre-test-compile-helper</goal>
-                            <goal>post-test-run-helper</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <excludePackaging>pom</excludePackaging>
-                    <excludeDependencies>test,runtime</excludeDependencies>
-                    <generatedSourceLocation>${project.build.directory}/generated-sources</generatedSourceLocation>
-                    <buildState>
-                        <project>${project}</project>
-                        <compileStateFilePath>org.openecomp.sdc:sdc-onboarding/target/build-data/compileState.dat</compileStateFilePath>
-                    </buildState>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-pmd-plugin</artifactId>
-                <version>${maven.pmd.plugin.version}</version>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.openecomp.sdc</groupId>
-                        <artifactId>build-tools</artifactId>
-                        <version>${build.tools.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>net.sourceforge.pmd</groupId>
-                        <artifactId>pmd-core</artifactId>
-                        <version>${pmd.core.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>net.sourceforge.pmd</groupId>
-                        <artifactId>pmd-java</artifactId>
-                        <version>${pmd.java.version}</version>
-                    </dependency>
-                </dependencies>
-                <configuration>
-                    <skip>${skipPMD}</skip>
-                    <showPmdLog>false</showPmdLog>
-                    <analysisCache>false</analysisCache>
-                    <analysisCacheLocation>${project.build.directory}/pmd/pmd.cache</analysisCacheLocation>
-                    <failOnViolation>false</failOnViolation>
-                    <printFailingErrors>false</printFailingErrors>
-                    <format>csv</format>
-                    <targetDirectory>${project.build.directory}/pmd</targetDirectory>
-                    <includeTests>true</includeTests>
-                    <linkXRef>false</linkXRef>
-                    <aggregate>false</aggregate>
-                    <rulesets>
-                        <ruleset>/category/java/bestpractices.xml</ruleset>
-                        <ruleset>/category/java/codestyle.xml</ruleset>
-                        <ruleset>/category/java/design.xml</ruleset>
-                        <ruleset>/category/java/errorprone.xml</ruleset>
-                        <ruleset>/category/java/multithreading.xml</ruleset>
-                        <ruleset>/category/java/performance.xml</ruleset>
-                        <ruleset>/category/java/security.xml</ruleset>
-                    </rulesets>
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>check</goal>
-                        </goals>
-                        <phase>integration-test</phase>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.openecomp.sdc.onboarding</groupId>
-                <artifactId>pmd-helper-plugin</artifactId>
-                <version>${project.version}</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>init-pmd-helper</goal>
-                            <goal>post-verify-helper</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <excludePackaging>pom</excludePackaging>
-                    <pmdTargetLocation>${project.build.directory}/pmd/pmd.xml</pmdTargetLocation>
-                    <pmdFailureReportLocation>${project.build.directory}/pmd.txt</pmdFailureReportLocation>
-                    <pmdReportFile>${project.build.directory}/pmd/pmd.csv</pmdReportFile>
-                    <persistingModuleCoordinates>org.openecomp.sdc:build-data-installer</persistingModuleCoordinates>
-                    <pmdCurrentStateFilePath>org.openecomp.sdc:sdc-onboarding/target/build-data/pmdState.dat</pmdCurrentStateFilePath>
-                    <pmdStateFile>${project.build.outputDirectory}/pmd.dat</pmdStateFile>
-                    <compiledFilesList>${project.build.directory}/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst</compiledFilesList>
-                    <compiledTestFilesList>${project.build.directory}/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst</compiledTestFilesList>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>${mvn.jar.version}</version>
-                <configuration>
-                    <archive>
-                        <addMavenDescriptor>false</addMavenDescriptor>
-                    </archive>
-                    <excludes>
-                        <exclude>${emptyJAR}</exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
-            <!-- blackduck maven plugin -->
+			<!-- ================================================== -->
+			<!-- Set the JDK compiler version. -->
+			<!-- ================================================== -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>${mvn.compiler.version}</version>
+				<inherited>true</inherited>
+				<executions>
+					<execution>
+						<id>default-compile</id>
+						<configuration>
+							<skipMain>${skipMainSourceCompile}</skipMain>
+						</configuration>
+					</execution>
+					<execution>
+						<id>default-testCompile</id>
+						<configuration>
+							<skip>${skipTestSourceCompile}</skip>
+						</configuration>
+					</execution>
+				</executions>
+				<configuration>
+					<source>${java.source}</source>
+					<target>${java.target}</target>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.openecomp.sdc.onboarding</groupId>
+				<artifactId>artifact-copy-plugin</artifactId>
+				<version>${project.version}</version>
+				<executions>
+					<execution>
+						<goals>
+							<goal>init-artifact-helper</goal>
+							<goal>calibrate-artifact-helper</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<groupId>org.openecomp.sdc</groupId>
+					<artifactId>build-data-installer</artifactId>
+					<version>${project.version}</version>
+					<artifactHelper>
+						<project>
+							${project}
+						</project>
+						<session>${session}</session>
+						<unicornRoot>org.openecomp.sdc:sdc-onboarding/target/build-data</unicornRoot>
+					</artifactHelper>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.openecomp.sdc.onboarding</groupId>
+				<artifactId>compile-helper-plugin</artifactId>
+				<version>${project.version}</version>
+				<dependencies>
+					<dependency>
+						<groupId>org.openecomp.sdc.onboarding</groupId>
+						<artifactId>pmd-helper-plugin</artifactId>
+						<version>${project.version}</version>
+					</dependency>
+				</dependencies>
+				<executions>
+					<execution>
+						<goals>
+							<goal>init-helper</goal>
+							<goal>pre-compile-helper</goal>
+							<goal>post-compile-helper</goal>
+							<goal>pre-test-compile-helper</goal>
+							<goal>post-test-run-helper</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<excludePackaging>pom</excludePackaging>
+					<excludeDependencies>test,runtime</excludeDependencies>
+					<generatedSourceLocation>${project.build.directory}/generated-sources</generatedSourceLocation>
+					<buildState>
+						<project>
+							${project}
+						</project>
+						<compileStateFilePath>org.openecomp.sdc:sdc-onboarding/target/build-data/compileState.dat</compileStateFilePath>
+					</buildState>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-pmd-plugin</artifactId>
+				<version>${maven.pmd.plugin.version}</version>
+				<dependencies>
+					<dependency>
+						<groupId>org.openecomp.sdc</groupId>
+						<artifactId>build-tools</artifactId>
+						<version>${build.tools.version}</version>
+					</dependency>
+					<dependency>
+						<groupId>net.sourceforge.pmd</groupId>
+						<artifactId>pmd-core</artifactId>
+						<version>${pmd.core.version}</version>
+					</dependency>
+					<dependency>
+						<groupId>net.sourceforge.pmd</groupId>
+						<artifactId>pmd-java</artifactId>
+						<version>${pmd.java.version}</version>
+					</dependency>
+				</dependencies>
+				<configuration>
+					<skip>${skipPMD}</skip>
+					<showPmdLog>false</showPmdLog>
+					<analysisCache>false</analysisCache>
+					<analysisCacheLocation>${project.build.directory}/pmd/pmd.cache</analysisCacheLocation>
+					<failOnViolation>false</failOnViolation>
+					<printFailingErrors>false</printFailingErrors>
+					<format>csv</format>
+					<targetDirectory>${project.build.directory}/pmd</targetDirectory>
+					<includeTests>true</includeTests>
+					<linkXRef>false</linkXRef>
+					<aggregate>false</aggregate>
+					<rulesets>
+						<ruleset>/category/java/bestpractices.xml</ruleset>
+						<ruleset>/category/java/codestyle.xml</ruleset>
+						<ruleset>/category/java/design.xml</ruleset>
+						<ruleset>/category/java/errorprone.xml</ruleset>
+						<ruleset>/category/java/multithreading.xml</ruleset>
+						<ruleset>/category/java/performance.xml</ruleset>
+						<ruleset>/category/java/security.xml</ruleset>
+					</rulesets>
+				</configuration>
+				<executions>
+					<execution>
+						<goals>
+							<goal>check</goal>
+						</goals>
+						<phase>integration-test</phase>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.openecomp.sdc.onboarding</groupId>
+				<artifactId>pmd-helper-plugin</artifactId>
+				<version>${project.version}</version>
+				<executions>
+					<execution>
+						<goals>
+							<goal>init-pmd-helper</goal>
+							<goal>post-verify-helper</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<excludePackaging>pom</excludePackaging>
+					<pmdTargetLocation>${project.build.directory}/pmd/pmd.xml</pmdTargetLocation>
+					<pmdFailureReportLocation>${project.build.directory}/pmd.txt</pmdFailureReportLocation>
+					<pmdReportFile>${project.build.directory}/pmd/pmd.csv</pmdReportFile>
+					<persistingModuleCoordinates>org.openecomp.sdc:build-data-installer</persistingModuleCoordinates>
+					<pmdCurrentStateFilePath>org.openecomp.sdc:sdc-onboarding/target/build-data/pmdState.dat</pmdCurrentStateFilePath>
+					<pmdStateFile>${project.build.outputDirectory}/pmd.dat</pmdStateFile>
+					<compiledFilesList>${project.build.directory}/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst</compiledFilesList>
+					<compiledTestFilesList>${project.build.directory}/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst</compiledTestFilesList>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<version>${mvn.jar.version}</version>
+				<configuration>
+					<archive>
+						<addMavenDescriptor>false</addMavenDescriptor>
+					</archive>
+					<excludes>
+						<exclude>${emptyJAR}</exclude>
+					</excludes>
+				</configuration>
+			</plugin>
+			<!-- blackduck maven plugin -->
 
-            <!--<plugin>
-                <groupId>com.blackducksoftware.integration</groupId>
-                <artifactId>hub-maven-plugin</artifactId>
-                <version>1.0.4</version>
-                <inherited>false</inherited>
-                <configuration>
-                    <target>${project.basedir}</target>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>create-bdio-file</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>createHubOutput</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>-->
+			<!--<plugin> <groupId>com.blackducksoftware.integration</groupId> <artifactId>hub-maven-plugin</artifactId> 
+				<version>1.0.4</version> <inherited>false</inherited> <configuration> <target>${project.basedir}</target> 
+				</configuration> <executions> <execution> <id>create-bdio-file</id> <phase>package</phase> 
+				<goals> <goal>createHubOutput</goal> </goals> </execution> </executions> 
+				</plugin> -->
 
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>license-maven-plugin</artifactId>
-                <version>${mvn.license.version}</version>
-                <configuration>
-                    <addJavaLicenseAfterPackage>false</addJavaLicenseAfterPackage>
-                    <processStartTag>============LICENSE_START=======================================================</processStartTag>
-                    <processEndTag>============LICENSE_END=========================================================</processEndTag>
-                    <sectionDelimiter>================================================================================</sectionDelimiter>
-                    <licenseName>apache_v2</licenseName>
-                    <inceptionYear>2017</inceptionYear>
-                    <organizationName>AT&amp;T Intellectual Property. All rights reserved.</organizationName>
-                    <projectName>SDC</projectName>
-                    <canUpdateCopyright>true</canUpdateCopyright>
-                    <canUpdateDescription>true</canUpdateDescription>
-                    <canUpdateLicense>true</canUpdateLicense>
-                    <emptyLineAfterHeader>true</emptyLineAfterHeader>
-                    <verbose>false</verbose>
-                    <includes>
-                        <include>**/*.java</include>
-                        <include>**/*.js</include>
-                        <include>**/*.ts</include>
-                    </includes>
-                    <roots>
-                        <root>src</root>
-                        <root>app</root>
-                        <root>server-mock</root>
-                        <root>typings</root>
-                    </roots>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>first</id>
-                        <goals>
-                            <goal>update-file-header</goal>
-                        </goals>
-                        <!--phase>process-sources</phase-->
-                    </execution>
-                </executions>
-            </plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>license-maven-plugin</artifactId>
+				<version>${mvn.license.version}</version>
+				<configuration>
+					<addJavaLicenseAfterPackage>false</addJavaLicenseAfterPackage>
+					<processStartTag>============LICENSE_START=======================================================</processStartTag>
+					<processEndTag>============LICENSE_END=========================================================</processEndTag>
+					<sectionDelimiter>================================================================================</sectionDelimiter>
+					<licenseName>apache_v2</licenseName>
+					<inceptionYear>2017</inceptionYear>
+					<organizationName>AT&amp;T Intellectual Property. All rights
+						reserved.</organizationName>
+					<projectName>SDC</projectName>
+					<canUpdateCopyright>true</canUpdateCopyright>
+					<canUpdateDescription>true</canUpdateDescription>
+					<canUpdateLicense>true</canUpdateLicense>
+					<emptyLineAfterHeader>true</emptyLineAfterHeader>
+					<verbose>false</verbose>
+					<includes>
+						<include>**/*.java</include>
+						<include>**/*.js</include>
+						<include>**/*.ts</include>
+					</includes>
+					<roots>
+						<root>src</root>
+						<root>app</root>
+						<root>server-mock</root>
+						<root>typings</root>
+					</roots>
+				</configuration>
+				<executions>
+					<execution>
+						<id>first</id>
+						<goals>
+							<goal>update-file-header</goal>
+						</goals>
+						<!--phase>process-sources</phase -->
+					</execution>
+				</executions>
+			</plugin>
 
 
-        </plugins>
+		</plugins>
 
-    </build>
+	</build>
 
 </project>