From d7df2dca953d55fbd808b49bff3278495a85c705 Mon Sep 17 00:00:00 2001 From: Dileep Ranganathan Date: Thu, 8 Mar 2018 10:38:25 -0800 Subject: Testing for HpaCapabilities object Fixed Schema - mismatch in the java attributes and xml attributes Added dependentOn for HpaFeatureAtrributes Added unit test for HPASchema Added sample payload for HPACapabilities inside flavor Issue-ID: AAI-742 Change-Id: I3525376886f10bee99aa0ce3f0a6b2a5efbaa9b1 Signed-off-by: Dileep Ranganathan --- .../src/test/resources/payloads/templates/hpa.json | 515 +++++++++++++++++++++ 1 file changed, 515 insertions(+) create mode 100644 aai-core/src/test/resources/payloads/templates/hpa.json (limited to 'aai-core/src/test/resources/payloads/templates') diff --git a/aai-core/src/test/resources/payloads/templates/hpa.json b/aai-core/src/test/resources/payloads/templates/hpa.json new file mode 100644 index 00000000..16708237 --- /dev/null +++ b/aai-core/src/test/resources/payloads/templates/hpa.json @@ -0,0 +1,515 @@ +{ + "cloud-owner": "${cloud-owner}", + "cloud-region-id": "${cloud-region-id}", + "cloud-type": "openstack-pike", + "owner-defined-type": "OUrR8kI6Br", + "cloud-region-version": "Nyr", + "identity-url": "JHqvA1M", + "cloud-zone": "Y5UfJUM", + "complex-name": "QLP", + "sriov-automation": false, + "tenants": { + "tenant": [ + { + "tenant-id": "${tenant-id}", + "tenant-name": "yhgVBcv3Pr", + "tenant-context": "De4NNayqFBO", + "vservers": { + "vserver": [ + { + "vserver-id": "${vserver-id}", + "vserver-name": "P3SJ347Uyv", + "vserver-name2": "1dHd", + "prov-status": "PR04shorWQ", + "vserver-selflink": "v7dU8H", + "in-maint": false, + "is-closed-loop-disabled": true, + "volumes": { + "volume": [ + { + "volume-id": "61cbb17e-8e5f-4545-a8ea-13a0e9c9871f-vk250x", + "volume-selflink": "mYkfJ9rGv" + }, + { + "volume-id": "d98083a6-b235-4e54-b19b-2ebfa1604246-vk250x", + "volume-selflink": "69RRsreL4" + } + ] + }, + "l-interfaces": { + "l-interface": [ + { + "interface-name": "top-linterface", + "interface-role": "3W1FAJGSQ", + "v6-wan-link-ip": "WugWw3N", + "selflink": "Of4j0pU", + "interface-id": "eoW", + "macaddr": "XNbbIy33", + "network-name": "ZETDv5sGhiS", + "management-option": "qR3RyCxgEU", + "interface-description": "ksuRPpWDEH7", + "is-port-mirrored": false, + "in-maint": false, + "prov-status": "20Q0ZE6n5iB0", + "is-ip-unnumbered": false, + "allowed-address-pairs": "KjPXyH", + "vlans": { + "vlan": [ + { + "vlan-interface": "8d225c33-7494-4173-939f-0e1e8741344d-vk250x", + "vlan-id-inner": 884, + "vlan-id-outer": 992, + "speed-value": "RyFPm", + "speed-units": "ZrckmLff7b", + "vlan-description": "zjAeUFgeagpf", + "backdoor-connection": "gANMvUquB", + "vpn-key": "l0rV7bb2Sc", + "orchestration-status": "WVnLpbzIx", + "in-maint": false, + "prov-status": "tYMRi6df", + "is-ip-unnumbered": false, + "l3-interface-ipv4-address-list": [ + { + "l3-interface-ipv4-address": "2e7d62a5-ff93-446f-9fa3-b4ba585e742b-vk250x", + "l3-interface-ipv4-prefix-length": 640, + "vlan-id-inner": 652, + "vlan-id-outer": 868, + "is-floating": true, + "neutron-network-id": "dJ8Fqs4ZTRn", + "neutron-subnet-id": "HC6ji9DO8" + } + ], + "l3-interface-ipv6-address-list": [ + { + "l3-interface-ipv6-address": "818cd2e5-8dac-4a49-aa2e-4f97d4e98594-vk250x", + "l3-interface-ipv6-prefix-length": 910, + "vlan-id-inner": 116, + "vlan-id-outer": 661, + "is-floating": true, + "neutron-network-id": "vSpYqFg5Tfe", + "neutron-subnet-id": "bqkOUZSlVF" + }, + { + "l3-interface-ipv6-address": "915a8e5d-9d39-4f99-a350-c48f48ac8f46-vk250x", + "l3-interface-ipv6-prefix-length": 593, + "vlan-id-inner": 554, + "vlan-id-outer": 762, + "is-floating": false, + "neutron-network-id": "b7PM", + "neutron-subnet-id": "u51Ma93" + } + ] + } + ] + }, + "sriov-vfs": { + "sriov-vf": [ + { + "pci-id": "01ca7dbe-e270-4545-a045-72e9e3fcb44b-vk250x", + "vf-vlan-filter": "f9YNFlqrfHi", + "vf-mac-filter": "HQhFdXpL1v", + "vf-vlan-strip": true, + "vf-vlan-anti-spoof-check": false, + "vf-mac-anti-spoof-check": false, + "vf-mirrors": "SqknCX", + "vf-broadcast-allow": true, + "vf-unknown-multicast-allow": false, + "vf-unknown-unicast-allow": false, + "vf-insert-stag": true, + "vf-link-status": "MsSX9hug4u1", + "neutron-network-id": "f4jq6yFxVVtC" + } + ] + }, + "l-interfaces": { + "l-interface": [ + { + "interface-name": "nested-linterface1", + "interface-role": "ZjOYJKIE4j9W1", + "v6-wan-link-ip": "63RKRTd", + "selflink": "5xF", + "interface-id": "akNmnDyijrHla", + "macaddr": "XLZCof4", + "network-name": "yJt", + "management-option": "FJ6qVt", + "interface-description": "fCHE1Glz", + "is-port-mirrored": false, + "in-maint": false, + "prov-status": "vuTb", + "is-ip-unnumbered": false, + "allowed-address-pairs": "5Lzn9" + }, + { + "interface-name": "nested-linterface2", + "interface-role": "ZjOYJKIE4j9W1", + "v6-wan-link-ip": "63RKRTd", + "selflink": "5xF", + "interface-id": "akNmnDyijrHla", + "macaddr": "XLZCof4", + "network-name": "yJt", + "management-option": "FJ6qVt", + "interface-description": "fCHE1Glz", + "is-port-mirrored": false, + "in-maint": false, + "prov-status": "vuTb", + "is-ip-unnumbered": false, + "allowed-address-pairs": "5Lzn9" + } + ] + }, + "l3-interface-ipv4-address-list": [ + { + "l3-interface-ipv4-address": "fc25fa49-ec46-43f5-bd39-c1c9067d2962-vk250x", + "l3-interface-ipv4-prefix-length": 339, + "vlan-id-inner": 644, + "vlan-id-outer": 701, + "is-floating": true, + "neutron-network-id": "IEpYVl", + "neutron-subnet-id": "7uWdipdgtC4Qc" + }, + { + "l3-interface-ipv4-address": "402d29fe-baf4-47e3-9208-e12a75e25349-vk250x", + "l3-interface-ipv4-prefix-length": 370, + "vlan-id-inner": 971, + "vlan-id-outer": 142, + "is-floating": false, + "neutron-network-id": "sRi62ZY3IrKkq", + "neutron-subnet-id": "PeV5RhIfV2Ib7" + } + ], + "l3-interface-ipv6-address-list": [ + { + "l3-interface-ipv6-address": "c9befce1-5617-4525-b217-105a57f6bd59-vk250x", + "l3-interface-ipv6-prefix-length": 333, + "vlan-id-inner": 275, + "vlan-id-outer": 324, + "is-floating": true, + "neutron-network-id": "em6Lc6ovvWsdx", + "neutron-subnet-id": "pyx4f" + }, + { + "l3-interface-ipv6-address": "18aa594c-143b-4564-ac0c-72144aecbb66-vk250x", + "l3-interface-ipv6-prefix-length": 350, + "vlan-id-inner": 893, + "vlan-id-outer": 37, + "is-floating": false, + "neutron-network-id": "lhiR1", + "neutron-subnet-id": "kdfoiCb7JYBuh" + } + ] + } + ] + } + } + ] + } + } + ] + }, + "flavors": { + "flavor": [ + { + "flavor-id": "${flavor-id1}", + "flavor-name": "flavor-numa-cpu-topology-instruction-set", + "flavor-vcpus": 64, + "flavor-ram": 65536, + "flavor-disk": 1048576, + "flavor-ephemeral": 128, + "flavor-swap": "0", + "flavor-is-public": false, + "flavor-selflink": "pXtX", + "flavor-disabled": false, + "hpa-capabilities": { + "hpa-capability": [ + { + "hpa-capability-id": "${hpa-capability-id1}", + "hpa-feature": "basicCapabilities", + "hpa-version": "v1", + "architecture": "generic", + "hpa-feature-attributes": [ + { + "hpa-attribute-key": "numVirtualCpu", + "hpa-attribute-value": "{value:4}" + }, + { + "hpa-attribute-key": "virtualMemSize", + "hpa-attribute-value": "{value:4, unit:\"GB\" }" + } + ] + }, + { + "hpa-capability-id": "${hpa-capability-id2}", + "hpa-feature": "cpuTopology", + "hpa-version": "v1", + "architecture": "generic", + "hpa-feature-attributes": [ + { + "hpa-attribute-key": "numCpuSockets", + "hpa-attribute-value": "{value:6}" + }, + { + "hpa-attribute-key": "numCpuCores", + "hpa-attribute-value": "{value:8}" + }, + { + "hpa-attribute-key": "numCpuThreads", + "hpa-attribute-value": "{value:8}" + } + ] + }, + { + "hpa-capability-id": "${hpa-capability-id3}", + "hpa-feature": "numa", + "hpa-version": "v1", + "architecture": "generic", + "hpa-feature-attributes": [ + { + "hpa-attribute-key": "numaNodes", + "hpa-attribute-value": "{value:2}" + }, + { + "hpa-attribute-key": "numaCpu-0", + "hpa-attribute-value": "{value:2}" + }, + { + "hpa-attribute-key": "numaCpu-1", + "hpa-attribute-value": "{value:4}" + }, + { + "hpa-attribute-key": "numaMem-0", + "hpa-attribute-value": "{value:2, unit:\"GB\" }" + }, + { + "hpa-attribute-key": "numaMem-1", + "hpa-attribute-value": "{value:4, unit:\"GB\" }" + } + ] + }, + { + "hpa-capability-id": "${hpa-capability-id4}", + "hpa-feature": "cpuInstructionSetExtensions", + "hpa-version": "v1", + "architecture": "Intel64", + "hpa-feature-attributes": [ + { + "hpa-attribute-key": "instructionSetExtensions", + "hpa-attribute-value": "{value:{['AAA', 'BBB', 'CCC', 'DDD']}}" + } + ] + } + ] + } + }, + { + "flavor-id": "${flavor-id2}", + "flavor-name": "flavor-cpu-pinning-ovsdpdk-instruction-set", + "flavor-vcpus": 32, + "flavor-ram": 131072, + "flavor-disk": 2097152, + "flavor-ephemeral": 128, + "flavor-swap": "0", + "flavor-is-public": false, + "flavor-selflink": "pXtX", + "flavor-disabled": false, + "hpa-capabilities": { + "hpa-capability": [ + { + "hpa-capability-id": "${hpa-capability-id5}", + "hpa-feature": "basicCapabilities", + "hpa-version": "v1", + "architecture": "generic", + "hpa-feature-attributes": [ + { + "hpa-attribute-key": "numVirtualCpu", + "hpa-attribute-value": "{value:8}" + }, + { + "hpa-attribute-key": "virtualMemSize", + "hpa-attribute-value": "{value:16, unit:\"GB\" }" + } + ] + }, + { + "hpa-capability-id": "${hpa-capability-id6}", + "hpa-feature": "cpuPinning", + "hpa-version": "v1", + "architecture": "generic", + "hpa-feature-attributes": [ + { + "hpa-attribute-key": "logicalCpuThreadPinningPolicy", + "hpa-attribute-value": "{value:\"prefer\"}" + }, + { + "hpa-attribute-key": "logicalCpuPinningPolicy", + "hpa-attribute-value": "{value:\"dedicated\"}" + } + ] + }, + { + "hpa-capability-id": "${hpa-capability-id7}", + "hpa-feature": "ovsDpdk", + "hpa-version": "v1", + "architecture": "generic", + "hpa-feature-attributes": [ + { + "hpa-attribute-key": "dataProcessingAccelerationLibrary", + "hpa-attribute-value": "{value:\"v18.02\"}" + } + ] + }, + { + "hpa-capability-id": "${hpa-capability-id8}", + "hpa-feature": "cpuInstructionSetExtensions", + "hpa-version": "v1", + "architecture": "generic", + "hpa-feature-attributes": [ + { + "hpa-attribute-key": "instructionSetExtensions", + "hpa-attribute-value": "{value:{['A11', 'B22']}}" + } + ] + } + ] + } + } + ] + }, + "group-assignments": { + "group-assignment": [ + { + "group-id": "30c1bb60-1b71-4b46-910f-d33c7905a779-vk250x", + "group-type": "bRh", + "group-name": "hg11sdvW", + "group-description": "df3w60RR" + } + ] + }, + "snapshots": { + "snapshot": [ + { + "snapshot-id": "26c013f4-c119-4ddd-89cf-e9b2729f87e5-vk250x", + "snapshot-name": "0J3q8ZjyPGH", + "snapshot-architecture": "wMu9Tvile", + "snapshot-os-distro": "2Vv4Pqzu", + "snapshot-os-version": "Vim0fyf404YVW", + "application": "oxkCtHUk", + "application-vendor": "tTpXkD", + "application-version": "aOqn", + "snapshot-selflink": "GCapKV9Tq", + "prev-snapshot-id": "Imnj21xW5Hez" + }, + { + "snapshot-id": "ee2e8769-2dcf-4a3c-90bd-a0ba91c97f13-vk250x", + "snapshot-name": "zRh94rw3pc1", + "snapshot-architecture": "FxVDY", + "snapshot-os-distro": "QZnKXjI5LDBSi", + "snapshot-os-version": "u0Bl2moOJ7bb", + "application": "dlXZPm9B7", + "application-vendor": "89tls6", + "application-version": "c05X", + "snapshot-selflink": "rmExWmnDIZu3", + "prev-snapshot-id": "5chZxlmHfhe" + } + ] + }, + "images": { + "image": [ + { + "image-id": "691210f6-f3f2-488f-993c-a9c9570fb71f-vk250x", + "image-name": "GsPzYlduuWk", + "image-architecture": "vNdK4fYJf", + "image-os-distro": "ZxYe", + "image-os-version": "SVBBpHEc", + "application": "GgBxi1zv8h2KG", + "application-vendor": "x6NtDNUj", + "application-version": "VOZYqE04K9", + "image-selflink": "gOzbbHZtkuh", + "metadata": { + "metadatum": [ + { + "metaname": "b9565dfa-ed1f-4d35-90c6-bb56a48d9b2a-vk250x", + "metaval": "nyq5IHmI" + } + ] + } + }, + { + "image-id": "1f00c00a-9ab7-44a0-9961-bcf5f806fef8-vk250x", + "image-name": "WChNCg3ThQ1Of", + "image-architecture": "oL2m4nUPPG6j", + "image-os-distro": "kf7", + "image-os-version": "DxTTyv4S16e", + "application": "Y0dytCJ2ouDk", + "application-vendor": "F7E7a", + "application-version": "8wkd3Cy", + "image-selflink": "5N5A", + "metadata": { + "metadatum": [ + { + "metaname": "a5c4c98f-0b36-4f70-a235-5135e8e644f1-vk250x", + "metaval": "vupk3k29rdN" + }, + { + "metaname": "e6084e48-df73-4854-a2be-522087b5f6a3-vk250x", + "metaval": "l9VaEeP" + } + ] + } + } + ] + }, + "dvs-switches": { + "dvs-switch": [ + { + "switch-name": "b01222d9-f9f9-493d-8ee0-9ab7c095d5a0-vk250x", + "vcenter-url": "NNtc" + }, + { + "switch-name": "7abed153-9fb5-4c05-87aa-ead0feb35b16-vk250x", + "vcenter-url": "YSS" + } + ] + }, + "oam-networks": { + "oam-network": [ + { + "network-uuid": "af2371f8-0fa6-4d4d-90c8-9c5d3ba3e01e-vk250x", + "network-name": "cVevT9o20HAs4", + "cvlan-tag": 560, + "ipv4-oam-gateway-address": "F565rGb", + "ipv4-oam-gateway-address-prefix-length": 540 + } + ] + }, + "availability-zones": { + "availability-zone": [ + { + "availability-zone-name": "9761e922-fd2a-4c96-9a13-4e62e1daccdc-vk250x", + "hypervisor-type": "qijdeI", + "operational-status": "C0KkUiJ" + } + ] + }, + "vip-ipv4-address-list": [ + { + "vip-ipv4-address": "08b4a6c1-c702-4449-8791-caaa5341c6d9-vk250x", + "vip-ipv4-prefix-length": 185, + "vlan-id-inner": 969, + "vlan-id-outer": 414, + "is-floating": true, + "neutron-network-id": "S7r90cEZ", + "neutron-subnet-id": "2NwjH" + } + ], + "vip-ipv6-address-list": [ + { + "vip-ipv6-address": "f01dbad0-10c5-491c-a6e5-d972c9b99f56-vk250x", + "vip-ipv6-prefix-length": 365, + "vlan-id-inner": 326, + "vlan-id-outer": 927, + "is-floating": true, + "neutron-network-id": "ULEl0", + "neutron-subnet-id": "eyt9" + } + ] +} \ No newline at end of file -- cgit 1.2.3-korg