From a86d6a6644d6de3f3f814cd6e25cfe2213d5dd05 Mon Sep 17 00:00:00 2001 From: "Kajur, Harish (vk250x)" Date: Fri, 10 Aug 2018 12:42:00 -0400 Subject: Integrate aai-schema-ingest library into aai-core Integrate the aai-core into using the aai-schema-ingest library to be agnostic to the schema changes Remove any references to aai-schema dependency in aai-core Reorder the components so the aai-schema-ingest is first installed Moved the edge rules to the aai-schema as they are linked to schema Rework the generation of the aai-schema to using aai-schema-ingest library Also remove the yaml and html folders as they get generated on the fly So when maven pushes the aai-schema jar, the jar contains the generated yaml, html and xsd files at runtime due to the gerrit limit of filesize Issue-ID: AAI-1455 Change-Id: I87ecd9eb2fc96a09d3a6399955637674f6e7fb21 Signed-off-by: Kajur, Harish (vk250x) --- .../templates/cloud-region-with-vserver.json | 26 +++++++++++++++++++++ .../resources/payloads/templates/customer.json | 27 ++++++++++++++++++++++ .../payloads/templates/generic-vnf-resource.json | 8 +++++++ .../resources/payloads/templates/generic-vnf.json | 7 ++++++ .../resources/payloads/templates/model-ver.json | 5 ++++ .../test/resources/payloads/templates/model.json | 4 ++++ 6 files changed, 77 insertions(+) create mode 100644 aai-core/src/test/resources/payloads/templates/cloud-region-with-vserver.json create mode 100644 aai-core/src/test/resources/payloads/templates/customer.json create mode 100644 aai-core/src/test/resources/payloads/templates/generic-vnf-resource.json create mode 100644 aai-core/src/test/resources/payloads/templates/generic-vnf.json create mode 100644 aai-core/src/test/resources/payloads/templates/model-ver.json create mode 100644 aai-core/src/test/resources/payloads/templates/model.json (limited to 'aai-core/src/test/resources/payloads/templates') diff --git a/aai-core/src/test/resources/payloads/templates/cloud-region-with-vserver.json b/aai-core/src/test/resources/payloads/templates/cloud-region-with-vserver.json new file mode 100644 index 00000000..e31a201f --- /dev/null +++ b/aai-core/src/test/resources/payloads/templates/cloud-region-with-vserver.json @@ -0,0 +1,26 @@ +{ + "cloud-owner" : "${cloud-owner}", + "cloud-region-id" : "${cloud-region-id}", + "tenants" : { + "tenant" : [ { + "tenant-id" : "${tenant-id}", + "tenant-name" : "yhgVBcv3Pr", + "vservers" : { + "vserver" : [ { + "vserver-id" : "${vserver-id}", + "vserver-name" : "P3SJ347Uyv", + "vserver-name2" : "1dHd", + "vserver-selflink": "jfoasjdfjsaodi", + "relationship-list": { + "relationship": [ + { + "related-to": "generic-vnf", + "related-link": "${related-link}" + } + ] + } + } ] + } + } ] + } +} diff --git a/aai-core/src/test/resources/payloads/templates/customer.json b/aai-core/src/test/resources/payloads/templates/customer.json new file mode 100644 index 00000000..c7114578 --- /dev/null +++ b/aai-core/src/test/resources/payloads/templates/customer.json @@ -0,0 +1,27 @@ +{ + "global-customer-id": "${global-customer-id}", + "subscriber-name": "example-subscriber-name-val-99675", + "subscriber-type": "example-subscriber-type-val-40388", + "service-subscriptions": { + "service-subscription": [ + { + "service-type": "${subscription-type}", + "temp-ub-sub-account-id": "example-temp-ub-sub-account-id-val-64687", + "service-instances": { + "service-instance": [ + { + "service-instance-id": "${service-instance-id}", + "service-instance-name": "example-service-instance-name-val-4896", + "service-type": "example-service-type-val-25453", + "service-role": "example-service-role-val-66197", + "environment-context": "example-environment-context-val-95014", + "workload-context": "example-workload-context-val-56102", + "model-invariant-id": "${model-invariant-id}", + "model-version-id": "${model-version-id}" + } + ] + } + } + ] + } +} \ No newline at end of file diff --git a/aai-core/src/test/resources/payloads/templates/generic-vnf-resource.json b/aai-core/src/test/resources/payloads/templates/generic-vnf-resource.json new file mode 100644 index 00000000..fa9ce841 --- /dev/null +++ b/aai-core/src/test/resources/payloads/templates/generic-vnf-resource.json @@ -0,0 +1,8 @@ +{ + "vnf-id": "${vnf-id}", + "vnf-type": "someval", + "vnf-name": "someval", + "model-invariant-id": "${model-invariant-id}", + "model-version-id": "${model-version-id}", + "resource-version": "${resource-version}" +} diff --git a/aai-core/src/test/resources/payloads/templates/generic-vnf.json b/aai-core/src/test/resources/payloads/templates/generic-vnf.json new file mode 100644 index 00000000..7b592514 --- /dev/null +++ b/aai-core/src/test/resources/payloads/templates/generic-vnf.json @@ -0,0 +1,7 @@ +{ + "vnf-id": "${vnf-id}", + "vnf-type": "someval", + "vnf-name": "someval", + "model-invariant-id": "${model-invariant-id}", + "model-version-id": "${model-version-id}" +} diff --git a/aai-core/src/test/resources/payloads/templates/model-ver.json b/aai-core/src/test/resources/payloads/templates/model-ver.json new file mode 100644 index 00000000..e20e0a39 --- /dev/null +++ b/aai-core/src/test/resources/payloads/templates/model-ver.json @@ -0,0 +1,5 @@ +{ + "model-version-id": "${model-version-id}", + "model-name": "${model-name}", + "model-version": "${model-version}" +} \ No newline at end of file diff --git a/aai-core/src/test/resources/payloads/templates/model.json b/aai-core/src/test/resources/payloads/templates/model.json new file mode 100644 index 00000000..7eaa4c6d --- /dev/null +++ b/aai-core/src/test/resources/payloads/templates/model.json @@ -0,0 +1,4 @@ +{ + "model-invariant-id": "${model-invariant-id}", + "model-type": "some-type" +} \ No newline at end of file -- cgit 1.2.3-korg