From c604f64b971491f8c9b953adce54b847d7946e26 Mon Sep 17 00:00:00 2001 From: Prudence Au Date: Mon, 13 Aug 2018 17:06:59 -0400 Subject: Initial submission for validation service Change-Id: I9372430f1ae347373d5a9a0c7a427d7bd393d61e Issue-ID: LOG-427 Signed-off-by: Prudence Au (prudence.au@amdocs.com) Signed-off-by: Geora Barsky Signed-off-by: Pierre Rioux --- .../model-reader/aai-environment.properties | 30 + .../model-validation/model-reader/all-models.xml | 1370 ++++++++++++++++++++ .../connector-widget-id-no-children-1.xml | 51 + .../connector-widget-id-no-children-2.xml | 79 ++ .../model-reader/connector-widget-id.xml | 107 ++ .../model-reader/logical-link-widget-id.xml | 181 +++ .../model-instance-mapping-attributes-1.json | 11 + .../model-instance-mapping-attributes-2.json | 11 + ...el-instance-mapping-relationships-filter-1.json | 18 + ...el-instance-mapping-relationships-filter-2.json | 18 + ...el-instance-mapping-relationships-filter-3.json | 17 + ...el-instance-mapping-relationships-filter-4.json | 18 + ...el-instance-mapping-relationships-filter-5.json | 17 + ...el-instance-mapping-relationships-filter-6.json | 14 + ...odel-instance-mapping-relationships-root-1.json | 18 + ...odel-instance-mapping-relationships-root-2.json | 17 + ...del-instance-mapping-relationships-with-id.json | 18 + .../model-instance-mapping-relationships.json | 18 + .../model-reader/test-validation-service-beans.xml | 52 + .../model-reader/validation-service.properties | 29 + .../model-reader/virtual-data-center-widget-id.xml | 72 + 21 files changed, 2166 insertions(+) create mode 100644 src/test/resources/model-validation/model-reader/aai-environment.properties create mode 100644 src/test/resources/model-validation/model-reader/all-models.xml create mode 100644 src/test/resources/model-validation/model-reader/connector-widget-id-no-children-1.xml create mode 100644 src/test/resources/model-validation/model-reader/connector-widget-id-no-children-2.xml create mode 100644 src/test/resources/model-validation/model-reader/connector-widget-id.xml create mode 100644 src/test/resources/model-validation/model-reader/logical-link-widget-id.xml create mode 100644 src/test/resources/model-validation/model-reader/model-instance-mapping-attributes-1.json create mode 100644 src/test/resources/model-validation/model-reader/model-instance-mapping-attributes-2.json create mode 100644 src/test/resources/model-validation/model-reader/model-instance-mapping-relationships-filter-1.json create mode 100644 src/test/resources/model-validation/model-reader/model-instance-mapping-relationships-filter-2.json create mode 100644 src/test/resources/model-validation/model-reader/model-instance-mapping-relationships-filter-3.json create mode 100644 src/test/resources/model-validation/model-reader/model-instance-mapping-relationships-filter-4.json create mode 100644 src/test/resources/model-validation/model-reader/model-instance-mapping-relationships-filter-5.json create mode 100644 src/test/resources/model-validation/model-reader/model-instance-mapping-relationships-filter-6.json create mode 100644 src/test/resources/model-validation/model-reader/model-instance-mapping-relationships-root-1.json create mode 100644 src/test/resources/model-validation/model-reader/model-instance-mapping-relationships-root-2.json create mode 100644 src/test/resources/model-validation/model-reader/model-instance-mapping-relationships-with-id.json create mode 100644 src/test/resources/model-validation/model-reader/model-instance-mapping-relationships.json create mode 100644 src/test/resources/model-validation/model-reader/test-validation-service-beans.xml create mode 100644 src/test/resources/model-validation/model-reader/validation-service.properties create mode 100644 src/test/resources/model-validation/model-reader/virtual-data-center-widget-id.xml (limited to 'src/test/resources/model-validation/model-reader') diff --git a/src/test/resources/model-validation/model-reader/aai-environment.properties b/src/test/resources/model-validation/model-reader/aai-environment.properties new file mode 100644 index 0000000..3450105 --- /dev/null +++ b/src/test/resources/model-validation/model-reader/aai-environment.properties @@ -0,0 +1,30 @@ +# ============LICENSE_START=================================================== +# Copyright (c) 2018 Amdocs +# ============================================================================ +# 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===================================================== + +httpProtocol=file +baseModelURI=src/test/resources/model-validation/model-reader/all-models.xml + +# the following fields are autowired but will never be used +host= +port= +trustStorePath= +keyStorePath= +keyStorePassword.x= +keyManagerFactoryAlgorithm= +keyStoreType= +securityProtocol= +connectionTimeout= +readTimeout= diff --git a/src/test/resources/model-validation/model-reader/all-models.xml b/src/test/resources/model-validation/model-reader/all-models.xml new file mode 100644 index 0000000..afc5dda --- /dev/null +++ b/src/test/resources/model-validation/model-reader/all-models.xml @@ -0,0 +1,1370 @@ + + + + + 22382f81-70cb-470d-8ab2-3e1b9fad10df + widget + generic-vnf + 6dcdbbc8-23b6-42c3-ac9f-2c0a3fe8cfba + v1.0 + 1466698747 + + + model-element + https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/43095b8a-8e9c-4a76-8490-6120140f6804/model-elements/model-element/41e6d6e5-aa69-4d33-b9f2-975bf418d1e3/ + + model.model-name-version-id + 43095b8a-8e9c-4a76-8490-6120140f6804 + + + model-element.model-element-uuid + 41e6d6e5-aa69-4d33-b9f2-975bf418d1e3 + + + + model-element + https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/0d23052d-8ffe-433e-a25d-da5da027bb7c/model-elements/model-element/17e48d38-e055-4158-ae6b-a170e8a647cd/ + + model.model-name-version-id + 0d23052d-8ffe-433e-a25d-da5da027bb7c + + + model-element.model-element-uuid + 17e48d38-e055-4158-ae6b-a170e8a647cd + + + + named-query-element + https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/named-queries/named-query/be890aae-cf27-4b6a-aeae-e6fa4b5ee17f/named-query-elements/named-query-element/1ac142fb-2caf-4f59-975e-8ad7631c301e/named-query-elements/named-query-element/311f1cad-b41c-4833-8b9f-0d54d85f9009/named-query-elements/named-query-element/dc38d8ae-0993-4426-af79-a7aff4a4b4f3/named-query-elements/named-query-element/a97e8ab3-addd-40ee-9d29-3de505a56374/ + + named-query.named-query-uuid + be890aae-cf27-4b6a-aeae-e6fa4b5ee17f + + + named-query-element.named-query-element-uuid + 1ac142fb-2caf-4f59-975e-8ad7631c301e + + + named-query-element.named-query-element-uuid + 311f1cad-b41c-4833-8b9f-0d54d85f9009 + + + named-query-element.named-query-element-uuid + dc38d8ae-0993-4426-af79-a7aff4a4b4f3 + + + named-query-element.named-query-element-uuid + a97e8ab3-addd-40ee-9d29-3de505a56374 + + + + named-query-element + https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/named-queries/named-query/55f38763-9820-4fce-82a1-e0fa3c38ed24/named-query-elements/named-query-element/dc799ed9-45a5-4323-a2dc-bd1ec3242499/named-query-elements/named-query-element/97ae5271-9ad9-4815-804d-89af014d5b07/named-query-elements/named-query-element/7d189446-54de-49db-b786-8e946f0aece5/named-query-elements/named-query-element/920399b7-21c1-4e81-8fb9-a3b2283a72ba/named-query-elements/named-query-element/759ef1e4-3eca-4d55-8a9c-a8be31179f47/ + + named-query.named-query-uuid + 55f38763-9820-4fce-82a1-e0fa3c38ed24 + + + named-query-element.named-query-element-uuid + dc799ed9-45a5-4323-a2dc-bd1ec3242499 + + + named-query-element.named-query-element-uuid + 97ae5271-9ad9-4815-804d-89af014d5b07 + + + named-query-element.named-query-element-uuid + 7d189446-54de-49db-b786-8e946f0aece5 + + + named-query-element.named-query-element-uuid + 920399b7-21c1-4e81-8fb9-a3b2283a72ba + + + named-query-element.named-query-element-uuid + 759ef1e4-3eca-4d55-8a9c-a8be31179f47 + + + + + + connector-widget-id + widget + connector + connector-model-id + v2.0 + 1466689944 + + + 43095b8a-8e9c-4a76-8490-6120140f6804 + resource + vSbg + b23fb31b-4c21-45f7-9d92-96ed70e63df1 + v1.0 + 1466698622 + + + 41e6d6e5-aa69-4d33-b9f2-975bf418d1e3 + F + unbounded + + 1466698619 + + + model + https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/22382f81-70cb-470d-8ab2-3e1b9fad10df/ + + model.model-name-version-id + 22382f81-70cb-470d-8ab2-3e1b9fad10df + + + model.model-name + generic-vnf + + + model.model-type + widget + + + + + + + + model-element + https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/682ae094-0aaa-4381-a55d-bc633c40e4c0/model-elements/model-element/9ce59457-81b7-4f0e-8b72-a044a1be4bdf/model-elements/model-element/6cf69470-ccbf-4034-a37f-f714c135f05c/ + + model.model-name-version-id + 682ae094-0aaa-4381-a55d-bc633c40e4c0 + + + model-element.model-element-uuid + 9ce59457-81b7-4f0e-8b72-a044a1be4bdf + + + model-element.model-element-uuid + 6cf69470-ccbf-4034-a37f-f714c135f05c + + + + model-element + https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/e2ccd5c5-bc6e-4ed0-8378-6805ee6ba161/model-elements/model-element/c44dbdf9-494e-49c1-b462-74e24e837b22/model-elements/model-element/059db56c-6d72-4023-9fc3-0db29534ddff/ + + model.model-name-version-id + e2ccd5c5-bc6e-4ed0-8378-6805ee6ba161 + + + model-element.model-element-uuid + c44dbdf9-494e-49c1-b462-74e24e837b22 + + + model-element.model-element-uuid + 059db56c-6d72-4023-9fc3-0db29534ddff + + + + + + 523f0645-8182-4c91-9d6a-2f968e923937 + widget + pserver + c277c968-7e2b-4a88-9094-2b8a55dfb9f4 + v1.0 + 1466698757 + + + model-element + https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/5ed1c299-4d31-4531-ae43-4bb56f8f10c8/model-elements/model-element/76624fe1-0f28-4e17-ae9f-f0e2bba6d13d/ + + model.model-name-version-id + 5ed1c299-4d31-4531-ae43-4bb56f8f10c8 + + + model-element.model-element-uuid + 76624fe1-0f28-4e17-ae9f-f0e2bba6d13d + + + + model-element + https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/6614ffae-6e64-4c78-9dea-4d5c0f057ea2/model-elements/model-element/0204aad0-fe13-4f75-b022-f91f245f0e9e/ + + model.model-name-version-id + 6614ffae-6e64-4c78-9dea-4d5c0f057ea2 + + + model-element.model-element-uuid + 0204aad0-fe13-4f75-b022-f91f245f0e9e + + + + named-query-element + https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/named-queries/named-query/55f38763-9820-4fce-82a1-e0fa3c38ed24/named-query-elements/named-query-element/dc799ed9-45a5-4323-a2dc-bd1ec3242499/named-query-elements/named-query-element/97ae5271-9ad9-4815-804d-89af014d5b07/named-query-elements/named-query-element/7d189446-54de-49db-b786-8e946f0aece5/named-query-elements/named-query-element/920399b7-21c1-4e81-8fb9-a3b2283a72ba/named-query-elements/named-query-element/a79552d6-20dc-4b9e-b4d4-f29a8a2a8447/ + + named-query.named-query-uuid + 55f38763-9820-4fce-82a1-e0fa3c38ed24 + + + named-query-element.named-query-element-uuid + dc799ed9-45a5-4323-a2dc-bd1ec3242499 + + + named-query-element.named-query-element-uuid + 97ae5271-9ad9-4815-804d-89af014d5b07 + + + named-query-element.named-query-element-uuid + 7d189446-54de-49db-b786-8e946f0aece5 + + + named-query-element.named-query-element-uuid + 920399b7-21c1-4e81-8fb9-a3b2283a72ba + + + named-query-element.named-query-element-uuid + a79552d6-20dc-4b9e-b4d4-f29a8a2a8447 + + + + named-query-element + https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/named-queries/named-query/be890aae-cf27-4b6a-aeae-e6fa4b5ee17f/named-query-elements/named-query-element/1ac142fb-2caf-4f59-975e-8ad7631c301e/named-query-elements/named-query-element/311f1cad-b41c-4833-8b9f-0d54d85f9009/named-query-elements/named-query-element/dc38d8ae-0993-4426-af79-a7aff4a4b4f3/named-query-elements/named-query-element/41294247-9f7e-4abf-becd-3bbca6945c09/ + + named-query.named-query-uuid + be890aae-cf27-4b6a-aeae-e6fa4b5ee17f + + + named-query-element.named-query-element-uuid + 1ac142fb-2caf-4f59-975e-8ad7631c301e + + + named-query-element.named-query-element-uuid + 311f1cad-b41c-4833-8b9f-0d54d85f9009 + + + named-query-element.named-query-element-uuid + dc38d8ae-0993-4426-af79-a7aff4a4b4f3 + + + named-query-element.named-query-element-uuid + 41294247-9f7e-4abf-becd-3bbca6945c09 + + + + + + 99469866-95bb-400e-8786-f83e87696725 + widget + virtual-data-center + 3c70c43f-99ed-4476-82f4-92a30616e512 + v1.0 + 1466698727 + + + model-element + https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/668464da-6d41-4599-bdbb-2576147b440e/model-elements/model-element/93a37846-b497-490e-bc97-7d130022d6db/model-elements/model-element/200de3d5-c207-47c2-a507-8846ba1d7068/ + + model.model-name-version-id + 668464da-6d41-4599-bdbb-2576147b440e + + + model-element.model-element-uuid + 93a37846-b497-490e-bc97-7d130022d6db + + + model-element.model-element-uuid + 200de3d5-c207-47c2-a507-8846ba1d7068 + + + + named-query-element + https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/named-queries/named-query/be890aae-cf27-4b6a-aeae-e6fa4b5ee17f/named-query-elements/named-query-element/1ac142fb-2caf-4f59-975e-8ad7631c301e/named-query-elements/named-query-element/311f1cad-b41c-4833-8b9f-0d54d85f9009/ + + named-query.named-query-uuid + be890aae-cf27-4b6a-aeae-e6fa4b5ee17f + + + named-query-element.named-query-element-uuid + 1ac142fb-2caf-4f59-975e-8ad7631c301e + + + named-query-element.named-query-element-uuid + 311f1cad-b41c-4833-8b9f-0d54d85f9009 + + + + named-query-element + https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/named-queries/named-query/55f38763-9820-4fce-82a1-e0fa3c38ed24/named-query-elements/named-query-element/dc799ed9-45a5-4323-a2dc-bd1ec3242499/named-query-elements/named-query-element/97ae5271-9ad9-4815-804d-89af014d5b07/named-query-elements/named-query-element/7d189446-54de-49db-b786-8e946f0aece5/ + + named-query.named-query-uuid + 55f38763-9820-4fce-82a1-e0fa3c38ed24 + + + named-query-element.named-query-element-uuid + dc799ed9-45a5-4323-a2dc-bd1ec3242499 + + + named-query-element.named-query-element-uuid + 97ae5271-9ad9-4815-804d-89af014d5b07 + + + named-query-element.named-query-element-uuid + 7d189446-54de-49db-b786-8e946f0aece5 + + + + + + 5ed1c299-4d31-4531-ae43-4bb56f8f10c8 + resource + ipe + e8f973a5-418a-44f2-9784-159e3e37d708 + v1.0 + 1466698622 + + + 76624fe1-0f28-4e17-ae9f-f0e2bba6d13d + F + unbounded + + 1466698621 + + + b7b48ba6-427b-4d23-ada7-a67ac9e0f84f + F + unbounded + + 1466698621 + + + ebc25508-b2e3-4021-b684-269cfd2b63c0 + T + unbounded + + 1466698621 + + + f610d699-11af-4c13-a918-a89344e4a1bd + T + unbounded + + 1466698621 + + + model + https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/49032ff1-5466-4054-b64b-15395ac10c00/ + + model.model-name-version-id + 49032ff1-5466-4054-b64b-15395ac10c00 + + + model.model-name + vlan + + + model.model-type + widget + + + + + + + + model + https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/0a706320-b8e7-4b18-9485-fba156ea00cf/ + + model.model-name-version-id + 0a706320-b8e7-4b18-9485-fba156ea00cf + + + model.model-name + l-interface + + + model.model-type + widget + + + + + + + + model + https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/3d9f4b1d-360c-4862-9623-703b150157ce/ + + model.model-name-version-id + 3d9f4b1d-360c-4862-9623-703b150157ce + + + model.model-name + p-interface + + + model.model-type + widget + + + + + + + + model + https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/523f0645-8182-4c91-9d6a-2f968e923937/ + + model.model-name-version-id + 523f0645-8182-4c91-9d6a-2f968e923937 + + + model.model-name + pserver + + + model.model-type + widget + + + + + + + + model-element + https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/682ae094-0aaa-4381-a55d-bc633c40e4c0/model-elements/model-element/9ce59457-81b7-4f0e-8b72-a044a1be4bdf/model-elements/model-element/304ddca5-47cd-49ec-a2d7-1ce17baa5b70/ + + model.model-name-version-id + 682ae094-0aaa-4381-a55d-bc633c40e4c0 + + + model-element.model-element-uuid + 9ce59457-81b7-4f0e-8b72-a044a1be4bdf + + + model-element.model-element-uuid + 304ddca5-47cd-49ec-a2d7-1ce17baa5b70 + + + + model-element + https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/e2ccd5c5-bc6e-4ed0-8378-6805ee6ba161/model-elements/model-element/c44dbdf9-494e-49c1-b462-74e24e837b22/model-elements/model-element/193ec825-44ce-4416-85ac-20a6b6663575/ + + model.model-name-version-id + e2ccd5c5-bc6e-4ed0-8378-6805ee6ba161 + + + model-element.model-element-uuid + c44dbdf9-494e-49c1-b462-74e24e837b22 + + + model-element.model-element-uuid + 193ec825-44ce-4416-85ac-20a6b6663575 + + + + + + 668464da-6d41-4599-bdbb-2576147b440e + resource + WAN Connector v0.1 + dc700a83-c507-47d9-b775-1fdfcdd5f9eb + 0.1 + Connects a customer vpn to the border elements of a vendor product + 1466698623 + + + 93a37846-b497-490e-bc97-7d130022d6db + T + unbounded + + 1466698622 + + + 200de3d5-c207-47c2-a507-8846ba1d7068 + T + unbounded + + 1466698622 + + + 7ccfe6b5-6566-4b44-83d3-b79f5de7a87b + T + unbounded + + 1466698622 + + + model + https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/e2ccd5c5-bc6e-4ed0-8378-6805ee6ba161/ + + model.model-name-version-id + e2ccd5c5-bc6e-4ed0-8378-6805ee6ba161 + + + model.model-name + VL ELAN + + + model.model-type + resource + + + + + + dfd30146-74f4-49e9-bad6-019d413352ac + T + unbounded + + 1466698622 + + + model + https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/682ae094-0aaa-4381-a55d-bc633c40e4c0/ + + model.model-name-version-id + 682ae094-0aaa-4381-a55d-bc633c40e4c0 + + + model.model-name + vLAN on a Physical Wire + + + model.model-type + resource + + + + + + + + model + https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/99469866-95bb-400e-8786-f83e87696725/ + + model.model-name-version-id + 99469866-95bb-400e-8786-f83e87696725 + + + model.model-name + virtual-data-center + + + model.model-type + widget + + + + + + + + model + https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/15f47352-28b7-4bbd-9828-393eaf79eeff/ + + model.model-name-version-id + 15f47352-28b7-4bbd-9828-393eaf79eeff + + + model.model-name + connector + + + model.model-type + widget + + + + + + + + product + product-value-1 + 1466698623 + + + vpn-id + vpn-id-value-1 + 1466698623 + + + + + model-element + https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/460c6de2-a92b-4e3b-9ba3-538ce782b2fa/model-elements/model-element/71b825be-febf-45f7-b86a-ca0e3de19c90/model-elements/model-element/986167cb-57d3-4aad-8896-784a22c5289c/ + + model.model-name-version-id + 460c6de2-a92b-4e3b-9ba3-538ce782b2fa + + + model-element.model-element-uuid + 71b825be-febf-45f7-b86a-ca0e3de19c90 + + + model-element.model-element-uuid + 986167cb-57d3-4aad-8896-784a22c5289c + + + + + + 460c6de2-a92b-4e3b-9ba3-538ce782b2fa + service + WAN Bonding v0.1 + 0ee8c1bc-7cbd-4b0a-a1ac-e9999255abc1 + 0.1 + service-instance of the wan object + 1466698623 + + + 71b825be-febf-45f7-b86a-ca0e3de19c90 + T + unbounded + + 1466698623 + + + 986167cb-57d3-4aad-8896-784a22c5289c + T + unbounded + + 1466698623 + + + model + https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/668464da-6d41-4599-bdbb-2576147b440e/ + + model.model-name-version-id + 668464da-6d41-4599-bdbb-2576147b440e + + + model.model-name + WAN Connector v0.1 + + + model.model-type + resource + + + + + + + + model + https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/46b92144-923a-4d20-b85a-3cbd847668a9/ + + model.model-name-version-id + 46b92144-923a-4d20-b85a-3cbd847668a9 + + + model.model-name + service-instance + + + model.model-type + widget + + + + + + + + b + product + 1466698623 + + + a + vpn-id + 1466698623 + + + + + generic-vnf-widget-id + widget + generic-vnf + generic-vnf-model-id + v1.0 + 1466624623 + + + model-element + https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/vMME-resource-id/model-elements/model-element/af4b6df2-65d0-4d10-b25e-02206799e1fa/ + + model.model-name-version-id + vMME-resource-id + + + model-element.model-element-uuid + af4b6df2-65d0-4d10-b25e-02206799e1fa + + + + + + 6614ffae-6e64-4c78-9dea-4d5c0f057ea2 + resource + pBgf + 9038f1d7-61f2-49ef-a61d-ace468d4ab32 + v1.0 + 1466698622 + + + 0204aad0-fe13-4f75-b022-f91f245f0e9e + F + unbounded + + 1466698620 + + + model + https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/523f0645-8182-4c91-9d6a-2f968e923937/ + + model.model-name-version-id + 523f0645-8182-4c91-9d6a-2f968e923937 + + + model.model-name + pserver + + + model.model-type + widget + + + + + + + + model-element + https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/e2ccd5c5-bc6e-4ed0-8378-6805ee6ba161/model-elements/model-element/c44dbdf9-494e-49c1-b462-74e24e837b22/model-elements/model-element/ad161a89-ef32-4b2c-b86d-7fbb7a251571/ + + model.model-name-version-id + e2ccd5c5-bc6e-4ed0-8378-6805ee6ba161 + + + model-element.model-element-uuid + c44dbdf9-494e-49c1-b462-74e24e837b22 + + + model-element.model-element-uuid + ad161a89-ef32-4b2c-b86d-7fbb7a251571 + + + + model-element + https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/682ae094-0aaa-4381-a55d-bc633c40e4c0/model-elements/model-element/9ce59457-81b7-4f0e-8b72-a044a1be4bdf/model-elements/model-element/d0d50aad-bb97-4865-a3bb-72dbf41be50b/ + + model.model-name-version-id + 682ae094-0aaa-4381-a55d-bc633c40e4c0 + + + model-element.model-element-uuid + 9ce59457-81b7-4f0e-8b72-a044a1be4bdf + + + model-element.model-element-uuid + d0d50aad-bb97-4865-a3bb-72dbf41be50b + + + + + + 15f47352-28b7-4bbd-9828-393eaf79eeff + widget + connector + 4f0dbd2d-b667-4d19-a563-84a764e62fa7 + v1.0 + 1466698717 + + + named-query-element + https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/named-queries/named-query/55f38763-9820-4fce-82a1-e0fa3c38ed24/named-query-elements/named-query-element/dc799ed9-45a5-4323-a2dc-bd1ec3242499/named-query-elements/named-query-element/97ae5271-9ad9-4815-804d-89af014d5b07/ + + named-query.named-query-uuid + 55f38763-9820-4fce-82a1-e0fa3c38ed24 + + + named-query-element.named-query-element-uuid + dc799ed9-45a5-4323-a2dc-bd1ec3242499 + + + named-query-element.named-query-element-uuid + 97ae5271-9ad9-4815-804d-89af014d5b07 + + + + model-element + https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/668464da-6d41-4599-bdbb-2576147b440e/model-elements/model-element/93a37846-b497-490e-bc97-7d130022d6db/ + + model.model-name-version-id + 668464da-6d41-4599-bdbb-2576147b440e + + + model-element.model-element-uuid + 93a37846-b497-490e-bc97-7d130022d6db + + + + named-query-element + https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/named-queries/named-query/be890aae-cf27-4b6a-aeae-e6fa4b5ee17f/named-query-elements/named-query-element/1ac142fb-2caf-4f59-975e-8ad7631c301e/ + + named-query.named-query-uuid + be890aae-cf27-4b6a-aeae-e6fa4b5ee17f + + + named-query-element.named-query-element-uuid + 1ac142fb-2caf-4f59-975e-8ad7631c301e + + + + + + 682ae094-0aaa-4381-a55d-bc633c40e4c0 + resource + vLAN on a Physical Wire + 32bee148-2cae-4f3d-a42e-22c9e4f078a2 + 1 + An l2-bridge used by a wan connector connects an ipe to a BGF + 1466698622 + + + 9ce59457-81b7-4f0e-8b72-a044a1be4bdf + T + unbounded + + 1466698622 + + + d0d50aad-bb97-4865-a3bb-72dbf41be50b + T + unbounded + + 1466698622 + + + model + https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/6614ffae-6e64-4c78-9dea-4d5c0f057ea2/ + + model.model-name-version-id + 6614ffae-6e64-4c78-9dea-4d5c0f057ea2 + + + model.model-name + pBgf + + + model.model-type + resource + + + + + + + + model + https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/fa01ef50-bbb5-49d4-91d1-ebbda9816e01/ + + model.model-name-version-id + fa01ef50-bbb5-49d4-91d1-ebbda9816e01 + + + model.model-name + logical-link + + + model.model-type + widget + + + + + + + + model-element + https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/668464da-6d41-4599-bdbb-2576147b440e/model-elements/model-element/93a37846-b497-490e-bc97-7d130022d6db/model-elements/model-element/200de3d5-c207-47c2-a507-8846ba1d7068/model-elements/model-element/dfd30146-74f4-49e9-bad6-019d413352ac/ + + model.model-name-version-id + 668464da-6d41-4599-bdbb-2576147b440e + + + model-element.model-element-uuid + 93a37846-b497-490e-bc97-7d130022d6db + + + model-element.model-element-uuid + 200de3d5-c207-47c2-a507-8846ba1d7068 + + + model-element.model-element-uuid + dfd30146-74f4-49e9-bad6-019d413352ac + + + + + + 46b92144-923a-4d20-b85a-3cbd847668a9 + widget + service-instance + 82194af1-3c2c-485a-8f44-420e22a9eaa4 + v1.0 + 1466698646 + + + named-query-element + https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/named-queries/named-query/55f38763-9820-4fce-82a1-e0fa3c38ed24/named-query-elements/named-query-element/dc799ed9-45a5-4323-a2dc-bd1ec3242499/ + + named-query.named-query-uuid + 55f38763-9820-4fce-82a1-e0fa3c38ed24 + + + named-query-element.named-query-element-uuid + dc799ed9-45a5-4323-a2dc-bd1ec3242499 + + + + model-element + https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/460c6de2-a92b-4e3b-9ba3-538ce782b2fa/model-elements/model-element/71b825be-febf-45f7-b86a-ca0e3de19c90/ + + model.model-name-version-id + 460c6de2-a92b-4e3b-9ba3-538ce782b2fa + + + model-element.model-element-uuid + 71b825be-febf-45f7-b86a-ca0e3de19c90 + + + + + + 3d9f4b1d-360c-4862-9623-703b150157ce + widget + p-interface + 479f5f13-51d9-4ccb-bddf-f554f1af0cfc + v1.0 + 1466698621 + + + model-element + https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/5ed1c299-4d31-4531-ae43-4bb56f8f10c8/model-elements/model-element/76624fe1-0f28-4e17-ae9f-f0e2bba6d13d/model-elements/model-element/b7b48ba6-427b-4d23-ada7-a67ac9e0f84f/ + + model.model-name-version-id + 5ed1c299-4d31-4531-ae43-4bb56f8f10c8 + + + model-element.model-element-uuid + 76624fe1-0f28-4e17-ae9f-f0e2bba6d13d + + + model-element.model-element-uuid + b7b48ba6-427b-4d23-ada7-a67ac9e0f84f + + + + + + 0d23052d-8ffe-433e-a25d-da5da027bb7c + resource + vDbe + fe8aac07-ce6c-4f9f-aa0d-b561c77da9e8 + v1.0 + 1466698622 + + + 17e48d38-e055-4158-ae6b-a170e8a647cd + F + unbounded + + 1466698618 + + + model + https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/22382f81-70cb-470d-8ab2-3e1b9fad10df/ + + model.model-name-version-id + 22382f81-70cb-470d-8ab2-3e1b9fad10df + + + model.model-name + generic-vnf + + + model.model-type + widget + + + + + + + + model-element + https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/682ae094-0aaa-4381-a55d-bc633c40e4c0/model-elements/model-element/9ce59457-81b7-4f0e-8b72-a044a1be4bdf/model-elements/model-element/1d73a0dc-e7f6-4b6d-9450-5dda720d1a7f/ + + model.model-name-version-id + 682ae094-0aaa-4381-a55d-bc633c40e4c0 + + + model-element.model-element-uuid + 9ce59457-81b7-4f0e-8b72-a044a1be4bdf + + + model-element.model-element-uuid + 1d73a0dc-e7f6-4b6d-9450-5dda720d1a7f + + + + model-element + https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/e2ccd5c5-bc6e-4ed0-8378-6805ee6ba161/model-elements/model-element/c44dbdf9-494e-49c1-b462-74e24e837b22/model-elements/model-element/a1b205ea-17bb-442b-83a3-38b4e0fcb099/ + + model.model-name-version-id + e2ccd5c5-bc6e-4ed0-8378-6805ee6ba161 + + + model-element.model-element-uuid + c44dbdf9-494e-49c1-b462-74e24e837b22 + + + model-element.model-element-uuid + a1b205ea-17bb-442b-83a3-38b4e0fcb099 + + + + + + vMME-resource-id + resource + vMME + vMME-model-id + v1.0 + 1466624623 + + + af4b6df2-65d0-4d10-b25e-02206799e1fa + true + unbounded + + 1466624623 + + + model + https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/generic-vnf-widget-id/ + + model.model-name-version-id + generic-vnf-widget-id + + + model.model-name + generic-vnf + + + model.model-type + widget + + + + + + + + fa01ef50-bbb5-49d4-91d1-ebbda9816e01 + widget + logical-link + 8742d5b3-ee98-4165-8bd5-fc012a7885b9 + v1.0 + 1466698737 + + + model-element + https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/e2ccd5c5-bc6e-4ed0-8378-6805ee6ba161/model-elements/model-element/c44dbdf9-494e-49c1-b462-74e24e837b22/ + + model.model-name-version-id + e2ccd5c5-bc6e-4ed0-8378-6805ee6ba161 + + + model-element.model-element-uuid + c44dbdf9-494e-49c1-b462-74e24e837b22 + + + + model-element + https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/682ae094-0aaa-4381-a55d-bc633c40e4c0/model-elements/model-element/9ce59457-81b7-4f0e-8b72-a044a1be4bdf/ + + model.model-name-version-id + 682ae094-0aaa-4381-a55d-bc633c40e4c0 + + + model-element.model-element-uuid + 9ce59457-81b7-4f0e-8b72-a044a1be4bdf + + + + named-query-element + https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/named-queries/named-query/55f38763-9820-4fce-82a1-e0fa3c38ed24/named-query-elements/named-query-element/dc799ed9-45a5-4323-a2dc-bd1ec3242499/named-query-elements/named-query-element/97ae5271-9ad9-4815-804d-89af014d5b07/named-query-elements/named-query-element/7d189446-54de-49db-b786-8e946f0aece5/named-query-elements/named-query-element/920399b7-21c1-4e81-8fb9-a3b2283a72ba/ + + named-query.named-query-uuid + 55f38763-9820-4fce-82a1-e0fa3c38ed24 + + + named-query-element.named-query-element-uuid + dc799ed9-45a5-4323-a2dc-bd1ec3242499 + + + named-query-element.named-query-element-uuid + 97ae5271-9ad9-4815-804d-89af014d5b07 + + + named-query-element.named-query-element-uuid + 7d189446-54de-49db-b786-8e946f0aece5 + + + named-query-element.named-query-element-uuid + 920399b7-21c1-4e81-8fb9-a3b2283a72ba + + + + named-query-element + https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/named-queries/named-query/be890aae-cf27-4b6a-aeae-e6fa4b5ee17f/named-query-elements/named-query-element/1ac142fb-2caf-4f59-975e-8ad7631c301e/named-query-elements/named-query-element/311f1cad-b41c-4833-8b9f-0d54d85f9009/named-query-elements/named-query-element/dc38d8ae-0993-4426-af79-a7aff4a4b4f3/ + + named-query.named-query-uuid + be890aae-cf27-4b6a-aeae-e6fa4b5ee17f + + + named-query-element.named-query-element-uuid + 1ac142fb-2caf-4f59-975e-8ad7631c301e + + + named-query-element.named-query-element-uuid + 311f1cad-b41c-4833-8b9f-0d54d85f9009 + + + named-query-element.named-query-element-uuid + dc38d8ae-0993-4426-af79-a7aff4a4b4f3 + + + + + + 0a706320-b8e7-4b18-9485-fba156ea00cf + widget + l-interface + d9131b0d-698f-4297-8699-af0a3ac7ebdc + v1.0 + 1466698767 + + + model-element + https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/5ed1c299-4d31-4531-ae43-4bb56f8f10c8/model-elements/model-element/76624fe1-0f28-4e17-ae9f-f0e2bba6d13d/model-elements/model-element/b7b48ba6-427b-4d23-ada7-a67ac9e0f84f/model-elements/model-element/ebc25508-b2e3-4021-b684-269cfd2b63c0/ + + model.model-name-version-id + 5ed1c299-4d31-4531-ae43-4bb56f8f10c8 + + + model-element.model-element-uuid + 76624fe1-0f28-4e17-ae9f-f0e2bba6d13d + + + model-element.model-element-uuid + b7b48ba6-427b-4d23-ada7-a67ac9e0f84f + + + model-element.model-element-uuid + ebc25508-b2e3-4021-b684-269cfd2b63c0 + + + + named-query-element + https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/named-queries/named-query/be890aae-cf27-4b6a-aeae-e6fa4b5ee17f/named-query-elements/named-query-element/1ac142fb-2caf-4f59-975e-8ad7631c301e/named-query-elements/named-query-element/311f1cad-b41c-4833-8b9f-0d54d85f9009/named-query-elements/named-query-element/dc38d8ae-0993-4426-af79-a7aff4a4b4f3/named-query-elements/named-query-element/29ac58b9-37fa-4d6a-9d2e-29f33e1e3b7a/ + + named-query.named-query-uuid + be890aae-cf27-4b6a-aeae-e6fa4b5ee17f + + + named-query-element.named-query-element-uuid + 1ac142fb-2caf-4f59-975e-8ad7631c301e + + + named-query-element.named-query-element-uuid + 311f1cad-b41c-4833-8b9f-0d54d85f9009 + + + named-query-element.named-query-element-uuid + dc38d8ae-0993-4426-af79-a7aff4a4b4f3 + + + named-query-element.named-query-element-uuid + 29ac58b9-37fa-4d6a-9d2e-29f33e1e3b7a + + + + named-query-element + https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/named-queries/named-query/55f38763-9820-4fce-82a1-e0fa3c38ed24/named-query-elements/named-query-element/dc799ed9-45a5-4323-a2dc-bd1ec3242499/named-query-elements/named-query-element/97ae5271-9ad9-4815-804d-89af014d5b07/named-query-elements/named-query-element/7d189446-54de-49db-b786-8e946f0aece5/named-query-elements/named-query-element/920399b7-21c1-4e81-8fb9-a3b2283a72ba/named-query-elements/named-query-element/eda1554f-3eff-4195-9185-bcbc4f75826f/ + + named-query.named-query-uuid + 55f38763-9820-4fce-82a1-e0fa3c38ed24 + + + named-query-element.named-query-element-uuid + dc799ed9-45a5-4323-a2dc-bd1ec3242499 + + + named-query-element.named-query-element-uuid + 97ae5271-9ad9-4815-804d-89af014d5b07 + + + named-query-element.named-query-element-uuid + 7d189446-54de-49db-b786-8e946f0aece5 + + + named-query-element.named-query-element-uuid + 920399b7-21c1-4e81-8fb9-a3b2283a72ba + + + named-query-element.named-query-element-uuid + eda1554f-3eff-4195-9185-bcbc4f75826f + + + + + + 49032ff1-5466-4054-b64b-15395ac10c00 + widget + vlan + 2febb0bc-b776-45b3-af50-75a578a8a4c4 + v1.0 + 1466698621 + + + model-element + https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/5ed1c299-4d31-4531-ae43-4bb56f8f10c8/model-elements/model-element/76624fe1-0f28-4e17-ae9f-f0e2bba6d13d/model-elements/model-element/b7b48ba6-427b-4d23-ada7-a67ac9e0f84f/model-elements/model-element/ebc25508-b2e3-4021-b684-269cfd2b63c0/model-elements/model-element/f610d699-11af-4c13-a918-a89344e4a1bd/ + + model.model-name-version-id + 5ed1c299-4d31-4531-ae43-4bb56f8f10c8 + + + model-element.model-element-uuid + 76624fe1-0f28-4e17-ae9f-f0e2bba6d13d + + + model-element.model-element-uuid + b7b48ba6-427b-4d23-ada7-a67ac9e0f84f + + + model-element.model-element-uuid + ebc25508-b2e3-4021-b684-269cfd2b63c0 + + + model-element.model-element-uuid + f610d699-11af-4c13-a918-a89344e4a1bd + + + + + + e2ccd5c5-bc6e-4ed0-8378-6805ee6ba161 + resource + VL ELAN + 932518e5-4260-4cc4-8038-df604a367f85 + 1 + An l2-bridge used by a wan connector connects an ipe to a SBG or DBE + 1466698622 + + + c44dbdf9-494e-49c1-b462-74e24e837b22 + T + unbounded + + 1466698621 + + + a1b205ea-17bb-442b-83a3-38b4e0fcb099 + T + unbounded + + 1466698621 + + + model + https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/0d23052d-8ffe-433e-a25d-da5da027bb7c/ + + model.model-name-version-id + 0d23052d-8ffe-433e-a25d-da5da027bb7c + + + model.model-name + vDbe + + + model.model-type + resource + + + + + + + + model + https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/fa01ef50-bbb5-49d4-91d1-ebbda9816e01/ + + model.model-name-version-id + fa01ef50-bbb5-49d4-91d1-ebbda9816e01 + + + model.model-name + logical-link + + + model.model-type + widget + + + + + + + + model-element + https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/668464da-6d41-4599-bdbb-2576147b440e/model-elements/model-element/93a37846-b497-490e-bc97-7d130022d6db/model-elements/model-element/200de3d5-c207-47c2-a507-8846ba1d7068/model-elements/model-element/7ccfe6b5-6566-4b44-83d3-b79f5de7a87b/ + + model.model-name-version-id + 668464da-6d41-4599-bdbb-2576147b440e + + + model-element.model-element-uuid + 93a37846-b497-490e-bc97-7d130022d6db + + + model-element.model-element-uuid + 200de3d5-c207-47c2-a507-8846ba1d7068 + + + model-element.model-element-uuid + 7ccfe6b5-6566-4b44-83d3-b79f5de7a87b + + + + + \ No newline at end of file diff --git a/src/test/resources/model-validation/model-reader/connector-widget-id-no-children-1.xml b/src/test/resources/model-validation/model-reader/connector-widget-id-no-children-1.xml new file mode 100644 index 0000000..e60416c --- /dev/null +++ b/src/test/resources/model-validation/model-reader/connector-widget-id-no-children-1.xml @@ -0,0 +1,51 @@ + + + connector-widget-id + widget + connector + connector-model-id + v1.0 + 1466417894 + + + vpn-id + a + 1466417844 + + + product + b + 1466417844 + + + + + model-element + https://dummy-host.onap.org:8443/aai/v7/service-design-and-creation/model-elements/model-element/54629607-160a-4dcf-8c5c-15b8a3756f9a/ + + model-element.model-element-uuid + 54629607-160a-4dcf-8c5c-15b8a3756f9a + + + model.model-name-version-id + wan-connector-service-id + + + + \ No newline at end of file diff --git a/src/test/resources/model-validation/model-reader/connector-widget-id-no-children-2.xml b/src/test/resources/model-validation/model-reader/connector-widget-id-no-children-2.xml new file mode 100644 index 0000000..924ce67 --- /dev/null +++ b/src/test/resources/model-validation/model-reader/connector-widget-id-no-children-2.xml @@ -0,0 +1,79 @@ + + + connector-widget-id + widget + connector + connector-model-id + v1.0 + 1466417894 + + + 8c0fd413-0d2b-491b-ad14-10c434c359bb + T + unbounded + + 1466417894 + + + + model + https://dummy-host.onap.org:8443/aai/v7/service-design-and-creation/models/model/virtual-data-center-widget-id/ + + model.model-name-version-id + virtual-data-center-widget-id + + + model.model-name + virtual-data-center + + + model.model-type + widget + + + + + + + + vpn-id + a + 1466417844 + + + product + b + 1466417844 + + + + + model-element + https://dummy-host.onap.org:8443/aai/v7/service-design-and-creation/model-elements/model-element/54629607-160a-4dcf-8c5c-15b8a3756f9a/ + + model-element.model-element-uuid + 54629607-160a-4dcf-8c5c-15b8a3756f9a + + + model.model-name-version-id + wan-connector-service-id + + + + \ No newline at end of file diff --git a/src/test/resources/model-validation/model-reader/connector-widget-id.xml b/src/test/resources/model-validation/model-reader/connector-widget-id.xml new file mode 100644 index 0000000..bd2edfc --- /dev/null +++ b/src/test/resources/model-validation/model-reader/connector-widget-id.xml @@ -0,0 +1,107 @@ + + + connector-widget-id + widget + connector + connector-model-id + v1.0 + 1466417894 + + + 8c0fd413-0d2b-491b-ad14-10c434c359bb + T + unbounded + + 1466417894 + + + 6d2dbb11-d509-4e03-8ed9-05bf4aad99d2 + T + unbounded + + 1466417894 + + + + model + https://dummy-host.onap.org:8443/aai/v7/service-design-and-creation/models/model/l2-bridge-for-wan-connector-resource-id/ + + model.model-name-version-id + e2ccd5c5-bc6e-4ed0-8378-6805ee6ba161 + + + model.model-name + l2-bridge-for-wan-connector + + + model.model-type + resource + + + + + + + + + model + https://dummy-host.onap.org:8443/aai/v7/service-design-and-creation/models/model/virtual-data-center-widget-id/ + + model.model-name-version-id + virtual-data-center-widget-id + + + model.model-name + virtual-data-center + + + model.model-type + widget + + + + + + + + vpn-id + a + 1466417844 + + + product + b + 1466417844 + + + + + model-element + https://dummy-host.onap.org:8443/aai/v7/service-design-and-creation/model-elements/model-element/54629607-160a-4dcf-8c5c-15b8a3756f9a/ + + model-element.model-element-uuid + 54629607-160a-4dcf-8c5c-15b8a3756f9a + + + model.model-name-version-id + wan-connector-service-id + + + + \ No newline at end of file diff --git a/src/test/resources/model-validation/model-reader/logical-link-widget-id.xml b/src/test/resources/model-validation/model-reader/logical-link-widget-id.xml new file mode 100644 index 0000000..39c08a3 --- /dev/null +++ b/src/test/resources/model-validation/model-reader/logical-link-widget-id.xml @@ -0,0 +1,181 @@ + + + e2ccd5c5-bc6e-4ed0-8378-6805ee6ba161 + resource + VL ELAN + 932518e5-4260-4cc4-8038-df604a367f85 + 1 + An l2-bridge used by a wan connector connects an ipe to a SBG or DBE + 1466698622 + + + c44dbdf9-494e-49c1-b462-74e24e837b22 + T + unbounded + + 1466698621 + + + ad161a89-ef32-4b2c-b86d-7fbb7a251571 + T + unbounded + + 1466698621 + + + model + https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/6614ffae-6e64-4c78-9dea-4d5c0f057ea2/ + + model.model-name-version-id + 6614ffae-6e64-4c78-9dea-4d5c0f057ea2 + + + model.model-name + pBgf + + + model.model-type + resource + + + + + + a1b205ea-17bb-442b-83a3-38b4e0fcb099 + T + unbounded + + 1466698621 + + + model + https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/0d23052d-8ffe-433e-a25d-da5da027bb7c/ + + model.model-name-version-id + 0d23052d-8ffe-433e-a25d-da5da027bb7c + + + model.model-name + vDbe + + + model.model-type + resource + + + + + + 193ec825-44ce-4416-85ac-20a6b6663575 + T + unbounded + + pserver|lag-interface|l-interface + pserver|p-interface|l-interface + vlan|l-interface + + 1466698621 + + + model + https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/5ed1c299-4d31-4531-ae43-4bb56f8f10c8/ + + model.model-name-version-id + 5ed1c299-4d31-4531-ae43-4bb56f8f10c8 + + + model.model-name + ipe + + + model.model-type + resource + + + + + + 059db56c-6d72-4023-9fc3-0db29534ddff + T + unbounded + + 1466698621 + + + model + https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/43095b8a-8e9c-4a76-8490-6120140f6804/ + + model.model-name-version-id + 43095b8a-8e9c-4a76-8490-6120140f6804 + + + model.model-name + vSbg + + + model.model-type + resource + + + + + + + + model + https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/fa01ef50-bbb5-49d4-91d1-ebbda9816e01/ + + model.model-name-version-id + fa01ef50-bbb5-49d4-91d1-ebbda9816e01 + + + model.model-name + logical-link + + + model.model-type + widget + + + + + + + + model-element + https://dummy-host.test.onap.org:8443/aai/v7/service-design-and-creation/models/model/668464da-6d41-4599-bdbb-2576147b440e/model-elements/model-element/93a37846-b497-490e-bc97-7d130022d6db/model-elements/model-element/200de3d5-c207-47c2-a507-8846ba1d7068/model-elements/model-element/7ccfe6b5-6566-4b44-83d3-b79f5de7a87b/ + + model.model-name-version-id + 668464da-6d41-4599-bdbb-2576147b440e + + + model-element.model-element-uuid + 93a37846-b497-490e-bc97-7d130022d6db + + + model-element.model-element-uuid + 200de3d5-c207-47c2-a507-8846ba1d7068 + + + model-element.model-element-uuid + 7ccfe6b5-6566-4b44-83d3-b79f5de7a87b + + + + \ No newline at end of file diff --git a/src/test/resources/model-validation/model-reader/model-instance-mapping-attributes-1.json b/src/test/resources/model-validation/model-reader/model-instance-mapping-attributes-1.json new file mode 100644 index 0000000..916f898 --- /dev/null +++ b/src/test/resources/model-validation/model-reader/model-instance-mapping-attributes-1.json @@ -0,0 +1,11 @@ +[ + { + "mappingType": "ATTRIBUTE", + "model": { + "value": "metadata/metadatum/metaname" + }, + "instance": { + "value": "$..metadata.metadatum[*].metaname" + } + } +] \ No newline at end of file diff --git a/src/test/resources/model-validation/model-reader/model-instance-mapping-attributes-2.json b/src/test/resources/model-validation/model-reader/model-instance-mapping-attributes-2.json new file mode 100644 index 0000000..7bd8829 --- /dev/null +++ b/src/test/resources/model-validation/model-reader/model-instance-mapping-attributes-2.json @@ -0,0 +1,11 @@ +[ + { + "mappingType": "ATTRIBUTE", + "model": { + "value": "unkown" + }, + "instance": { + "value": "$..metadata.metadatum[*].metaname" + } + } +] \ No newline at end of file diff --git a/src/test/resources/model-validation/model-reader/model-instance-mapping-relationships-filter-1.json b/src/test/resources/model-validation/model-reader/model-instance-mapping-relationships-filter-1.json new file mode 100644 index 0000000..4d550f0 --- /dev/null +++ b/src/test/resources/model-validation/model-reader/model-instance-mapping-relationships-filter-1.json @@ -0,0 +1,18 @@ +[ + { + "mappingType": "RELATIONSHIP", + "model": { + "root": "model-elements/model-element", + "id": "relationship-list/relationship/relationship-data/relationship-value[../relationship-key/text()='model.model-name-version-id']", + "value": "relationship-list/relationship/related-to-property/property-value[../property-key/text()='model.model-name']", + "filter": { + "path": "relationship-list/relationship/related-to-property/property-value[../property-key/text()='model.model-type']", + "valid": ["INVALID_TYPE"] + } + }, + "instance": { + "origin": "$.inventory-response-item[0]", + "root": "$.inventory-response-items.inventory-response-item[*]" + } + } +] \ No newline at end of file diff --git a/src/test/resources/model-validation/model-reader/model-instance-mapping-relationships-filter-2.json b/src/test/resources/model-validation/model-reader/model-instance-mapping-relationships-filter-2.json new file mode 100644 index 0000000..2c9799e --- /dev/null +++ b/src/test/resources/model-validation/model-reader/model-instance-mapping-relationships-filter-2.json @@ -0,0 +1,18 @@ +[ + { + "mappingType": "RELATIONSHIP", + "model": { + "root": "model-elements/model-element", + "id": "relationship-list/relationship/relationship-data/relationship-value[../relationship-key/text()='model.model-name-version-id']", + "value": "relationship-list/relationship/related-to-property/property-value[../property-key/text()='model.model-name']", + "filter": { + "path": "relationship-list/relationship/related-to-property/property-value[../property-key/text()='model.model-type']", + "valid": [] + } + }, + "instance": { + "origin": "$.inventory-response-item[0]", + "root": "$.inventory-response-items.inventory-response-item[*]" + } + } +] \ No newline at end of file diff --git a/src/test/resources/model-validation/model-reader/model-instance-mapping-relationships-filter-3.json b/src/test/resources/model-validation/model-reader/model-instance-mapping-relationships-filter-3.json new file mode 100644 index 0000000..6442d7b --- /dev/null +++ b/src/test/resources/model-validation/model-reader/model-instance-mapping-relationships-filter-3.json @@ -0,0 +1,17 @@ +[ + { + "mappingType": "RELATIONSHIP", + "model": { + "root": "model-elements/model-element", + "id": "relationship-list/relationship/relationship-data/relationship-value[../relationship-key/text()='model.model-name-version-id']", + "value": "relationship-list/relationship/related-to-property/property-value[../property-key/text()='model.model-name']", + "filter": { + "path": "relationship-list/relationship/related-to-property/property-value[../property-key/text()='model.model-type']" + } + }, + "instance": { + "origin": "$.inventory-response-item[0]", + "root": "$.inventory-response-items.inventory-response-item[*]" + } + } +] \ No newline at end of file diff --git a/src/test/resources/model-validation/model-reader/model-instance-mapping-relationships-filter-4.json b/src/test/resources/model-validation/model-reader/model-instance-mapping-relationships-filter-4.json new file mode 100644 index 0000000..4f50042 --- /dev/null +++ b/src/test/resources/model-validation/model-reader/model-instance-mapping-relationships-filter-4.json @@ -0,0 +1,18 @@ +[ + { + "mappingType": "RELATIONSHIP", + "model": { + "root": "model-elements/model-element", + "id": "relationship-list/relationship/relationship-data/relationship-value[../relationship-key/text()='model.model-name-version-id']", + "value": "relationship-list/relationship/related-to-property/property-value[../property-key/text()='model.model-name']", + "filter": { + "path": "INVALID_PATH", + "valid": ["widget"] + } + }, + "instance": { + "origin": "$.inventory-response-item[0]", + "root": "$.inventory-response-items.inventory-response-item[*]" + } + } +] \ No newline at end of file diff --git a/src/test/resources/model-validation/model-reader/model-instance-mapping-relationships-filter-5.json b/src/test/resources/model-validation/model-reader/model-instance-mapping-relationships-filter-5.json new file mode 100644 index 0000000..8085cfd --- /dev/null +++ b/src/test/resources/model-validation/model-reader/model-instance-mapping-relationships-filter-5.json @@ -0,0 +1,17 @@ +[ + { + "mappingType": "RELATIONSHIP", + "model": { + "root": "model-elements/model-element", + "id": "relationship-list/relationship/relationship-data/relationship-value[../relationship-key/text()='model.model-name-version-id']", + "value": "relationship-list/relationship/related-to-property/property-value[../property-key/text()='model.model-name']", + "filter": { + "valid": ["widget"] + } + }, + "instance": { + "origin": "$.inventory-response-item[0]", + "root": "$.inventory-response-items.inventory-response-item[*]" + } + } +] \ No newline at end of file diff --git a/src/test/resources/model-validation/model-reader/model-instance-mapping-relationships-filter-6.json b/src/test/resources/model-validation/model-reader/model-instance-mapping-relationships-filter-6.json new file mode 100644 index 0000000..67be561 --- /dev/null +++ b/src/test/resources/model-validation/model-reader/model-instance-mapping-relationships-filter-6.json @@ -0,0 +1,14 @@ +[ + { + "mappingType": "RELATIONSHIP", + "model": { + "root": "model-elements/model-element", + "id": "relationship-list/relationship/relationship-data/relationship-value[../relationship-key/text()='model.model-name-version-id']", + "value": "relationship-list/relationship/related-to-property/property-value[../property-key/text()='model.model-name']" + }, + "instance": { + "origin": "$.inventory-response-item[0]", + "root": "$.inventory-response-items.inventory-response-item[*]" + } + } +] \ No newline at end of file diff --git a/src/test/resources/model-validation/model-reader/model-instance-mapping-relationships-root-1.json b/src/test/resources/model-validation/model-reader/model-instance-mapping-relationships-root-1.json new file mode 100644 index 0000000..de11bb2 --- /dev/null +++ b/src/test/resources/model-validation/model-reader/model-instance-mapping-relationships-root-1.json @@ -0,0 +1,18 @@ +[ + { + "mappingType": "RELATIONSHIP", + "model": { + "root": "INVALID_ROOT", + "id": "relationship-list/relationship/relationship-data/relationship-value[../relationship-key/text()='model.model-name-version-id']", + "value": "relationship-list/relationship/related-to-property/property-value[../property-key/text()='model.model-name']", + "filter": { + "path": "relationship-list/relationship/related-to-property/property-value[../property-key/text()='model.model-type']", + "valid": ["widget"] + } + }, + "instance": { + "origin": "$.inventory-response-item[0]", + "root": "$.inventory-response-items.inventory-response-item[*]" + } + } +] \ No newline at end of file diff --git a/src/test/resources/model-validation/model-reader/model-instance-mapping-relationships-root-2.json b/src/test/resources/model-validation/model-reader/model-instance-mapping-relationships-root-2.json new file mode 100644 index 0000000..7bc88ae --- /dev/null +++ b/src/test/resources/model-validation/model-reader/model-instance-mapping-relationships-root-2.json @@ -0,0 +1,17 @@ +[ + { + "mappingType": "RELATIONSHIP", + "model": { + "id": "relationship-list/relationship/relationship-data/relationship-value[../relationship-key/text()='model.model-name-version-id']", + "value": "relationship-list/relationship/related-to-property/property-value[../property-key/text()='model.model-name']", + "filter": { + "path": "relationship-list/relationship/related-to-property/property-value[../property-key/text()='model.model-type']", + "valid": ["widget"] + } + }, + "instance": { + "origin": "$.inventory-response-item[0]", + "root": "$.inventory-response-items.inventory-response-item[*]" + } + } +] \ No newline at end of file diff --git a/src/test/resources/model-validation/model-reader/model-instance-mapping-relationships-with-id.json b/src/test/resources/model-validation/model-reader/model-instance-mapping-relationships-with-id.json new file mode 100644 index 0000000..2c9799e --- /dev/null +++ b/src/test/resources/model-validation/model-reader/model-instance-mapping-relationships-with-id.json @@ -0,0 +1,18 @@ +[ + { + "mappingType": "RELATIONSHIP", + "model": { + "root": "model-elements/model-element", + "id": "relationship-list/relationship/relationship-data/relationship-value[../relationship-key/text()='model.model-name-version-id']", + "value": "relationship-list/relationship/related-to-property/property-value[../property-key/text()='model.model-name']", + "filter": { + "path": "relationship-list/relationship/related-to-property/property-value[../property-key/text()='model.model-type']", + "valid": [] + } + }, + "instance": { + "origin": "$.inventory-response-item[0]", + "root": "$.inventory-response-items.inventory-response-item[*]" + } + } +] \ No newline at end of file diff --git a/src/test/resources/model-validation/model-reader/model-instance-mapping-relationships.json b/src/test/resources/model-validation/model-reader/model-instance-mapping-relationships.json new file mode 100644 index 0000000..89bcae9 --- /dev/null +++ b/src/test/resources/model-validation/model-reader/model-instance-mapping-relationships.json @@ -0,0 +1,18 @@ +[ + { + "mappingType": "RELATIONSHIP", + "model": { + "root": "model-elements/model-element", + "id": "relationship-list/relationship/relationship-data/relationship-value[../relationship-key/text()='model.model-name-version-id']", + "value": "relationship-list/relationship/related-to-property/property-value[../property-key/text()='model.model-name']", + "filter": { + "path": "relationship-list/relationship/related-to-property/property-value[../property-key/text()='model.model-type']", + "valid": ["widget"] + } + }, + "instance": { + "origin": "$.inventory-response-item[0]", + "root": "$.inventory-response-items.inventory-response-item[*]" + } + } +] \ No newline at end of file diff --git a/src/test/resources/model-validation/model-reader/test-validation-service-beans.xml b/src/test/resources/model-validation/model-reader/test-validation-service-beans.xml new file mode 100644 index 0000000..81dab3e --- /dev/null +++ b/src/test/resources/model-validation/model-reader/test-validation-service-beans.xml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/test/resources/model-validation/model-reader/validation-service.properties b/src/test/resources/model-validation/model-reader/validation-service.properties new file mode 100644 index 0000000..4e1b264 --- /dev/null +++ b/src/test/resources/model-validation/model-reader/validation-service.properties @@ -0,0 +1,29 @@ +# ============LICENSE_START=================================================== +# Copyright (c) 2018 Amdocs +# ============================================================================ +# 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===================================================== + +topic.publish.enable=true +topic.publish.retries=3 +topic.consume.enable=true +topic.consume.polling.interval.seconds=3 + +event.domain=devINT1 +event.action.exclude=DELETE +event.type.rule=AAI-EVENT,AAI-DATA-EXPORT-API,GIZMO-EVENT +event.type.model=AAI-DATA-EXPORT-NQ +event.type.end=END-EVENT + +model.cache.expirySeconds=3 +aai.oxm.version=12 diff --git a/src/test/resources/model-validation/model-reader/virtual-data-center-widget-id.xml b/src/test/resources/model-validation/model-reader/virtual-data-center-widget-id.xml new file mode 100644 index 0000000..aadee37 --- /dev/null +++ b/src/test/resources/model-validation/model-reader/virtual-data-center-widget-id.xml @@ -0,0 +1,72 @@ + + + virtual-data-center-widget-id + widget + virtual-data-center + vdc-model-id + v1.0 + 1466417894 + + + 6d2dbb11-d509-4e03-8ed9-05bf4aad99d2 + T + unbounded + + 1466417894 + + + + model + https://dummy-host.onap.org:8443/aai/v7/service-design-and-creation/models/model/l2-bridge-for-wan-connector-resource-id/ + + model.model-name-version-id + e2ccd5c5-bc6e-4ed0-8378-6805ee6ba161 + + + model.model-name + l2-bridge-for-wan-connector + + + model.model-type + resource + + + + + + + + + model-element + https://dummy-host.onap.org:8443/aai/v7/service-design-and-creation/model-elements/model-element/8c0fd413-0d2b-491b-ad14-10c434c359bb/ + + model-element.model-element-uuid + 8c0fd413-0d2b-491b-ad14-10c434c359bb + + + model-element.model-element-uuid + 54629607-160a-4dcf-8c5c-15b8a3756f9a + + + model.model-name-version-id + wan-connector-service-id + + + + \ No newline at end of file -- cgit 1.2.3-korg