diff options
| author |   mark.j.leonard <mark.j.leonard@gmail.com> | 2018-11-27 16:54:33 +0000 |
|---|---|---|
| committer | mark.j.leonard <mark.j.leonard@gmail.com> | 2018-11-27 16:54:33 +0000 |
| commit | 05e7b934ad49c54c98ce840841528a13e882f8d3 (patch) | |
| tree | 7e531b70c09201cf9a076d0c84dea3044812e9f1 /src/test/resources | |
| parent | 047862bba53addd381fc7c715ac9e3dff76b740d (diff) | |
Process Service-level Instance Groups
Create an InstanceGroup XML model for groups of the Service topology
template in the case where there is no Resource model generated.
Add a test CSAR file for a Service Proxy (an unsupported type).
Assert that the Service is associated with the instance-group Models.
Change-Id: If76bf7a1cfb960bc8692f1e136ee85176725915e
Issue-ID: AAI-1963
Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
Diffstat (limited to 'src/test/resources')
4 files changed, 133 insertions, 0 deletions
diff --git a/src/test/resources/compressedArtifacts/service-S1-csar.csar b/src/test/resources/compressedArtifacts/service-S1-csar.csar Binary files differnew file mode 100644 index 0000000..9bd9889 --- /dev/null +++ b/src/test/resources/compressedArtifacts/service-S1-csar.csar diff --git a/src/test/resources/generatedXml/AAI-Grouping Service for Test-service-1.0.xml b/src/test/resources/generatedXml/AAI-Grouping Service for Test-service-1.0.xml new file mode 100644 index 0000000..2bafb2f --- /dev/null +++ b/src/test/resources/generatedXml/AAI-Grouping Service for Test-service-1.0.xml @@ -0,0 +1,69 @@ +<model xmlns="http://org.onap.aai.inventory/v14"> + <model-invariant-id>service-invariant-uuid</model-invariant-id> + <model-type>service</model-type> + <model-vers> + <model-ver> + <model-version-id>service-uuid</model-version-id> + <model-name>Grouping Service for Test</model-name> + <model-version>1.0</model-version> + <model-description>xxx</model-description> + <model-elements> + <model-element> + <new-data-del-flag>T</new-data-del-flag> + <cardinality>unbounded</cardinality> + <model-elements> + <model-element> + <new-data-del-flag>T</new-data-del-flag> + <cardinality>unbounded</cardinality> + <model-elements/> + <relationship-list> + <relationship> + <related-to>model-ver</related-to> + <relationship-data> + <relationship-key>model-ver.model-version-id</relationship-key> + <relationship-value>instance-group-0-version-id</relationship-value> + </relationship-data> + <relationship-data> + <relationship-key>model.model-invariant-id</relationship-key> + <relationship-value>instance-group-0-invariant-id</relationship-value> + </relationship-data> + </relationship> + </relationship-list> + </model-element> + <model-element> + <new-data-del-flag>T</new-data-del-flag> + <cardinality>unbounded</cardinality> + <model-elements/> + <relationship-list> + <relationship> + <related-to>model-ver</related-to> + <relationship-data> + <relationship-key>model-ver.model-version-id</relationship-key> + <relationship-value>instance-group-1-version-id</relationship-value> + </relationship-data> + <relationship-data> + <relationship-key>model.model-invariant-id</relationship-key> + <relationship-value>instance-group-1-invariant-id</relationship-value> + </relationship-data> + </relationship> + </relationship-list> + </model-element> + </model-elements> + <relationship-list> + <relationship> + <related-to>model-ver</related-to> + <relationship-data> + <relationship-key>model-ver.model-version-id</relationship-key> + <relationship-value>service-instance-version-id</relationship-value> + </relationship-data> + <relationship-data> + <relationship-key>model.model-invariant-id</relationship-key> + <relationship-value>service-instance-invariant-id</relationship-value> + </relationship-data> + </relationship> + </relationship-list> + </model-element> + </model-elements> + </model-ver> + </model-vers> +</model>
\ No newline at end of file diff --git a/src/test/resources/generatedXml/AAI-groupingservicefortest..ResourceInstanceGroup..0-resource-1.xml b/src/test/resources/generatedXml/AAI-groupingservicefortest..ResourceInstanceGroup..0-resource-1.xml new file mode 100644 index 0000000..b246667 --- /dev/null +++ b/src/test/resources/generatedXml/AAI-groupingservicefortest..ResourceInstanceGroup..0-resource-1.xml @@ -0,0 +1,32 @@ +<model xmlns="http://org.onap.aai.inventory/v14"> + <model-invariant-id>instance-group-0-invariant-id</model-invariant-id> + <model-type>resource</model-type> + <model-vers> + <model-ver> + <model-version-id>instance-group-0-version-id</model-version-id> + <model-name>groupingservicefortest..ResourceInstanceGroup..0</model-name> + <model-version>1</model-version> + <model-description>DDD0</model-description> + <model-elements> + <model-element> + <new-data-del-flag>T</new-data-del-flag> + <cardinality>unbounded</cardinality> + <model-elements/> + <relationship-list> + <relationship> + <related-to>model-ver</related-to> + <relationship-data> + <relationship-key>model-ver.model-version-id</relationship-key> + <relationship-value>instance-group-version-id</relationship-value> + </relationship-data> + <relationship-data> + <relationship-key>model.model-invariant-id</relationship-key> + <relationship-value>instance-group-invariant-id</relationship-value> + </relationship-data> + </relationship> + </relationship-list> + </model-element> + </model-elements> + </model-ver> + </model-vers> +</model>
\ No newline at end of file diff --git a/src/test/resources/generatedXml/AAI-groupingservicefortest..ResourceInstanceGroup..1-resource-1.xml b/src/test/resources/generatedXml/AAI-groupingservicefortest..ResourceInstanceGroup..1-resource-1.xml new file mode 100644 index 0000000..d49e480 --- /dev/null +++ b/src/test/resources/generatedXml/AAI-groupingservicefortest..ResourceInstanceGroup..1-resource-1.xml @@ -0,0 +1,32 @@ +<model xmlns="http://org.onap.aai.inventory/v14"> + <model-invariant-id>instance-group-1-invariant-id</model-invariant-id> + <model-type>resource</model-type> + <model-vers> + <model-ver> + <model-version-id>instance-group-1-version-id</model-version-id> + <model-name>groupingservicefortest..ResourceInstanceGroup..1</model-name> + <model-version>1</model-version> + <model-description>DDD1</model-description> + <model-elements> + <model-element> + <new-data-del-flag>T</new-data-del-flag> + <cardinality>unbounded</cardinality> + <model-elements/> + <relationship-list> + <relationship> + <related-to>model-ver</related-to> + <relationship-data> + <relationship-key>model-ver.model-version-id</relationship-key> + <relationship-value>instance-group-version-id</relationship-value> + </relationship-data> + <relationship-data> + <relationship-key>model.model-invariant-id</relationship-key> + <relationship-value>instance-group-invariant-id</relationship-value> + </relationship-data> + </relationship> + </relationship-list> + </model-element> + </model-elements> + </model-ver> + </model-vers> +</model> |