Code Review / aai / model-loader.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (from parent 1: ef768a7)
Update Poms and Tests 13/213/1
authorSteve Smokowski <ss835w@att.com>
Fri, 10 Feb 2017 21:08:20 +0000 (16:08 -0500)
committerSteve Smokowski <ss835w@att.com>
Fri, 10 Feb 2017 21:08:35 +0000 (16:08 -0500)
Change-Id: If95a1f2188e4073725c50b7dbb1e03b1329b7e27
Signed-off-by: Steve Smokowski <ss835w@att.com>
12 files changed:
License.txt patch | blob | history
pom.xml patch | blob | history
src/main/docker/startup.sh patch | blob | history
src/main/webapp/WEB-INF/applicationContext.xml patch | blob | history
src/main/webapp/WEB-INF/rest-servlet.xml patch | blob | history
src/main/webapp/WEB-INF/web.xml patch | blob | history
src/test/java/org/openecomp/modelloader/entity/model/ModelArtifactParserTest.java patch | blob | history
src/test/resources/models/complete-model.xml patch | blob | history
src/test/resources/models/named-query-wan-connector.xml patch | blob | history
src/test/resources/models/vnf-model.xml patch | blob | history
src/test/resources/models/wan-connector-model.xml patch | blob | history
src/test/resources/vnfcatalogexample.xml patch | blob | history

diff --git a/License.txt b/License.txt
index 17cfdd5..eee2e15 100644 (file)
--- a/License.txt
+++ b/License.txt
@@ -1,22 +1,20 @@
-  ============LICENSE_START=======================================================
-  MODEL LOADER SERVICE
-  ================================================================================
-  Copyright © 2017 AT&T Intellectual Property.
-  Copyright © 2017 Amdocs
-  All rights reserved.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ============LICENSE_END=========================================================
-  
-  ECOMP and OpenECOMP are trademarks
-  and service marks of AT&T Intellectual Property.
\ No newline at end of file
+============LICENSE_START=======================================================
+Model Loader
+================================================================================
+Copyright © 2017 AT&T Intellectual Property.
+Copyright © 2017 Amdocs
+All rights reserved.
+================================================================================
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+============LICENSE_END=========================================================
+
+ECOMP and OpenECOMP are trademarks
+and service marks of AT&T Intellectual Property.
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 2228b40..08f7f0a 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -38,37 +38,8 @@
                <maven.compiler.source>1.8</maven.compiler.source>
        <maven.compiler.target>1.8</maven.compiler.target>
        </properties>
-       
-       <repositories>
-               <repository>
-                       <id>maven-central</id>
-                       <name>maven-central</name>
-                       <url>http://central.maven.org/maven2/</url>
-                       <releases>
-                               <enabled>true</enabled>
-                               <updatePolicy>never</updatePolicy>
-                       </releases>
-                       <snapshots>
-                               <enabled>false</enabled>
-                       </snapshots>
-               </repository>
-               <repository>
-                       <id>ecomp-nexus</id>
-                       <name>ecomp-nexus</name>
-                       <url>https://ecomp-nexus:8443/repository/maven-releases/</url>
-                       <releases>
-                               <enabled>true</enabled>
-                               <updatePolicy>never</updatePolicy>
-                       </releases>
-                       <snapshots>
-                               <enabled>false</enabled>
-                       </snapshots>
-               </repository>
-       </repositories>
 
-       
        <dependencies>
-               <!-- powermockito dependencies -->
                <dependency>
                        <groupId>org.mockito</groupId>
                        <artifactId>mockito-all</artifactId>
@@ -133,15 +104,14 @@
                </dependency>
                <!-- Common logging framework -->
                <dependency>
-                       <groupId>org.openecomp.cl</groupId>
+                       <groupId>org.openecomp.aai.logging-service</groupId>
                        <artifactId>common-logging</artifactId>
                        <version>1.0.0-SNAPSHOT</version>
                </dependency>
-               <!-- ASDC Client Library -->
                <dependency>
                        <groupId>org.openecomp.sdc</groupId>
-                       <artifactId>sdc-distribution-client</artifactId>
-                       <version>1.1.2</version>
+                   <artifactId>sdc-distribution-client</artifactId>
+                       <version>0.9.0</version>
                </dependency>
                <dependency>
                        <groupId>org.json</groupId>
@@ -168,6 +138,44 @@
         
        </dependencies>
        
+       <!-- Plugins and repositories -->
+          <pluginRepositories>
+                <pluginRepository>
+                           <id>central</id>
+                          <url>http://repo1.maven.org/maven2</url>
+                   </pluginRepository>
+                  <pluginRepository>
+                          <id>EvoSuite</id>
+                        <name>EvoSuite Repository</name>
+                         <url>http://www.evosuite.org/m2</url>
+                  </pluginRepository>
+          </pluginRepositories>
+           <repositories>
+                   <repository>
+                          <id>central</id>
+                          <name>Maven 2 repository 2</name>
+                          <url>http://repo2.maven.org/maven2/</url>
+                  </repository>
+              <repository>
+                         <id>ecomp-releases</id>
+                          <name>ECOMP Release Repository</name>
+                         <url>https://nexus.openecomp.org/content/repositories/releases/</url>
+                  </repository>
+                  <repository>
+                         <id>ecomp-snapshots</id>
+                          <name>ECOMP Snapshot Repository</name>
+                         <url>https://nexus.openecomp.org/content/repositories/snapshots/</url>
+                          <snapshots>
+            <updatePolicy>always</updatePolicy>
+        </snapshots>
+        <releases>
+            <updatePolicy>always</updatePolicy>
+        </releases>
+                  </repository>
+
+          </repositories>
+       
+       
        <build>
                <plugins>
                        <plugin>
@@ -278,25 +286,7 @@
                                        <forceTags>true</forceTags>
                                </configuration>
                        </plugin>
-                       <!-- blackduck maven plugin -->
-                       <plugin>
-                               <groupId>com.blackducksoftware.integration</groupId>
-                               <artifactId>hub-maven-plugin</artifactId>
-                               <version>1.0.4</version>
-                               <inherited>false</inherited>
-                               <configuration>
-                                       <target>${project.basedir/target}</target>
-                               </configuration>
-                               <executions>
-                                       <execution>
-                                               <id>create-bdio-file</id>
-                                               <phase>package</phase>
-                                               <goals>
-                                                       <goal>createHubOutput</goal>
-                                               </goals>
-                                       </execution>
-                               </executions>
-                       </plugin>
+               
                        <!-- Checkstyle plugin - used to report on compliance with -->
                        <!-- the Google style guide. -->
                        <plugin>
diff --git a/src/main/docker/startup.sh b/src/main/docker/startup.sh
index 22950cd..c4a4d5f 100644 (file)
--- a/src/main/docker/startup.sh
+++ b/src/main/docker/startup.sh
@@ -24,4 +24,4 @@ echo "Checking environment for configuration options"
 $BIN_DIR/update_config.sh
 
 echo "Starting up model loader..."
-$BIN_DIR/jetty.sh run > /dev/null 2>&1
\ No newline at end of file
+$BIN_DIR/jetty.sh run > /dev/null 2>&1
diff --git a/src/main/webapp/WEB-INF/applicationContext.xml b/src/main/webapp/WEB-INF/applicationContext.xml
index efca1ce..08a88e6 100644 (file)
--- a/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/src/main/webapp/WEB-INF/applicationContext.xml
@@ -1,3 +1,23 @@
+<!--
+  ============LICENSE_START=======================================================
+  MODEL LOADER SERVICE
+  ================================================================================
+  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=========================================================
+  -->
+
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:context="http://www.springframework.org/schema/context"
     xmlns:mvc="http://www.springframework.org/schema/mvc"
@@ -6,4 +26,4 @@
     http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.0.xsd
     http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.0.xsd">
 
-</beans>
\ No newline at end of file
+</beans>
diff --git a/src/main/webapp/WEB-INF/rest-servlet.xml b/src/main/webapp/WEB-INF/rest-servlet.xml
index e976951..6a23c2b 100644 (file)
--- a/src/main/webapp/WEB-INF/rest-servlet.xml
+++ b/src/main/webapp/WEB-INF/rest-servlet.xml
@@ -1,3 +1,23 @@
+<!--
+  ============LICENSE_START=======================================================
+  MODEL LOADER SERVICE
+  ================================================================================
+  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=========================================================
+  -->
+
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:context="http://www.springframework.org/schema/context"
     xmlns:mvc="http://www.springframework.org/schema/mvc"
@@ -9,4 +29,4 @@
        <bean id="modelLoader" class="org.openecomp.modelloader.service.ModelLoaderService" init-method="start"/>
                
 
-</beans>
\ No newline at end of file
+</beans>
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 7be34e7..c256b26 100644 (file)
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ============LICENSE_START=======================================================
+  MODEL LOADER SERVICE
+  ================================================================================
+  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=========================================================
+  -->
+
 <web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" version="2.5">
   <display-name>model-loader</display-name>
   
@@ -17,4 +37,4 @@
     <servlet-name>rest</servlet-name>
     <url-pattern>/</url-pattern>
   </servlet-mapping>
-</web-app>
\ No newline at end of file
+</web-app>
diff --git a/src/test/java/org/openecomp/modelloader/entity/model/ModelArtifactParserTest.java b/src/test/java/org/openecomp/modelloader/entity/model/ModelArtifactParserTest.java
index 448e5d3..f7b7871 100644 (file)
--- a/src/test/java/org/openecomp/modelloader/entity/model/ModelArtifactParserTest.java
+++ b/src/test/java/org/openecomp/modelloader/entity/model/ModelArtifactParserTest.java
@@ -97,7 +97,7 @@ public class ModelArtifactParserTest {
         System.out.println(model.toString());
       }
 
-      assertTrue(modelList.size() == 14);
+      assertTrue(modelList.size() == 3);
 
       ModelArtifact modelVdc = (ModelArtifact) modelList.get(0);
       assertTrue(
@@ -106,7 +106,7 @@ public class ModelArtifactParserTest {
       assertTrue(modelVdc.getDependentModelIds().size() == 1);
       assertTrue(modelVdc.getDependentModelIds().contains("93d9d45d-7eec-4371-9083-675e4c353de3"));
 
-      ModelArtifact modelPserver = (ModelArtifact) modelList.get(9);
+      ModelArtifact modelPserver = (ModelArtifact) modelList.get(2);
       assertTrue(
           modelPserver.getNameVersionId().equalsIgnoreCase("f2b24d95-c582-48d5-b2d6-c5b3a94ce812"));
       assertTrue(modelPserver.getType().toString().equalsIgnoreCase("MODEL"));
diff --git a/src/test/resources/models/complete-model.xml b/src/test/resources/models/complete-model.xml
index f6aaf1e..45e849b 100644 (file)
--- a/src/test/resources/models/complete-model.xml
+++ b/src/test/resources/models/complete-model.xml
@@ -18,7 +18,7 @@
   ============LICENSE_END=========================================================
   -->
 
-<models xmlns="http://org.openecomp.aai.inventory/v7">
+<models xmlns="http://org.openecomp.aai.inventory/v8">
        <model>
                <model-name-version-id>997fc7-fca1-451f-b953-9a1e6197b4d6
                </model-name-version-id>
@@ -30,7 +30,7 @@
                <relationship-list>
                        <relationship>
                                <related-to>model-element</related-to>
-                               <related-link>https://localhost:8443/aai/v7/service-design-and-creation/model-elements/model-element/ccb3a5a4-1722-4213-8785-2b6b5527d453/
+                               <related-link>https://localhost:8443/aai/v8/service-design-and-creation/model-elements/model-element/ccb3a5a4-1722-4213-8785-2b6b5527d453/
                                </related-link>
                                <relationship-data>
                                        <relationship-key>model-element.model-element-uuid
@@ -63,7 +63,7 @@
                <relationship-list>
                        <relationship>
                                <related-to>model-element</related-to>
-                               <related-link>https://localhost:8443/aai/v7/service-design-and-creation/model-elements/model-element/fc3a2260-d0ee-4c8e-b7e9-74791d7c5721/
+                               <related-link>https://localhost:8443/aai/v8/service-design-and-creation/model-elements/model-element/fc3a2260-d0ee-4c8e-b7e9-74791d7c5721/
                                </related-link>
                                <relationship-data>
                                        <relationship-key>model-element.model-element-uuid
@@ -96,256 +96,7 @@
                        </relationship>
                </relationship-list>
        </model>
-       <model>
-               <model-name-version-id>d09dd9da-0148-46cd-a947-591afc844d24
-               </model-name-version-id>
-               <model-type>widget</model-type>
-               <model-name>connector</model-name>
-               <model-id>63ac2806-4d47-467f-bf9d-5a8a83a13cac</model-id>
-               <model-version>v1.0</model-version>
-               <resource-version>1463175188</resource-version>
-               <relationship-list>
-                       <relationship>
-                               <related-to>model-element</related-to>
-                               <related-link>https://localhost:8443/aai/v7/service-design-and-creation/model-elements/model-element/df2e4cc0-18ca-4046-9c1b-2abec86a58d6/
-                               </related-link>
-                               <relationship-data>
-                                       <relationship-key>model-element.model-element-uuid
-                                       </relationship-key>
-                                       <relationship-value>df2e4cc0-18ca-4046-9c1b-2abec86a58d6
-                                       </relationship-value>
-                               </relationship-data>
-                               <relationship-data>
-                                       <relationship-key>model.model-name-version-id</relationship-key>
-                                       <relationship-value>93d9d45d-7eec-4371-9083-675e4c353de3
-                                       </relationship-value>
-                               </relationship-data>
-                       </relationship>
-               </relationship-list>
-       </model>
-       <model>
-               <model-name-version-id>93a6166f-b3d5-4f06-b4ba-aed48d009ad9
-               </model-name-version-id>
-               <model-type>widget</model-type>
-               <model-name>generic-vnf</model-name>
-               <model-id>acc6edd8-a8d4-4b93-afaa-0994068be14c</model-id>
-               <model-version>v1.0</model-version>
-               <resource-version>1463175177</resource-version>
-               <relationship-list>
-                       <relationship>
-                               <related-to>model-element</related-to>
-                               <related-link>https://localhost:8443/aai/v7/service-design-and-creation/model-elements/model-element/88a0e5fd-0254-41dc-a9d5-7a7db446f2f3/
-                               </related-link>
-                               <relationship-data>
-                                       <relationship-key>model-element.model-element-uuid
-                                       </relationship-key>
-                                       <relationship-value>88a0e5fd-0254-41dc-a9d5-7a7db446f2f3
-                                       </relationship-value>
-                               </relationship-data>
-                               <relationship-data>
-                                       <relationship-key>model.model-name-version-id</relationship-key>
-                                       <relationship-value>8da97b81-e0e9-4157-a4cd-af3ba52871d6
-                                       </relationship-value>
-                               </relationship-data>
-                       </relationship>
-                       <relationship>
-                               <related-to>model-element</related-to>
-                               <related-link>https://localhost:8443/aai/v7/service-design-and-creation/model-elements/model-element/baefe75b-30f2-43d2-bd73-553f65ea1405/
-                               </related-link>
-                               <relationship-data>
-                                       <relationship-key>model-element.model-element-uuid
-                                       </relationship-key>
-                                       <relationship-value>baefe75b-30f2-43d2-bd73-553f65ea1405
-                                       </relationship-value>
-                               </relationship-data>
-                               <relationship-data>
-                                       <relationship-key>model.model-name-version-id</relationship-key>
-                                       <relationship-value>a6d9de88-4046-4b78-a59e-5691243d292a
-                                       </relationship-value>
-                               </relationship-data>
-                       </relationship>
-               </relationship-list>
-       </model>
-       <model>
-               <model-name-version-id>759dbd4a-2473-46f3-a932-48d987c9b4a1
-               </model-name-version-id>
-               <model-type>resource</model-type>
-               <model-name>ipe</model-name>
-               <model-id>323ac9c1-b345-44a2-9d07-dd7653137705</model-id>
-               <model-version>v1.0</model-version>
-               <resource-version>1463175188</resource-version>
-               <relationship-list>
-                       <relationship>
-                               <related-to>model-element</related-to>
-                               <related-link>https://localhost:8443/aai/v7/service-design-and-creation/model-elements/model-element/746b864c-333b-4da9-806e-c70f883f8c9d/
-                               </related-link>
-                               <relationship-data>
-                                       <relationship-key>model-element.model-element-uuid
-                                       </relationship-key>
-                                       <relationship-value>746b864c-333b-4da9-806e-c70f883f8c9d
-                                       </relationship-value>
-                               </relationship-data>
-                               <relationship-data>
-                                       <relationship-key>element-choice-set.element-choice-set-uuid
-                                       </relationship-key>
-                                       <relationship-value>1c69d7dc-ddf1-4cf3-86dd-929aa886429c
-                                       </relationship-value>
-                               </relationship-data>
-                               <relationship-data>
-                                       <relationship-key>constrained-element-set.constrained-element-set-uuid
-                                       </relationship-key>
-                                       <relationship-value>999</relationship-value>
-                               </relationship-data>
-                               <relationship-data>
-                                       <relationship-key>model-element.model-element-uuid
-                                       </relationship-key>
-                                       <relationship-value>df2e4cc0-18ca-4046-9c1b-2abec86a58d6
-                                       </relationship-value>
-                               </relationship-data>
-                               <relationship-data>
-                                       <relationship-key>model.model-name-version-id</relationship-key>
-                                       <relationship-value>93d9d45d-7eec-4371-9083-675e4c353de3
-                                       </relationship-value>
-                               </relationship-data>
-                       </relationship>
-               </relationship-list>
-       </model>
-       <model>
-               <model-name-version-id>93d9d45d-7eec-4371-9083-675e4c353de3
-               </model-name-version-id>
-               <model-type>service</model-type>
-               <model-name>wan-connector</model-name>
-               <model-id>e4a9901b-6c94-4e07-b8d8-b877d3df554c</model-id>
-               <model-version>v1.0</model-version>
-               <model-description>Connects a customer vpn to the border elements of
-                       an AT&amp;T product</model-description>
-               <resource-version>1463175188</resource-version>
-               <relationship-list />
-       </model>
-       <model>
-               <model-name-version-id>35be1acf-1298-48c6-a128-66850083b8bd
-               </model-name-version-id>
-               <model-type>resource</model-type>
-               <model-name>pBgf</model-name>
-               <model-id>897fb848-3b38-4d0d-a6a7-2543070fc450</model-id>
-               <model-version>v1.0</model-version>
-               <resource-version>1463175188</resource-version>
-               <relationship-list>
-                       <relationship>
-                               <related-to>model-element</related-to>
-                               <related-link>https://localhost:8443/aai/v7/service-design-and-creation/model-elements/model-element/d985355f-a162-493b-8cb9-0b5b948bb7b0/
-                               </related-link>
-                               <relationship-data>
-                                       <relationship-key>model-element.model-element-uuid
-                                       </relationship-key>
-                                       <relationship-value>d985355f-a162-493b-8cb9-0b5b948bb7b0
-                                       </relationship-value>
-                               </relationship-data>
-                               <relationship-data>
-                                       <relationship-key>element-choice-set.element-choice-set-uuid
-                                       </relationship-key>
-                                       <relationship-value>646ee687-1475-419d-bd10-f3760d5430dc
-                                       </relationship-value>
-                               </relationship-data>
-                               <relationship-data>
-                                       <relationship-key>constrained-element-set.constrained-element-set-uuid
-                                       </relationship-key>
-                                       <relationship-value>999</relationship-value>
-                               </relationship-data>
-                               <relationship-data>
-                                       <relationship-key>model-element.model-element-uuid
-                                       </relationship-key>
-                                       <relationship-value>df2e4cc0-18ca-4046-9c1b-2abec86a58d6
-                                       </relationship-value>
-                               </relationship-data>
-                               <relationship-data>
-                                       <relationship-key>model.model-name-version-id</relationship-key>
-                                       <relationship-value>93d9d45d-7eec-4371-9083-675e4c353de3
-                                       </relationship-value>
-                               </relationship-data>
-                       </relationship>
-               </relationship-list>
-       </model>
-       <model>
-               <model-name-version-id>a6d9de88-4046-4b78-a59e-5691243d292a
-               </model-name-version-id>
-               <model-type>resource</model-type>
-               <model-name>vSbg</model-name>
-               <model-id>326690fa-9747-4ebd-9d9f-a5ef02943e1a</model-id>
-               <model-version>v1.0</model-version>
-               <resource-version>1463175188</resource-version>
-               <relationship-list>
-                       <relationship>
-                               <related-to>model-element</related-to>
-                               <related-link>https://localhost:8443/aai/v7/service-design-and-creation/model-elements/model-element/b989a7b6-907a-431d-b54e-262d29c45b6f/
-                               </related-link>
-                               <relationship-data>
-                                       <relationship-key>model-element.model-element-uuid
-                                       </relationship-key>
-                                       <relationship-value>b989a7b6-907a-431d-b54e-262d29c45b6f
-                                       </relationship-value>
-                               </relationship-data>
-                               <relationship-data>
-                                       <relationship-key>element-choice-set.element-choice-set-uuid
-                                       </relationship-key>
-                                       <relationship-value>646ee687-1475-419d-bd10-f3760d5430dc
-                                       </relationship-value>
-                               </relationship-data>
-                               <relationship-data>
-                                       <relationship-key>constrained-element-set.constrained-element-set-uuid
-                                       </relationship-key>
-                                       <relationship-value>999</relationship-value>
-                               </relationship-data>
-                               <relationship-data>
-                                       <relationship-key>model-element.model-element-uuid
-                                       </relationship-key>
-                                       <relationship-value>df2e4cc0-18ca-4046-9c1b-2abec86a58d6
-                                       </relationship-value>
-                               </relationship-data>
-                               <relationship-data>
-                                       <relationship-key>model.model-name-version-id</relationship-key>
-                                       <relationship-value>93d9d45d-7eec-4371-9083-675e4c353de3
-                                       </relationship-value>
-                               </relationship-data>
-                       </relationship>
-               </relationship-list>
-       </model>
-       <model>
-               <model-name-version-id>ae16244f-4d29-4801-a559-e25f2db2a4c3
-               </model-name-version-id>
-               <model-type>resource</model-type>
-               <model-name>l2-bridge-for-wan-connector</model-name>
-               <model-id>9494e925-04a0-4f52-983b-36fa8f75d97e</model-id>
-               <model-version>v1.0</model-version>
-               <model-description>An l2-bridge used by a wan connector connects an
-                       ipe to a product border element</model-description>
-               <resource-version>1463175188</resource-version>
-               <relationship-list>
-                       <relationship>
-                               <related-to>model-element</related-to>
-                               <related-link>https://localhost:8443/aai/v7/service-design-and-creation/model-elements/model-element/061f2f1d-d76f-4b4a-810c-1f9a452a4db3/
-                               </related-link>
-                               <relationship-data>
-                                       <relationship-key>model-element.model-element-uuid
-                                       </relationship-key>
-                                       <relationship-value>061f2f1d-d76f-4b4a-810c-1f9a452a4db3
-                                       </relationship-value>
-                               </relationship-data>
-                               <relationship-data>
-                                       <relationship-key>model-element.model-element-uuid
-                                       </relationship-key>
-                                       <relationship-value>df2e4cc0-18ca-4046-9c1b-2abec86a58d6
-                                       </relationship-value>
-                               </relationship-data>
-                               <relationship-data>
-                                       <relationship-key>model.model-name-version-id</relationship-key>
-                                       <relationship-value>93d9d45d-7eec-4371-9083-675e4c353de3
-                                       </relationship-value>
-                               </relationship-data>
-                       </relationship>
-               </relationship-list>
-       </model>
-       <model>
+               <model>
                <model-name-version-id>f2b24d95-c582-48d5-b2d6-c5b3a94ce812
                </model-name-version-id>
                <model-type>widget</model-type>
@@ -356,7 +107,7 @@
                <relationship-list>
                        <relationship>
                                <related-to>model-element</related-to>
-                               <related-link>https://localhost:8443/aai/v7/service-design-and-creation/model-elements/model-element/5eab2693-78ec-446a-afe4-14332e348246/
+                               <related-link>https://localhost:8443/aai/v8/service-design-and-creation/model-elements/model-element/5eab2693-78ec-446a-afe4-14332e348246/
                                </related-link>
                                <relationship-data>
                                        <relationship-key>model-element.model-element-uuid
@@ -372,7 +123,7 @@
                        </relationship>
                        <relationship>
                                <related-to>model-element</related-to>
-                               <related-link>https://localhost:8443/aai/v7/service-design-and-creation/model-elements/model-element/f7659dac-6311-45b6-b483-60b39364a85a/
+                               <related-link>https://localhost:8443/aai/v8/service-design-and-creation/model-elements/model-element/f7659dac-6311-45b6-b483-60b39364a85a/
                                </related-link>
                                <relationship-data>
                                        <relationship-key>model-element.model-element-uuid
@@ -388,113 +139,5 @@
                        </relationship>
                </relationship-list>
        </model>
-       <model>
-               <model-name-version-id>53be71b0-c689-4841-9fe6-c7fab529d310
-               </model-name-version-id>
-               <model-type>widget</model-type>
-               <model-name>p-interface</model-name>
-               <model-id>759dbd4a-2473-46f3-a932-48d987c9b4a1</model-id>
-               <model-version>v1.0</model-version>
-               <resource-version>1463175178</resource-version>
-               <relationship-list>
-                       <relationship>
-                               <related-to>model-element</related-to>
-                               <related-link>https://localhost:8443/aai/v7/service-design-and-creation/model-elements/model-element/f118b348-1231-4895-ad26-0b227253cdf0/
-                               </related-link>
-                               <relationship-data>
-                                       <relationship-key>model-element.model-element-uuid
-                                       </relationship-key>
-                                       <relationship-value>f118b348-1231-4895-ad26-0b227253cdf0
-                                       </relationship-value>
-                               </relationship-data>
-                               <relationship-data>
-                                       <relationship-key>model-element.model-element-uuid
-                                       </relationship-key>
-                                       <relationship-value>f7659dac-6311-45b6-b483-60b39364a85a
-                                       </relationship-value>
-                               </relationship-data>
-                               <relationship-data>
-                                       <relationship-key>model.model-name-version-id</relationship-key>
-                                       <relationship-value>759dbd4a-2473-46f3-a932-48d987c9b4a1
-                                       </relationship-value>
-                               </relationship-data>
-                       </relationship>
-               </relationship-list>
-       </model>
-       <model>
-               <model-name-version-id>706c7e05-8faf-4258-acca-8e4cf556961d
-               </model-name-version-id>
-               <model-type>widget</model-type>
-               <model-name>l-interface</model-name>
-               <model-id>92e579cc-eb63-490f-b9eb-16b7af2660c7</model-id>
-               <model-version>v1.0</model-version>
-               <resource-version>1463175178</resource-version>
-               <relationship-list>
-                       <relationship>
-                               <related-to>model-element</related-to>
-                               <related-link>https://localhost:8443/aai/v7/service-design-and-creation/model-elements/model-element/82f1cf8a-470b-4aaa-a1eb-27b83ba8f176/
-                               </related-link>
-                               <relationship-data>
-                                       <relationship-key>model-element.model-element-uuid
-                                       </relationship-key>
-                                       <relationship-value>82f1cf8a-470b-4aaa-a1eb-27b83ba8f176
-                                       </relationship-value>
-                               </relationship-data>
-                               <relationship-data>
-                                       <relationship-key>model-element.model-element-uuid
-                                       </relationship-key>
-                                       <relationship-value>f7659dac-6311-45b6-b483-60b39364a85a
-                                       </relationship-value>
-                               </relationship-data>
-                               <relationship-data>
-                                       <relationship-key>model.model-name-version-id</relationship-key>
-                                       <relationship-value>759dbd4a-2473-46f3-a932-48d987c9b4a1
-                                       </relationship-value>
-                               </relationship-data>
-                       </relationship>
-               </relationship-list>
-       </model>
-       <model>
-               <model-name-version-id>897df7ea-8938-42b0-bc57-46e913a4d93b
-               </model-name-version-id>
-               <model-type>widget</model-type>
-               <model-name>logical-link</model-name>
-               <model-id>c575bd11-6907-4b44-82d8-f55294fff63f</model-id>
-               <model-version>v1.0</model-version>
-               <resource-version>1463175143</resource-version>
-               <relationship-list />
-       </model>
-       <model>
-               <model-name-version-id>f749dc48-4f58-4601-9d3e-605a06a0899e
-               </model-name-version-id>
-               <model-type>widget</model-type>
-               <model-name>vlan</model-name>
-               <model-id>76544264-9287-45c6-871b-6e7a456a9f32</model-id>
-               <model-version>v1.0</model-version>
-               <resource-version>1463175178</resource-version>
-               <relationship-list>
-                       <relationship>
-                               <related-to>model-element</related-to>
-                               <related-link>https://localhost:8443/aai/v7/service-design-and-creation/model-elements/model-element/fd994cef-bc62-460f-bd21-cc8c07fbccc4/
-                               </related-link>
-                               <relationship-data>
-                                       <relationship-key>model-element.model-element-uuid
-                                       </relationship-key>
-                                       <relationship-value>fd994cef-bc62-460f-bd21-cc8c07fbccc4
-                                       </relationship-value>
-                               </relationship-data>
-                               <relationship-data>
-                                       <relationship-key>model-element.model-element-uuid
-                                       </relationship-key>
-                                       <relationship-value>f7659dac-6311-45b6-b483-60b39364a85a
-                                       </relationship-value>
-                               </relationship-data>
-                               <relationship-data>
-                                       <relationship-key>model.model-name-version-id</relationship-key>
-                                       <relationship-value>759dbd4a-2473-46f3-a932-48d987c9b4a1
-                                       </relationship-value>
-                               </relationship-data>
-                       </relationship>
-               </relationship-list>
-       </model>
+       
 </models>
diff --git a/src/test/resources/models/named-query-wan-connector.xml b/src/test/resources/models/named-query-wan-connector.xml
index d0d5a05..5606cf8 100644 (file)
--- a/src/test/resources/models/named-query-wan-connector.xml
+++ b/src/test/resources/models/named-query-wan-connector.xml
@@ -18,7 +18,7 @@
   ============LICENSE_END=========================================================
   -->
 
-<named-query xmlns="http://org.openecomp.aai.inventory/v7">
+<named-query xmlns="http://org.openecomp.aai.inventory/v8">
        <named-query-uuid>94cac189-8d88-4d63-a194-f44214e080ff
        </named-query-uuid>
        <named-query-name>wan-connector</named-query-name>
diff --git a/src/test/resources/models/vnf-model.xml b/src/test/resources/models/vnf-model.xml
index 616f4b9..2dd44b5 100644 (file)
--- a/src/test/resources/models/vnf-model.xml
+++ b/src/test/resources/models/vnf-model.xml
@@ -18,7 +18,7 @@
   ============LICENSE_END=========================================================
   -->
 
-<model xmlns="http://org.openecomp.aai.inventory/v7">
+<model xmlns="http://org.openecomp.aai.inventory/v8">
        <model-id>model-id</model-id>
        <model-type>widget</model-type>
        <model-name>generic-vnf</model-name>
diff --git a/src/test/resources/models/wan-connector-model.xml b/src/test/resources/models/wan-connector-model.xml
index 5e3ff10..c8a434b 100644 (file)
--- a/src/test/resources/models/wan-connector-model.xml
+++ b/src/test/resources/models/wan-connector-model.xml
@@ -18,15 +18,14 @@
   ============LICENSE_END=========================================================
   -->
 
-<model xmlns="http://org.openecomp.aai.inventory/v7">
+<model xmlns="http://org.openecomp.aai.inventory/v8">
        <model-id>e4a9901b-6c94-4e07-b8d8-b877d3df554c</model-id>
        <model-type>service</model-type>
-       <model-name>wan-connector</model-name>
+       <model-name>test-model</model-name>
        <model-version>v1.0</model-version>
        <model-name-version-id>93d9d45d-7eec-4371-9083-675e4c353de3
        </model-name-version-id>
-       <model-description>Connects a customer vpn to the border elements of an
-               AT&amp;T product</model-description>
+       <model-description>desc</model-description>
        <metadata>
                <metadatum>
                        <metaname>a</metaname>
diff --git a/src/test/resources/vnfcatalogexample.xml b/src/test/resources/vnfcatalogexample.xml
index 1557efa..c7ba530 100644 (file)
--- a/src/test/resources/vnfcatalogexample.xml
+++ b/src/test/resources/vnfcatalogexample.xml
@@ -49,21 +49,21 @@
                        <software-version-state>0</software-version-state>
                        <software-filetype>IMAGE</software-filetype>
                        <file-md5-value>1c59a521885c465004456f74d003726c</file-md5-value>
-                       <software-filename>fortinet-FW-IMG-5.2.7.qcow2</software-filename>
+                       <software-filename>test3</software-filename>
                </software-version-list>
                <software-version-list>
                        <software-version>5.2.5</software-version>
                        <software-version-state>1</software-version-state>
                        <software-filetype>IMAGE</software-filetype>
                        <file-md5-value>C4D2CBE51669796E48623E006782F7DC</file-md5-value>
-                       <software-filename>fortinet-FW-IMG-5.2.5.qcow2</software-filename>
+                       <software-filename>test2</software-filename>
                </software-version-list>
                <software-version-list>
                        <software-version>5.2.4</software-version>
                        <software-version-state>2</software-version-state>
                        <software-filetype>IMAGE</software-filetype>
                        <file-md5-value>4987E1E743FD641C879E1D3C5D50BCE0</file-md5-value>
-                       <software-filename>fortinet-FW-IMG-5.2.4.qcow2</software-filename>
+                       <software-filename>test1</software-filename>
                </software-version-list>
                <vnf-features-list>
                        <vnf-feature>APPID</vnf-feature>
@@ -112,21 +112,21 @@
                        <software-version-state>0</software-version-state>
                        <software-filetype>IMAGE</software-filetype>
                        <file-md5-value>1c59a521885c465004456f74d003726c</file-md5-value>
-                       <software-filename>fortinet-FW-IMG-5.2.7.qcow2</software-filename>
+                       <software-filename>software file name 3</software-filename>
                </software-version-list>
                <software-version-list>
                        <software-version>5.2.5</software-version>
                        <software-version-state>1</software-version-state>
                        <software-filetype>IMAGE</software-filetype>
                        <file-md5-value>C4D2CBE51669796E48623E006782F7DC</file-md5-value>
-                       <software-filename>fortinet-FW-IMG-5.2.5.qcow2</software-filename>
+                       <software-filename>software file name 2</software-filename>
                </software-version-list>
                <software-version-list>
                        <software-version>5.2.4</software-version>
                        <software-version-state>2</software-version-state>
                        <software-filetype>IMAGE</software-filetype>
                        <file-md5-value>4987E1E743FD641C879E1D3C5D50BCE0</file-md5-value>
-                       <software-filename>fortinet-FW-IMG-5.2.4.qcow2</software-filename>
+                       <software-filename>software file name</software-filename>
                </software-version-list>
                <vnf-features-list>
                        <vnf-feature>APPID</vnf-feature>
@@ -141,1738 +141,9 @@
                        <vnf-feature>Anti-Virus</vnf-feature>
                </vnf-features-list>
                <license-list>
-                       <license-assignment-group>FortiGate-VM01</license-assignment-group>
+                       <license-assignment-group>license group</license-assignment-group>
                        <license-required>FALSE</license-required>
                </license-list>
        </part-number-list>
-       <part-number-list>
-               <att-part-number>FortiGate-VM02</att-part-number>
-               <vnf-type>FW</vnf-type>
-               <vendor-info>
-                       <vendor-name>FORTINET</vendor-name>
-                       <vendor-part-number>FortiGate-VM02</vendor-part-number>
-                       <vendor-model>VM02</vendor-model>
-               </vendor-info>
-               <vcpu>
-                       <vcpu-default>2</vcpu-default>
-                       <vcpu-min>1</vcpu-min>
-                       <vcpu-max>2</vcpu-max>
-               </vcpu>
-               <vmemory>
-                       <vmemory-default>4</vmemory-default>
-                       <vmemory-units>GB</vmemory-units>
-                       <vmemory-min>1</vmemory-min>
-                       <vmemory-max>4</vmemory-max>
-               </vmemory>
-               <vdisk>
-                       <vdisk-default>4</vdisk-default>
-                       <vdisk-units>GB</vdisk-units>
-                       <vdisk-min>2</vdisk-min>
-                       <vdisk-max>32</vdisk-max>
-               </vdisk>
-               <software-version-list>
-                       <software-version>5.2.7</software-version>
-                       <software-version-state>0</software-version-state>
-                       <software-filetype>IMAGE</software-filetype>
-                       <file-md5-value>1c59a521885c465004456f74d003726c</file-md5-value>
-                       <software-filename>fortinet-FW-IMG-5.2.7.qcow2</software-filename>
-               </software-version-list>
-               <software-version-list>
-                       <software-version>5.2.5</software-version>
-                       <software-version-state>1</software-version-state>
-                       <software-filetype>IMAGE</software-filetype>
-                       <file-md5-value>C4D2CBE51669796E48623E006782F7DC</file-md5-value>
-                       <software-filename>fortinet-FW-IMG-5.2.5.qcow2</software-filename>
-               </software-version-list>
-               <software-version-list>
-                       <software-version>5.2.4</software-version>
-                       <software-version-state>2</software-version-state>
-                       <software-filetype>IMAGE</software-filetype>
-                       <file-md5-value>4987E1E743FD641C879E1D3C5D50BCE0</file-md5-value>
-                       <software-filename>fortinet-FW-IMG-5.2.4.qcow2</software-filename>
-               </software-version-list>
-               <vnf-features-list>
-                       <vnf-feature>APPID</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>IPS-IDS</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>URLF</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>Anti-Virus</vnf-feature>
-               </vnf-features-list>
-               <license-list>
-                       <license-assignment-group>FortiGate-VM02</license-assignment-group>
-                       <license-required>FALSE</license-required>
-               </license-list>
-       </part-number-list>
-       <part-number-list>
-               <att-part-number>FortiGate-VM04</att-part-number>
-               <vnf-type>FW</vnf-type>
-               <vendor-info>
-                       <vendor-name>FORTINET</vendor-name>
-                       <vendor-part-number>FortiGate-VM04</vendor-part-number>
-                       <vendor-model>VM04</vendor-model>
-               </vendor-info>
-               <vcpu>
-                       <vcpu-default>4</vcpu-default>
-                       <vcpu-min>1</vcpu-min>
-                       <vcpu-max>4</vcpu-max>
-               </vcpu>
-               <vmemory>
-                       <vmemory-default>6</vmemory-default>
-                       <vmemory-units>GB</vmemory-units>
-                       <vmemory-min>1</vmemory-min>
-                       <vmemory-max>6</vmemory-max>
-               </vmemory>
-               <vdisk>
-                       <vdisk-default>8</vdisk-default>
-                       <vdisk-units>GB</vdisk-units>
-                       <vdisk-min>2</vdisk-min>
-                       <vdisk-max>32</vdisk-max>
-               </vdisk>
-               <software-version-list>
-                       <software-version>5.2.7</software-version>
-                       <software-version-state>0</software-version-state>
-                       <software-filetype>IMAGE</software-filetype>
-                       <file-md5-value>1c59a521885c465004456f74d003726c</file-md5-value>
-                       <software-filename>fortinet-FW-IMG-5.2.7.qcow2</software-filename>
-               </software-version-list>
-               <software-version-list>
-                       <software-version>5.2.5</software-version>
-                       <software-version-state>1</software-version-state>
-                       <software-filetype>IMAGE</software-filetype>
-                       <file-md5-value>C4D2CBE51669796E48623E006782F7DC</file-md5-value>
-                       <software-filename>fortinet-FW-IMG-5.2.5.qcow2</software-filename>
-               </software-version-list>
-               <software-version-list>
-                       <software-version>5.2.4</software-version>
-                       <software-version-state>2</software-version-state>
-                       <software-filetype>IMAGE</software-filetype>
-                       <file-md5-value>4987E1E743FD641C879E1D3C5D50BCE0</file-md5-value>
-                       <software-filename>fortinet-FW-IMG-5.2.4.qcow2</software-filename>
-               </software-version-list>
-               <vnf-features-list>
-                       <vnf-feature>APPID</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>IPS-IDS</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>URLF</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>Anti-Virus</vnf-feature>
-               </vnf-features-list>
-               <license-list>
-                       <license-assignment-group>FortiGate-VM04</license-assignment-group>
-                       <license-required>FALSE</license-required>
-               </license-list>
-       </part-number-list>
-       <part-number-list>
-               <att-part-number>FortiGate-VM08</att-part-number>
-               <vnf-type>FW</vnf-type>
-               <vendor-info>
-                       <vendor-name>FORTINET</vendor-name>
-                       <vendor-part-number>FortiGate-VM08</vendor-part-number>
-                       <vendor-model>VM08</vendor-model>
-               </vendor-info>
-               <vcpu>
-                       <vcpu-default>8</vcpu-default>
-                       <vcpu-min>1</vcpu-min>
-                       <vcpu-max>8</vcpu-max>
-               </vcpu>
-               <vmemory>
-                       <vmemory-default>12</vmemory-default>
-                       <vmemory-units>GB</vmemory-units>
-                       <vmemory-min>1</vmemory-min>
-                       <vmemory-max>12</vmemory-max>
-               </vmemory>
-               <vdisk>
-                       <vdisk-default>16</vdisk-default>
-                       <vdisk-units>GB</vdisk-units>
-                       <vdisk-min>2</vdisk-min>
-                       <vdisk-max>32</vdisk-max>
-               </vdisk>
-               <software-version-list>
-                       <software-version>5.2.7</software-version>
-                       <software-version-state>0</software-version-state>
-                       <software-filetype>IMAGE</software-filetype>
-                       <file-md5-value>1c59a521885c465004456f74d003726c</file-md5-value>
-                       <software-filename>fortinet-FW-IMG-5.2.7.qcow2</software-filename>
-               </software-version-list>
-               <software-version-list>
-                       <software-version>5.2.5</software-version>
-                       <software-version-state>1</software-version-state>
-                       <software-filetype>IMAGE</software-filetype>
-                       <file-md5-value>C4D2CBE51669796E48623E006782F7DC</file-md5-value>
-                       <software-filename>fortinet-FW-IMG-5.2.5.qcow2</software-filename>
-               </software-version-list>
-               <software-version-list>
-                       <software-version>5.2.4</software-version>
-                       <software-version-state>2</software-version-state>
-                       <software-filetype>IMAGE</software-filetype>
-                       <file-md5-value>4987E1E743FD641C879E1D3C5D50BCE0</file-md5-value>
-                       <software-filename>fortinet-FW-IMG-5.2.4.qcow2</software-filename>
-               </software-version-list>
-               <vnf-features-list>
-                       <vnf-feature>APPID</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>IPS-IDS</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>URLF</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>Anti-Virus</vnf-feature>
-               </vnf-features-list>
-               <license-list>
-                       <license-assignment-group>FortiGate-VM08</license-assignment-group>
-                       <license-required>FALSE</license-required>
-               </license-list>
-       </part-number-list>
-       <part-number-list>
-               <att-part-number>L-CSR-10M-APP-1Y</att-part-number>
-               <vnf-type>RT</vnf-type>
-               <vendor-info>
-                       <vendor-name>CISCO</vendor-name>
-                       <vendor-part-number>L-CSR-10M-APP-1Y</vendor-part-number>
-                       <vendor-model>L-CSR-10M-APP-1Y</vendor-model>
-               </vendor-info>
-               <vcpu>
-                       <vcpu-default>1</vcpu-default>
-                       <vcpu-min>1</vcpu-min>
-                       <vcpu-max>1</vcpu-max>
-               </vcpu>
-               <vmemory>
-                       <vmemory-default>4</vmemory-default>
-                       <vmemory-units>GB</vmemory-units>
-                       <vmemory-min>4</vmemory-min>
-                       <vmemory-max>4</vmemory-max>
-               </vmemory>
-               <vdisk>
-                       <vdisk-default>8</vdisk-default>
-                       <vdisk-units>GB</vdisk-units>
-                       <vdisk-min>8</vdisk-min>
-                       <vdisk-max>8</vdisk-max>
-               </vdisk>
-               <software-version-list>
-                       <software-version>3.16.1aS</software-version>
-                       <software-version-state>0</software-version-state>
-                       <software-filetype>IMAGE</software-filetype>
-                       <software-filename>cisco-RT-IMG-csr1000v-universalk9.03.16.01a.S.155-3.S1a-ext.qcow2</software-filename>
-                       <file-md5-value>D034E0BC74A84EFFE667113E5ABAC6E1</file-md5-value>
-               </software-version-list>
-
-               <vnf-features-list>
-                       <vnf-feature>IPv6</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>NetFLOW v9</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>NTP</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>SNMP</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>GRE Tunnel</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>Border Gateway Protocol (BGP)</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>Open Shortest Path First (OSPF)</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>Enhanced Interior Gateway Routing Protocol (EIGRP)</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>NAT</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>DHCP Server</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>DHCP Relay</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>VRF-Lite</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>COS</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>Multicast</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>HSRP</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>VRRP</vnf-feature>
-               </vnf-features-list>
-               <license-list>
-                       <license-assignment-group>L-CSR-10M-APP-1Y</license-assignment-group>
-                       <license-required>TRUE</license-required>
-               </license-list>
-       </part-number-list>
-       <part-number-list>
-               <att-part-number>L-CSR-50M-APP-1Y</att-part-number>
-               <vnf-type>RT</vnf-type>
-               <vendor-info>
-                       <vendor-name>CISCO</vendor-name>
-                       <vendor-part-number>L-CSR-50M-APP-1Y</vendor-part-number>
-                       <vendor-model>L-CSR-50M-APP-1Y</vendor-model>
-               </vendor-info>
-               <vcpu>
-                       <vcpu-default>1</vcpu-default>
-                       <vcpu-min>1</vcpu-min>
-                       <vcpu-max>1</vcpu-max>
-               </vcpu>
-               <vmemory>
-                       <vmemory-default>4</vmemory-default>
-                       <vmemory-units>GB</vmemory-units>
-                       <vmemory-min>4</vmemory-min>
-                       <vmemory-max>4</vmemory-max>
-               </vmemory>
-               <vdisk>
-                       <vdisk-default>8</vdisk-default>
-                       <vdisk-units>GB</vdisk-units>
-                       <vdisk-min>8</vdisk-min>
-                       <vdisk-max>8</vdisk-max>
-               </vdisk>
-               <software-version-list>
-                       <software-version>3.16.1aS</software-version>
-                       <software-version-state>0</software-version-state>
-                       <software-filetype>IMAGE</software-filetype>
-                       <software-filename>cisco-RT-IMG-csr1000v-universalk9.03.16.01a.S.155-3.S1a-ext.qcow2</software-filename>
-                       <file-md5-value>D034E0BC74A84EFFE667113E5ABAC6E1</file-md5-value>
-               </software-version-list>
 
-               <vnf-features-list>
-                       <vnf-feature>IPv6</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>NetFLOW v9</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>NTP</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>SNMP</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>GRE Tunnel</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>Border Gateway Protocol (BGP)</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>Open Shortest Path First (OSPF)</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>Enhanced Interior Gateway Routing Protocol (EIGRP)</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>NAT</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>DHCP Server</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>DHCP Relay</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>VRF-Lite</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>COS</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>Multicast</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>HSRP</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>VRRP</vnf-feature>
-               </vnf-features-list>
-               <license-list>
-                       <license-assignment-group>L-CSR-50M-APP-1Y</license-assignment-group>
-                       <license-required>TRUE</license-required>
-               </license-list>
-       </part-number-list>
-       <part-number-list>
-               <att-part-number>L-CSR-100M-APP-1Y</att-part-number>
-               <vnf-type>RT</vnf-type>
-               <vendor-info>
-                       <vendor-name>CISCO</vendor-name>
-                       <vendor-part-number>L-CSR-100M-APP-1Y</vendor-part-number>
-                       <vendor-model>L-CSR-100M-APP-1Y</vendor-model>
-               </vendor-info>
-               <vcpu>
-                       <vcpu-default>1</vcpu-default>
-                       <vcpu-min>1</vcpu-min>
-                       <vcpu-max>1</vcpu-max>
-               </vcpu>
-               <vmemory>
-                       <vmemory-default>4</vmemory-default>
-                       <vmemory-units>GB</vmemory-units>
-                       <vmemory-min>4</vmemory-min>
-                       <vmemory-max>4</vmemory-max>
-               </vmemory>
-               <vdisk>
-                       <vdisk-default>8</vdisk-default>
-                       <vdisk-units>GB</vdisk-units>
-                       <vdisk-min>8</vdisk-min>
-                       <vdisk-max>8</vdisk-max>
-               </vdisk>
-               <software-version-list>
-                       <software-version>3.16.1aS</software-version>
-                       <software-version-state>0</software-version-state>
-                       <software-filetype>IMAGE</software-filetype>
-                       <software-filename>cisco-RT-IMG-csr1000v-universalk9.03.16.01a.S.155-3.S1a-ext.qcow2</software-filename>
-                       <file-md5-value>D034E0BC74A84EFFE667113E5ABAC6E1</file-md5-value>
-               </software-version-list>
-
-               <vnf-features-list>
-                       <vnf-feature>IPv6</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>NetFLOW v9</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>NTP</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>SNMP</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>GRE Tunnel</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>Border Gateway Protocol (BGP)</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>Open Shortest Path First (OSPF)</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>Enhanced Interior Gateway Routing Protocol (EIGRP)</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>NAT</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>DHCP Server</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>DHCP Relay</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>VRF-Lite</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>COS</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>Multicast</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>HSRP</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>VRRP</vnf-feature>
-               </vnf-features-list>
-               <license-list>
-                       <license-assignment-group>L-CSR-100M-APP-1Y</license-assignment-group>
-                       <license-required>TRUE</license-required>
-               </license-list>
-       </part-number-list>
-       <part-number-list>
-               <att-part-number>L-CSR-250M-APP-1Y</att-part-number>
-               <vnf-type>RT</vnf-type>
-               <vendor-info>
-                       <vendor-name>CISCO</vendor-name>
-                       <vendor-part-number>L-CSR-250M-APP-1Y</vendor-part-number>
-                       <vendor-model>L-CSR-250M-APP-1Y</vendor-model>
-               </vendor-info>
-               <vcpu>
-                       <vcpu-default>1</vcpu-default>
-                       <vcpu-min>1</vcpu-min>
-                       <vcpu-max>1</vcpu-max>
-               </vcpu>
-               <vmemory>
-                       <vmemory-default>4</vmemory-default>
-                       <vmemory-units>GB</vmemory-units>
-                       <vmemory-min>4</vmemory-min>
-                       <vmemory-max>4</vmemory-max>
-               </vmemory>
-               <vdisk>
-                       <vdisk-default>8</vdisk-default>
-                       <vdisk-units>GB</vdisk-units>
-                       <vdisk-min>8</vdisk-min>
-                       <vdisk-max>8</vdisk-max>
-               </vdisk>
-               <software-version-list>
-                       <software-version>3.16.1aS</software-version>
-                       <software-version-state>0</software-version-state>
-                       <software-filetype>IMAGE</software-filetype>
-                       <software-filename>cisco-RT-IMG-csr1000v-universalk9.03.16.01a.S.155-3.S1a-ext.qcow2</software-filename>
-                       <file-md5-value>D034E0BC74A84EFFE667113E5ABAC6E1</file-md5-value>
-               </software-version-list>
-
-               <vnf-features-list>
-                       <vnf-feature>IPv6</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>NetFLOW v9</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>NTP</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>SNMP</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>GRE Tunnel</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>Border Gateway Protocol (BGP)</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>Open Shortest Path First (OSPF)</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>Enhanced Interior Gateway Routing Protocol (EIGRP)</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>NAT</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>DHCP Server</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>DHCP Relay</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>VRF-Lite</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>COS</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>Multicast</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>HSRP</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>VRRP</vnf-feature>
-               </vnf-features-list>
-               <license-list>
-                       <license-assignment-group>L-CSR-250M-APP-1Y</license-assignment-group>
-                       <license-required>TRUE</license-required>
-               </license-list>
-       </part-number-list>
-       <part-number-list>
-               <att-part-number>L-CSR-500M-APP-1Y</att-part-number>
-               <vnf-type>RT</vnf-type>
-               <vendor-info>
-                       <vendor-name>CISCO</vendor-name>
-                       <vendor-part-number>L-CSR-500M-APP-1Y</vendor-part-number>
-                       <vendor-model>L-CSR-500M-APP-1Y</vendor-model>
-               </vendor-info>
-               <vcpu>
-                       <vcpu-default>1</vcpu-default>
-                       <vcpu-min>1</vcpu-min>
-                       <vcpu-max>1</vcpu-max>
-               </vcpu>
-               <vmemory>
-                       <vmemory-default>4</vmemory-default>
-                       <vmemory-units>GB</vmemory-units>
-                       <vmemory-min>4</vmemory-min>
-                       <vmemory-max>4</vmemory-max>
-               </vmemory>
-               <vdisk>
-                       <vdisk-default>8</vdisk-default>
-                       <vdisk-units>GB</vdisk-units>
-                       <vdisk-min>8</vdisk-min>
-                       <vdisk-max>8</vdisk-max>
-               </vdisk>
-               <software-version-list>
-                       <software-version>3.16.1aS</software-version>
-                       <software-version-state>0</software-version-state>
-                       <software-filetype>IMAGE</software-filetype>
-                       <software-filename>cisco-RT-IMG-csr1000v-universalk9.03.16.01a.S.155-3.S1a-ext.qcow2</software-filename>
-                       <file-md5-value>D034E0BC74A84EFFE667113E5ABAC6E1</file-md5-value>
-               </software-version-list>
-
-               <vnf-features-list>
-                       <vnf-feature>IPv6</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>NetFLOW v9</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>NTP</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>SNMP</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>GRE Tunnel</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>Border Gateway Protocol (BGP)</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>Open Shortest Path First (OSPF)</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>Enhanced Interior Gateway Routing Protocol (EIGRP)</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>NAT</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>DHCP Server</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>DHCP Relay</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>VRF-Lite</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>COS</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>Multicast</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>HSRP</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>VRRP</vnf-feature>
-               </vnf-features-list>
-               <license-list>
-                       <license-assignment-group>L-CSR-500M-APP-1Y</license-assignment-group>
-                       <license-required>TRUE</license-required>
-               </license-list>
-       </part-number-list>
-       <part-number-list>
-               <att-part-number>L-CSR-1G-APP-1Y</att-part-number>
-               <vnf-type>RT</vnf-type>
-               <vendor-info>
-                       <vendor-name>CISCO</vendor-name>
-                       <vendor-part-number>L-CSR-1G-APP-1Y</vendor-part-number>
-                       <vendor-model>L-CSR-1G-APP-1Y</vendor-model>
-               </vendor-info>
-               <vcpu>
-                       <vcpu-default>1</vcpu-default>
-                       <vcpu-min>1</vcpu-min>
-                       <vcpu-max>1</vcpu-max>
-               </vcpu>
-               <vmemory>
-                       <vmemory-default>4</vmemory-default>
-                       <vmemory-units>GB</vmemory-units>
-                       <vmemory-min>4</vmemory-min>
-                       <vmemory-max>4</vmemory-max>
-               </vmemory>
-               <vdisk>
-                       <vdisk-default>8</vdisk-default>
-                       <vdisk-units>GB</vdisk-units>
-                       <vdisk-min>8</vdisk-min>
-                       <vdisk-max>8</vdisk-max>
-               </vdisk>
-               <software-version-list>
-                       <software-version>3.16.1aS</software-version>
-                       <software-version-state>0</software-version-state>
-                       <software-filetype>IMAGE</software-filetype>
-                       <software-filename>cisco-RT-IMG-csr1000v-universalk9.03.16.01a.S.155-3.S1a-ext.qcow2</software-filename>
-                       <file-md5-value>D034E0BC74A84EFFE667113E5ABAC6E1</file-md5-value>
-               </software-version-list>
-
-               <vnf-features-list>
-                       <vnf-feature>IPv6</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>NetFLOW v9</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>NTP</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>SNMP</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>GRE Tunnel</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>Border Gateway Protocol (BGP)</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>Open Shortest Path First (OSPF)</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>Enhanced Interior Gateway Routing Protocol (EIGRP)</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>NAT</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>DHCP Server</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>DHCP Relay</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>VRF-Lite</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>COS</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>Multicast</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>HSRP</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>VRRP</vnf-feature>
-               </vnf-features-list>
-               <license-list>
-                       <license-assignment-group>L-CSR-1G-APP-1Y</license-assignment-group>
-                       <license-required>TRUE</license-required>
-               </license-list>
-       </part-number-list>
-       <part-number-list>
-               <att-part-number>L-CSR-2.5G-APP-1Y</att-part-number>
-               <vnf-type>RT</vnf-type>
-               <vendor-info>
-                       <vendor-name>CISCO</vendor-name>
-                       <vendor-part-number>L-CSR-2.5G-APP-1Y</vendor-part-number>
-                       <vendor-model>L-CSR-2.5G-APP-1Y</vendor-model>
-               </vendor-info>
-               <vcpu>
-                       <vcpu-default>1</vcpu-default>
-                       <vcpu-min>1</vcpu-min>
-                       <vcpu-max>1</vcpu-max>
-               </vcpu>
-               <vmemory>
-                       <vmemory-default>4</vmemory-default>
-                       <vmemory-units>GB</vmemory-units>
-                       <vmemory-min>4</vmemory-min>
-                       <vmemory-max>4</vmemory-max>
-               </vmemory>
-               <vdisk>
-                       <vdisk-default>8</vdisk-default>
-                       <vdisk-units>GB</vdisk-units>
-                       <vdisk-min>8</vdisk-min>
-                       <vdisk-max>8</vdisk-max>
-               </vdisk>
-               <software-version-list>
-                       <software-version>3.16.1aS</software-version>
-                       <software-version-state>0</software-version-state>
-                       <software-filetype>IMAGE</software-filetype>
-                       <software-filename>cisco-RT-IMG-csr1000v-universalk9.03.16.01a.S.155-3.S1a-ext.qcow2</software-filename>
-                       <file-md5-value>D034E0BC74A84EFFE667113E5ABAC6E1</file-md5-value>
-               </software-version-list>
-
-               <vnf-features-list>
-                       <vnf-feature>IPv6</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>NetFLOW v9</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>NTP</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>SNMP</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>GRE Tunnel</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>Border Gateway Protocol (BGP)</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>Open Shortest Path First (OSPF)</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>Enhanced Interior Gateway Routing Protocol (EIGRP)</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>NAT</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>DHCP Server</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>DHCP Relay</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>VRF-Lite</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>COS</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>Multicast</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>HSRP</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>VRRP</vnf-feature>
-               </vnf-features-list>
-               <license-list>
-                       <license-assignment-group>L-CSR-2.5G-APP-1Y</license-assignment-group>
-                       <license-required>TRUE</license-required>
-               </license-list>
-       </part-number-list>
-       <part-number-list>
-               <att-part-number>VCX-SUB-00255-U</att-part-number>
-               <vnf-type>WX</vnf-type>
-               <vendor-info>
-                       <vendor-name>RIVERBED</vendor-name>
-                       <vendor-part-number>VCX-SUB-00255-U</vendor-part-number>
-                       <vendor-model>VCX-SUB-00255-U</vendor-model>
-               </vendor-info>
-               <vcpu>
-                       <vcpu-default>2</vcpu-default>
-                       <vcpu-min>1</vcpu-min>
-                       <vcpu-max>2</vcpu-max>
-               </vcpu>
-               <vmemory>
-                       <vmemory-default>2</vmemory-default>
-                       <vmemory-units>GB</vmemory-units>
-                       <vmemory-min>2</vmemory-min>
-                       <vmemory-max>2</vmemory-max>
-               </vmemory>
-               <vdisk>
-                       <vdisk-default>50</vdisk-default>
-                       <vdisk-units>GB</vdisk-units>
-                       <vdisk-min>50</vdisk-min>
-                       <vdisk-max>50</vdisk-max>
-               </vdisk>
-               <software-version-list>
-                       <software-version>9.2.0</software-version>
-                       <software-version-state>0</software-version-state>
-                       <software-filetype>IMAGE</software-filetype>
-                       <file-md5-value>386CF5D3482F068EC9C480B51F6BCE42</file-md5-value>
-                       <software-filename>riverbed-WX-IMG-9.2.0.qcow2</software-filename>
-               </software-version-list>
-               <vnf-features-list>
-                       <vnf-feature>TCP OPTIMIZATION</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>APPLICATION OPTIMIZATION</vnf-feature>
-               </vnf-features-list>
-               <license-list>
-                       <license-assignment-group>VCX-SUB-00255-U</license-assignment-group>
-                       <license-required>TRUE</license-required>
-               </license-list>
-       </part-number-list>
-       <part-number-list>
-               <att-part-number>VCX-SUB-00255-L</att-part-number>
-               <vnf-type>WX</vnf-type>
-               <vendor-info>
-                       <vendor-name>RIVERBED</vendor-name>
-                       <vendor-part-number>VCX-SUB-00255-L</vendor-part-number>
-                       <vendor-model>VCX-SUB-00255-L</vendor-model>
-               </vendor-info>
-               <vcpu>
-                       <vcpu-default>2</vcpu-default>
-                       <vcpu-min>1</vcpu-min>
-                       <vcpu-max>2</vcpu-max>
-               </vcpu>
-               <vmemory>
-                       <vmemory-default>2</vmemory-default>
-                       <vmemory-units>GB</vmemory-units>
-                       <vmemory-min>2</vmemory-min>
-                       <vmemory-max>2</vmemory-max>
-               </vmemory>
-               <vdisk>
-                       <vdisk-default>50</vdisk-default>
-                       <vdisk-units>GB</vdisk-units>
-                       <vdisk-min>50</vdisk-min>
-                       <vdisk-max>50</vdisk-max>
-               </vdisk>
-               <software-version-list>
-                       <software-version>9.2.0</software-version>
-                       <software-version-state>0</software-version-state>
-                       <software-filetype>IMAGE</software-filetype>
-                       <file-md5-value>386CF5D3482F068EC9C480B51F6BCE42</file-md5-value>
-                       <software-filename>riverbed-WX-IMG-9.2.0.qcow2</software-filename>
-               </software-version-list>
-               <vnf-features-list>
-                       <vnf-feature>TCP OPTIMIZATION</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>APPLICATION OPTIMIZATION</vnf-feature>
-               </vnf-features-list>
-               <license-list>
-                       <license-assignment-group>VCX-SUB-00255-L</license-assignment-group>
-                       <license-required>TRUE</license-required>
-               </license-list>
-       </part-number-list>
-       <part-number-list>
-               <att-part-number>VCX-SUB-00255-M</att-part-number>
-               <vnf-type>WX</vnf-type>
-               <vendor-info>
-                       <vendor-name>RIVERBED</vendor-name>
-                       <vendor-part-number>VCX-SUB-00255-M</vendor-part-number>
-                       <vendor-model>VCX-SUB-00255-M</vendor-model>
-               </vendor-info>
-               <vcpu>
-                       <vcpu-default>2</vcpu-default>
-                       <vcpu-min>1</vcpu-min>
-                       <vcpu-max>2</vcpu-max>
-               </vcpu>
-               <vmemory>
-                       <vmemory-default>2</vmemory-default>
-                       <vmemory-units>GB</vmemory-units>
-                       <vmemory-min>2</vmemory-min>
-                       <vmemory-max>2</vmemory-max>
-               </vmemory>
-               <vdisk>
-                       <vdisk-default>50</vdisk-default>
-                       <vdisk-units>GB</vdisk-units>
-                       <vdisk-min>50</vdisk-min>
-                       <vdisk-max>50</vdisk-max>
-               </vdisk>
-               <software-version-list>
-                       <software-version>9.2.0</software-version>
-                       <software-version-state>0</software-version-state>
-                       <software-filetype>IMAGE</software-filetype>
-                       <file-md5-value>386CF5D3482F068EC9C480B51F6BCE42</file-md5-value>
-                       <software-filename>riverbed-WX-IMG-9.2.0.qcow2</software-filename>
-               </software-version-list>
-               <vnf-features-list>
-                       <vnf-feature>TCP OPTIMIZATION</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>APPLICATION OPTIMIZATION</vnf-feature>
-               </vnf-features-list>
-               <license-list>
-                       <license-assignment-group>VCX-SUB-00255-M</license-assignment-group>
-                       <license-required>TRUE</license-required>
-               </license-list>
-       </part-number-list>
-       <part-number-list>
-               <att-part-number>VCX-SUB-00255-H</att-part-number>
-               <vnf-type>WX</vnf-type>
-               <vendor-info>
-                       <vendor-name>RIVERBED</vendor-name>
-                       <vendor-part-number>VCX-SUB-00255-H</vendor-part-number>
-                       <vendor-model>VCX-SUB-00255-H</vendor-model>
-               </vendor-info>
-               <vcpu>
-                       <vcpu-default>2</vcpu-default>
-                       <vcpu-min>1</vcpu-min>
-                       <vcpu-max>2</vcpu-max>
-               </vcpu>
-               <vmemory>
-                       <vmemory-default>2</vmemory-default>
-                       <vmemory-units>GB</vmemory-units>
-                       <vmemory-min>2</vmemory-min>
-                       <vmemory-max>2</vmemory-max>
-               </vmemory>
-               <vdisk>
-                       <vdisk-default>50</vdisk-default>
-                       <vdisk-units>GB</vdisk-units>
-                       <vdisk-min>50</vdisk-min>
-                       <vdisk-max>50</vdisk-max>
-               </vdisk>
-               <software-version-list>
-                       <software-version>9.2.0</software-version>
-                       <software-version-state>0</software-version-state>
-                       <software-filetype>IMAGE</software-filetype>
-                       <file-md5-value>386CF5D3482F068EC9C480B51F6BCE42</file-md5-value>
-                       <software-filename>riverbed-WX-IMG-9.2.0.qcow2</software-filename>
-               </software-version-list>
-               <vnf-features-list>
-                       <vnf-feature>TCP OPTIMIZATION</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>APPLICATION OPTIMIZATION</vnf-feature>
-               </vnf-features-list>
-               <license-list>
-                       <license-assignment-group>VCX-SUB-00255-H</license-assignment-group>
-                       <license-required>TRUE</license-required>
-               </license-list>
-       </part-number-list>
-       <part-number-list>
-               <att-part-number>VCX-SUB-00555-L</att-part-number>
-               <vnf-type>WX</vnf-type>
-               <vendor-info>
-                       <vendor-name>RIVERBED</vendor-name>
-                       <vendor-part-number>VCX-SUB-00555-L</vendor-part-number>
-                       <vendor-model>VCX-SUB-00555-L</vendor-model>
-               </vendor-info>
-               <vcpu>
-                       <vcpu-default>2</vcpu-default>
-                       <vcpu-min>1</vcpu-min>
-                       <vcpu-max>2</vcpu-max>
-               </vcpu>
-               <vmemory>
-                       <vmemory-default>4</vmemory-default>
-                       <vmemory-units>GB</vmemory-units>
-                       <vmemory-min>2</vmemory-min>
-                       <vmemory-max>4</vmemory-max>
-               </vmemory>
-               <vdisk>
-                       <vdisk-default>80</vdisk-default>
-                       <vdisk-units>GB</vdisk-units>
-                       <vdisk-min>80</vdisk-min>
-                       <vdisk-max>80</vdisk-max>
-               </vdisk>
-               <software-version-list>
-                       <software-version>9.2.0</software-version>
-                       <software-version-state>0</software-version-state>
-                       <software-filetype>IMAGE</software-filetype>
-                       <file-md5-value>386CF5D3482F068EC9C480B51F6BCE42</file-md5-value>
-                       <software-filename>riverbed-WX-IMG-9.2.0.qcow2</software-filename>
-               </software-version-list>
-               <vnf-features-list>
-                       <vnf-feature>TCP OPTIMIZATION</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>APPLICATION OPTIMIZATION</vnf-feature>
-               </vnf-features-list>
-               <license-list>
-                       <license-assignment-group>VCX-SUB-00555-L</license-assignment-group>
-                       <license-required>TRUE</license-required>
-               </license-list>
-       </part-number-list>
-       <part-number-list>
-               <att-part-number>VCX-SUB-00555-M</att-part-number>
-               <vnf-type>WX</vnf-type>
-               <vendor-info>
-                       <vendor-name>RIVERBED</vendor-name>
-                       <vendor-part-number>VCX-SUB-00555-M</vendor-part-number>
-                       <vendor-model>VCX-SUB-00555-M</vendor-model>
-               </vendor-info>
-               <vcpu>
-                       <vcpu-default>2</vcpu-default>
-                       <vcpu-min>1</vcpu-min>
-                       <vcpu-max>2</vcpu-max>
-               </vcpu>
-               <vmemory>
-                       <vmemory-default>4</vmemory-default>
-                       <vmemory-units>GB</vmemory-units>
-                       <vmemory-min>2</vmemory-min>
-                       <vmemory-max>4</vmemory-max>
-               </vmemory>
-               <vdisk>
-                       <vdisk-default>80</vdisk-default>
-                       <vdisk-units>GB</vdisk-units>
-                       <vdisk-min>80</vdisk-min>
-                       <vdisk-max>80</vdisk-max>
-               </vdisk>
-               <software-version-list>
-                       <software-version>9.2.0</software-version>
-                       <software-version-state>0</software-version-state>
-                       <software-filetype>IMAGE</software-filetype>
-                       <file-md5-value>386CF5D3482F068EC9C480B51F6BCE42</file-md5-value>
-                       <software-filename>riverbed-WX-IMG-9.2.0.qcow2</software-filename>
-               </software-version-list>
-               <vnf-features-list>
-                       <vnf-feature>TCP OPTIMIZATION</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>APPLICATION OPTIMIZATION</vnf-feature>
-               </vnf-features-list>
-               <license-list>
-                       <license-assignment-group>VCX-SUB-00555-M</license-assignment-group>
-                       <license-required>TRUE</license-required>
-               </license-list>
-       </part-number-list>
-       <part-number-list>
-               <att-part-number>VCX-SUB-00555-H</att-part-number>
-               <vnf-type>WX</vnf-type>
-               <vendor-info>
-                       <vendor-name>RIVERBED</vendor-name>
-                       <vendor-part-number>VCX-SUB-00555-H</vendor-part-number>
-                       <vendor-model>VCX-SUB-00555-H</vendor-model>
-               </vendor-info>
-               <vcpu>
-                       <vcpu-default>2</vcpu-default>
-                       <vcpu-min>1</vcpu-min>
-                       <vcpu-max>2</vcpu-max>
-               </vcpu>
-               <vmemory>
-                       <vmemory-default>4</vmemory-default>
-                       <vmemory-units>GB</vmemory-units>
-                       <vmemory-min>2</vmemory-min>
-                       <vmemory-max>4</vmemory-max>
-               </vmemory>
-               <vdisk>
-                       <vdisk-default>80</vdisk-default>
-                       <vdisk-units>GB</vdisk-units>
-                       <vdisk-min>80</vdisk-min>
-                       <vdisk-max>80</vdisk-max>
-               </vdisk>
-               <software-version-list>
-                       <software-version>9.2.0</software-version>
-                       <software-version-state>0</software-version-state>
-                       <software-filetype>IMAGE</software-filetype>
-                       <file-md5-value>386CF5D3482F068EC9C480B51F6BCE42</file-md5-value>
-                       <software-filename>riverbed-WX-IMG-9.2.0.qcow2</software-filename>
-               </software-version-list>
-               <vnf-features-list>
-                       <vnf-feature>TCP OPTIMIZATION</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>APPLICATION OPTIMIZATION</vnf-feature>
-               </vnf-features-list>
-               <license-list>
-                       <license-assignment-group>VCX-SUB-00555-H</license-assignment-group>
-                       <license-required>TRUE</license-required>
-               </license-list>
-       </part-number-list>
-       <part-number-list>
-               <att-part-number>VCX-SUB-00755-L</att-part-number>
-               <vnf-type>WX</vnf-type>
-               <vendor-info>
-                       <vendor-name>RIVERBED</vendor-name>
-                       <vendor-part-number>VCX-SUB-00755-L</vendor-part-number>
-                       <vendor-model>VCX-SUB-00755-L</vendor-model>
-               </vendor-info>
-               <vcpu>
-                       <vcpu-default>4</vcpu-default>
-                       <vcpu-min>2</vcpu-min>
-                       <vcpu-max>4</vcpu-max>
-               </vcpu>
-               <vmemory>
-                       <vmemory-default>8</vmemory-default>
-                       <vmemory-units>GB</vmemory-units>
-                       <vmemory-min>4</vmemory-min>
-                       <vmemory-max>8</vmemory-max>
-               </vmemory>
-               <vdisk>
-                       <vdisk-default>150</vdisk-default>
-                       <vdisk-units>GB</vdisk-units>
-                       <vdisk-min>150</vdisk-min>
-                       <vdisk-max>150</vdisk-max>
-               </vdisk>
-               <software-version-list>
-                       <software-version>9.2.0</software-version>
-                       <software-version-state>0</software-version-state>
-                       <software-filetype>IMAGE</software-filetype>
-                       <file-md5-value>386CF5D3482F068EC9C480B51F6BCE42</file-md5-value>
-                       <software-filename>riverbed-WX-IMG-9.2.0.qcow2</software-filename>
-               </software-version-list>
-               <vnf-features-list>
-                       <vnf-feature>TCP OPTIMIZATION</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>APPLICATION OPTIMIZATION</vnf-feature>
-               </vnf-features-list>
-               <license-list>
-                       <license-assignment-group>VCX-SUB-00755-L</license-assignment-group>
-                       <license-required>TRUE</license-required>
-               </license-list>
-       </part-number-list>
-       <part-number-list>
-               <att-part-number>VCX-SUB-00755-M</att-part-number>
-               <vnf-type>WX</vnf-type>
-               <vendor-info>
-                       <vendor-name>RIVERBED</vendor-name>
-                       <vendor-part-number>VCX-SUB-00755-M</vendor-part-number>
-                       <vendor-model>VCX-SUB-00755-M</vendor-model>
-               </vendor-info>
-               <vcpu>
-                       <vcpu-default>4</vcpu-default>
-                       <vcpu-min>2</vcpu-min>
-                       <vcpu-max>4</vcpu-max>
-               </vcpu>
-               <vmemory>
-                       <vmemory-default>8</vmemory-default>
-                       <vmemory-units>GB</vmemory-units>
-                       <vmemory-min>4</vmemory-min>
-                       <vmemory-max>8</vmemory-max>
-               </vmemory>
-               <vdisk>
-                       <vdisk-default>150</vdisk-default>
-                       <vdisk-units>GB</vdisk-units>
-                       <vdisk-min>150</vdisk-min>
-                       <vdisk-max>150</vdisk-max>
-               </vdisk>
-               <software-version-list>
-                       <software-version>9.2.0</software-version>
-                       <software-version-state>0</software-version-state>
-                       <software-filetype>IMAGE</software-filetype>
-                       <file-md5-value>386CF5D3482F068EC9C480B51F6BCE42</file-md5-value>
-                       <software-filename>riverbed-WX-IMG-9.2.0.qcow2</software-filename>
-               </software-version-list>
-               <vnf-features-list>
-                       <vnf-feature>TCP OPTIMIZATION</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>APPLICATION OPTIMIZATION</vnf-feature>
-               </vnf-features-list>
-               <license-list>
-                       <license-assignment-group>VCX-SUB-00755-M</license-assignment-group>
-                       <license-required>TRUE</license-required>
-               </license-list>
-       </part-number-list>
-       <part-number-list>
-               <att-part-number>VCX-SUB-00755-H</att-part-number>
-               <vnf-type>WX</vnf-type>
-               <vendor-info>
-                       <vendor-name>RIVERBED</vendor-name>
-                       <vendor-part-number>VCX-SUB-00755-H</vendor-part-number>
-                       <vendor-model>VCX-SUB-00755-H</vendor-model>
-               </vendor-info>
-               <vcpu>
-                       <vcpu-default>4</vcpu-default>
-                       <vcpu-min>2</vcpu-min>
-                       <vcpu-max>4</vcpu-max>
-               </vcpu>
-               <vmemory>
-                       <vmemory-default>8</vmemory-default>
-                       <vmemory-units>GB</vmemory-units>
-                       <vmemory-min>4</vmemory-min>
-                       <vmemory-max>8</vmemory-max>
-               </vmemory>
-               <vdisk>
-                       <vdisk-default>150</vdisk-default>
-                       <vdisk-units>GB</vdisk-units>
-                       <vdisk-min>150</vdisk-min>
-                       <vdisk-max>150</vdisk-max>
-               </vdisk>
-               <software-version-list>
-                       <software-version>9.2.0</software-version>
-                       <software-version-state>0</software-version-state>
-                       <software-filetype>IMAGE</software-filetype>
-                       <file-md5-value>386CF5D3482F068EC9C480B51F6BCE42</file-md5-value>
-                       <software-filename>riverbed-WX-IMG-9.2.0.qcow2</software-filename>
-               </software-version-list>
-               <vnf-features-list>
-                       <vnf-feature>TCP OPTIMIZATION</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>APPLICATION OPTIMIZATION</vnf-feature>
-               </vnf-features-list>
-               <license-list>
-                       <license-assignment-group>VCX-SUB-00755-H</license-assignment-group>
-                       <license-required>TRUE</license-required>
-               </license-list>
-       </part-number-list>
-       <part-number-list>
-               <att-part-number>VCX-SUB-00255-UB</att-part-number>
-               <vnf-type>WX</vnf-type>
-               <vendor-info>
-                       <vendor-name>RIVERBED</vendor-name>
-                       <vendor-part-number>VCX-SUB-00255-UB</vendor-part-number>
-                       <vendor-model>VCX-SUB-00255-UB</vendor-model>
-               </vendor-info>
-               <vcpu>
-                       <vcpu-default>2</vcpu-default>
-                       <vcpu-min>1</vcpu-min>
-                       <vcpu-max>2</vcpu-max>
-               </vcpu>
-               <vmemory>
-                       <vmemory-default>2</vmemory-default>
-                       <vmemory-units>GB</vmemory-units>
-                       <vmemory-min>2</vmemory-min>
-                       <vmemory-max>2</vmemory-max>
-               </vmemory>
-               <vdisk>
-                       <vdisk-default>50</vdisk-default>
-                       <vdisk-units>GB</vdisk-units>
-                       <vdisk-min>50</vdisk-min>
-                       <vdisk-max>50</vdisk-max>
-               </vdisk>
-               <software-version-list>
-                       <software-version>9.2.0</software-version>
-                       <software-version-state>0</software-version-state>
-                       <software-filetype>IMAGE</software-filetype>
-                       <file-md5-value>386CF5D3482F068EC9C480B51F6BCE42</file-md5-value>
-                       <software-filename>riverbed-WX-IMG-9.2.0.qcow2</software-filename>
-               </software-version-list>
-               <vnf-features-list>
-                       <vnf-feature>TCP OPTIMIZATION</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>APPLICATION OPTIMIZATION</vnf-feature>
-               </vnf-features-list>
-               <license-list>
-                       <license-assignment-group>VCX-SUB-00255-UB</license-assignment-group>
-                       <license-required>TRUE</license-required>
-               </license-list>
-       </part-number-list>
-       <part-number-list>
-               <att-part-number>VCX-SUB-00255-LB</att-part-number>
-               <vnf-type>WX</vnf-type>
-               <vendor-info>
-                       <vendor-name>RIVERBED</vendor-name>
-                       <vendor-part-number>VCX-SUB-00255-LB</vendor-part-number>
-                       <vendor-model>VCX-SUB-00255-LB</vendor-model>
-               </vendor-info>
-               <vcpu>
-                       <vcpu-default>2</vcpu-default>
-                       <vcpu-min>1</vcpu-min>
-                       <vcpu-max>2</vcpu-max>
-               </vcpu>
-               <vmemory>
-                       <vmemory-default>2</vmemory-default>
-                       <vmemory-units>GB</vmemory-units>
-                       <vmemory-min>2</vmemory-min>
-                       <vmemory-max>2</vmemory-max>
-               </vmemory>
-               <vdisk>
-                       <vdisk-default>50</vdisk-default>
-                       <vdisk-units>GB</vdisk-units>
-                       <vdisk-min>50</vdisk-min>
-                       <vdisk-max>50</vdisk-max>
-               </vdisk>
-               <software-version-list>
-                       <software-version>9.2.0</software-version>
-                       <software-version-state>0</software-version-state>
-                       <software-filetype>IMAGE</software-filetype>
-                       <file-md5-value>386CF5D3482F068EC9C480B51F6BCE42</file-md5-value>
-                       <software-filename>riverbed-WX-IMG-9.2.0.qcow2</software-filename>
-               </software-version-list>
-               <vnf-features-list>
-                       <vnf-feature>TCP OPTIMIZATION</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>APPLICATION OPTIMIZATION</vnf-feature>
-               </vnf-features-list>
-               <license-list>
-                       <license-assignment-group>VCX-SUB-00255-LB</license-assignment-group>
-                       <license-required>TRUE</license-required>
-               </license-list>
-       </part-number-list>
-       <part-number-list>
-               <att-part-number>VCX-SUB-00255-MB</att-part-number>
-               <vnf-type>WX</vnf-type>
-               <vendor-info>
-                       <vendor-name>RIVERBED</vendor-name>
-                       <vendor-part-number>VCX-SUB-00255-MB</vendor-part-number>
-                       <vendor-model>VCX-SUB-00255-MB</vendor-model>
-               </vendor-info>
-               <vcpu>
-                       <vcpu-default>2</vcpu-default>
-                       <vcpu-min>1</vcpu-min>
-                       <vcpu-max>2</vcpu-max>
-               </vcpu>
-               <vmemory>
-                       <vmemory-default>2</vmemory-default>
-                       <vmemory-units>GB</vmemory-units>
-                       <vmemory-min>2</vmemory-min>
-                       <vmemory-max>2</vmemory-max>
-               </vmemory>
-               <vdisk>
-                       <vdisk-default>50</vdisk-default>
-                       <vdisk-units>GB</vdisk-units>
-                       <vdisk-min>50</vdisk-min>
-                       <vdisk-max>50</vdisk-max>
-               </vdisk>
-               <software-version-list>
-                       <software-version>9.2.0</software-version>
-                       <software-version-state>0</software-version-state>
-                       <software-filetype>IMAGE</software-filetype>
-                       <file-md5-value>386CF5D3482F068EC9C480B51F6BCE42</file-md5-value>
-                       <software-filename>riverbed-WX-IMG-9.2.0.qcow2</software-filename>
-               </software-version-list>
-               <vnf-features-list>
-                       <vnf-feature>TCP OPTIMIZATION</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>APPLICATION OPTIMIZATION</vnf-feature>
-               </vnf-features-list>
-               <license-list>
-                       <license-assignment-group>VCX-SUB-00255-MB</license-assignment-group>
-                       <license-required>TRUE</license-required>
-               </license-list>
-       </part-number-list>
-       <part-number-list>
-               <att-part-number>VCX-SUB-00255-HB</att-part-number>
-               <vnf-type>WX</vnf-type>
-               <vendor-info>
-                       <vendor-name>RIVERBED</vendor-name>
-                       <vendor-part-number>VCX-SUB-00255-HB</vendor-part-number>
-                       <vendor-model>VCX-SUB-00255-HB</vendor-model>
-               </vendor-info>
-               <vcpu>
-                       <vcpu-default>2</vcpu-default>
-                       <vcpu-min>1</vcpu-min>
-                       <vcpu-max>2</vcpu-max>
-               </vcpu>
-               <vmemory>
-                       <vmemory-default>2</vmemory-default>
-                       <vmemory-units>GB</vmemory-units>
-                       <vmemory-min>2</vmemory-min>
-                       <vmemory-max>2</vmemory-max>
-               </vmemory>
-               <vdisk>
-                       <vdisk-default>50</vdisk-default>
-                       <vdisk-units>GB</vdisk-units>
-                       <vdisk-min>50</vdisk-min>
-                       <vdisk-max>50</vdisk-max>
-               </vdisk>
-               <software-version-list>
-                       <software-version>9.2.0</software-version>
-                       <software-version-state>0</software-version-state>
-                       <software-filetype>IMAGE</software-filetype>
-                       <file-md5-value>386CF5D3482F068EC9C480B51F6BCE42</file-md5-value>
-                       <software-filename>riverbed-WX-IMG-9.2.0.qcow2</software-filename>
-               </software-version-list>
-               <vnf-features-list>
-                       <vnf-feature>TCP OPTIMIZATION</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>APPLICATION OPTIMIZATION</vnf-feature>
-               </vnf-features-list>
-               <license-list>
-                       <license-assignment-group>VCX-SUB-00255-HB</license-assignment-group>
-                       <license-required>TRUE</license-required>
-               </license-list>
-       </part-number-list>
-       <part-number-list>
-               <att-part-number>VCX-SUB-00555-LB</att-part-number>
-               <vnf-type>WX</vnf-type>
-               <vendor-info>
-                       <vendor-name>RIVERBED</vendor-name>
-                       <vendor-part-number>VCX-SUB-00555-LB</vendor-part-number>
-                       <vendor-model>VCX-SUB-00555-LB</vendor-model>
-               </vendor-info>
-               <vcpu>
-                       <vcpu-default>2</vcpu-default>
-                       <vcpu-min>1</vcpu-min>
-                       <vcpu-max>2</vcpu-max>
-               </vcpu>
-               <vmemory>
-                       <vmemory-default>4</vmemory-default>
-                       <vmemory-units>GB</vmemory-units>
-                       <vmemory-min>2</vmemory-min>
-                       <vmemory-max>4</vmemory-max>
-               </vmemory>
-               <vdisk>
-                       <vdisk-default>80</vdisk-default>
-                       <vdisk-units>GB</vdisk-units>
-                       <vdisk-min>80</vdisk-min>
-                       <vdisk-max>80</vdisk-max>
-               </vdisk>
-               <software-version-list>
-                       <software-version>9.2.0</software-version>
-                       <software-version-state>0</software-version-state>
-                       <software-filetype>IMAGE</software-filetype>
-                       <file-md5-value>386CF5D3482F068EC9C480B51F6BCE42</file-md5-value>
-                       <software-filename>riverbed-WX-IMG-9.2.0.qcow2</software-filename>
-               </software-version-list>
-               <vnf-features-list>
-                       <vnf-feature>TCP OPTIMIZATION</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>APPLICATION OPTIMIZATION</vnf-feature>
-               </vnf-features-list>
-               <license-list>
-                       <license-assignment-group>VCX-SUB-00555-LB</license-assignment-group>
-                       <license-required>TRUE</license-required>
-               </license-list>
-       </part-number-list>
-       <part-number-list>
-               <att-part-number>VCX-SUB-00555-MB</att-part-number>
-               <vnf-type>WX</vnf-type>
-               <vendor-info>
-                       <vendor-name>RIVERBED</vendor-name>
-                       <vendor-part-number>VCX-SUB-00555-MB</vendor-part-number>
-                       <vendor-model>VCX-SUB-00555-MB</vendor-model>
-               </vendor-info>
-               <vcpu>
-                       <vcpu-default>2</vcpu-default>
-                       <vcpu-min>1</vcpu-min>
-                       <vcpu-max>2</vcpu-max>
-               </vcpu>
-               <vmemory>
-                       <vmemory-default>4</vmemory-default>
-                       <vmemory-units>GB</vmemory-units>
-                       <vmemory-min>2</vmemory-min>
-                       <vmemory-max>4</vmemory-max>
-               </vmemory>
-               <vdisk>
-                       <vdisk-default>80</vdisk-default>
-                       <vdisk-units>GB</vdisk-units>
-                       <vdisk-min>80</vdisk-min>
-                       <vdisk-max>80</vdisk-max>
-               </vdisk>
-               <software-version-list>
-                       <software-version>9.2.0</software-version>
-                       <software-version-state>0</software-version-state>
-                       <software-filetype>IMAGE</software-filetype>
-                       <file-md5-value>386CF5D3482F068EC9C480B51F6BCE42</file-md5-value>
-                       <software-filename>riverbed-WX-IMG-9.2.0.qcow2</software-filename>
-               </software-version-list>
-               <vnf-features-list>
-                       <vnf-feature>TCP OPTIMIZATION</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>APPLICATION OPTIMIZATION</vnf-feature>
-               </vnf-features-list>
-               <license-list>
-                       <license-assignment-group>VCX-SUB-00555-MB</license-assignment-group>
-                       <license-required>TRUE</license-required>
-               </license-list>
-       </part-number-list>
-       <part-number-list>
-               <att-part-number>VCX-SUB-00555-HB</att-part-number>
-               <vnf-type>WX</vnf-type>
-               <vendor-info>
-                       <vendor-name>RIVERBED</vendor-name>
-                       <vendor-part-number>VCX-SUB-00555-HB</vendor-part-number>
-                       <vendor-model>VCX-SUB-00555-HB</vendor-model>
-               </vendor-info>
-               <vcpu>
-                       <vcpu-default>2</vcpu-default>
-                       <vcpu-min>1</vcpu-min>
-                       <vcpu-max>2</vcpu-max>
-               </vcpu>
-               <vmemory>
-                       <vmemory-default>4</vmemory-default>
-                       <vmemory-units>GB</vmemory-units>
-                       <vmemory-min>2</vmemory-min>
-                       <vmemory-max>4</vmemory-max>
-               </vmemory>
-               <vdisk>
-                       <vdisk-default>80</vdisk-default>
-                       <vdisk-units>GB</vdisk-units>
-                       <vdisk-min>80</vdisk-min>
-                       <vdisk-max>80</vdisk-max>
-               </vdisk>
-               <software-version-list>
-                       <software-version>9.2.0</software-version>
-                       <software-version-state>0</software-version-state>
-                       <software-filetype>IMAGE</software-filetype>
-                       <file-md5-value>386CF5D3482F068EC9C480B51F6BCE42</file-md5-value>
-                       <software-filename>riverbed-WX-IMG-9.2.0.qcow2</software-filename>
-               </software-version-list>
-               <vnf-features-list>
-                       <vnf-feature>TCP OPTIMIZATION</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>APPLICATION OPTIMIZATION</vnf-feature>
-               </vnf-features-list>
-               <license-list>
-                       <license-assignment-group>VCX-SUB-00555-HB</license-assignment-group>
-                       <license-required>TRUE</license-required>
-               </license-list>
-       </part-number-list>
-       <part-number-list>
-               <att-part-number>VCX-SUB-00755-LB</att-part-number>
-               <vnf-type>WX</vnf-type>
-               <vendor-info>
-                       <vendor-name>RIVERBED</vendor-name>
-                       <vendor-part-number>VCX-SUB-00755-LB</vendor-part-number>
-                       <vendor-model>VCX-SUB-00755-LB</vendor-model>
-               </vendor-info>
-               <vcpu>
-                       <vcpu-default>4</vcpu-default>
-                       <vcpu-min>2</vcpu-min>
-                       <vcpu-max>4</vcpu-max>
-               </vcpu>
-               <vmemory>
-                       <vmemory-default>8</vmemory-default>
-                       <vmemory-units>GB</vmemory-units>
-                       <vmemory-min>4</vmemory-min>
-                       <vmemory-max>8</vmemory-max>
-               </vmemory>
-               <vdisk>
-                       <vdisk-default>150</vdisk-default>
-                       <vdisk-units>GB</vdisk-units>
-                       <vdisk-min>150</vdisk-min>
-                       <vdisk-max>150</vdisk-max>
-               </vdisk>
-               <software-version-list>
-                       <software-version>9.2.0</software-version>
-                       <software-version-state>0</software-version-state>
-                       <software-filetype>IMAGE</software-filetype>
-                       <file-md5-value>386CF5D3482F068EC9C480B51F6BCE42</file-md5-value>
-                       <software-filename>riverbed-WX-IMG-9.2.0.qcow2</software-filename>
-               </software-version-list>
-               <vnf-features-list>
-                       <vnf-feature>TCP OPTIMIZATION</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>APPLICATION OPTIMIZATION</vnf-feature>
-               </vnf-features-list>
-               <license-list>
-                       <license-assignment-group>VCX-SUB-00755-LB</license-assignment-group>
-                       <license-required>TRUE</license-required>
-               </license-list>
-       </part-number-list>
-       <part-number-list>
-               <att-part-number>VCX-SUB-00755-MB</att-part-number>
-               <vnf-type>WX</vnf-type>
-               <vendor-info>
-                       <vendor-name>RIVERBED</vendor-name>
-                       <vendor-part-number>VCX-SUB-00755-MB</vendor-part-number>
-                       <vendor-model>VCX-SUB-00755-MB</vendor-model>
-               </vendor-info>
-               <vcpu>
-                       <vcpu-default>4</vcpu-default>
-                       <vcpu-min>2</vcpu-min>
-                       <vcpu-max>4</vcpu-max>
-               </vcpu>
-               <vmemory>
-                       <vmemory-default>8</vmemory-default>
-                       <vmemory-units>GB</vmemory-units>
-                       <vmemory-min>4</vmemory-min>
-                       <vmemory-max>8</vmemory-max>
-               </vmemory>
-               <vdisk>
-                       <vdisk-default>150</vdisk-default>
-                       <vdisk-units>GB</vdisk-units>
-                       <vdisk-min>150</vdisk-min>
-                       <vdisk-max>150</vdisk-max>
-               </vdisk>
-               <software-version-list>
-                       <software-version>9.2.0</software-version>
-                       <software-version-state>0</software-version-state>
-                       <software-filetype>IMAGE</software-filetype>
-                       <file-md5-value>386CF5D3482F068EC9C480B51F6BCE42</file-md5-value>
-                       <software-filename>riverbed-WX-IMG-9.2.0.qcow2</software-filename>
-               </software-version-list>
-               <vnf-features-list>
-                       <vnf-feature>TCP OPTIMIZATION</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>APPLICATION OPTIMIZATION</vnf-feature>
-               </vnf-features-list>
-               <license-list>
-                       <license-assignment-group>VCX-SUB-00755-MB</license-assignment-group>
-                       <license-required>TRUE</license-required>
-               </license-list>
-       </part-number-list>
-       <part-number-list>
-               <att-part-number>VCX-SUB-00755-HB</att-part-number>
-               <vnf-type>WX</vnf-type>
-               <vendor-info>
-                       <vendor-name>RIVERBED</vendor-name>
-                       <vendor-part-number>VCX-SUB-00755-HB</vendor-part-number>
-                       <vendor-model>VCX-SUB-00755-HB</vendor-model>
-               </vendor-info>
-               <vcpu>
-                       <vcpu-default>4</vcpu-default>
-                       <vcpu-min>2</vcpu-min>
-                       <vcpu-max>4</vcpu-max>
-               </vcpu>
-               <vmemory>
-                       <vmemory-default>8</vmemory-default>
-                       <vmemory-units>GB</vmemory-units>
-                       <vmemory-min>4</vmemory-min>
-                       <vmemory-max>8</vmemory-max>
-               </vmemory>
-               <vdisk>
-                       <vdisk-default>150</vdisk-default>
-                       <vdisk-units>GB</vdisk-units>
-                       <vdisk-min>150</vdisk-min>
-                       <vdisk-max>150</vdisk-max>
-               </vdisk>
-               <software-version-list>
-                       <software-version>9.2.0</software-version>
-                       <software-version-state>0</software-version-state>
-                       <software-filetype>IMAGE</software-filetype>
-                       <file-md5-value>386CF5D3482F068EC9C480B51F6BCE42</file-md5-value>
-                       <software-filename>riverbed-WX-IMG-9.2.0.qcow2</software-filename>
-               </software-version-list>
-               <vnf-features-list>
-                       <vnf-feature>TCP OPTIMIZATION</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>APPLICATION OPTIMIZATION</vnf-feature>
-               </vnf-features-list>
-               <license-list>
-                       <license-assignment-group>VCX-SUB-00755-HB</license-assignment-group>
-                       <license-required>TRUE</license-required>
-               </license-list>
-       </part-number-list>
-       <part-number-list>
-               <att-part-number>JUN-vSRX-15X</att-part-number>
-               <vnf-type>RT</vnf-type>
-               <vendor-info>
-                       <vendor-name>JUNIPER</vendor-name>
-                       <vendor-part-number>JUN-vSRX-15X</vendor-part-number>
-                       <vendor-model>VSRX</vendor-model>
-               </vendor-info>
-               <vcpu>
-                       <vcpu-default>2</vcpu-default>
-                       <vcpu-min>2</vcpu-min>
-                       <vcpu-max>2</vcpu-max>
-               </vcpu>
-               <vmemory>
-                       <vmemory-default>4</vmemory-default>
-                       <vmemory-units>GB</vmemory-units>
-                       <vmemory-min>4</vmemory-min>
-                       <vmemory-max>4</vmemory-max>
-               </vmemory>
-               <vdisk>
-                       <vdisk-default>8</vdisk-default>
-                       <vdisk-units>GB</vdisk-units>
-                       <vdisk-min>8</vdisk-min>
-                       <vdisk-max>8</vdisk-max>
-               </vdisk>
-               <software-version-list>
-                       <software-version>15.1X49-D40.6</software-version>
-                       <software-version-state>0</software-version-state>
-                       <software-filetype>IMAGE</software-filetype>
-                       <software-filename>media-vsrx-vmdisk-15.1X49-D40.6.qcow2</software-filename>
-                       <file-md5-value>4b874dbd75fc83dc2494b90b2012d514</file-md5-value>
-               </software-version-list>
-               <vnf-features-list>
-                       <vnf-feature>IPv6</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>NetFLOW v9</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>NTP</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>SNMP</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>GRE Tunnel</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>Border Gateway Protocol (BGP)</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>Open Shortest Path First (OSPF)</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>NAT</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>DHCP Server</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>DHCP Relay</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>VRF-Lite</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>COS</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>Multicast</vnf-feature>
-               </vnf-features-list>
-               <vnf-features-list>
-                       <vnf-feature>VRRP</vnf-feature>
-               </vnf-features-list>
-               <license-list>
-                       <license-assignment-group>JUN-vSRX-15X</license-assignment-group>
-                       <license-required>FALSE</license-required>
-               </license-list>
-       </part-number-list>
 </vnf-catalog>
Loads SDC Models into A&AI