From fe17f093d5c61207949eebef95b83baf5139be50 Mon Sep 17 00:00:00 2001 From: "Blimkie, Steven (sb787e)" Date: Tue, 27 Jun 2017 21:08:37 +0300 Subject: Allow handling of legact model artifacts Change-Id: I3d4c5e51140d4d05b3fd871d58c2590421c0e9db Signed-off-by: Blimkie, Steven (sb787e) --- src/test/resources/logback-test.xml | 54 +-- .../model-loader-empty-auth-password.properties | 66 ++-- .../model-loader-no-auth-password.properties | 62 ++-- src/test/resources/model-loader.properties | 66 ++-- ...I-Testvsp..vmme_cinder..module-1-resource-1.xml | 84 ++--- ...tvsp..vmme_small_ecomp..module-0-resource-1.xml | 340 +++++++++--------- src/test/resources/models/AAI-VL-resource-1.xml | 84 ++--- .../models/AAI-stellService-service-1.xml | 158 ++++----- .../resources/models/AAI-testvsp-resource-1.xml | 158 ++++----- src/test/resources/models/complete-model.xml | 384 --------------------- src/test/resources/models/incomplete-model.xml | 54 +-- src/test/resources/models/incomplete-models.xml | 50 --- src/test/resources/models/invalid-model.xml | 82 ++--- src/test/resources/models/l3-network-widget.xml | 42 +-- .../resources/models/named-query-wan-connector.xml | 160 ++++----- .../resources/models/v8-wan-connector-model.xml | 165 +++++++++ src/test/resources/vnfcatalogexample.xml | 278 +++++++-------- 17 files changed, 869 insertions(+), 1418 deletions(-) delete mode 100644 src/test/resources/models/complete-model.xml delete mode 100644 src/test/resources/models/incomplete-models.xml create mode 100644 src/test/resources/models/v8-wan-connector-model.xml (limited to 'src/test/resources') diff --git a/src/test/resources/logback-test.xml b/src/test/resources/logback-test.xml index 3f0fb7a..aef38e6 100644 --- a/src/test/resources/logback-test.xml +++ b/src/test/resources/logback-test.xml @@ -1,37 +1,17 @@ - - - - - - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - - - - - - - - - + + + + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + + + + + + diff --git a/src/test/resources/model-loader-empty-auth-password.properties b/src/test/resources/model-loader-empty-auth-password.properties index 34432a4..91fd527 100644 --- a/src/test/resources/model-loader-empty-auth-password.properties +++ b/src/test/resources/model-loader-empty-auth-password.properties @@ -1,43 +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========================================================= -### - -# Model Loader Distribution Client Configuration -ml.distribution.ACTIVE_SERVER_TLS_AUTH=false -ml.distribution.ASDC_ADDRESS= -ml.distribution.CONSUMER_GROUP=aai-ml-group-test -ml.distribution.CONSUMER_ID=aai-ml-id-test -ml.distribution.ENVIRONMENT_NAME= -ml.distribution.KEYSTORE_PASSWORD= -ml.distribution.KEYSTORE_FILE=asdc-client.jks -ml.distribution.PASSWORD= -ml.distribution.POLLING_INTERVAL=30 -ml.distribution.POLLING_TIMEOUT=20 -ml.distribution.USER=ci -ml.distribution.ARTIFACT_TYPES=MODEL_INVENTORY_PROFILE,MODEL_QUERY_SPEC,VNF_CATALOG - -# Model Loader AAI REST Client Configuration -ml.aai.BASE_URL= -ml.aai.MODEL_URL=/aai/v8/service-design-and-creation/models/model/ -ml.aai.NAMED_QUERY_URL=/aai/v8/service-design-and-creation/named-queries/named-query/ -ml.aai.VNF_IMAGE_URL=/aai/v8/service-design-and-creation/vnf-images -ml.aai.KEYSTORE_FILE=aai-client-cert.p12 -ml.aai.KEYSTORE_PASSWORD= -ml.aai.AUTH_USER=ModelLoader -ml.aai.AUTH_PASSWORD= +# Model Loader Distribution Client Configuration +ml.distribution.ACTIVE_SERVER_TLS_AUTH=false +ml.distribution.ASDC_ADDRESS= +ml.distribution.CONSUMER_GROUP=aai-ml-group-test +ml.distribution.CONSUMER_ID=aai-ml-id-test +ml.distribution.ENVIRONMENT_NAME= +ml.distribution.KEYSTORE_PASSWORD= +ml.distribution.KEYSTORE_FILE=asdc-client.jks +ml.distribution.PASSWORD= +ml.distribution.POLLING_INTERVAL=30 +ml.distribution.POLLING_TIMEOUT=20 +ml.distribution.USER=ci +ml.distribution.ARTIFACT_TYPES=MODEL_INVENTORY_PROFILE,MODEL_QUERY_SPEC,VNF_CATALOG + +# Model Loader AAI REST Client Configuration +ml.aai.BASE_URL= +ml.aai.MODEL_URL=/aai/v8/service-design-and-creation/models/model/ +ml.aai.NAMED_QUERY_URL=/aai/v8/service-design-and-creation/named-queries/named-query/ +ml.aai.VNF_IMAGE_URL=/aai/v8/service-design-and-creation/vnf-images +ml.aai.KEYSTORE_FILE=aai-client-cert.p12 +ml.aai.KEYSTORE_PASSWORD= +ml.aai.AUTH_USER=ModelLoader +ml.aai.AUTH_PASSWORD= diff --git a/src/test/resources/model-loader-no-auth-password.properties b/src/test/resources/model-loader-no-auth-password.properties index 035d3e8..2f36934 100644 --- a/src/test/resources/model-loader-no-auth-password.properties +++ b/src/test/resources/model-loader-no-auth-password.properties @@ -1,41 +1,21 @@ -### -# ============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========================================================= -### - -# Model Loader Distribution Client Configuration -ml.distribution.ACTIVE_SERVER_TLS_AUTH=false -ml.distribution.ASDC_ADDRESS= -ml.distribution.CONSUMER_GROUP=aai-ml-group-test -ml.distribution.CONSUMER_ID=aai-ml-id-test -ml.distribution.ENVIRONMENT_NAME= -ml.distribution.KEYSTORE_PASSWORD= -ml.distribution.KEYSTORE_FILE=asdc-client.jks -ml.distribution.PASSWORD= -ml.distribution.POLLING_INTERVAL=30 -ml.distribution.POLLING_TIMEOUT=20 -ml.distribution.USER=ci -ml.distribution.ARTIFACT_TYPES=MODEL_INVENTORY_PROFILE,MODEL_QUERY_SPEC,VNF_CATALOG - -# Model Loader AAI REST Client Configuration -ml.aai.BASE_URL= -ml.aai.MODEL_URL=/aai/v8/service-design-and-creation/models/model/ -ml.aai.NAMED_QUERY_URL=/aai/v8/service-design-and-creation/named-queries/named-query/ -ml.aai.VNF_IMAGE_URL=/aai/v8/service-design-and-creation/vnf-images -ml.aai.KEYSTORE_FILE=aai-client-cert.p12 -ml.aai.KEYSTORE_PASSWORD= +# Model Loader Distribution Client Configuration +ml.distribution.ACTIVE_SERVER_TLS_AUTH=false +ml.distribution.ASDC_ADDRESS= +ml.distribution.CONSUMER_GROUP=aai-ml-group-test +ml.distribution.CONSUMER_ID=aai-ml-id-test +ml.distribution.ENVIRONMENT_NAME= +ml.distribution.KEYSTORE_PASSWORD= +ml.distribution.KEYSTORE_FILE=asdc-client.jks +ml.distribution.PASSWORD= +ml.distribution.POLLING_INTERVAL=30 +ml.distribution.POLLING_TIMEOUT=20 +ml.distribution.USER=ci +ml.distribution.ARTIFACT_TYPES=MODEL_INVENTORY_PROFILE,MODEL_QUERY_SPEC,VNF_CATALOG + +# Model Loader AAI REST Client Configuration +ml.aai.BASE_URL= +ml.aai.MODEL_URL=/aai/v8/service-design-and-creation/models/model/ +ml.aai.NAMED_QUERY_URL=/aai/v8/service-design-and-creation/named-queries/named-query/ +ml.aai.VNF_IMAGE_URL=/aai/v8/service-design-and-creation/vnf-images +ml.aai.KEYSTORE_FILE=aai-client-cert.p12 +ml.aai.KEYSTORE_PASSWORD= diff --git a/src/test/resources/model-loader.properties b/src/test/resources/model-loader.properties index 34432a4..91fd527 100644 --- a/src/test/resources/model-loader.properties +++ b/src/test/resources/model-loader.properties @@ -1,43 +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========================================================= -### - -# Model Loader Distribution Client Configuration -ml.distribution.ACTIVE_SERVER_TLS_AUTH=false -ml.distribution.ASDC_ADDRESS= -ml.distribution.CONSUMER_GROUP=aai-ml-group-test -ml.distribution.CONSUMER_ID=aai-ml-id-test -ml.distribution.ENVIRONMENT_NAME= -ml.distribution.KEYSTORE_PASSWORD= -ml.distribution.KEYSTORE_FILE=asdc-client.jks -ml.distribution.PASSWORD= -ml.distribution.POLLING_INTERVAL=30 -ml.distribution.POLLING_TIMEOUT=20 -ml.distribution.USER=ci -ml.distribution.ARTIFACT_TYPES=MODEL_INVENTORY_PROFILE,MODEL_QUERY_SPEC,VNF_CATALOG - -# Model Loader AAI REST Client Configuration -ml.aai.BASE_URL= -ml.aai.MODEL_URL=/aai/v8/service-design-and-creation/models/model/ -ml.aai.NAMED_QUERY_URL=/aai/v8/service-design-and-creation/named-queries/named-query/ -ml.aai.VNF_IMAGE_URL=/aai/v8/service-design-and-creation/vnf-images -ml.aai.KEYSTORE_FILE=aai-client-cert.p12 -ml.aai.KEYSTORE_PASSWORD= -ml.aai.AUTH_USER=ModelLoader -ml.aai.AUTH_PASSWORD= +# Model Loader Distribution Client Configuration +ml.distribution.ACTIVE_SERVER_TLS_AUTH=false +ml.distribution.ASDC_ADDRESS= +ml.distribution.CONSUMER_GROUP=aai-ml-group-test +ml.distribution.CONSUMER_ID=aai-ml-id-test +ml.distribution.ENVIRONMENT_NAME= +ml.distribution.KEYSTORE_PASSWORD= +ml.distribution.KEYSTORE_FILE=asdc-client.jks +ml.distribution.PASSWORD= +ml.distribution.POLLING_INTERVAL=30 +ml.distribution.POLLING_TIMEOUT=20 +ml.distribution.USER=ci +ml.distribution.ARTIFACT_TYPES=MODEL_INVENTORY_PROFILE,MODEL_QUERY_SPEC,VNF_CATALOG + +# Model Loader AAI REST Client Configuration +ml.aai.BASE_URL= +ml.aai.MODEL_URL=/aai/v8/service-design-and-creation/models/model/ +ml.aai.NAMED_QUERY_URL=/aai/v8/service-design-and-creation/named-queries/named-query/ +ml.aai.VNF_IMAGE_URL=/aai/v8/service-design-and-creation/vnf-images +ml.aai.KEYSTORE_FILE=aai-client-cert.p12 +ml.aai.KEYSTORE_PASSWORD= +ml.aai.AUTH_USER=ModelLoader +ml.aai.AUTH_PASSWORD= diff --git a/src/test/resources/models/AAI-Testvsp..vmme_cinder..module-1-resource-1.xml b/src/test/resources/models/AAI-Testvsp..vmme_cinder..module-1-resource-1.xml index 7bd1073..6ec4fb3 100644 --- a/src/test/resources/models/AAI-Testvsp..vmme_cinder..module-1-resource-1.xml +++ b/src/test/resources/models/AAI-Testvsp..vmme_cinder..module-1-resource-1.xml @@ -1,52 +1,32 @@ - - - - 5a2aac99-ffe8-415f-9242-420ed10da23e - resource - - - 29d3fc43-4ff2-4e5c-acd0-7370f5b2715a - Testvsp..vmme_cinder..module-1 - 1 - - - - F - unbounded - - - - model-ver - - model-ver.model-version-id - c00563ae-812b-4e62-8330-7c4d0f47088a - - - model.model-invariant-id - ef86f9c5-2165-44f3-8fc3-96018b609ea5 - - - - - - - - + + 5a2aac99-ffe8-415f-9242-420ed10da23e + resource + + + 29d3fc43-4ff2-4e5c-acd0-7370f5b2715a + Testvsp..vmme_cinder..module-1 + 1 + + + + F + unbounded + + + + model-ver + + model-ver.model-version-id + c00563ae-812b-4e62-8330-7c4d0f47088a + + + model.model-invariant-id + ef86f9c5-2165-44f3-8fc3-96018b609ea5 + + + + + + + + \ No newline at end of file diff --git a/src/test/resources/models/AAI-Testvsp..vmme_small_ecomp..module-0-resource-1.xml b/src/test/resources/models/AAI-Testvsp..vmme_small_ecomp..module-0-resource-1.xml index 8fe5319..ee436ba 100644 --- a/src/test/resources/models/AAI-Testvsp..vmme_small_ecomp..module-0-resource-1.xml +++ b/src/test/resources/models/AAI-Testvsp..vmme_small_ecomp..module-0-resource-1.xml @@ -1,180 +1,160 @@ - - - - 1e8fdfc0-03cf-4742-b060-dab818954d67 - resource - - - da6769f0-aa58-4e90-b2c9-664c2630d131 - Testvsp..vmme_small_ecomp..module-0 - 1 - - - - F - unbounded - - - F - unbounded - - - F - unbounded - - - - model-ver - - model-ver.model-version-id - f6a038c2-820c-42ba-8c2b-375e24e8f932 - - - model.model-invariant-id - 3f4c7204-739b-4bbb-87a7-8a6856439c90 - - - - - - F - unbounded - - - - model-ver - - model-ver.model-version-id - abcc54bc-bb74-49dc-9043-7f7171707545 - - - model.model-invariant-id - 97c26c99-6870-44c1-8a07-1d900d3f4ce6 - - - - - - F - unbounded - - - - model-ver - - model-ver.model-version-id - 36200fb5-f251-4f5d-a520-7c5ad5c2cd4b - - - model.model-invariant-id - bace8d1c-a261-4041-9e37-823117415d0f - - - - - - F - unbounded - - - - model-ver - - model-ver.model-version-id - a32613fd-18b9-459e-aab8-fffb3912966a - - - model.model-invariant-id - cea0a982-8d55-4093-921e-418fbccf7060 - - - - - - F - unbounded - - - - model-ver - - model-ver.model-version-id - 5761e0a7-c6df-4d8a-9ebd-b8f445054dec - - - model.model-invariant-id - 96129eb9-f0de-4e05-8af2-73146473f766 - - - - - - - - model-ver - - model-ver.model-version-id - 8ecb2c5d-7176-4317-a255-26274edfdd53 - - - model.model-invariant-id - ff69d4e0-a8e8-4108-bdb0-dd63217e63c7 - - - - - - F - unbounded - - - - model-ver - - model-ver.model-version-id - 9111f20f-e680-4001-b83f-19a2fc23bfc1 - - - model.model-invariant-id - 3d560d81-57d0-438b-a2a1-5334dba0651a - - - - - - - - model-ver - - model-ver.model-version-id - c00563ae-812b-4e62-8330-7c4d0f47088a - - - model.model-invariant-id - ef86f9c5-2165-44f3-8fc3-96018b609ea5 - - - - - - - - + + 1e8fdfc0-03cf-4742-b060-dab818954d67 + resource + + + da6769f0-aa58-4e90-b2c9-664c2630d131 + Testvsp..vmme_small_ecomp..module-0 + 1 + + + + F + unbounded + + + F + unbounded + + + F + unbounded + + + + model-ver + + model-ver.model-version-id + f6a038c2-820c-42ba-8c2b-375e24e8f932 + + + model.model-invariant-id + 3f4c7204-739b-4bbb-87a7-8a6856439c90 + + + + + + F + unbounded + + + + model-ver + + model-ver.model-version-id + abcc54bc-bb74-49dc-9043-7f7171707545 + + + model.model-invariant-id + 97c26c99-6870-44c1-8a07-1d900d3f4ce6 + + + + + + F + unbounded + + + + model-ver + + model-ver.model-version-id + 36200fb5-f251-4f5d-a520-7c5ad5c2cd4b + + + model.model-invariant-id + bace8d1c-a261-4041-9e37-823117415d0f + + + + + + F + unbounded + + + + model-ver + + model-ver.model-version-id + a32613fd-18b9-459e-aab8-fffb3912966a + + + model.model-invariant-id + cea0a982-8d55-4093-921e-418fbccf7060 + + + + + + F + unbounded + + + + model-ver + + model-ver.model-version-id + 5761e0a7-c6df-4d8a-9ebd-b8f445054dec + + + model.model-invariant-id + 96129eb9-f0de-4e05-8af2-73146473f766 + + + + + + + + model-ver + + model-ver.model-version-id + 8ecb2c5d-7176-4317-a255-26274edfdd53 + + + model.model-invariant-id + ff69d4e0-a8e8-4108-bdb0-dd63217e63c7 + + + + + + F + unbounded + + + + model-ver + + model-ver.model-version-id + 9111f20f-e680-4001-b83f-19a2fc23bfc1 + + + model.model-invariant-id + 3d560d81-57d0-438b-a2a1-5334dba0651a + + + + + + + + model-ver + + model-ver.model-version-id + c00563ae-812b-4e62-8330-7c4d0f47088a + + + model.model-invariant-id + ef86f9c5-2165-44f3-8fc3-96018b609ea5 + + + + + + + + \ No newline at end of file diff --git a/src/test/resources/models/AAI-VL-resource-1.xml b/src/test/resources/models/AAI-VL-resource-1.xml index 98941ad..e80d4f3 100644 --- a/src/test/resources/models/AAI-VL-resource-1.xml +++ b/src/test/resources/models/AAI-VL-resource-1.xml @@ -1,52 +1,32 @@ - - - - 5c12984d-db0f-4300-a0e0-9791775cc40f - resource - - - 88bdbadf-db8a-490f-881e-c8effcbc3f66 - VL - 1 - Virtual link (VL) describes the basic topology of the connectivity as well as other required parameters (e.g. bandwidth and QoS class). - - - F - unbounded - - - - model-ver - - model-ver.model-version-id - 9111f20f-e680-4001-b83f-19a2fc23bfc1 - - - model.model-invariant-id - 3d560d81-57d0-438b-a2a1-5334dba0651a - - - - - - - - + + 5c12984d-db0f-4300-a0e0-9791775cc40f + resource + + + 88bdbadf-db8a-490f-881e-c8effcbc3f66 + VL + 1 + Virtual link (VL) describes the basic topology of the connectivity as well as other required parameters (e.g. bandwidth and QoS class). + + + F + unbounded + + + + model-ver + + model-ver.model-version-id + 9111f20f-e680-4001-b83f-19a2fc23bfc1 + + + model.model-invariant-id + 3d560d81-57d0-438b-a2a1-5334dba0651a + + + + + + + + \ No newline at end of file diff --git a/src/test/resources/models/AAI-stellService-service-1.xml b/src/test/resources/models/AAI-stellService-service-1.xml index 378b09e..20cfd11 100644 --- a/src/test/resources/models/AAI-stellService-service-1.xml +++ b/src/test/resources/models/AAI-stellService-service-1.xml @@ -1,89 +1,69 @@ - - - - fedf9da3-6a74-4813-8fa2-221a98b0e7ad - service - - - e0373537-7f66-4094-9939-e2f5de6ff5f6 - stellService - 1 - fd - - - F - unbounded - - - F - unbounded - - - - model-ver - - model-ver.model-version-id - 88bdbadf-db8a-490f-881e-c8effcbc3f66 - - - model.model-invariant-id - 5c12984d-db0f-4300-a0e0-9791775cc40f - - - - - - F - unbounded - - - - model-ver - - model-ver.model-version-id - 374d0899-bbc2-4403-9320-fe9bebef75c6 - - - model.model-invariant-id - 959b7c09-9f34-4e5f-8b63-505381db176e - - - - - - - - model-ver - - model-ver.model-version-id - 46b92144-923a-4d20-b85a-3cbd847668a9 - - - model.model-invariant-id - 82194af1-3c2c-485a-8f44-420e22a9eaa4 - - - - - - - - + + fedf9da3-6a74-4813-8fa2-221a98b0e7ad + service + + + e0373537-7f66-4094-9939-e2f5de6ff5f6 + stellService + 1 + fd + + + F + unbounded + + + F + unbounded + + + + model-ver + + model-ver.model-version-id + 88bdbadf-db8a-490f-881e-c8effcbc3f66 + + + model.model-invariant-id + 5c12984d-db0f-4300-a0e0-9791775cc40f + + + + + + F + unbounded + + + + model-ver + + model-ver.model-version-id + 374d0899-bbc2-4403-9320-fe9bebef75c6 + + + model.model-invariant-id + 959b7c09-9f34-4e5f-8b63-505381db176e + + + + + + + + model-ver + + model-ver.model-version-id + 46b92144-923a-4d20-b85a-3cbd847668a9 + + + model.model-invariant-id + 82194af1-3c2c-485a-8f44-420e22a9eaa4 + + + + + + + + \ No newline at end of file diff --git a/src/test/resources/models/AAI-testvsp-resource-1.xml b/src/test/resources/models/AAI-testvsp-resource-1.xml index c9a70ff..bafecfb 100644 --- a/src/test/resources/models/AAI-testvsp-resource-1.xml +++ b/src/test/resources/models/AAI-testvsp-resource-1.xml @@ -1,89 +1,69 @@ - - - - 959b7c09-9f34-4e5f-8b63-505381db176e - resource - - - 374d0899-bbc2-4403-9320-fe9bebef75c6 - testvsp - 1 - nkjlkl - - - F - unbounded - - - F - unbounded - - - - model-ver - - model-ver.model-version-id - da6769f0-aa58-4e90-b2c9-664c2630d131 - - - model.model-invariant-id - 1e8fdfc0-03cf-4742-b060-dab818954d67 - - - - - - F - unbounded - - - - model-ver - - model-ver.model-version-id - 29d3fc43-4ff2-4e5c-acd0-7370f5b2715a - - - model.model-invariant-id - 5a2aac99-ffe8-415f-9242-420ed10da23e - - - - - - - - model-ver - - model-ver.model-version-id - 93a6166f-b3d5-4f06-b4ba-aed48d009ad9 - - - model.model-invariant-id - acc6edd8-a8d4-4b93-afaa-0994068be14c - - - - - - - - + + 959b7c09-9f34-4e5f-8b63-505381db176e + resource + + + 374d0899-bbc2-4403-9320-fe9bebef75c6 + testvsp + 1 + nkjlkl + + + F + unbounded + + + F + unbounded + + + + model-ver + + model-ver.model-version-id + da6769f0-aa58-4e90-b2c9-664c2630d131 + + + model.model-invariant-id + 1e8fdfc0-03cf-4742-b060-dab818954d67 + + + + + + F + unbounded + + + + model-ver + + model-ver.model-version-id + 29d3fc43-4ff2-4e5c-acd0-7370f5b2715a + + + model.model-invariant-id + 5a2aac99-ffe8-415f-9242-420ed10da23e + + + + + + + + model-ver + + model-ver.model-version-id + 93a6166f-b3d5-4f06-b4ba-aed48d009ad9 + + + model.model-invariant-id + acc6edd8-a8d4-4b93-afaa-0994068be14c + + + + + + + + \ No newline at end of file diff --git a/src/test/resources/models/complete-model.xml b/src/test/resources/models/complete-model.xml deleted file mode 100644 index 394c073..0000000 --- a/src/test/resources/models/complete-model.xml +++ /dev/null @@ -1,384 +0,0 @@ - - - - - 5c12984d-db0f-4300-a0e0-9791775cc40f - resource - - - 88bdbadf-db8a-490f-881e-c8effcbc3f66 - VL - 1 - Virtual link (VL) describes the basic topology of the connectivity as well as other required parameters (e.g. bandwidth and QoS class). - - - F - unbounded - - - - model-ver - - model-ver.model-version-id - 9111f20f-e680-4001-b83f-19a2fc23bfc1 - - - model.model-invariant-id - 3d560d81-57d0-438b-a2a1-5334dba0651a - - - - - - - - - - 1e8fdfc0-03cf-4742-b060-dab818954d67 - resource - - - da6769f0-aa58-4e90-b2c9-664c2630d131 - Testvsp..vmme_small_ecomp..module-0 - 1 - - - - F - unbounded - - - F - unbounded - - - F - unbounded - - - - model-ver - - model-ver.model-version-id - f6a038c2-820c-42ba-8c2b-375e24e8f932 - - - model.model-invariant-id - 3f4c7204-739b-4bbb-87a7-8a6856439c90 - - - - - - F - unbounded - - - - model-ver - - model-ver.model-version-id - abcc54bc-bb74-49dc-9043-7f7171707545 - - - model.model-invariant-id - 97c26c99-6870-44c1-8a07-1d900d3f4ce6 - - - - - - F - unbounded - - - - model-ver - - model-ver.model-version-id - 36200fb5-f251-4f5d-a520-7c5ad5c2cd4b - - - model.model-invariant-id - bace8d1c-a261-4041-9e37-823117415d0f - - - - - - F - unbounded - - - - model-ver - - model-ver.model-version-id - a32613fd-18b9-459e-aab8-fffb3912966a - - - model.model-invariant-id - cea0a982-8d55-4093-921e-418fbccf7060 - - - - - - F - unbounded - - - - model-ver - - model-ver.model-version-id - 5761e0a7-c6df-4d8a-9ebd-b8f445054dec - - - model.model-invariant-id - 96129eb9-f0de-4e05-8af2-73146473f766 - - - - - - - - model-ver - - model-ver.model-version-id - 8ecb2c5d-7176-4317-a255-26274edfdd53 - - - model.model-invariant-id - ff69d4e0-a8e8-4108-bdb0-dd63217e63c7 - - - - - - F - unbounded - - - - model-ver - - model-ver.model-version-id - 9111f20f-e680-4001-b83f-19a2fc23bfc1 - - - model.model-invariant-id - 3d560d81-57d0-438b-a2a1-5334dba0651a - - - - - - - - model-ver - - model-ver.model-version-id - c00563ae-812b-4e62-8330-7c4d0f47088a - - - model.model-invariant-id - ef86f9c5-2165-44f3-8fc3-96018b609ea5 - - - - - - - - - - 5a2aac99-ffe8-415f-9242-420ed10da23e - resource - - - 29d3fc43-4ff2-4e5c-acd0-7370f5b2715a - Testvsp..vmme_cinder..module-1 - 1 - - - - F - unbounded - - - - model-ver - - model-ver.model-version-id - c00563ae-812b-4e62-8330-7c4d0f47088a - - - model.model-invariant-id - ef86f9c5-2165-44f3-8fc3-96018b609ea5 - - - - - - - - - - 959b7c09-9f34-4e5f-8b63-505381db176e - resource - - - 374d0899-bbc2-4403-9320-fe9bebef75c6 - testvsp - 1 - nkjlkl - - - F - unbounded - - - F - unbounded - - - - model-ver - - model-ver.model-version-id - da6769f0-aa58-4e90-b2c9-664c2630d131 - - - model.model-invariant-id - 1e8fdfc0-03cf-4742-b060-dab818954d67 - - - - - - F - unbounded - - - - model-ver - - model-ver.model-version-id - 29d3fc43-4ff2-4e5c-acd0-7370f5b2715a - - - model.model-invariant-id - 5a2aac99-ffe8-415f-9242-420ed10da23e - - - - - - - - model-ver - - model-ver.model-version-id - 93a6166f-b3d5-4f06-b4ba-aed48d009ad9 - - - model.model-invariant-id - acc6edd8-a8d4-4b93-afaa-0994068be14c - - - - - - - - - - fedf9da3-6a74-4813-8fa2-221a98b0e7ad - service - - - e0373537-7f66-4094-9939-e2f5de6ff5f6 - stellService - 1 - fd - - - F - unbounded - - - F - unbounded - - - - model-ver - - model-ver.model-version-id - 88bdbadf-db8a-490f-881e-c8effcbc3f66 - - - model.model-invariant-id - 5c12984d-db0f-4300-a0e0-9791775cc40f - - - - - - F - unbounded - - - - model-ver - - model-ver.model-version-id - 374d0899-bbc2-4403-9320-fe9bebef75c6 - - - model.model-invariant-id - 959b7c09-9f34-4e5f-8b63-505381db176e - - - - - - - - model-ver - - model-ver.model-version-id - 46b92144-923a-4d20-b85a-3cbd847668a9 - - - model.model-invariant-id - 82194af1-3c2c-485a-8f44-420e22a9eaa4 - - - - - - - - - diff --git a/src/test/resources/models/incomplete-model.xml b/src/test/resources/models/incomplete-model.xml index b30d4d7..5bc0581 100644 --- a/src/test/resources/models/incomplete-model.xml +++ b/src/test/resources/models/incomplete-model.xml @@ -1,37 +1,17 @@ - - - - resource - - - VL - 1 - Virtual link (VL) describes the basic topology of the connectivity as well as other required parameters (e.g. bandwidth and QoS class). - - - F - unbounded - - - - - - + + resource + + + VL + 1 + Virtual link (VL) describes the basic topology of the connectivity as well as other required parameters (e.g. bandwidth and QoS class). + + + F + unbounded + + + + + + \ No newline at end of file diff --git a/src/test/resources/models/incomplete-models.xml b/src/test/resources/models/incomplete-models.xml deleted file mode 100644 index 56b10de..0000000 --- a/src/test/resources/models/incomplete-models.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - 3d560d81-57d0-438b-a2a1-5334dba0651a - widget - - - 9111f20f-e680-4001-b83f-19a2fc23bfc1 - 1.0 - l3-network - - - - - resource - - - VL - 1 - Virtual link (VL) describes the basic topology of the connectivity as well as other required parameters (e.g. bandwidth and QoS class). - - - F - unbounded - - - - - - - diff --git a/src/test/resources/models/invalid-model.xml b/src/test/resources/models/invalid-model.xml index 906cd21..865f5d3 100644 --- a/src/test/resources/models/invalid-model.xml +++ b/src/test/resources/models/invalid-model.xml @@ -1,51 +1,31 @@ - - - - 5c12984d-db0f-4300-a0e0-9791775cc40f - resource - - - 88bdbadf-db8a-490f-881e-c8effcbc3f66 - VL - 1 - Virtual link (VL) describes the basic topology of the connectivity as well as other required parameters (e.g. bandwidth and QoS class). - - - F - unbounded - - - - model-ver - - model-ver.model-version-id - 9111f20f-e680-4001-b83f-19a2fc23bfc1 - - - model.model-invariant-id - 3d560d81-57d0-438b-a2a1-5334dba0651a - - - - - - - + + 5c12984d-db0f-4300-a0e0-9791775cc40f + resource + + + 88bdbadf-db8a-490f-881e-c8effcbc3f66 + VL + 1 + Virtual link (VL) describes the basic topology of the connectivity as well as other required parameters (e.g. bandwidth and QoS class). + + + F + unbounded + + + + model-ver + + model-ver.model-version-id + 9111f20f-e680-4001-b83f-19a2fc23bfc1 + + + model.model-invariant-id + 3d560d81-57d0-438b-a2a1-5334dba0651a + + + + + + + diff --git a/src/test/resources/models/l3-network-widget.xml b/src/test/resources/models/l3-network-widget.xml index 1e50300..1d0240b 100644 --- a/src/test/resources/models/l3-network-widget.xml +++ b/src/test/resources/models/l3-network-widget.xml @@ -1,31 +1,11 @@ - - - - 3d560d81-57d0-438b-a2a1-5334dba0651a - widget - - - 9111f20f-e680-4001-b83f-19a2fc23bfc1 - 1.0 - l3-network - - - + + 3d560d81-57d0-438b-a2a1-5334dba0651a + widget + + + 9111f20f-e680-4001-b83f-19a2fc23bfc1 + 1.0 + l3-network + + + \ No newline at end of file diff --git a/src/test/resources/models/named-query-wan-connector.xml b/src/test/resources/models/named-query-wan-connector.xml index 51047df..55d8fda 100644 --- a/src/test/resources/models/named-query-wan-connector.xml +++ b/src/test/resources/models/named-query-wan-connector.xml @@ -1,90 +1,70 @@ - - - - 94cac189-8d88-4d63-a194-f44214e080ff - - wan-connector - v1.0 - Named Query - Wan Connector - - - - - model - - - model.model-invariant-id - d09dd9da-0148-46cd-a947-591afc844d24 - - - - - - - - - model - - - model.model-invariant-id - 997fc7-fca1-451f-b953-9a1e6197b4d6 - - - - - - - - - model - - - model.model-invariant-id - - 897df7ea-8938-42b0-bc57-46e913a4d93b - - - - - - - - - model - - - model.model-invariant-id - - f2b24d95-c582-48d5-b2d6-c5b3a94ce812 - - - - - - - - - - - - - - + + 94cac189-8d88-4d63-a194-f44214e080ff + + wan-connector + v1.0 + Named Query - Wan Connector + + + + + model + + + model.model-invariant-id + d09dd9da-0148-46cd-a947-591afc844d24 + + + + + + + + + model + + + model.model-invariant-id + 997fc7-fca1-451f-b953-9a1e6197b4d6 + + + + + + + + + model + + + model.model-invariant-id + + 897df7ea-8938-42b0-bc57-46e913a4d93b + + + + + + + + + model + + + model.model-invariant-id + + f2b24d95-c582-48d5-b2d6-c5b3a94ce812 + + + + + + + + + + + + + + diff --git a/src/test/resources/models/v8-wan-connector-model.xml b/src/test/resources/models/v8-wan-connector-model.xml new file mode 100644 index 0000000..09f1933 --- /dev/null +++ b/src/test/resources/models/v8-wan-connector-model.xml @@ -0,0 +1,165 @@ + + e4a9901b-6c94-4e07-b8d8-b877d3df554c + service + wan-connector + v1.0 + 93d9d45d-7eec-4371-9083-675e4c353de3 + + Connects a customer vpn to the border elements of an + AT&T product + + + a + vpn-id + + + b + product + + + + + true + unbounded + + + model + + + model.model-name-version-id + d09dd9da-0148-46cd-a947-591afc844d24 + + + + + + + true + unbounded + + + model + + + model.model-name-version-id + 997fc7-fca1-451f-b953-9a1e6197b4d6 + + + + + + + true + unbounded + + + model + + + model.model-name-version-id + + ae16244f-4d29-4801-a559-e25f2db2a4c3 + + + + + + + + logical-link + 999 + + combination + AND + + + A + 1 + + + unbounded + false + + + model + + + model.model-name-version-id + + 759dbd4a-2473-46f3-a932-48d987c9b4a1 + + + + + + l-interface|p-interface|pserver + + + + + + + B + 1 + + + unbounded + false + + + model + + + model.model-name-version-id + + 8da97b81-e0e9-4157-a4cd-af3ba52871d6 + + + + + + + unbounded + false + + + model + + + model.model-name-version-id + + a6d9de88-4046-4b78-a59e-5691243d292a + + + + + + + unbounded + false + + + model + + + model.model-name-version-id + + 35be1acf-1298-48c6-a128-66850083b8bd + + + + + + + + + + + + + + + + + + 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 @@ - - - - - FortiGate-VM00 - FW - - FORTINET - FortiGate-VM00 - VM00 - - - 1 - 1 - 1 - - - 1 - GB - 1 - 1 - - - 2 - GB - 2 - 32 - - - 5.2.7 - 0 - IMAGE - 1c59a521885c465004456f74d003726c - test3 - - - 5.2.5 - 1 - IMAGE - C4D2CBE51669796E48623E006782F7DC - test2 - - - 5.2.4 - 2 - IMAGE - 4987E1E743FD641C879E1D3C5D50BCE0 - test1 - - - APPID - - - IPS-IDS - - - URLF - - - Anti-Virus - - - FortiGate-VM00 - FALSE - - - - FortiGate-VM01 - FW - - FORTINET - FortiGate-VM01 - VM01 - - - 1 - 1 - 1 - - - 2 - GB - 1 - 2 - - - 2 - GB - 2 - 32 - - - 5.2.7 - 0 - IMAGE - 1c59a521885c465004456f74d003726c - software file name 3 - - - 5.2.5 - 1 - IMAGE - C4D2CBE51669796E48623E006782F7DC - software file name 2 - - - 5.2.4 - 2 - IMAGE - 4987E1E743FD641C879E1D3C5D50BCE0 - software file name - - - APPID - - - IPS-IDS - - - URLF - - - Anti-Virus - - - license group - FALSE - - - - + + + FortiGate-VM00 + FW + + FORTINET + FortiGate-VM00 + VM00 + + + 1 + 1 + 1 + + + 1 + GB + 1 + 1 + + + 2 + GB + 2 + 32 + + + 5.2.7 + 0 + IMAGE + 1c59a521885c465004456f74d003726c + test3 + + + 5.2.5 + 1 + IMAGE + C4D2CBE51669796E48623E006782F7DC + test2 + + + 5.2.4 + 2 + IMAGE + 4987E1E743FD641C879E1D3C5D50BCE0 + test1 + + + APPID + + + IPS-IDS + + + URLF + + + Anti-Virus + + + FortiGate-VM00 + FALSE + + + + FortiGate-VM01 + FW + + FORTINET + FortiGate-VM01 + VM01 + + + 1 + 1 + 1 + + + 2 + GB + 1 + 2 + + + 2 + GB + 2 + 32 + + + 5.2.7 + 0 + IMAGE + 1c59a521885c465004456f74d003726c + software file name 3 + + + 5.2.5 + 1 + IMAGE + C4D2CBE51669796E48623E006782F7DC + software file name 2 + + + 5.2.4 + 2 + IMAGE + 4987E1E743FD641C879E1D3C5D50BCE0 + software file name + + + APPID + + + IPS-IDS + + + URLF + + + Anti-Virus + + + license group + FALSE + + + + -- cgit 1.2.3-korg