Allow handling of legact model artifacts

Change-Id: I3d4c5e51140d4d05b3fd871d58c2590421c0e9db
Signed-off-by: Blimkie, Steven (sb787e) <steven.blimkie@amdocs.com>

1 files changed, 129 insertions, 149 deletions

diff --git a/src/test/resources/vnfcatalogexample.xml b/src/test/resources/vnfcatalogexample.xml
index 0348f71..c38b411 100644
--- a/src/test/resources/vnfcatalogexample.xml
+++ b/src/test/resources/vnfcatalogexample.xml
@@ -1,149 +1,129 @@
-<!--

-  ============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=========================================================

-  -->

-

-<vnf-catalog>

-	<part-number-list>

-		<part-number>FortiGate-VM00</part-number>

-		<vnf-type>FW</vnf-type>

-		<vendor-info>

-			<vendor-name>FORTINET</vendor-name>

-			<vendor-part-number>FortiGate-VM00</vendor-part-number>

-			<vendor-model>VM00</vendor-model>

-		</vendor-info>

-		<vcpu>

-			<vcpu-default>1</vcpu-default>

-			<vcpu-min>1</vcpu-min>

-			<vcpu-max>1</vcpu-max>

-		</vcpu>

-		<vmemory>

-			<vmemory-default>1</vmemory-default>

-			<vmemory-units>GB</vmemory-units>

-			<vmemory-min>1</vmemory-min>

-			<vmemory-max>1</vmemory-max>

-		</vmemory>

-		<vdisk>

-			<vdisk-default>2</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>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>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>test1</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-VM00</license-assignment-group>

-			<license-required>FALSE</license-required>

-		</license-list>

-	</part-number-list>

-	<part-number-list>

-		<part-number>FortiGate-VM01</part-number>

-		<vnf-type>FW</vnf-type>

-		<vendor-info>

-			<vendor-name>FORTINET</vendor-name>

-			<vendor-part-number>FortiGate-VM01</vendor-part-number>

-			<vendor-model>VM01</vendor-model>

-		</vendor-info>

-		<vcpu>

-			<vcpu-default>1</vcpu-default>

-			<vcpu-min>1</vcpu-min>

-			<vcpu-max>1</vcpu-max>

-		</vcpu>

-		<vmemory>

-			<vmemory-default>2</vmemory-default>

-			<vmemory-units>GB</vmemory-units>

-			<vmemory-min>1</vmemory-min>

-			<vmemory-max>2</vmemory-max>

-		</vmemory>

-		<vdisk>

-			<vdisk-default>2</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>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>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>software file name</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>license group</license-assignment-group>

-			<license-required>FALSE</license-required>

-		</license-list>

-	</part-number-list>

-

-</vnf-catalog>

+<vnf-catalog>
+	<part-number-list>
+		<part-number>FortiGate-VM00</part-number>
+		<vnf-type>FW</vnf-type>
+		<vendor-info>
+			<vendor-name>FORTINET</vendor-name>
+			<vendor-part-number>FortiGate-VM00</vendor-part-number>
+			<vendor-model>VM00</vendor-model>
+		</vendor-info>
+		<vcpu>
+			<vcpu-default>1</vcpu-default>
+			<vcpu-min>1</vcpu-min>
+			<vcpu-max>1</vcpu-max>
+		</vcpu>
+		<vmemory>
+			<vmemory-default>1</vmemory-default>
+			<vmemory-units>GB</vmemory-units>
+			<vmemory-min>1</vmemory-min>
+			<vmemory-max>1</vmemory-max>
+		</vmemory>
+		<vdisk>
+			<vdisk-default>2</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>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>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>test1</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-VM00</license-assignment-group>
+			<license-required>FALSE</license-required>
+		</license-list>
+	</part-number-list>
+	<part-number-list>
+		<part-number>FortiGate-VM01</part-number>
+		<vnf-type>FW</vnf-type>
+		<vendor-info>
+			<vendor-name>FORTINET</vendor-name>
+			<vendor-part-number>FortiGate-VM01</vendor-part-number>
+			<vendor-model>VM01</vendor-model>
+		</vendor-info>
+		<vcpu>
+			<vcpu-default>1</vcpu-default>
+			<vcpu-min>1</vcpu-min>
+			<vcpu-max>1</vcpu-max>
+		</vcpu>
+		<vmemory>
+			<vmemory-default>2</vmemory-default>
+			<vmemory-units>GB</vmemory-units>
+			<vmemory-min>1</vmemory-min>
+			<vmemory-max>2</vmemory-max>
+		</vmemory>
+		<vdisk>
+			<vdisk-default>2</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>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>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>software file name</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>license group</license-assignment-group>
+			<license-required>FALSE</license-required>
+		</license-list>
+	</part-number-list>
+
+</vnf-catalog>