From e690871517457e68586e81f2cf19d43f121b5299 Mon Sep 17 00:00:00 2001 From: Steve Smokowski Date: Fri, 10 Feb 2017 16:08:20 -0500 Subject: [PATCH] Update Poms and Tests Change-Id: If95a1f2188e4073725c50b7dbb1e03b1329b7e27 Signed-off-by: Steve Smokowski --- License.txt | 42 +- pom.xml | 94 +- src/main/docker/startup.sh | 2 +- src/main/webapp/WEB-INF/applicationContext.xml | 22 +- src/main/webapp/WEB-INF/rest-servlet.xml | 22 +- src/main/webapp/WEB-INF/web.xml | 22 +- .../entity/model/ModelArtifactParserTest.java | 4 +- src/test/resources/models/complete-model.xml | 371 +---- .../resources/models/named-query-wan-connector.xml | 2 +- src/test/resources/models/vnf-model.xml | 2 +- src/test/resources/models/wan-connector-model.xml | 7 +- src/test/resources/vnfcatalogexample.xml | 1743 +------------------- 12 files changed, 147 insertions(+), 2186 deletions(-) diff --git a/License.txt b/License.txt index 17cfdd5..eee2e15 100644 --- 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 --- a/pom.xml +++ b/pom.xml @@ -38,37 +38,8 @@ 1.8 1.8 - - - - maven-central - maven-central - http://central.maven.org/maven2/ - - true - never - - - false - - - - ecomp-nexus - ecomp-nexus - https://ecomp-nexus:8443/repository/maven-releases/ - - true - never - - - false - - - - - org.mockito mockito-all @@ -133,15 +104,14 @@ - org.openecomp.cl + org.openecomp.aai.logging-service common-logging 1.0.0-SNAPSHOT - org.openecomp.sdc - sdc-distribution-client - 1.1.2 + sdc-distribution-client + 0.9.0 org.json @@ -168,6 +138,44 @@ + + + + central + http://repo1.maven.org/maven2 + + + EvoSuite + EvoSuite Repository + http://www.evosuite.org/m2 + + + + + central + Maven 2 repository 2 + http://repo2.maven.org/maven2/ + + + ecomp-releases + ECOMP Release Repository + https://nexus.openecomp.org/content/repositories/releases/ + + + ecomp-snapshots + ECOMP Snapshot Repository + https://nexus.openecomp.org/content/repositories/snapshots/ + + always + + + always + + + + + + @@ -278,25 +286,7 @@ true - - - com.blackducksoftware.integration - hub-maven-plugin - 1.0.4 - false - - ${project.basedir/target} - - - - create-bdio-file - package - - createHubOutput - - - - + diff --git a/src/main/docker/startup.sh b/src/main/docker/startup.sh index 22950cd..c4a4d5f 100644 --- 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 --- a/src/main/webapp/WEB-INF/applicationContext.xml +++ b/src/main/webapp/WEB-INF/applicationContext.xml @@ -1,3 +1,23 @@ + + - \ No newline at end of file + diff --git a/src/main/webapp/WEB-INF/rest-servlet.xml b/src/main/webapp/WEB-INF/rest-servlet.xml index e976951..6a23c2b 100644 --- a/src/main/webapp/WEB-INF/rest-servlet.xml +++ b/src/main/webapp/WEB-INF/rest-servlet.xml @@ -1,3 +1,23 @@ + + - \ No newline at end of file + diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index 7be34e7..c256b26 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -1,4 +1,24 @@ + + model-loader @@ -17,4 +37,4 @@ rest / - \ No newline at end of file + 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 --- 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 --- a/src/test/resources/models/complete-model.xml +++ b/src/test/resources/models/complete-model.xml @@ -18,7 +18,7 @@ ============LICENSE_END========================================================= --> - + 997fc7-fca1-451f-b953-9a1e6197b4d6 @@ -30,7 +30,7 @@ model-element - https://localhost:8443/aai/v7/service-design-and-creation/model-elements/model-element/ccb3a5a4-1722-4213-8785-2b6b5527d453/ + https://localhost:8443/aai/v8/service-design-and-creation/model-elements/model-element/ccb3a5a4-1722-4213-8785-2b6b5527d453/ model-element.model-element-uuid @@ -63,7 +63,7 @@ model-element - https://localhost:8443/aai/v7/service-design-and-creation/model-elements/model-element/fc3a2260-d0ee-4c8e-b7e9-74791d7c5721/ + https://localhost:8443/aai/v8/service-design-and-creation/model-elements/model-element/fc3a2260-d0ee-4c8e-b7e9-74791d7c5721/ model-element.model-element-uuid @@ -96,256 +96,7 @@ - - d09dd9da-0148-46cd-a947-591afc844d24 - - widget - connector - 63ac2806-4d47-467f-bf9d-5a8a83a13cac - v1.0 - 1463175188 - - - model-element - https://localhost:8443/aai/v7/service-design-and-creation/model-elements/model-element/df2e4cc0-18ca-4046-9c1b-2abec86a58d6/ - - - model-element.model-element-uuid - - df2e4cc0-18ca-4046-9c1b-2abec86a58d6 - - - - model.model-name-version-id - 93d9d45d-7eec-4371-9083-675e4c353de3 - - - - - - - 93a6166f-b3d5-4f06-b4ba-aed48d009ad9 - - widget - generic-vnf - acc6edd8-a8d4-4b93-afaa-0994068be14c - v1.0 - 1463175177 - - - model-element - https://localhost:8443/aai/v7/service-design-and-creation/model-elements/model-element/88a0e5fd-0254-41dc-a9d5-7a7db446f2f3/ - - - model-element.model-element-uuid - - 88a0e5fd-0254-41dc-a9d5-7a7db446f2f3 - - - - model.model-name-version-id - 8da97b81-e0e9-4157-a4cd-af3ba52871d6 - - - - - model-element - https://localhost:8443/aai/v7/service-design-and-creation/model-elements/model-element/baefe75b-30f2-43d2-bd73-553f65ea1405/ - - - model-element.model-element-uuid - - baefe75b-30f2-43d2-bd73-553f65ea1405 - - - - model.model-name-version-id - a6d9de88-4046-4b78-a59e-5691243d292a - - - - - - - 759dbd4a-2473-46f3-a932-48d987c9b4a1 - - resource - ipe - 323ac9c1-b345-44a2-9d07-dd7653137705 - v1.0 - 1463175188 - - - model-element - https://localhost:8443/aai/v7/service-design-and-creation/model-elements/model-element/746b864c-333b-4da9-806e-c70f883f8c9d/ - - - model-element.model-element-uuid - - 746b864c-333b-4da9-806e-c70f883f8c9d - - - - element-choice-set.element-choice-set-uuid - - 1c69d7dc-ddf1-4cf3-86dd-929aa886429c - - - - constrained-element-set.constrained-element-set-uuid - - 999 - - - model-element.model-element-uuid - - df2e4cc0-18ca-4046-9c1b-2abec86a58d6 - - - - model.model-name-version-id - 93d9d45d-7eec-4371-9083-675e4c353de3 - - - - - - - 93d9d45d-7eec-4371-9083-675e4c353de3 - - service - wan-connector - e4a9901b-6c94-4e07-b8d8-b877d3df554c - v1.0 - Connects a customer vpn to the border elements of - an AT&T product - 1463175188 - - - - 35be1acf-1298-48c6-a128-66850083b8bd - - resource - pBgf - 897fb848-3b38-4d0d-a6a7-2543070fc450 - v1.0 - 1463175188 - - - model-element - https://localhost:8443/aai/v7/service-design-and-creation/model-elements/model-element/d985355f-a162-493b-8cb9-0b5b948bb7b0/ - - - model-element.model-element-uuid - - d985355f-a162-493b-8cb9-0b5b948bb7b0 - - - - element-choice-set.element-choice-set-uuid - - 646ee687-1475-419d-bd10-f3760d5430dc - - - - constrained-element-set.constrained-element-set-uuid - - 999 - - - model-element.model-element-uuid - - df2e4cc0-18ca-4046-9c1b-2abec86a58d6 - - - - model.model-name-version-id - 93d9d45d-7eec-4371-9083-675e4c353de3 - - - - - - - a6d9de88-4046-4b78-a59e-5691243d292a - - resource - vSbg - 326690fa-9747-4ebd-9d9f-a5ef02943e1a - v1.0 - 1463175188 - - - model-element - https://localhost:8443/aai/v7/service-design-and-creation/model-elements/model-element/b989a7b6-907a-431d-b54e-262d29c45b6f/ - - - model-element.model-element-uuid - - b989a7b6-907a-431d-b54e-262d29c45b6f - - - - element-choice-set.element-choice-set-uuid - - 646ee687-1475-419d-bd10-f3760d5430dc - - - - constrained-element-set.constrained-element-set-uuid - - 999 - - - model-element.model-element-uuid - - df2e4cc0-18ca-4046-9c1b-2abec86a58d6 - - - - model.model-name-version-id - 93d9d45d-7eec-4371-9083-675e4c353de3 - - - - - - - ae16244f-4d29-4801-a559-e25f2db2a4c3 - - resource - l2-bridge-for-wan-connector - 9494e925-04a0-4f52-983b-36fa8f75d97e - v1.0 - An l2-bridge used by a wan connector connects an - ipe to a product border element - 1463175188 - - - model-element - https://localhost:8443/aai/v7/service-design-and-creation/model-elements/model-element/061f2f1d-d76f-4b4a-810c-1f9a452a4db3/ - - - model-element.model-element-uuid - - 061f2f1d-d76f-4b4a-810c-1f9a452a4db3 - - - - model-element.model-element-uuid - - df2e4cc0-18ca-4046-9c1b-2abec86a58d6 - - - - model.model-name-version-id - 93d9d45d-7eec-4371-9083-675e4c353de3 - - - - - - + f2b24d95-c582-48d5-b2d6-c5b3a94ce812 widget @@ -356,7 +107,7 @@ model-element - https://localhost:8443/aai/v7/service-design-and-creation/model-elements/model-element/5eab2693-78ec-446a-afe4-14332e348246/ + https://localhost:8443/aai/v8/service-design-and-creation/model-elements/model-element/5eab2693-78ec-446a-afe4-14332e348246/ model-element.model-element-uuid @@ -372,7 +123,7 @@ model-element - https://localhost:8443/aai/v7/service-design-and-creation/model-elements/model-element/f7659dac-6311-45b6-b483-60b39364a85a/ + https://localhost:8443/aai/v8/service-design-and-creation/model-elements/model-element/f7659dac-6311-45b6-b483-60b39364a85a/ model-element.model-element-uuid @@ -388,113 +139,5 @@ - - 53be71b0-c689-4841-9fe6-c7fab529d310 - - widget - p-interface - 759dbd4a-2473-46f3-a932-48d987c9b4a1 - v1.0 - 1463175178 - - - model-element - https://localhost:8443/aai/v7/service-design-and-creation/model-elements/model-element/f118b348-1231-4895-ad26-0b227253cdf0/ - - - model-element.model-element-uuid - - f118b348-1231-4895-ad26-0b227253cdf0 - - - - model-element.model-element-uuid - - f7659dac-6311-45b6-b483-60b39364a85a - - - - model.model-name-version-id - 759dbd4a-2473-46f3-a932-48d987c9b4a1 - - - - - - - 706c7e05-8faf-4258-acca-8e4cf556961d - - widget - l-interface - 92e579cc-eb63-490f-b9eb-16b7af2660c7 - v1.0 - 1463175178 - - - model-element - https://localhost:8443/aai/v7/service-design-and-creation/model-elements/model-element/82f1cf8a-470b-4aaa-a1eb-27b83ba8f176/ - - - model-element.model-element-uuid - - 82f1cf8a-470b-4aaa-a1eb-27b83ba8f176 - - - - model-element.model-element-uuid - - f7659dac-6311-45b6-b483-60b39364a85a - - - - model.model-name-version-id - 759dbd4a-2473-46f3-a932-48d987c9b4a1 - - - - - - - 897df7ea-8938-42b0-bc57-46e913a4d93b - - widget - logical-link - c575bd11-6907-4b44-82d8-f55294fff63f - v1.0 - 1463175143 - - - - f749dc48-4f58-4601-9d3e-605a06a0899e - - widget - vlan - 76544264-9287-45c6-871b-6e7a456a9f32 - v1.0 - 1463175178 - - - model-element - https://localhost:8443/aai/v7/service-design-and-creation/model-elements/model-element/fd994cef-bc62-460f-bd21-cc8c07fbccc4/ - - - model-element.model-element-uuid - - fd994cef-bc62-460f-bd21-cc8c07fbccc4 - - - - model-element.model-element-uuid - - f7659dac-6311-45b6-b483-60b39364a85a - - - - model.model-name-version-id - 759dbd4a-2473-46f3-a932-48d987c9b4a1 - - - - - + 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 --- 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========================================================= --> - + 94cac189-8d88-4d63-a194-f44214e080ff wan-connector diff --git a/src/test/resources/models/vnf-model.xml b/src/test/resources/models/vnf-model.xml index 616f4b9..2dd44b5 100644 --- a/src/test/resources/models/vnf-model.xml +++ b/src/test/resources/models/vnf-model.xml @@ -18,7 +18,7 @@ ============LICENSE_END========================================================= --> - + model-id widget generic-vnf diff --git a/src/test/resources/models/wan-connector-model.xml b/src/test/resources/models/wan-connector-model.xml index 5e3ff10..c8a434b 100644 --- a/src/test/resources/models/wan-connector-model.xml +++ b/src/test/resources/models/wan-connector-model.xml @@ -18,15 +18,14 @@ ============LICENSE_END========================================================= --> - + e4a9901b-6c94-4e07-b8d8-b877d3df554c service - wan-connector + test-model v1.0 93d9d45d-7eec-4371-9083-675e4c353de3 - Connects a customer vpn to the border elements of an - AT&T product + desc a diff --git a/src/test/resources/vnfcatalogexample.xml b/src/test/resources/vnfcatalogexample.xml index 1557efa..c7ba530 100644 --- a/src/test/resources/vnfcatalogexample.xml +++ b/src/test/resources/vnfcatalogexample.xml @@ -49,21 +49,21 @@ 0 IMAGE 1c59a521885c465004456f74d003726c - fortinet-FW-IMG-5.2.7.qcow2 + test3 5.2.5 1 IMAGE C4D2CBE51669796E48623E006782F7DC - fortinet-FW-IMG-5.2.5.qcow2 + test2 5.2.4 2 IMAGE 4987E1E743FD641C879E1D3C5D50BCE0 - fortinet-FW-IMG-5.2.4.qcow2 + test1 APPID @@ -112,21 +112,21 @@ 0 IMAGE 1c59a521885c465004456f74d003726c - fortinet-FW-IMG-5.2.7.qcow2 + software file name 3 5.2.5 1 IMAGE C4D2CBE51669796E48623E006782F7DC - fortinet-FW-IMG-5.2.5.qcow2 + software file name 2 5.2.4 2 IMAGE 4987E1E743FD641C879E1D3C5D50BCE0 - fortinet-FW-IMG-5.2.4.qcow2 + software file name APPID @@ -141,1738 +141,9 @@ Anti-Virus - FortiGate-VM01 + license group FALSE - - FortiGate-VM02 - FW - - FORTINET - FortiGate-VM02 - VM02 - - - 2 - 1 - 2 - - - 4 - GB - 1 - 4 - - - 4 - GB - 2 - 32 - - - 5.2.7 - 0 - IMAGE - 1c59a521885c465004456f74d003726c - fortinet-FW-IMG-5.2.7.qcow2 - - - 5.2.5 - 1 - IMAGE - C4D2CBE51669796E48623E006782F7DC - fortinet-FW-IMG-5.2.5.qcow2 - - - 5.2.4 - 2 - IMAGE - 4987E1E743FD641C879E1D3C5D50BCE0 - fortinet-FW-IMG-5.2.4.qcow2 - - - APPID - - - IPS-IDS - - - URLF - - - Anti-Virus - - - FortiGate-VM02 - FALSE - - - - FortiGate-VM04 - FW - - FORTINET - FortiGate-VM04 - VM04 - - - 4 - 1 - 4 - - - 6 - GB - 1 - 6 - - - 8 - GB - 2 - 32 - - - 5.2.7 - 0 - IMAGE - 1c59a521885c465004456f74d003726c - fortinet-FW-IMG-5.2.7.qcow2 - - - 5.2.5 - 1 - IMAGE - C4D2CBE51669796E48623E006782F7DC - fortinet-FW-IMG-5.2.5.qcow2 - - - 5.2.4 - 2 - IMAGE - 4987E1E743FD641C879E1D3C5D50BCE0 - fortinet-FW-IMG-5.2.4.qcow2 - - - APPID - - - IPS-IDS - - - URLF - - - Anti-Virus - - - FortiGate-VM04 - FALSE - - - - FortiGate-VM08 - FW - - FORTINET - FortiGate-VM08 - VM08 - - - 8 - 1 - 8 - - - 12 - GB - 1 - 12 - - - 16 - GB - 2 - 32 - - - 5.2.7 - 0 - IMAGE - 1c59a521885c465004456f74d003726c - fortinet-FW-IMG-5.2.7.qcow2 - - - 5.2.5 - 1 - IMAGE - C4D2CBE51669796E48623E006782F7DC - fortinet-FW-IMG-5.2.5.qcow2 - - - 5.2.4 - 2 - IMAGE - 4987E1E743FD641C879E1D3C5D50BCE0 - fortinet-FW-IMG-5.2.4.qcow2 - - - APPID - - - IPS-IDS - - - URLF - - - Anti-Virus - - - FortiGate-VM08 - FALSE - - - - L-CSR-10M-APP-1Y - RT - - CISCO - L-CSR-10M-APP-1Y - L-CSR-10M-APP-1Y - - - 1 - 1 - 1 - - - 4 - GB - 4 - 4 - - - 8 - GB - 8 - 8 - - - 3.16.1aS - 0 - IMAGE - cisco-RT-IMG-csr1000v-universalk9.03.16.01a.S.155-3.S1a-ext.qcow2 - D034E0BC74A84EFFE667113E5ABAC6E1 - - - - IPv6 - - - NetFLOW v9 - - - NTP - - - SNMP - - - GRE Tunnel - - - Border Gateway Protocol (BGP) - - - Open Shortest Path First (OSPF) - - - Enhanced Interior Gateway Routing Protocol (EIGRP) - - - NAT - - - DHCP Server - - - DHCP Relay - - - VRF-Lite - - - COS - - - Multicast - - - HSRP - - - VRRP - - - L-CSR-10M-APP-1Y - TRUE - - - - L-CSR-50M-APP-1Y - RT - - CISCO - L-CSR-50M-APP-1Y - L-CSR-50M-APP-1Y - - - 1 - 1 - 1 - - - 4 - GB - 4 - 4 - - - 8 - GB - 8 - 8 - - - 3.16.1aS - 0 - IMAGE - cisco-RT-IMG-csr1000v-universalk9.03.16.01a.S.155-3.S1a-ext.qcow2 - D034E0BC74A84EFFE667113E5ABAC6E1 - - - IPv6 - - - NetFLOW v9 - - - NTP - - - SNMP - - - GRE Tunnel - - - Border Gateway Protocol (BGP) - - - Open Shortest Path First (OSPF) - - - Enhanced Interior Gateway Routing Protocol (EIGRP) - - - NAT - - - DHCP Server - - - DHCP Relay - - - VRF-Lite - - - COS - - - Multicast - - - HSRP - - - VRRP - - - L-CSR-50M-APP-1Y - TRUE - - - - L-CSR-100M-APP-1Y - RT - - CISCO - L-CSR-100M-APP-1Y - L-CSR-100M-APP-1Y - - - 1 - 1 - 1 - - - 4 - GB - 4 - 4 - - - 8 - GB - 8 - 8 - - - 3.16.1aS - 0 - IMAGE - cisco-RT-IMG-csr1000v-universalk9.03.16.01a.S.155-3.S1a-ext.qcow2 - D034E0BC74A84EFFE667113E5ABAC6E1 - - - - IPv6 - - - NetFLOW v9 - - - NTP - - - SNMP - - - GRE Tunnel - - - Border Gateway Protocol (BGP) - - - Open Shortest Path First (OSPF) - - - Enhanced Interior Gateway Routing Protocol (EIGRP) - - - NAT - - - DHCP Server - - - DHCP Relay - - - VRF-Lite - - - COS - - - Multicast - - - HSRP - - - VRRP - - - L-CSR-100M-APP-1Y - TRUE - - - - L-CSR-250M-APP-1Y - RT - - CISCO - L-CSR-250M-APP-1Y - L-CSR-250M-APP-1Y - - - 1 - 1 - 1 - - - 4 - GB - 4 - 4 - - - 8 - GB - 8 - 8 - - - 3.16.1aS - 0 - IMAGE - cisco-RT-IMG-csr1000v-universalk9.03.16.01a.S.155-3.S1a-ext.qcow2 - D034E0BC74A84EFFE667113E5ABAC6E1 - - - - IPv6 - - - NetFLOW v9 - - - NTP - - - SNMP - - - GRE Tunnel - - - Border Gateway Protocol (BGP) - - - Open Shortest Path First (OSPF) - - - Enhanced Interior Gateway Routing Protocol (EIGRP) - - - NAT - - - DHCP Server - - - DHCP Relay - - - VRF-Lite - - - COS - - - Multicast - - - HSRP - - - VRRP - - - L-CSR-250M-APP-1Y - TRUE - - - - L-CSR-500M-APP-1Y - RT - - CISCO - L-CSR-500M-APP-1Y - L-CSR-500M-APP-1Y - - - 1 - 1 - 1 - - - 4 - GB - 4 - 4 - - - 8 - GB - 8 - 8 - - - 3.16.1aS - 0 - IMAGE - cisco-RT-IMG-csr1000v-universalk9.03.16.01a.S.155-3.S1a-ext.qcow2 - D034E0BC74A84EFFE667113E5ABAC6E1 - - - - IPv6 - - - NetFLOW v9 - - - NTP - - - SNMP - - - GRE Tunnel - - - Border Gateway Protocol (BGP) - - - Open Shortest Path First (OSPF) - - - Enhanced Interior Gateway Routing Protocol (EIGRP) - - - NAT - - - DHCP Server - - - DHCP Relay - - - VRF-Lite - - - COS - - - Multicast - - - HSRP - - - VRRP - - - L-CSR-500M-APP-1Y - TRUE - - - - L-CSR-1G-APP-1Y - RT - - CISCO - L-CSR-1G-APP-1Y - L-CSR-1G-APP-1Y - - - 1 - 1 - 1 - - - 4 - GB - 4 - 4 - - - 8 - GB - 8 - 8 - - - 3.16.1aS - 0 - IMAGE - cisco-RT-IMG-csr1000v-universalk9.03.16.01a.S.155-3.S1a-ext.qcow2 - D034E0BC74A84EFFE667113E5ABAC6E1 - - - - IPv6 - - - NetFLOW v9 - - - NTP - - - SNMP - - - GRE Tunnel - - - Border Gateway Protocol (BGP) - - - Open Shortest Path First (OSPF) - - - Enhanced Interior Gateway Routing Protocol (EIGRP) - - - NAT - - - DHCP Server - - - DHCP Relay - - - VRF-Lite - - - COS - - - Multicast - - - HSRP - - - VRRP - - - L-CSR-1G-APP-1Y - TRUE - - - - L-CSR-2.5G-APP-1Y - RT - - CISCO - L-CSR-2.5G-APP-1Y - L-CSR-2.5G-APP-1Y - - - 1 - 1 - 1 - - - 4 - GB - 4 - 4 - - - 8 - GB - 8 - 8 - - - 3.16.1aS - 0 - IMAGE - cisco-RT-IMG-csr1000v-universalk9.03.16.01a.S.155-3.S1a-ext.qcow2 - D034E0BC74A84EFFE667113E5ABAC6E1 - - - - IPv6 - - - NetFLOW v9 - - - NTP - - - SNMP - - - GRE Tunnel - - - Border Gateway Protocol (BGP) - - - Open Shortest Path First (OSPF) - - - Enhanced Interior Gateway Routing Protocol (EIGRP) - - - NAT - - - DHCP Server - - - DHCP Relay - - - VRF-Lite - - - COS - - - Multicast - - - HSRP - - - VRRP - - - L-CSR-2.5G-APP-1Y - TRUE - - - - VCX-SUB-00255-U - WX - - RIVERBED - VCX-SUB-00255-U - VCX-SUB-00255-U - - - 2 - 1 - 2 - - - 2 - GB - 2 - 2 - - - 50 - GB - 50 - 50 - - - 9.2.0 - 0 - IMAGE - 386CF5D3482F068EC9C480B51F6BCE42 - riverbed-WX-IMG-9.2.0.qcow2 - - - TCP OPTIMIZATION - - - APPLICATION OPTIMIZATION - - - VCX-SUB-00255-U - TRUE - - - - VCX-SUB-00255-L - WX - - RIVERBED - VCX-SUB-00255-L - VCX-SUB-00255-L - - - 2 - 1 - 2 - - - 2 - GB - 2 - 2 - - - 50 - GB - 50 - 50 - - - 9.2.0 - 0 - IMAGE - 386CF5D3482F068EC9C480B51F6BCE42 - riverbed-WX-IMG-9.2.0.qcow2 - - - TCP OPTIMIZATION - - - APPLICATION OPTIMIZATION - - - VCX-SUB-00255-L - TRUE - - - - VCX-SUB-00255-M - WX - - RIVERBED - VCX-SUB-00255-M - VCX-SUB-00255-M - - - 2 - 1 - 2 - - - 2 - GB - 2 - 2 - - - 50 - GB - 50 - 50 - - - 9.2.0 - 0 - IMAGE - 386CF5D3482F068EC9C480B51F6BCE42 - riverbed-WX-IMG-9.2.0.qcow2 - - - TCP OPTIMIZATION - - - APPLICATION OPTIMIZATION - - - VCX-SUB-00255-M - TRUE - - - - VCX-SUB-00255-H - WX - - RIVERBED - VCX-SUB-00255-H - VCX-SUB-00255-H - - - 2 - 1 - 2 - - - 2 - GB - 2 - 2 - - - 50 - GB - 50 - 50 - - - 9.2.0 - 0 - IMAGE - 386CF5D3482F068EC9C480B51F6BCE42 - riverbed-WX-IMG-9.2.0.qcow2 - - - TCP OPTIMIZATION - - - APPLICATION OPTIMIZATION - - - VCX-SUB-00255-H - TRUE - - - - VCX-SUB-00555-L - WX - - RIVERBED - VCX-SUB-00555-L - VCX-SUB-00555-L - - - 2 - 1 - 2 - - - 4 - GB - 2 - 4 - - - 80 - GB - 80 - 80 - - - 9.2.0 - 0 - IMAGE - 386CF5D3482F068EC9C480B51F6BCE42 - riverbed-WX-IMG-9.2.0.qcow2 - - - TCP OPTIMIZATION - - - APPLICATION OPTIMIZATION - - - VCX-SUB-00555-L - TRUE - - - - VCX-SUB-00555-M - WX - - RIVERBED - VCX-SUB-00555-M - VCX-SUB-00555-M - - - 2 - 1 - 2 - - - 4 - GB - 2 - 4 - - - 80 - GB - 80 - 80 - - - 9.2.0 - 0 - IMAGE - 386CF5D3482F068EC9C480B51F6BCE42 - riverbed-WX-IMG-9.2.0.qcow2 - - - TCP OPTIMIZATION - - - APPLICATION OPTIMIZATION - - - VCX-SUB-00555-M - TRUE - - - - VCX-SUB-00555-H - WX - - RIVERBED - VCX-SUB-00555-H - VCX-SUB-00555-H - - - 2 - 1 - 2 - - - 4 - GB - 2 - 4 - - - 80 - GB - 80 - 80 - - - 9.2.0 - 0 - IMAGE - 386CF5D3482F068EC9C480B51F6BCE42 - riverbed-WX-IMG-9.2.0.qcow2 - - - TCP OPTIMIZATION - - - APPLICATION OPTIMIZATION - - - VCX-SUB-00555-H - TRUE - - - - VCX-SUB-00755-L - WX - - RIVERBED - VCX-SUB-00755-L - VCX-SUB-00755-L - - - 4 - 2 - 4 - - - 8 - GB - 4 - 8 - - - 150 - GB - 150 - 150 - - - 9.2.0 - 0 - IMAGE - 386CF5D3482F068EC9C480B51F6BCE42 - riverbed-WX-IMG-9.2.0.qcow2 - - - TCP OPTIMIZATION - - - APPLICATION OPTIMIZATION - - - VCX-SUB-00755-L - TRUE - - - - VCX-SUB-00755-M - WX - - RIVERBED - VCX-SUB-00755-M - VCX-SUB-00755-M - - - 4 - 2 - 4 - - - 8 - GB - 4 - 8 - - - 150 - GB - 150 - 150 - - - 9.2.0 - 0 - IMAGE - 386CF5D3482F068EC9C480B51F6BCE42 - riverbed-WX-IMG-9.2.0.qcow2 - - - TCP OPTIMIZATION - - - APPLICATION OPTIMIZATION - - - VCX-SUB-00755-M - TRUE - - - - VCX-SUB-00755-H - WX - - RIVERBED - VCX-SUB-00755-H - VCX-SUB-00755-H - - - 4 - 2 - 4 - - - 8 - GB - 4 - 8 - - - 150 - GB - 150 - 150 - - - 9.2.0 - 0 - IMAGE - 386CF5D3482F068EC9C480B51F6BCE42 - riverbed-WX-IMG-9.2.0.qcow2 - - - TCP OPTIMIZATION - - - APPLICATION OPTIMIZATION - - - VCX-SUB-00755-H - TRUE - - - - VCX-SUB-00255-UB - WX - - RIVERBED - VCX-SUB-00255-UB - VCX-SUB-00255-UB - - - 2 - 1 - 2 - - - 2 - GB - 2 - 2 - - - 50 - GB - 50 - 50 - - - 9.2.0 - 0 - IMAGE - 386CF5D3482F068EC9C480B51F6BCE42 - riverbed-WX-IMG-9.2.0.qcow2 - - - TCP OPTIMIZATION - - - APPLICATION OPTIMIZATION - - - VCX-SUB-00255-UB - TRUE - - - - VCX-SUB-00255-LB - WX - - RIVERBED - VCX-SUB-00255-LB - VCX-SUB-00255-LB - - - 2 - 1 - 2 - - - 2 - GB - 2 - 2 - - - 50 - GB - 50 - 50 - - - 9.2.0 - 0 - IMAGE - 386CF5D3482F068EC9C480B51F6BCE42 - riverbed-WX-IMG-9.2.0.qcow2 - - - TCP OPTIMIZATION - - - APPLICATION OPTIMIZATION - - - VCX-SUB-00255-LB - TRUE - - - - VCX-SUB-00255-MB - WX - - RIVERBED - VCX-SUB-00255-MB - VCX-SUB-00255-MB - - - 2 - 1 - 2 - - - 2 - GB - 2 - 2 - - - 50 - GB - 50 - 50 - - - 9.2.0 - 0 - IMAGE - 386CF5D3482F068EC9C480B51F6BCE42 - riverbed-WX-IMG-9.2.0.qcow2 - - - TCP OPTIMIZATION - - - APPLICATION OPTIMIZATION - - - VCX-SUB-00255-MB - TRUE - - - - VCX-SUB-00255-HB - WX - - RIVERBED - VCX-SUB-00255-HB - VCX-SUB-00255-HB - - - 2 - 1 - 2 - - - 2 - GB - 2 - 2 - - - 50 - GB - 50 - 50 - - - 9.2.0 - 0 - IMAGE - 386CF5D3482F068EC9C480B51F6BCE42 - riverbed-WX-IMG-9.2.0.qcow2 - - - TCP OPTIMIZATION - - - APPLICATION OPTIMIZATION - - - VCX-SUB-00255-HB - TRUE - - - - VCX-SUB-00555-LB - WX - - RIVERBED - VCX-SUB-00555-LB - VCX-SUB-00555-LB - - - 2 - 1 - 2 - - - 4 - GB - 2 - 4 - - - 80 - GB - 80 - 80 - - - 9.2.0 - 0 - IMAGE - 386CF5D3482F068EC9C480B51F6BCE42 - riverbed-WX-IMG-9.2.0.qcow2 - - - TCP OPTIMIZATION - - - APPLICATION OPTIMIZATION - - - VCX-SUB-00555-LB - TRUE - - - - VCX-SUB-00555-MB - WX - - RIVERBED - VCX-SUB-00555-MB - VCX-SUB-00555-MB - - - 2 - 1 - 2 - - - 4 - GB - 2 - 4 - - - 80 - GB - 80 - 80 - - - 9.2.0 - 0 - IMAGE - 386CF5D3482F068EC9C480B51F6BCE42 - riverbed-WX-IMG-9.2.0.qcow2 - - - TCP OPTIMIZATION - - - APPLICATION OPTIMIZATION - - - VCX-SUB-00555-MB - TRUE - - - - VCX-SUB-00555-HB - WX - - RIVERBED - VCX-SUB-00555-HB - VCX-SUB-00555-HB - - - 2 - 1 - 2 - - - 4 - GB - 2 - 4 - - - 80 - GB - 80 - 80 - - - 9.2.0 - 0 - IMAGE - 386CF5D3482F068EC9C480B51F6BCE42 - riverbed-WX-IMG-9.2.0.qcow2 - - - TCP OPTIMIZATION - - - APPLICATION OPTIMIZATION - - - VCX-SUB-00555-HB - TRUE - - - - VCX-SUB-00755-LB - WX - - RIVERBED - VCX-SUB-00755-LB - VCX-SUB-00755-LB - - - 4 - 2 - 4 - - - 8 - GB - 4 - 8 - - - 150 - GB - 150 - 150 - - - 9.2.0 - 0 - IMAGE - 386CF5D3482F068EC9C480B51F6BCE42 - riverbed-WX-IMG-9.2.0.qcow2 - - - TCP OPTIMIZATION - - - APPLICATION OPTIMIZATION - - - VCX-SUB-00755-LB - TRUE - - - - VCX-SUB-00755-MB - WX - - RIVERBED - VCX-SUB-00755-MB - VCX-SUB-00755-MB - - - 4 - 2 - 4 - - - 8 - GB - 4 - 8 - - - 150 - GB - 150 - 150 - - - 9.2.0 - 0 - IMAGE - 386CF5D3482F068EC9C480B51F6BCE42 - riverbed-WX-IMG-9.2.0.qcow2 - - - TCP OPTIMIZATION - - - APPLICATION OPTIMIZATION - - - VCX-SUB-00755-MB - TRUE - - - - VCX-SUB-00755-HB - WX - - RIVERBED - VCX-SUB-00755-HB - VCX-SUB-00755-HB - - - 4 - 2 - 4 - - - 8 - GB - 4 - 8 - - - 150 - GB - 150 - 150 - - - 9.2.0 - 0 - IMAGE - 386CF5D3482F068EC9C480B51F6BCE42 - riverbed-WX-IMG-9.2.0.qcow2 - - - TCP OPTIMIZATION - - - APPLICATION OPTIMIZATION - - - VCX-SUB-00755-HB - TRUE - - - - JUN-vSRX-15X - RT - - JUNIPER - JUN-vSRX-15X - VSRX - - - 2 - 2 - 2 - - - 4 - GB - 4 - 4 - - - 8 - GB - 8 - 8 - - - 15.1X49-D40.6 - 0 - IMAGE - media-vsrx-vmdisk-15.1X49-D40.6.qcow2 - 4b874dbd75fc83dc2494b90b2012d514 - - - IPv6 - - - NetFLOW v9 - - - NTP - - - SNMP - - - GRE Tunnel - - - Border Gateway Protocol (BGP) - - - Open Shortest Path First (OSPF) - - - NAT - - - DHCP Server - - - DHCP Relay - - - VRF-Lite - - - COS - - - Multicast - - - VRRP - - - JUN-vSRX-15X - FALSE - - -- 2.16.6