Merge "Adding new resources of aai v14 model"

1 files changed, 51 insertions, 39 deletions

diff --git a/aai-service/provider/src/main/resources/aai-path.properties b/aai-service/provider/src/main/resources/aai-path.properties
index 85c8ff70d..2c566f9b2 100755
--- a/aai-service/provider/src/main/resources/aai-path.properties
+++ b/aai-service/provider/src/main/resources/aai-path.properties
@@ -117,42 +117,6 @@ customer|service-subscription|service-instance|allotted-resource|tunnel-xconnect
 customer|service-subscription|service-instance|allotted-resource|tunnel-xconnect = /aai/v14/business/customers/customer/{global-customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances/service-instance/{service-instance-id}/allotted-resources/allotted-resource/{id}/tunnel-xconnects/tunnel-xconnect/{id}
 customer|service-subscription|service-instance|metadata = /aai/v14/business/customers/customer/{global-customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances/service-instance/{service-instance-id}/metadata
 customer|service-subscription|service-instance|metadatum = /aai/v14/business/customers/customer/{global-customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances/service-instance/{service-instance-id}/metadata/metadatum/{metaname}
-lines-of-business = /aai/v14/business/lines-of-business
-line-of-business = /aai/v14/business/lines-of-business/line-of-business/{line-of-business-name}
-owning-entities = /aai/v14/business/owning-entities
-owning-entity = /aai/v14/business/owning-entities/owning-entity/{owning-entity-id}
-platforms = /aai/v14/business/platforms
-platform = /aai/v14/business/platforms/platform/{platform-name}
-projects = /aai/v14/business/projects
-project = /aai/v14/business/projects/project/{project-name}
-models = /aai/v14/service-design-and-creation/models
-model = /aai/v14/service-design-and-creation/models/model/{model-invariant-id}
-model|model-vers = /aai/v14/service-design-and-creation/models/model/{model-invariant-id}/model-vers
-model|model-ver = /aai/v14/service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}
-model|model-ver|metadata = /aai/v14/service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}/metadata
-model|model-ver|metadatum = /aai/v14/service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}/metadata/metadatum/{metaname}
-model|model-ver|model-elements = /aai/v14/service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}/model-elements
-model|model-ver|model-element = /aai/v14/service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}/model-elements/model-element/{model-element-uuid}
-model|model-ver|model-element|model-constraints = /aai/v14/service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}/model-elements/model-element/{model-element-uuid}/model-constraints
-model|model-ver|model-element|model-constraint = /aai/v14/service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}/model-elements/model-element/{model-element-uuid}/model-constraints/model-constraint/{model-constraint-uuid}
-model|model-ver|model-element|model-constraint|constrained-element-sets = /aai/v14/service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}/model-elements/model-element/{model-element-uuid}/model-constraints/model-constraint/{model-constraint-uuid}/constrained-element-sets
-model|model-ver|model-element|model-constraint|constrained-element-set = /aai/v14/service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}/model-elements/model-element/{model-element-uuid}/model-constraints/model-constraint/{model-constraint-uuid}/constrained-element-sets/constrained-element-set/{constrained-element-set-uuid}
-model|model-ver|model-element|model-constraint|constrained-element-set|element-choice-sets = /aai/v14/service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}/model-elements/model-element/{model-element-uuid}/model-constraints/model-constraint/{model-constraint-uuid}/constrained-element-sets/constrained-element-set/{constrained-element-set-uuid}/element-choice-sets
-model|model-ver|model-element|model-constraint|constrained-element-set|element-choice-set = /aai/v14/service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}/model-elements/model-element/{model-element-uuid}/model-constraints/model-constraint/{model-constraint-uuid}/constrained-element-sets/constrained-element-set/{constrained-element-set-uuid}/element-choice-sets/element-choice-set/{element-choice-set-uuid}
-named-queries = /aai/v14/service-design-and-creation/named-queries
-named-query = /aai/v14/service-design-and-creation/named-queries/named-query/{named-query-uuid}
-named-query|named-query-elements = /aai/v14/service-design-and-creation/named-queries/named-query/{named-query-uuid}/named-query-elements
-named-query|named-query-element = /aai/v14/service-design-and-creation/named-queries/named-query/{named-query-uuid}/named-query-elements/named-query-element/{named-query-element-uuid}
-named-query|named-query-element|property-constraints = /aai/v14/service-design-and-creation/named-queries/named-query/{named-query-uuid}/named-query-elements/named-query-element/{named-query-element-uuid}/property-constraints
-named-query|named-query-element|property-constraint = /aai/v14/service-design-and-creation/named-queries/named-query/{named-query-uuid}/named-query-elements/named-query-element/{named-query-element-uuid}/property-constraints/property-constraint/{property-constraint-uuid}
-named-query|named-query-element|related-lookups = /aai/v14/service-design-and-creation/named-queries/named-query/{named-query-uuid}/named-query-elements/named-query-element/{named-query-element-uuid}/related-lookups
-named-query|named-query-element|related-lookup = /aai/v14/service-design-and-creation/named-queries/named-query/{named-query-uuid}/named-query-elements/named-query-element/{named-query-element-uuid}/related-lookups/related-lookup/{related-lookup-uuid}
-service-capabilities = /aai/v14/service-design-and-creation/service-capabilities
-service-capability = /aai/v14/service-design-and-creation/service-capabilities/service-capability/{service-type}/{vnf-type}
-services = /aai/v14/service-design-and-creation/services
-service = /aai/v14/service-design-and-creation/services/service/{service-id}
-vnf-images = /aai/v14/service-design-and-creation/vnf-images
-vnf-image = /aai/v14/service-design-and-creation/vnf-images/vnf-image/{vnf-image-uuid}
 configurations = /aai/v14/network/configurations
 configuration = /aai/v14/network/configurations/configuration/{configuration-id}
 configuration|evcs = /aai/v14/network/configurations/configuration/{configuration-id}/evcs
@@ -161,6 +125,12 @@ configuration|forwarder-evcs = /aai/v14/network/configurations/configuration/{co
 configuration|forwarder-evc = /aai/v14/network/configurations/configuration/{configuration-id}/forwarder-evcs/forwarder-evc/{forwarder-evc-id}
 configuration|metadata = /aai/v14/network/configurations/configuration/{configuration-id}/metadata
 configuration|metadatum = /aai/v14/network/configurations/configuration/{configuration-id}/metadata/metadatum/{metaname}
+connectivities = /aai/v14/network/connectivities
+connectivity = /aai/v14/network/connectivities/connectivity/{connectivity-id}
+devices = /aai/v14/network/devices
+device = /aai/v14/network/devices/device/{device-id}
+esr-thirdparty-sdnc = /aai/v14/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/{thirdparty-sdnc-id}
+esr-thirdparty-sdnc-list = /aai/v14/external-system/esr-thirdparty-sdnc-list
 forwarding-paths = /aai/v14/network/forwarding-paths
 forwarding-path = /aai/v14/network/forwarding-paths/forwarding-path/{forwarding-path-id}
 forwarding-path|forwarders = /aai/v14/network/forwarding-paths/forwarding-path/{forwarding-path-id}/forwarders
@@ -213,12 +183,38 @@ l3-network|subnet|host-routes = /aai/v14/network/l3-networks/l3-network/{network
 l3-network|subnet|host-route = /aai/v14/network/l3-networks/l3-network/{network-id}/subnets/subnet/{subnet-id}/host-routes/host-route/{host-route-id}
 lag-links = /aai/v14/network/lag-links
 lag-link = /aai/v14/network/lag-links/lag-link/{link-name}
+lines-of-business = /aai/v14/business/lines-of-business
+line-of-business = /aai/v14/business/lines-of-business/line-of-business/{line-of-business-name}
 logical-links = /aai/v14/network/logical-links
 logical-link = /aai/v14/network/logical-links/logical-link/{link-name}
+models = /aai/v14/service-design-and-creation/models
+model = /aai/v14/service-design-and-creation/models/model/{model-invariant-id}
+model|model-vers = /aai/v14/service-design-and-creation/models/model/{model-invariant-id}/model-vers
+model|model-ver = /aai/v14/service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}
+model|model-ver|metadata = /aai/v14/service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}/metadata
+model|model-ver|metadatum = /aai/v14/service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}/metadata/metadatum/{metaname}
+model|model-ver|model-elements = /aai/v14/service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}/model-elements
+model|model-ver|model-element = /aai/v14/service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}/model-elements/model-element/{model-element-uuid}
+model|model-ver|model-element|model-constraints = /aai/v14/service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}/model-elements/model-element/{model-element-uuid}/model-constraints
+model|model-ver|model-element|model-constraint = /aai/v14/service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}/model-elements/model-element/{model-element-uuid}/model-constraints/model-constraint/{model-constraint-uuid}
+model|model-ver|model-element|model-constraint|constrained-element-sets = /aai/v14/service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}/model-elements/model-element/{model-element-uuid}/model-constraints/model-constraint/{model-constraint-uuid}/constrained-element-sets
+model|model-ver|model-element|model-constraint|constrained-element-set = /aai/v14/service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}/model-elements/model-element/{model-element-uuid}/model-constraints/model-constraint/{model-constraint-uuid}/constrained-element-sets/constrained-element-set/{constrained-element-set-uuid}
+model|model-ver|model-element|model-constraint|constrained-element-set|element-choice-sets = /aai/v14/service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}/model-elements/model-element/{model-element-uuid}/model-constraints/model-constraint/{model-constraint-uuid}/constrained-element-sets/constrained-element-set/{constrained-element-set-uuid}/element-choice-sets
+model|model-ver|model-element|model-constraint|constrained-element-set|element-choice-set = /aai/v14/service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}/model-elements/model-element/{model-element-uuid}/model-constraints/model-constraint/{model-constraint-uuid}/constrained-element-sets/constrained-element-set/{constrained-element-set-uuid}/element-choice-sets/element-choice-set/{element-choice-set-uuid}
 multicast-configurations = /aai/v14/network/multicast-configurations
 multicast-configuration = /aai/v14/network/multicast-configurations/multicast-configuration/{multicast-configuration-id}
+named-queries = /aai/v14/service-design-and-creation/named-queries
+named-query = /aai/v14/service-design-and-creation/named-queries/named-query/{named-query-uuid}
+named-query|named-query-elements = /aai/v14/service-design-and-creation/named-queries/named-query/{named-query-uuid}/named-query-elements
+named-query|named-query-element = /aai/v14/service-design-and-creation/named-queries/named-query/{named-query-uuid}/named-query-elements/named-query-element/{named-query-element-uuid}
+named-query|named-query-element|property-constraints = /aai/v14/service-design-and-creation/named-queries/named-query/{named-query-uuid}/named-query-elements/named-query-element/{named-query-element-uuid}/property-constraints
+named-query|named-query-element|property-constraint = /aai/v14/service-design-and-creation/named-queries/named-query/{named-query-uuid}/named-query-elements/named-query-element/{named-query-element-uuid}/property-constraints/property-constraint/{property-constraint-uuid}
+named-query|named-query-element|related-lookups = /aai/v14/service-design-and-creation/named-queries/named-query/{named-query-uuid}/named-query-elements/named-query-element/{named-query-element-uuid}/related-lookups
+named-query|named-query-element|related-lookup = /aai/v14/service-design-and-creation/named-queries/named-query/{named-query-uuid}/named-query-elements/named-query-element/{named-query-element-uuid}/related-lookups/related-lookup/{related-lookup-uuid}
 network-policies = /aai/v14/network/network-policies
 network-policy = /aai/v14/network/network-policies/network-policy/{network-policy-id}
+network-resources = /aai/v14/network/network-resources
+network-resource = /aai/v14/network/network-resources/network-resource/{network-id}
 newvces = /aai/v14/network/newvces
 newvce = /aai/v14/network/newvces/newvce/{vnf-id2}
 newvce|l-interfaces = /aai/v14/network/newvces/newvce/{vnf-id2}/l-interfaces
@@ -231,8 +227,12 @@ newvce|l-interface|vlans = /aai/v14/network/newvces/newvce/{vnf-id2}/l-interface
 newvce|l-interface|vlan = /aai/v14/network/newvces/newvce/{vnf-id2}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}
 newvce|l-interface|vlan|l3-interface-ipv4-address-list = /aai/v14/network/newvces/newvce/{vnf-id2}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}
 newvce|l-interface|vlan|l3-interface-ipv6-address-list = /aai/v14/network/newvces/newvce/{vnf-id2}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}
+owning-entities = /aai/v14/business/owning-entities
+owning-entity = /aai/v14/business/owning-entities/owning-entity/{owning-entity-id}
 physical-links = /aai/v14/network/physical-links
 physical-link = /aai/v14/network/physical-links/physical-link/{link-name}
+platforms = /aai/v14/business/platforms
+platform = /aai/v14/business/platforms/platform/{platform-name}
 pnfs = /aai/v14/network/pnfs
 pnf = /aai/v14/network/pnfs/pnf/{pnf-name}
 pnf|lag-interfaces = /aai/v14/network/pnfs/pnf/{pnf-name}/lag-interfaces
@@ -261,8 +261,16 @@ pnf|p-interface|l-interface|vlan|l3-interface-ipv4-address-list = /aai/v14/netwo
 pnf|p-interface|l-interface|vlan|l3-interface-ipv6-address-list = /aai/v14/network/pnfs/pnf/{pnf-name}/p-interfaces/p-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}
 pnf|p-interface|sriov-pfs = /aai/v14/network/pnfs/pnf/{pnf-name}/p-interfaces/p-interface/{interface-name}/sriov-pfs
 pnf|p-interface|sriov-pf = /aai/v14/network/pnfs/pnf/{pnf-name}/p-interfaces/p-interface/{interface-name}/sriov-pfs/sriov-pf/{pf-pci-id}
+projects = /aai/v14/business/projects
+project = /aai/v14/business/projects/project/{project-name}
 route-table-references = /aai/v14/network/route-table-references
 route-table-reference = /aai/v14/network/route-table-references/route-table-reference/{route-table-reference-id}
+sdwan-vpns = /aai/v14/network/sdwan-vpns
+sdwan-vpn = /aai/v14/network/sdwan-vpns/sdwan-vpn/{sdwan-vpn-id}
+service-capabilities = /aai/v14/service-design-and-creation/service-capabilities
+service-capability = /aai/v14/service-design-and-creation/service-capabilities/service-capability/{service-type}/{vnf-type}
+services = /aai/v14/service-design-and-creation/services
+service = /aai/v14/service-design-and-creation/services/service/{service-id}
 site-pair-sets = /aai/v14/network/site-pair-sets
 site-pair-set = /aai/v14/network/site-pair-sets/site-pair-set/{site-pair-set-id}
 site-pair-set|routing-instances = /aai/v14/network/site-pair-sets/site-pair-set/{site-pair-set-id}/routing-instances
@@ -271,6 +279,8 @@ site-pair-set|routing-instance|site-pairs = /aai/v14/network/site-pair-sets/site
 site-pair-set|routing-instance|site-pair = /aai/v14/network/site-pair-sets/site-pair-set/{site-pair-set-id}/routing-instances/routing-instance/{routing-instance-id}/site-pairs/site-pair/{site-pair-id}
 site-pair-set|routing-instance|site-pair|classes-of-service = /aai/v14/network/site-pair-sets/site-pair-set/{site-pair-set-id}/routing-instances/routing-instance/{routing-instance-id}/site-pairs/site-pair/{site-pair-id}/classes-of-service
 site-pair-set|routing-instance|site-pair|class-of-service = /aai/v14/network/site-pair-sets/site-pair-set/{site-pair-set-id}/routing-instances/routing-instance/{routing-instance-id}/site-pairs/site-pair/{site-pair-id}/classes-of-service/class-of-service/{cos}
+site-resources = /aai/v14/network/site-resources
+site-resource = /aai/v14/network/site-resources/site-resource/{site-resource-id}
 vces = /aai/v14/network/vces
 vce = /aai/v14/network/vces/vce/{vnf-id}
 vce|entitlements = /aai/v14/network/vces/vce/{vnf-id}/entitlements
@@ -281,6 +291,8 @@ vce|port-groups = /aai/v14/network/vces/vce/{vnf-id}/port-groups
 vce|port-group = /aai/v14/network/vces/vce/{vnf-id}/port-groups/port-group/{interface-id}
 vce|port-group|cvlan-tags = /aai/v14/network/vces/vce/{vnf-id}/port-groups/port-group/{interface-id}/cvlan-tags
 vce|port-group|cvlan-tag-entry = /aai/v14/network/vces/vce/{vnf-id}/port-groups/port-group/{interface-id}/cvlan-tags/cvlan-tag-entry/{cvlan-tag}
+vnf-images = /aai/v14/service-design-and-creation/vnf-images
+vnf-image = /aai/v14/service-design-and-creation/vnf-images/vnf-image/{vnf-image-uuid}
 vnfcs = /aai/v14/network/vnfcs
 vnfc = /aai/v14/network/vnfcs/vnfc/{vnfc-name}
 vnfc|l3-interface-ipv4-address-list = /aai/v14/network/vnfcs/vnfc/{vnfc-name}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}
@@ -317,7 +329,7 @@ vpn-bindings = /aai/v14/network/vpn-bindings
 vpn-binding = /aai/v14/network/vpn-bindings/vpn-binding/{vpn-id}
 vpn-binding|route-targets = /aai/v14/network/vpn-bindings/vpn-binding/{vpn-id}/route-targets
 vpn-binding|route-target = /aai/v14/network/vpn-bindings/vpn-binding/{vpn-id}/route-targets/route-target/{global-route-target}/{route-target-role}
+wan-port-configs = /aai/v14/network/wan-port-configs
+wan-port-config = /aai/v14/network/wan-port-configs/wan-port-config/{wan-port-config-id}
 zones = /aai/v14/network/zones
-zone = /aai/v14/network/zones/zone/{zone-id}
-esr-thirdparty-sdnc = /aai/v14/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/{thirdparty-sdnc-id}
-esr-thirdparty-sdnc-list = /aai/v14/external-system/esr-thirdparty-sdnc-list
\ No newline at end of file
+zone = /aai/v14/network/zones/zone/{zone-id}
\ No newline at end of file