Deleted artifact generator modules

Change-Id: Ibad18285edc1181d7247d395efa8f2322e255147
Issue-ID: SDC-1906
Signed-off-by: vempo <vitaliy.emporopulo@amdocs.com>

57 files changed, 0 insertions, 27112 deletions

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
deleted file mode 100644
index ac39bb4b60..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/AaiModelGenerator.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.sdc.generator.aai;
-
-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;
-import org.slf4j.MDC;
-
-import java.io.StringWriter;
-
-public interface AaiModelGenerator {
-
-  /**
-   * Gets instance.
-   *
-   * @return the instance
-   */
-  public static AaiModelGenerator getInstance() {
-    Logger log = LoggerFactory.getLogger(AaiModelGenerator.class.getName());
-    try {
-      return AaiModelGenerator.class.cast(
-          Class.forName("org.onap.sdc.generator.aai.AaiModelGeneratorImpl").newInstance());
-    } catch (Exception exception) {
-      MDC.put(GeneratorConstants.PARTNER_NAME, GeneratorConstants.GENERATOR_PARTNER_NAME);
-      MDC.put(GeneratorConstants.ERROR_CATEGORY, CategoryLogLevel.ERROR.name());
-      MDC.put(GeneratorConstants.ERROR_CODE, GeneratorConstants.GENERATOR_ERROR_CODE);
-      MDC.put(
-          GeneratorConstants.ERROR_DESCRIPTION, GeneratorConstants.GENERATOR_ERROR_SERVICE_INSTANTIATION_FAILED);
-      StringWriter sw = new StringWriter();
-      log.error(sw.toString(), exception);
-    }
-    return null;
-  }
-
-  public String generateModelFor(Service service);
-
-  public String generateModelFor(Resource resource);
-
-
-}
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/AllotedResource.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/AllotedResource.java
deleted file mode 100644
index c6389392f6..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/AllotedResource.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.sdc.generator.aai.model;
-
-import org.onap.sdc.generator.aai.types.Cardinality;
-import org.onap.sdc.generator.aai.types.Model;
-
-@Model(widget = Widget.Type.ALLOTTED_RESOURCE, cardinality = Cardinality.UNBOUNDED,
-    dataDeleteFlag = true)
-public class AllotedResource extends Resource {
-}
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/AllotedResourceWidget.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/AllotedResourceWidget.java
deleted file mode 100644
index 88cdaa6af1..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/AllotedResourceWidget.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.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;
-
-
-@Model(widget = Widget.Type.ALLOTTED_RESOURCE, cardinality
-    = Cardinality.UNBOUNDED, dataDeleteFlag = true)
-@ModelWidget(type = ModelType.WIDGET, name = "allotted-resource")
-public class AllotedResourceWidget extends ResourceWidget {
-}
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
deleted file mode 100644
index b08a3d4e27..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/FlavorWidget.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.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;
-
-@Model(widget = Widget.Type.FLAVOR, cardinality = Cardinality.UNBOUNDED, dataDeleteFlag = false)
-@ModelWidget(type = ModelType.WIDGET, name = "flavor")
-public class FlavorWidget extends ResourceWidget {
-
-}
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
deleted file mode 100644
index aef01d8a5b..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/ImageWidget.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.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;
-
-@Model(widget = Widget.Type.IMAGE, cardinality = Cardinality.UNBOUNDED, dataDeleteFlag = false)
-@ModelWidget(type = ModelType.WIDGET, name = "image")
-public class ImageWidget extends ResourceWidget {
-
-}
- 
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/L3Network.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/L3Network.java
deleted file mode 100644
index 98713c086b..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/L3Network.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.sdc.generator.aai.model;
-
-import org.onap.sdc.generator.aai.types.Cardinality;
-import org.onap.sdc.generator.aai.types.Model;
-
-@Model(widget = Widget.Type.L3_NET, cardinality = Cardinality
-    .UNBOUNDED, dataDeleteFlag = false)
-public class L3Network extends Resource{
-}
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/L3NetworkWidget.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/L3NetworkWidget.java
deleted file mode 100644
index 4b59e99bc9..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/L3NetworkWidget.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.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;
-
-@Model(widget = Widget.Type.L3_NET,
-    cardinality = Cardinality.UNBOUNDED, dataDeleteFlag = true)
-@ModelWidget(type = ModelType.WIDGET, name = "l3-network")
-public class L3NetworkWidget extends Widget {
-
-}
- 
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
deleted file mode 100644
index d5f00ff50c..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/LIntfWidget.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.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;
-
-@Model(widget = Widget.Type.LINT, cardinality = Cardinality.UNBOUNDED, dataDeleteFlag = true)
-@ModelWidget(type = ModelType.WIDGET, name = "l-interface")
-public class LIntfWidget extends ResourceWidget {
-
-}
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/Model.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/Model.java
deleted file mode 100644
index 83ded46bd1..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/Model.java
+++ /dev/null
@@ -1,255 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.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.data.GeneratorConstants;
-import org.onap.sdc.generator.error.IllegalAccessException;
-
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-public abstract class Model {
-
-  protected Set<Resource> resources = new HashSet<>();
-  protected Set<Widget> widgets = new HashSet<>();
-  private String modelId;
-  private String modelName;
-  private String modelVersion;
-  private String modelNameVersionId;
-  private String modelDescription;
-
-  /**
-   * Gets model for.
-   *
-   * @param toscaType the tosca type
-   * @return the model for
-   */
-  public static Model getModelFor(String toscaType) {
-
-    Model modelToBeReturned = null;
-    while (isModelNotSet(toscaType, modelToBeReturned)) {
-
-      switch (toscaType) {
-
-        case "org.openecomp.resource.vf.allottedResource":
-          modelToBeReturned = new AllotedResource();
-          break;
-        case "org.openecomp.resource.vfc.AllottedResource":
-          modelToBeReturned = new ProvidingService();
-          break;
-        case "org.openecomp.resource.vfc":
-          modelToBeReturned = new VServerWidget();
-          break;
-        case "org.openecomp.resource.cp":
-        case "org.openecomp.cp":
-          modelToBeReturned = new LIntfWidget();
-          break;
-        case "org.openecomp.resource.vl":
-          modelToBeReturned = new L3Network();
-          break;
-        case "org.openecomp.resource.vf":
-          modelToBeReturned = new VirtualFunction();
-          break;
-        case "org.openecomp.groups.vfmodule":
-        case "org.openecomp.groups.VfModule":
-          modelToBeReturned = new VfModule();
-          break;
-        case "org.openecomp.resource.vfc.nodes.heat.cinder":
-          modelToBeReturned = new VolumeWidget();
-          break;
-        default:
-          modelToBeReturned = null;
-          break;
-      }
-
-      toscaType = toscaType.substring(0, toscaType.lastIndexOf("."));
-    }
-
-    return modelToBeReturned;
-  }
-
-
-  public abstract boolean addResource(Resource resource);
-
-  public abstract boolean addWidget(Widget resource);
-
-  /**
-   * Gets widget version id.
-   *
-   * @return the widget version id
-   */
-  public String getWidgetId() {
-    org.onap.sdc.generator.aai.types.Model model =
-        this.getClass().getAnnotation(org.onap.sdc.generator.aai.types.Model.class);
-    return Widget.getWidget(model.widget()).getId();
-  }
-
-  /**
-   * Gets invariant id.
-   *
-   * @return the invariant id
-   */
-  public String getWidgetInvariantId() {
-    org.onap.sdc.generator.aai.types.Model model =
-        this.getClass().getAnnotation(org.onap.sdc.generator.aai.types.Model.class);
-    return Widget.getWidget(model.widget()).getWidgetId();
-  }
-
-  /**
-   * Gets delete flag.
-   *
-   * @return the delete flag
-   */
-  public boolean getDeleteFlag() {
-    org.onap.sdc.generator.aai.types.Model model =
-        this.getClass().getAnnotation(org.onap.sdc.generator.aai.types.Model.class);
-    return model.dataDeleteFlag();
-  }
-
-  /**
-   * Gets cardinality.
-   *
-   * @return the cardinality
-   */
-  public Cardinality getCardinality() {
-    org.onap.sdc.generator.aai.types.Model model =
-        this.getClass().getAnnotation(org.onap.sdc.generator.aai.types.Model.class);
-    return model.cardinality();
-  }
-
-  public abstract Widget.Type getWidgetType();
-
-  public String getModelId() {
-    checkSupported();
-    return modelId;
-  }
-
-  /**
-   * Gets model type.
-   *
-   * @return the model type
-   */
-  public ModelType getModelType() {
-    if (this instanceof Service) {
-      return ModelType.SERVICE;
-    } else if (this instanceof Resource) {
-      return ModelType.RESOURCE;
-    } else if (this instanceof Widget) {
-      return ModelType.WIDGET;
-    } else {
-      return null;
-    }
-  }
-
-  public String getModelName() {
-    return modelName;
-  }
-
-  public String getModelVersion() {
-    return modelVersion;
-  }
-
-  public String getModelNameVersionId() {
-    checkSupported();
-    return modelNameVersionId;
-  }
-
-  public String getModelDescription() {
-    return modelDescription;
-  }
-
-  /**
-   * Populate model identification information.
-   *
-   * @param modelIdentInfo the model ident info
-   */
-  public void populateModelIdentificationInformation(Map<String, String> modelIdentInfo) {
-    for (Map.Entry<String,String> entry : modelIdentInfo.entrySet()) {
-      String property=entry.getKey();
-      switch (property) {
-
-        case "vfModuleModelInvariantUUID":
-        case "serviceInvariantUUID":
-        case "resourceInvariantUUID":
-        case "invariantUUID":
-        case "providing_service_invariant_uuid":
-          modelId = entry.getValue();
-          break;
-        case "vfModuleModelUUID":
-        case "resourceUUID":
-        case "serviceUUID":
-        case "UUID":
-        case "providing_service_uuid":
-          modelNameVersionId = entry.getValue();
-          break;
-        case "vfModuleModelVersion":
-        case "serviceVersion":
-        case "resourceversion":
-        case "version":
-          modelVersion = entry.getValue();
-          break;
-        case "vfModuleModelName":
-        case "serviceName":
-        case "resourceName":
-        case "name":
-          modelName = entry.getValue();
-          break;
-        case "serviceDescription":
-        case "resourceDescription":
-        case "vf_module_description":
-        case "description":
-          modelDescription = entry.getValue();
-          break;
-        case "providing_service_name":
-          modelName = entry.getValue();
-          modelDescription = entry.getValue();
-          break;
-        default:
-          break;
-      }
-    }
-
-
-
-  }
-
-  public Set<Resource> getResources() {
-    return resources;
-  }
-
-  public Set<Widget> getWidgets() {
-    return widgets;
-  }
-
-  private void checkSupported() {
-    if (this instanceof Widget) {
-      throw new IllegalAccessException(GeneratorConstants
-          .GENERATOR_AAI_ERROR_UNSUPPORTED_WIDGET_OPERATION);
-    }
-  }
-
-  private static boolean isModelNotSet(String toscaType, Model modelToBeReturned) {
-    return toscaType != null && toscaType.lastIndexOf(".") != -1 && modelToBeReturned == null;
-  }
-}
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
deleted file mode 100644
index 72686b5bc2..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/OamNetwork.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.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;
-
-@Model(widget = Widget.Type.L3_NET, cardinality = Cardinality.UNBOUNDED, dataDeleteFlag = true)
-@ModelWidget(type = ModelType.WIDGET, name = "oam-network")
-public class OamNetwork extends Widget {
-}
- 
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/ProvidingService.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/ProvidingService.java
deleted file mode 100644
index 3f44fe9b54..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/ProvidingService.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.sdc.generator.aai.model;
-
-import org.onap.sdc.generator.aai.types.Cardinality;
-import org.onap.sdc.generator.aai.types.Model;
-
-@Model(widget = Widget.Type.ALLOTTED_RESOURCE, cardinality = Cardinality
-    .UNBOUNDED,
-    dataDeleteFlag = false)
-public class ProvidingService extends Resource {
-}
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/Resource.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/Resource.java
deleted file mode 100644
index 6c7cbc7548..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/Resource.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.sdc.generator.aai.model;
-
-public class Resource extends Model {
-
-  @Override
-  public int hashCode() {
-    return getModelNameVersionId().hashCode();
-  }
-
-  @Override
-  public boolean equals(Object obj) {
-    if (obj instanceof Resource) {
-      return getModelNameVersionId().equals(((Resource) obj).getModelNameVersionId());
-    }
-    return false;
-  }
-
-  public boolean addResource(Resource resource) {
-    return resources.add(resource);
-  }
-
-  public boolean addWidget(Widget widget) {
-    return widgets.add(widget);
-  }
-
-  @Override
-  public Widget.Type getWidgetType() {
-    org.onap.sdc.generator.aai.types.Model model =
-        this.getClass().getAnnotation(org.onap.sdc.generator.aai.types.Model.class);
-    return model.widget();
-  }
-}
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/ResourceWidget.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/ResourceWidget.java
deleted file mode 100644
index 24975a2a9f..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/ResourceWidget.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.sdc.generator.aai.model;
-
-public class ResourceWidget extends Widget {
-
-}
- 
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/Service.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/Service.java
deleted file mode 100644
index f71ff91f3e..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/Service.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.sdc.generator.aai.model;
-
-import org.onap.sdc.generator.aai.types.Cardinality;
-
-@org.onap.sdc.generator.aai.types.Model(widget = Widget.Type.SERVICE,
-    cardinality = Cardinality.UNBOUNDED, dataDeleteFlag = true)
-public class Service extends Model {
-
-  public boolean addResource(Resource resource) {
-    return resources.add(resource);
-  }
-
-  public boolean addWidget(Widget widget) {
-    return widgets.add(widget);
-  }
-
-  @Override
-  public Widget.Type getWidgetType() {
-    return null;
-  }
-
-}
- 
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/ServiceWidget.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/ServiceWidget.java
deleted file mode 100644
index f6eb5fab53..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/ServiceWidget.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.sdc.generator.aai.model;
-
-import org.onap.sdc.generator.aai.types.ModelType;
-import org.onap.sdc.generator.aai.types.ModelWidget;
-
-@ModelWidget(type = ModelType.WIDGET, name = "service-instance")
-public class ServiceWidget extends Widget {
-
-}
- 
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
deleted file mode 100644
index 93ca9c5178..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/TenantWidget.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.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;
-
-@Model(widget = Widget.Type.TENANT, cardinality = Cardinality.UNBOUNDED, dataDeleteFlag = false)
-@ModelWidget(type = ModelType.WIDGET, name = "tenant")
-public class TenantWidget extends Widget {
-
-}
- 
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/TunnelXconnectWidget.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/TunnelXconnectWidget.java
deleted file mode 100644
index 1a8a9fea27..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/TunnelXconnectWidget.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.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;
-
-@Model(widget = Widget.Type.TUNNEL_XCONNECT,
-    cardinality = Cardinality.UNBOUNDED, dataDeleteFlag = true)
-@ModelWidget(type = ModelType.WIDGET, name = "tunnel-xconnect")
-public class TunnelXconnectWidget extends Widget {
-}
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
deleted file mode 100644
index c633f5b338..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/VServerWidget.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.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;
-
-@Model(widget = Widget.Type.VSERVER, cardinality = Cardinality.UNBOUNDED, dataDeleteFlag = true)
-@ModelWidget(type = ModelType.WIDGET, name = "vserver")
-public class VServerWidget extends Widget {
-
-  /**
-   * Instantiates a new V server widget.
-   */
-  public VServerWidget() {
-    addWidget(new FlavorWidget());
-    addWidget(new ImageWidget());
-    addWidget(new TenantWidget());
-    addWidget(new VfcWidget());
-  }
-
-  public boolean addWidget(Widget widget) {
-    return widgets.add(widget);
-  }
-
-}
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/VfModule.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/VfModule.java
deleted file mode 100644
index 1b715630e4..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/VfModule.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.sdc.generator.aai.model;
-
-import org.onap.sdc.generator.aai.types.Cardinality;
-import org.onap.sdc.generator.aai.types.Model;
-
-import java.util.List;
-
-@Model(widget = Widget.Type.VFMODULE, cardinality = Cardinality.UNBOUNDED, dataDeleteFlag = true)
-public class VfModule extends Resource {
-
-  Widget vserver = null;
-  boolean addlintf = false;
-  boolean addvolume = false;
-
-  List<String> members;
-
-  public void setMembers(List<String> members) {
-    this.members = members;
-  }
-
-  /**
-   * Adds Widget.
-   *
-   * @param widget the widget
-   * @return the boolean
-   */
-  public boolean addWidget(Widget widget) {
-    if (widget.memberOf(members)) {
-      if (vserver == null && widget.getId().equals(new VServerWidget().getId())) {
-        vserver = widget;
-        if (addlintf) {
-          vserver.addWidget(new LIntfWidget());
-        }
-        if (addvolume) {
-          vserver.addWidget(new VolumeWidget());
-        }
-      } else if (widget.getId().equals(new LIntfWidget().getId())) {
-        if (vserver != null) {
-          vserver.addWidget(widget);
-          return true;
-        } else {
-          addlintf = true;
-        }
-        return false;
-      } else if (widget.getId().equals(new VolumeWidget().getId())) {
-        if (vserver != null) {
-          vserver.addWidget(widget);
-        } else {
-          addvolume = true;
-        }
-        return true;
-      }
-      if (widget.getId().equals(new OamNetwork().getId())) {
-        return false;
-      }
-      return widgets.add(widget);
-    }
-    return false;
-  }
-
-}
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
deleted file mode 100644
index b191538e50..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/VfModuleWidget.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.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;
-
-@Model(widget = Widget.Type.VFMODULE,
-    cardinality = Cardinality.UNBOUNDED, dataDeleteFlag = true)
-@ModelWidget(type = ModelType.WIDGET, name = "vf-module")
-public class VfModuleWidget extends Widget {
-
-}
- 
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/VfWidget.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/VfWidget.java
deleted file mode 100644
index 20ea9973aa..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/VfWidget.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.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;
-
-@Model(widget = Widget.Type.VF,
-    cardinality = Cardinality.UNBOUNDED, dataDeleteFlag = true)
-@ModelWidget(type = ModelType.WIDGET, name = "generic-vnf")
-public class VfWidget extends ResourceWidget {
-
-}
- 
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/VfcWidget.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/VfcWidget.java
deleted file mode 100644
index 2d08ef8b7d..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/VfcWidget.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.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;
-
-@Model(widget = Widget.Type.VFC,
-    cardinality = Cardinality.UNBOUNDED, dataDeleteFlag = true)
-@ModelWidget(type = ModelType.WIDGET, name = "vnfc")
-public class VfcWidget extends ResourceWidget {
-
-}
- 
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/VirtualFunction.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/VirtualFunction.java
deleted file mode 100644
index 3736ebacc3..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/VirtualFunction.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.sdc.generator.aai.model;
-
-import org.onap.sdc.generator.aai.types.Cardinality;
-import org.onap.sdc.generator.aai.types.Model;
-
-@Model(widget = Widget.Type.VF, cardinality = Cardinality.UNBOUNDED, dataDeleteFlag = true)
-public class VirtualFunction extends Resource {
-
-}
- 
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/VolumeGroupWidget.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/VolumeGroupWidget.java
deleted file mode 100644
index 918cfa897c..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/VolumeGroupWidget.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.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;
-
-@Model(widget = Widget.Type.VOLUME_GROUP,
-    cardinality = Cardinality.UNBOUNDED, dataDeleteFlag = true)
-@ModelWidget(type = ModelType.WIDGET, name = "volume-group")
-public class VolumeGroupWidget extends Widget {
-
-}
- 
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/VolumeWidget.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/VolumeWidget.java
deleted file mode 100644
index e0cdac437a..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/VolumeWidget.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.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;
-
-@Model(widget = Widget.Type.VOLUME, cardinality = Cardinality.UNBOUNDED, dataDeleteFlag = true)
-@ModelWidget(type = ModelType.WIDGET, name = "volume")
-public class VolumeWidget extends ResourceWidget {
-
-}
- 
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
deleted file mode 100644
index dfb17cc660..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/Widget.java
+++ /dev/null
@@ -1,196 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.sdc.generator.aai.model;
-
-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<>();
-
-  /**
-   * Gets widget.
-   *
-   * @param type the type
-   * @return the widget
-   */
-  public static Widget getWidget(Type type) {
-
-    switch (type) {
-      case SERVICE:
-        return new ServiceWidget();
-      case VF:
-        return new VfWidget();
-      case VFC:
-        return new VfcWidget();
-      case VSERVER:
-        return new VServerWidget();
-      case VOLUME:
-        return new VolumeWidget();
-      case FLAVOR:
-        return new FlavorWidget();
-      case TENANT:
-        return new TenantWidget();
-      case VOLUME_GROUP:
-        return new VolumeGroupWidget();
-      case LINT:
-        return new LIntfWidget();
-      case L3_NET:
-        return new L3NetworkWidget();
-      case VFMODULE:
-        return new VfModuleWidget();
-      case IMAGE:
-        return new ImageWidget();
-      case OAM_NETWORK:
-        return new OamNetwork();
-      case ALLOTTED_RESOURCE:
-        return new AllotedResourceWidget();
-      case TUNNEL_XCONNECT:
-        return new TunnelXconnectWidget();
-      default:
-        return null;
-    }
-
-  }
-
-  /**
-   * Gets id.
-   *
-   * @return the id
-   */
-  public String getId() {
-    Properties properties = WidgetConfigurationUtil.getConfig();
-    String id = properties.getProperty(ArtifactType.AAI.name() + ".model-version-id." + getName());
-    if (id == null) {
-      throw new IllegalArgumentException(String.format(
-          GeneratorConstants.GENERATOR_AAI_CONFIGLPROP_NOT_FOUND,
-          ArtifactType.AAI.name() + ".model-version-id." + getName()));
-    }
-    return id;
-  }
-
-  public ModelType getType() {
-    ModelWidget widgetModel = this.getClass().getAnnotation(ModelWidget.class);
-    return widgetModel.type();
-  }
-
-  public String getName() {
-    ModelWidget widgetModel = this.getClass().getAnnotation(ModelWidget.class);
-    return widgetModel.name();
-  }
-
-  /**
-   * Get Widget Id from properties file.
-   * @return - Widget Id
-   */
-  public String getWidgetId() {
-    Properties properties = WidgetConfigurationUtil.getConfig();
-    String id = properties.getProperty(ArtifactType.AAI.name() + ".model-invariant-id."
-        + getName());
-    if (id == null) {
-      throw new IllegalArgumentException(String.format(
-          GeneratorConstants.GENERATOR_AAI_CONFIGLPROP_NOT_FOUND,
-          ArtifactType.AAI.name() + ".model-invariant-id." + getName()));
-    }
-    return id;
-  }
-
-  public int hashCode() {
-    return getId().hashCode();
-  }
-
-  @Override
-  public Type getWidgetType() {
-    return null;
-  }
-
-  /**
-   * Equals.
-   *
-   * @param obj Object
-   * @return the boolean
-   */
-  public boolean equals(Object obj) {
-    if (obj instanceof Widget) {
-      if (getId().equals(((Widget) obj).getId())) {
-        ((Widget) obj).keys.addAll(this.keys);
-        return true;
-      }
-      return false;
-    } else {
-      return false;
-    }
-  }
-
-  public void addKey(String key) {
-    this.keys.add(key);
-  }
-
-  /**
-   * Member of boolean.
-   *
-   * @param keys the keys
-   * @return the boolean
-   */
-  public boolean memberOf(List<String> keys) {
-    if (keys == null) {
-      return false;
-    }
-    return !Collections.disjoint(this.keys, keys);
-  }
-
-  /**
-   * All instances used boolean.
-   *
-   * @param collection the collection
-   * @return the boolean
-   */
-  public boolean allInstancesUsed(Set<String> collection) {
-    Set<String> keyCopy = new HashSet<>(keys);
-    keyCopy.removeAll(collection);
-    return keyCopy.isEmpty();
-  }
-
-  public boolean addResource(Resource resource) {
-    throw new IllegalAccessException(GeneratorConstants
-        .GENERATOR_AAI_ERROR_UNSUPPORTED_WIDGET_OPERATION);
-  }
-
-  public boolean addWidget(Widget widget) {
-    return true;
-  }
-
-  public enum Type {
-    SERVICE, VF, VFC, VSERVER, VOLUME, FLAVOR, TENANT, VOLUME_GROUP, LINT, L3_NET, VFMODULE, IMAGE,
-    OAM_NETWORK,ALLOTTED_RESOURCE,TUNNEL_XCONNECT
-  }
-}
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/tosca/CapabilityAssignment.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/tosca/CapabilityAssignment.java
deleted file mode 100644
index 99f9771654..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/tosca/CapabilityAssignment.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.sdc.generator.aai.tosca;
-
-import java.util.Map;
-
-public class CapabilityAssignment {
-
-  private Map<String, Object> properties;
-  private Map<String, Object> attributes;
-
-  public Map<String, Object> getProperties() {
-    return properties;
-  }
-
-  public void setProperties(Map<String, Object> properties) {
-    this.properties = properties;
-  }
-
-  public Map<String, Object> getAttributes() {
-    return attributes;
-  }
-
-  public void setAttributes(Map<String, Object> attributes) {
-    this.attributes = attributes;
-  }
-}
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/tosca/GroupDefinition.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/tosca/GroupDefinition.java
deleted file mode 100644
index 8892eebd7e..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/tosca/GroupDefinition.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.sdc.generator.aai.tosca;
-
-import java.util.List;
-import java.util.Map;
-
-public class GroupDefinition {
-
-  private String type;
-  private String description;
-  private Map<String, Object> properties;
-  private List<String> members;
-  private Map<String, String> metadata;
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public Map<String, Object> getProperties() {
-    return properties;
-  }
-
-  public void setProperties(Map<String, Object> properties) {
-    this.properties = properties;
-  }
-
-  public List<String> getMembers() {
-    return members;
-  }
-
-  public void setMembers(List<String> members) {
-    this.members = members;
-  }
-
-  public Map<String, String> getMetadata() {
-    return metadata;
-  }
-
-  public void setMetadata(Map<String, String> metadata) {
-    this.metadata = metadata;
-  }
-}
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/tosca/NodeTemplate.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/tosca/NodeTemplate.java
deleted file mode 100644
index d58d9e005d..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/tosca/NodeTemplate.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.sdc.generator.aai.tosca;
-
-import java.util.List;
-import java.util.Map;
-
-public class NodeTemplate {
-
-  private String type;
-  private String description;
-  private Map<String, String> metadata;
-  private Map<String, Object> properties;
-  private List<Map<String, RequirementAssignment>> requirements;
-  private Map<String, CapabilityAssignment> capabilities;
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public Map<String, Object> getProperties() {
-    return properties;
-  }
-
-  public void setProperties(Map<String, Object> properties) {
-    this.properties = properties;
-  }
-
-  public List<Map<String, RequirementAssignment>> getRequirements() {
-    return requirements;
-  }
-
-  public void setRequirements(List<Map<String, RequirementAssignment>> requirements) {
-    this.requirements = requirements;
-  }
-
-  public Map<String, CapabilityAssignment> getCapabilities() {
-    return capabilities;
-  }
-
-  public void setCapabilities(Map<String, CapabilityAssignment> capabilities) {
-    this.capabilities = capabilities;
-  }
-
-  public Map<String, String> getMetadata() {
-    return metadata;
-  }
-
-  public void setMetadata(Map<String, String> metadata) {
-    this.metadata = metadata;
-  }
-}
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/tosca/RequirementAssignment.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/tosca/RequirementAssignment.java
deleted file mode 100644
index 20d36a4ea0..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/tosca/RequirementAssignment.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.sdc.generator.aai.tosca;
-
-public class RequirementAssignment {
-
-  private String capability;
-  private String node;
-  private String relationship;
-
-  public String getCapability() {
-    return capability;
-  }
-
-  public void setCapability(String capability) {
-    this.capability = capability;
-  }
-
-  public String getNode() {
-    return node;
-  }
-
-  public void setNode(String node) {
-    this.node = node;
-  }
-
-  public String getRelationship() {
-    return relationship;
-  }
-
-  public void setRelationship(String relationship) {
-    this.relationship = relationship;
-  }
-
-}
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/tosca/TopologyTemplate.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/tosca/TopologyTemplate.java
deleted file mode 100644
index 124c55cc77..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/tosca/TopologyTemplate.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.sdc.generator.aai.tosca;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-
-public class TopologyTemplate {
-
-  private String description;
-  private Map<String, NodeTemplate> node_templates;
-  private Map<String, GroupDefinition> groups;
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public Map<String, GroupDefinition> getGroups() {
-    return groups;
-  }
-
-  public void setGroups(Map<String, GroupDefinition> groups) {
-    this.groups = groups;
-  }
-
-  public Map<String, NodeTemplate> getNode_templates() {
-    return node_templates;
-  }
-
-  public void setNode_templates(Map<String, NodeTemplate> node_templates) {
-    this.node_templates = node_templates;
-  }
-
-  /**
-   * Add group.
-   *
-   * @param groupKey        the group key
-   * @param groupDefinition the group definition
-   */
-  public void addGroup(String groupKey, GroupDefinition groupDefinition) {
-    if (Objects.isNull(this.groups)) {
-      this.groups = new HashMap<>();
-    }
-    this.groups.put(groupKey, groupDefinition);
-  }
-
-}
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/tosca/ToscaTemplate.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/tosca/ToscaTemplate.java
deleted file mode 100644
index d92b826071..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/tosca/ToscaTemplate.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.sdc.generator.aai.tosca;
-
-import java.util.Map;
-
-public class ToscaTemplate {
-  private String toscaDefinitionsVersion;
-  private Map<String, String> metadata;
-  private String description;
-  private TopologyTemplate topology_template;
-
-  public String getToscaDefinitionsVersion() {
-    return toscaDefinitionsVersion;
-  }
-
-  public void setToscaDefinitionsVersion(String toscaDefinitionsVersion) {
-    this.toscaDefinitionsVersion = toscaDefinitionsVersion;
-  }
-
-  public Map<String, String> getMetadata() {
-    return metadata;
-  }
-
-  public void setMetadata(Map<String, String> metadata) {
-    this.metadata = metadata;
-  }
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public TopologyTemplate getTopology_template() {
-    return topology_template;
-  }
-
-  public void setTopology_template(TopologyTemplate topology_template) {
-    this.topology_template = topology_template;
-  }
-
-  /**
-   * Is Service.
-   *
-   * @return the boolean
-   */
-  public boolean isService() {
-    return metadata.containsKey("serviceUUID")
-        || ("Service".equalsIgnoreCase(metadata.get("Type"))
-            || ("Service".equalsIgnoreCase(metadata.get("type"))));
-  }
-
-  public String getModelId() {
-    return metadata.get("invariantUUID");
-  }
-
-  public String getModelVersionId() {
-    return metadata.get("UUID");
-  }
-
-}
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/types/Cardinality.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/types/Cardinality.java
deleted file mode 100644
index be7c945af9..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/types/Cardinality.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.sdc.generator.aai.types;
-
-public enum Cardinality {
-
-  UNBOUNDED
-}
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/types/Model.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/types/Model.java
deleted file mode 100644
index 73407a5516..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/types/Model.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.sdc.generator.aai.types;
-
-import org.onap.sdc.generator.aai.model.Widget.Type;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Model {
-
-  /**
-   * Widget widget . type.
-   *
-   * @return the widget . type
-   */
-  public Type widget();
-
-  /**
-   * Data delete flag boolean.
-   *
-   * @return the boolean
-   */
-  public boolean dataDeleteFlag();
-
-  /**
-   * Cardinality cardinality.
-   *
-   * @return the cardinality
-   */
-  public Cardinality cardinality();
-
-}
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/types/ModelType.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/types/ModelType.java
deleted file mode 100644
index 90da359316..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/types/ModelType.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.sdc.generator.aai.types;
-
-public enum ModelType {
-  SERVICE, RESOURCE, WIDGET;
-
-  /**
-   * Gets model type.
-   *
-   * @param modelType the model type
-   * @return the model type
-   */
-  public static ModelType getModelType(String modelType) {
-    if (modelType != null) {
-      switch (modelType.toLowerCase()) {
-        case "service":
-          return SERVICE;
-        case "resource":
-          return RESOURCE;
-        case "widget":
-          return WIDGET;
-        default:
-          return null;
-      }
-    }
-    return null;
-  }
-}
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/types/ModelWidget.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/types/ModelWidget.java
deleted file mode 100644
index 6ce16459ba..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/types/ModelWidget.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.sdc.generator.aai.types;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface ModelWidget {
-
-  /**
-   * Type model type.
-   *
-   * @return the model type
-   */
-  public ModelType type();
-
-  /**
-   * Name string.
-   *
-   * @return the string
-   */
-  public String name();
-
-}
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/data/AdditionalParams.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/data/AdditionalParams.java
deleted file mode 100644
index d9cfadec9a..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/data/AdditionalParams.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.sdc.generator.data;
-
-
-public enum AdditionalParams {
-  ServiceVersion("serviceVersion");
-
-  private String name;
-
-  AdditionalParams(String name) {
-    this.name = name;
-  }
-
-  public String getName() {
-    return name;
-  }
-}
-
-
-
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/data/Artifact.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/data/Artifact.java
deleted file mode 100644
index d59fbc3bb7..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/data/Artifact.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.sdc.generator.data;
-
-public class Artifact {
-
-  String name;
-  String type;
-  String groupType;
-  String description;
-  String label;
-  String version;
-  String checksum;
-  byte[] payload;
-
-  /**
-   * Instantiates a new Artifact.
-   *
-   * @param type      the type
-   * @param groupType the group type
-   * @param checksum  the checksum
-   * @param payload   the payload
-   */
-  public Artifact(String type, String groupType, String checksum, byte[] payload) {
-    this.type = type;
-    this.groupType = groupType;
-    this.checksum = checksum;
-    this.payload = payload;
-  }
-
-  public byte[] getPayload() {
-    return payload;
-  }
-
-  public String getChecksum() {
-    return checksum;
-  }
-
-  public String getType() {
-    return type;
-  }
-
-  public String getGroupType() {
-    return groupType;
-  }
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public String getLabel() {
-    return label;
-  }
-
-  public void setLabel(String label) {
-    this.label = label;
-  }
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public String getVersion() {
-    return version;
-  }
-
-  public void setVersion(String version) {
-    this.version = version;
-  }
-}
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/data/ArtifactType.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/data/ArtifactType.java
deleted file mode 100644
index e844f945ab..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/data/ArtifactType.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.sdc.generator.data;
-
-public enum ArtifactType {
-  OTHER,
-  AAI,
-  MODEL_INVENTORY_PROFILE
-}
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/data/GenerationData.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/data/GenerationData.java
deleted file mode 100644
index 83a8452797..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/data/GenerationData.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.sdc.generator.data;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class GenerationData {
-
-  List<Artifact> resultData = new ArrayList<>();
-  Map<String, List<String>> errorData = new HashMap<>();
-
-  public void add(List<Artifact> resultData, Map<String, List<String>> errorData) {
-    this.resultData.addAll(resultData);
-    this.errorData.putAll(errorData);
-  }
-
-
-  public void add(Artifact generatedArtifact) {
-    resultData.add(generatedArtifact);
-  }
-
-  /**
-   * Add.
-   *
-   * @param generatorId the generator id
-   * @param errorCode   the error code
-   */
-  public void add(String generatorId, String errorCode) {
-    List<String> errorIds;
-    if ((errorIds = errorData.get(generatorId)) == null) {
-      errorIds = new ArrayList<>();
-      errorData.put(generatorId, errorIds);
-    }
-    errorIds.add(errorCode);
-  }
-
-  public void add(GenerationData generationData) {
-    this.resultData.addAll(generationData.resultData);
-    this.errorData.putAll(generationData.errorData);
-  }
-
-  public List<Artifact> getResultData() {
-    return resultData;
-  }
-
-  public Map<String, List<String>> getErrorData() {
-    return errorData;
-  }
-}
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/data/GeneratorConfiguration.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/data/GeneratorConfiguration.java
deleted file mode 100644
index af26b2b531..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/data/GeneratorConfiguration.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.sdc.generator.data;
-
-import java.util.List;
-
-public class GeneratorConfiguration {
-
-  private List<ArtifactType> artifactTypes = null;
-
-  public List<ArtifactType> getArtifactTypes() {
-    return artifactTypes;
-  }
-
-  public void setArtifactTypes(List<ArtifactType> artifactTypes) {
-    this.artifactTypes = artifactTypes;
-  }
-}
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/data/GeneratorConstants.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/data/GeneratorConstants.java
deleted file mode 100644
index 8f79aa1503..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/data/GeneratorConstants.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.sdc.generator.data;
-
-public class GeneratorConstants {
-
-  public static final String GENERATOR_AAI_GENERATED_ARTIFACT_EXTENSION = "xml";
-
-  //Error codes
-  public static final String GENERATOR_INVOCATION_ERROR_CODE =
-      "ARTIFACT_GENERATOR_INVOCATION_ERROR";
-
-
-  //Error Constants
-  public static final String GENERATOR_ERROR_INVALID_CLIENT_CONFIGURATION =
-      "Invalid Client Configuration";
-  public static final String GENERATOR_ERROR_ARTIFACT_GENERATION_FAILED =
-      "Unable to generate artifacts for the provided input";
-  public static final String GENERATOR_ERROR_SERVICE_INSTANTIATION_FAILED =
-      "Artifact Generation Service Instantiation failed";
-
-  //AAI Generator Error Messages
-  public static final String GENERATOR_AAI_ERROR_CHECKSUM_MISMATCH =
-      "Checksum Mismatch for file : %s";
-  public static final String GENERATOR_AAI_ERROR_INVALID_TOSCA =
-      "Invalid format for Tosca YML  : %s";
-  public static final String GENERATOR_AAI_ERROR_MANDATORY_METADATA_DEFINITION =
-      "Invalid Service/Resource definition mandatory attribute <%s> missing in Artifact: <%s>";
-  public static final String GENERATOR_AAI_ERROR_INVALID_ID =
-      "Invalid value for mandatory attribute <%s> in Artifact: <%s>";
-  public static final String GENERATOR_AAI_ERROR_UNSUPPORTED_WIDGET_OPERATION =
-      "Operation Not Supported for Widgets";
-  public static final String GENERATOR_AAI_ERROR_MISSING_SERVICE_TOSCA =
-      "Service tosca missing from list of input artifacts";
-  public static final String GENERATOR_AAI_ERROR_NULL_RESOURCE_VERSION_IN_SERVICE_TOSCA =
-      "Invalid Service definition mandatory attribute version missing for resource with UUID: <%s>";
-
-  public static final String GENERATOR_AAI_ERROR_INVALID_RESOURCE_VERSION_IN_SERVICE_TOSCA =
-      "Cannot generate artifacts. Invalid Resource version in Service tosca for resource with "
-          + "UUID: "
-          + "<%s>";
-  public static final String GENERATOR_AAI_ERROR_MISSING_RESOURCE_TOSCA =
-      "Cannot generate artifacts. Resource Tosca missing for resource with UUID: <%s>";
-
-  public static final String GENERATOR_AAI_ERROR_MISSING_SERVICE_VERSION =
-      "Cannot generate artifacts. Service version is not specified";
-
-  public static final String GENERATOR_AAI_INVALID_SERVICE_VERSION =
-      "Cannot generate artifacts. Service version is incorrect";
-
-  //Logging constants
-  public static final String REQUEST_ID = "uuid";
-  public static final String SERVICE_INSTANCE_ID = "serviceInstanceID";
-  public static final String PARTNER_NAME = "userId";
-  public static final String SERVICE_NAME = "ServiceName";
-  public static final String INSTANCE_UUID = "InstanceUUID";
-  public static final String REMOTE_HOST = "RemoteHost";
-  public static final String CLIENT_IP = "ClientIP";
-  public static final String CATEGORY_LOG_LEVEL = "level";
-  public static final String STATUS_CODE = "StatusCode";
-  public static final String RESPONSE_CODE = "ResponseCode";
-  public static final String RESPONSE_DESCRIPTION = "ResponseDescription";
-  public static final String ELAPSED_TIME = "ElapsedTime";
-  public static final String BEGIN_TIMESTAMP = "BeginTimestamp";
-  public static final String TARGET_SERVICE_NAME = "TargetServiceName";
-  public static final String TARGET_ENTITY = "TargetEntity";
-  public static final String END_TIMESTAMP = "EndTimestamp";
-  public static final String ERROR_CATEGORY = "ErrorCategory";
-  public static final String ERROR_CODE = "ErrorCode";
-  public static final String ERROR_DESCRIPTION = "ErrorDescription";
-  public static final String MDC_SDC_INSTANCE_UUID = "SDC_INSTANCE_UUID";
-  public static final String SERVICE_METRIC_BEGIN_TIMESTAMP = "SERVICE-METRIC-BEGIN-TIMESTAMP";
-  public static final String LOCAL_ADDR = "localAddr"; //map ServerIPAddress from loggingfilter
-  public static final String BE_FQDN = "beFqdn"; //map ServerFQDN from logging filter
-  public static final String ARTIFACT_MODEL_INFO = "ARTIFACT_MODEL_INFO";
-
-  public static final String GENERATOR_ERROR_CODE = "300F";
-  public static final String GENERATOR_PARTNER_NAME = "SDC Catalog";
-  public static final String GENERATOR_METRICS_TARGET_ENTITY = "SDC Catalog";
-  public static final String GENERATOR_METRICS_FAILURE_RESPONSE_CODE = "300E";
-  public static final String GENERATOR_METRICS_FAILURE_RESPONSE_DESC = "Artifact generation "
-      + "failed for artifact type %s";
-  public static final String GENERATOR_METRICS_SUCCESS_RESPONSE_CODE = "010";
-  public static final String GENERATOR_METRICS_SUCCESS_RESPONSE_DESC = "Artifacts for type %s "
-      + "were generated successfully";
-  public static final String GENERATOR_AUDIT_NO_ARTIFACT_TYPE_RESPONSE_DESC = "No Artifact Type "
-      + "found" ;
-
-  //AAI Generator Error Messages for Logging
-  public static final String GENERATOR_AAI_ERROR_INVALID_TOSCA_MSG =
-      "Invalid format for Tosca YML";
-  public static final String GENERATOR_AAI_ERROR_MANDATORY_METADATA_DEFINITION_MSG =
-      "Invalid Service/Resource definition mandatory attribute";
-  public static final String GENERATOR_AAI_ERROR_MISSING_SERVICE_TOSCA_MSG =
-      "Service tosca missing from list of input artifacts";
-  public static final String GENERATOR_ERROR_INVALID_CLIENT_CONFIGURATION_MSG =
-      "Invalid Client Configuration";
-  public static final String GENERATOR_ERROR_ARTIFACT_GENERATION_FAILED_MSG =
-      "Unable to generate artifacts for the provided input";
-  public static final String GENERATOR_AAI_CONFIGFILE_NOT_FOUND =
-      "Cannot generate artifacts. Artifact Generator Configuration file not found at %s";
-  public static final String GENERATOR_AAI_CONFIGLOCATION_NOT_FOUND =
-      "Cannot generate artifacts. artifactgenerator.config system property not configured";
-  public static final String GENERATOR_AAI_CONFIGLPROP_NOT_FOUND =
-      "Cannot generate artifacts. Widget configuration not found for %s";
-  public static final String GENERATOR_AAI_PROVIDING_SERVICE_MISSING =
-      "Cannot generate artifacts. Providing Service is missing for allotted resource %s";
-  public static final String GENERATOR_AAI_PROVIDING_SERVICE_METADATA_MISSING =
-      "Cannot generate artifacts. Providing Service Metadata is missing for allotted resource %s";
-  public static final int ID_LENGTH = 36;
-}
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/data/GeneratorUtil.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/data/GeneratorUtil.java
deleted file mode 100644
index 918fa1e0a8..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/data/GeneratorUtil.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.sdc.generator.data;
-
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
-import org.apache.commons.codec.digest.DigestUtils;
-
-import java.io.IOException;
-import java.util.Base64;
-
-/**
- * Utility method class for artifact generation.
- */
-public class GeneratorUtil {
-  /**
-   * Translate tosca yaml into the provided model class.
-   *
-   * @param tosca    Tosca file content
-   * @param classOfT Model class for the translated object
-   * @param <T>      Template parameter for the return object
-   * @return Object model for the provided tosca yaml file
-   */
-  public static <T> T translateTosca(String tosca, Class<T> classOfT) throws IOException {
-    T tos;
-    //changing file
-    ObjectMapper mapper = new ObjectMapper(new YAMLFactory()); // jackson data-bind
-    mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-    tos = mapper.readValue(tosca, classOfT);
-    return tos;
-  }
-
-  /**
-   * Decodes Base64 encode byte array input.
-   *
-   * @param input Base64 encoded byte array
-   * @return Decoded byte array
-   */
-  public static byte[] decoder(byte[] input) {
-    if (input != null) {
-      byte[] output = Base64.getDecoder().decode(input);
-      return output;
-    }
-    return null;
-  }
-
-  /**
-   * Encode a byte array input using Base64 encoding.
-   *
-   * @param input Input byte array to be encoded
-   * @return Base64 encoded byte array
-   */
-  public static byte[] encode(byte[] input) {
-    if (input != null) {
-      byte[] output = Base64.getEncoder().encode(input);
-      return output;
-    }
-    return null;
-  }
-
-  /**
-   * Calculate the checksum for a given input.
-   *
-   * @param input Byte array for which the checksum has to be calculated
-   * @return Calculated checksum of the input byte array
-   */
-  public static String checkSum(byte[] input) {
-    String checksum = null;
-    if (input != null) {
-      checksum = (DigestUtils.md5Hex(input)).toUpperCase();
-    }
-    return checksum;
-  }
-
-  /**
-   * Check if string is empty or null.
-   *
-   * @param input Input String
-   * @return true if string is empty/null and false otherwise
-   */
-  public static boolean isEmpty(String input) {
-    return input == null || input.length() == 0;
-  }
-
-}
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/data/GroupType.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/data/GroupType.java
deleted file mode 100644
index 69a8484885..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/data/GroupType.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.sdc.generator.data;
-
-public enum GroupType {
-  DEPLOYMENT,
-  OTHER
-}
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/data/WidgetConfigurationUtil.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/data/WidgetConfigurationUtil.java
deleted file mode 100644
index ab2da6caca..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/data/WidgetConfigurationUtil.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.sdc.generator.data;
-
-import java.util.Properties;
-
-public class WidgetConfigurationUtil {
-
-  private static Properties config ;
-
-  public static Properties getConfig() {
-    return config;
-  }
-
-  public static void setConfig(Properties config) {
-    WidgetConfigurationUtil.config = config;
-  }
-}
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/error/IllegalAccessException.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/error/IllegalAccessException.java
deleted file mode 100644
index 823af87fcc..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/error/IllegalAccessException.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.sdc.generator.error;
-
-public class IllegalAccessException extends RuntimeException {
-
-  public IllegalAccessException(String message) {
-    super(message);
-  }
-
-}
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
deleted file mode 100644
index 7e198df4bb..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/intf/ArtifactGenerator.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.sdc.generator.intf;
-
-import org.onap.sdc.generator.data.Artifact;
-import org.onap.sdc.generator.data.GenerationData;
-
-import java.util.List;
-import java.util.Map;
-
-
-public interface ArtifactGenerator {
-
-  public GenerationData generateArtifact(List<Artifact> input,
-                                         Map<String, String> additionalParams);
-
-}
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/intf/Generator.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/intf/Generator.java
deleted file mode 100644
index 069316a577..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/intf/Generator.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.sdc.generator.intf;
-
-import org.onap.sdc.generator.data.ArtifactType;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Generator {
-
-  /**
-   * Artifact type artifact type.
-   *
-   * @return the artifact type
-   */
-  public ArtifactType artifactType();
-}
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/logging/ArtifactGeneratorLogResponseCode.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/logging/ArtifactGeneratorLogResponseCode.java
deleted file mode 100644
index 17507f1474..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/logging/ArtifactGeneratorLogResponseCode.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.sdc.generator.logging;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public enum ArtifactGeneratorLogResponseCode {
-  INTERNAL_SERVER_ERROR(201),
-  MISSING_CONFIG_PROPERTIES_FILE(202),
-  MISSING_SYSTME_PROPERY_CONFIGURATION(203),
-  MANDATORY_ATTRIBUTE_MISSING(313),
-  SERVICE_TOSCA_MISSING(314),
-  INVALID_TOSCA_YAML(315),
-  INVALID_CLIENT_CONFIGURATION(316),
-  UNABLE_TO_GENERATE_ARTIFACT(317),
-  MISSING_WIDGET_CONFIGURATION(318),
-  INVALID_ID_VALUE(319),
-  MISSING_SERVICE_VERSION(320),
-  INVALID_SERVICE_VERSION(321),
-  MISSING_RESOURCE_VERSION(322),
-  INVALID_RESOURCE_VERSION(323),
-  MISSING_PRO_SERVICE(324),
-  MISSING_PRO_SERVICE_METADATA(325),
-  RESOURCE_TOSCA_MISSING(326);
-
-
-  private static Map<Integer, ArtifactGeneratorLogResponseCode> mapValueToEnum = new HashMap<>();
-
-  static {
-    for (ArtifactGeneratorLogResponseCode responseCode :
-        ArtifactGeneratorLogResponseCode.values()) {
-      mapValueToEnum.put(responseCode.value, responseCode);
-    }
-  }
-
-  private int value;
-
-  ArtifactGeneratorLogResponseCode(int value) {
-    this.value = value;
-  }
-
-  public static ArtifactGeneratorLogResponseCode parseValue(int value) {
-    return mapValueToEnum.get(value);
-  }
-
-  public int getValue() {
-    return value;
-  }
-}
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/logging/CategoryLogLevel.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/logging/CategoryLogLevel.java
deleted file mode 100644
index 930b5c78d0..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/logging/CategoryLogLevel.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.sdc.generator.logging;
-
-public enum CategoryLogLevel {
-  INFO,
-  WARN,
-  DEBUG,
-  ERROR,
-  FATAL
-}
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/logging/StatusCode.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/logging/StatusCode.java
deleted file mode 100644
index 0eb3b6d3b6..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/logging/StatusCode.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.sdc.generator.logging;
-
-public enum StatusCode {
-  COMPLETE,
-  ERROR
-}
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/logging/annotations/Audit.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/logging/annotations/Audit.java
deleted file mode 100644
index c56bd4a5f1..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/logging/annotations/Audit.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.sdc.generator.logging.annotations;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Indicates a method for auditing during artifact generation.
- */
-@Target(ElementType.METHOD)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Audit {
-}
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/logging/annotations/Metrics.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/logging/annotations/Metrics.java
deleted file mode 100644
index 468ab6412b..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/logging/annotations/Metrics.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.sdc.generator.logging.annotations;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Indicates a method for metrics recording during artifact generation.
- *
- */
-@Target(ElementType.METHOD)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Metrics {
-}
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
deleted file mode 100644
index 60a90e9a9e..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/service/ArtifactGenerationService.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.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.slf4j.MDC;
-
-import java.util.List;
-import java.util.Map;
-
-
-/**
- * Artifact Generation Service interface.
- */
-public interface ArtifactGenerationService {
-
-
-  /**
-   * Method to get artifact generation service implementation.
-   *
-   * @return Artifact generation implementation instance
-   */
-  public static ArtifactGenerationService lookup() {
-
-    Logger log = LoggerFactory.getLogger(ArtifactGenerationService.class.getName());
-    log.debug("Instantiating Artifact Generation Service");
-    try {
-      return ArtifactGenerationService.class.cast(
-          Class.forName("org.openecomp.sdc.generator.impl.ArtifactGenerationServiceImpl")
-              .newInstance());
-    } catch (Exception exception) {
-      MDC.put(GeneratorConstants.PARTNER_NAME, GeneratorConstants.GENERATOR_PARTNER_NAME);
-      MDC.put(GeneratorConstants.ERROR_CATEGORY, CategoryLogLevel.ERROR.name());
-      MDC.put(GeneratorConstants.ERROR_CODE, GeneratorConstants.GENERATOR_ERROR_CODE);
-      MDC.put(
-          GeneratorConstants.ERROR_DESCRIPTION, GeneratorConstants.GENERATOR_ERROR_SERVICE_INSTANTIATION_FAILED);
-      log.error(GeneratorConstants.GENERATOR_ERROR_SERVICE_INSTANTIATION_FAILED, exception);
-    }
-    log.debug(GeneratorConstants.GENERATOR_ERROR_SERVICE_INSTANTIATION_FAILED);
-    return null;
-  }
-
-  public GenerationData generateArtifact(List<Artifact> input, String overridingConfiguration,
-                                         Map<String, String> additionalParams);
-
-}
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
deleted file mode 100644
index 31a5ba89f5..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/resources/aai_schema_v10.xsd
+++ /dev/null
@@ -1,7890 +0,0 @@
-<?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">
-
-	<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
deleted file mode 100644
index 4ce1297629..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/resources/aai_schema_v11.xsd
+++ /dev/null
@@ -1,8486 +0,0 @@
-<?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: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
deleted file mode 100644
index c362e6a2dd..0000000000
--- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/resources/aai_schema_v9.xsd
+++ /dev/null
@@ -1,7889 +0,0 @@
-<?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: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>