Merge ECOMP updates to v25 schema 24/125424/2
authorwr148d <wr148d@att.com>
Wed, 27 Oct 2021 16:11:24 +0000 (12:11 -0400)
committerwr148d <wr148d@att.com>
Wed, 27 Oct 2021 16:27:13 +0000 (12:27 -0400)
Issue-ID: AAI-3404
Change-Id: Ie96d1b4aee7503006e92dbdd6b5db7838b37ef87
Signed-off-by: wr148d <wr148d@att.com>
aai-schema/src/main/resources/onap/dbedgerules/v25/DbEdgeRules_v25.json
aai-schema/src/main/resources/onap/oxm/v25/aai_oxm_v25.xml

index b275b01..e8f5ebf 100644 (file)
 {
-       "rules": [
-               {
-                       "from": "allotted-resource",
-                       "to": "allotted-resource",
-                       "label": "tosca.relationships.network.BindsTo",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "AAI-1925"
-               },
-               {
-                       "from": "allotted-resource",
-                       "to": "generic-vnf",
-                       "label": "org.onap.relationships.inventory.PartOf",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "allotted-resource",
-                       "to": "instance-group",
-                       "label": "org.onap.relationships.inventory.MemberOf",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "allotted-resource",
-                       "to": "l3-network",
-                       "label": "org.onap.relationships.inventory.PartOf",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "allotted-resource",
-                       "to": "l-interface",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "allotted-resource",
-                       "to": "network-policy",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "allotted-resource",
-                       "to": "vlan",
-                       "label": "org.onap.relationships.inventory.PartOf",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "allotted-resource",
-                       "to": "vpn-binding",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "tunnel-xconnect",
-                       "to": "allotted-resource",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "allotted-resource",
-                       "to": "logical-link",
-                       "label": "org.onap.relationships.inventory.ComposedOf",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "availability-zone",
-                       "to": "complex",
-                       "label": "org.onap.relationships.inventory.LocatedIn",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "availability-zone",
-                       "to": "service-capability",
-                       "label": "org.onap.relationships.inventory.AppliesTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "availability-zone",
-                       "to": "cloud-region",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "cloud-region",
-                       "to": "complex",
-                       "label": "org.onap.relationships.inventory.LocatedIn",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "cloud-region",
-                       "to": "l3-network",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "cloud-region",
-                       "to": "zone",
-                       "label": "org.onap.relationships.inventory.LocatedIn",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "dvs-switch",
-                       "to": "cloud-region",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "flavor",
-                       "to": "cloud-region",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "group-assignment",
-                       "to": "cloud-region",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "image",
-                       "to": "cloud-region",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "oam-network",
-                       "to": "cloud-region",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "snapshot",
-                       "to": "cloud-region",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "tenant",
-                       "to": "cloud-region",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "vip-ipv4-address-list",
-                       "to": "cloud-region",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "vip-ipv6-address-list",
-                       "to": "cloud-region",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "line-of-business",
-                       "to": "cloud-region",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "volume-group",
-                       "to": "cloud-region",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "complex",
-                       "to": "l3-network",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "ctag-pool",
-                       "to": "complex",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "configuration",
-                       "to": "allotted-resource",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "metadatum",
-                       "to": "configuration",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "connector",
-                       "to": "virtual-data-center",
-                       "label": "org.onap.relationships.inventory.LocatedIn",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "metadatum",
-                       "to": "connector",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "element-choice-set",
-                       "to": "constrained-element-set",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "ctag-pool",
-                       "to": "availability-zone",
-                       "label": "org.onap.relationships.inventory.AppliesTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "dvs-switch",
-                       "to": "availability-zone",
-                       "label": "org.onap.relationships.inventory.AppliesTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "model-element",
-                       "to": "element-choice-set",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "entitlement",
-                       "to": "generic-vnf",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "generic-vnf",
-                       "to": "availability-zone",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "generic-vnf",
-                       "to": "complex",
-                       "label": "org.onap.relationships.inventory.LocatedIn",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "generic-vnf",
-                       "to": "configuration",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "generic-vnf",
-                       "to": "ctag-pool",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "generic-vnf",
-                       "to": "instance-group",
-                       "label": "org.onap.relationships.inventory.MemberOf",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "generic-vnf",
-                       "to": "ipsec-configuration",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "generic-vnf",
-                       "to": "l3-network",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "generic-vnf",
-                       "to": "pnf",
-                       "label": "tosca.relationships.HostedOn",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "generic-vnf",
-                       "to": "pserver",
-                       "label": "tosca.relationships.HostedOn",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "generic-vnf",
-                       "to": "cloud-region",
-                       "label": "org.onap.relationships.inventory.LocatedIn",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "generic-vnf",
-                       "to": "tenant",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "vnfc",
-                       "to": "generic-vnf",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "generic-vnf",
-                       "to": "vnf-image",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "generic-vnf",
-                       "to": "volume-group",
-                       "label": "org.onap.relationships.inventory.DependsOn",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "generic-vnf",
-                       "to": "vserver",
-                       "label": "tosca.relationships.HostedOn",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "lag-interface",
-                       "to": "generic-vnf",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "license",
-                       "to": "generic-vnf",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "l-interface",
-                       "to": "generic-vnf",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "network-profile",
-                       "to": "generic-vnf",
-                       "label": "org.onap.relationships.inventory.AppliesTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "service-instance",
-                       "to": "generic-vnf",
-                       "label": "org.onap.relationships.inventory.ComposedOf",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "site-pair-set",
-                       "to": "generic-vnf",
-                       "label": "org.onap.relationships.inventory.AppliesTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "vf-module",
-                       "to": "generic-vnf",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-                {
-                        "from": "vf-module",
-                        "to": "tenant",
-                        "label": "tosca.relationships.HostedOn",
-                        "direction": "OUT",
-                        "multiplicity": "MANY2ONE",
-                        "contains-other-v": "NONE",
-                        "delete-other-v": "NONE",
-                        "prevent-delete": "NONE",
-                        "default": "true",
-                        "description": ""
-                },
-               {
-                       "from": "pserver",
-                       "to": "group-assignment",
-                       "label": "org.onap.relationships.inventory.MemberOf",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "${direction}",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "tenant",
-                       "to": "group-assignment",
-                       "label": "org.onap.relationships.inventory.MemberOf",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "metadatum",
-                       "to": "image",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "instance-group",
-                       "to": "model",
-                       "label": "org.onap.relationships.inventory.Targets",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "vig-server",
-                       "to": "ipsec-configuration",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "l3-interface-ipv4-address-list",
-                       "to": "instance-group",
-                       "label": "org.onap.relationships.inventory.network.MemberOf",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "l3-interface-ipv4-address-list",
-                       "to": "l3-network",
-                       "label": "org.onap.relationships.inventory.network.MemberOf",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "l3-interface-ipv4-address-list",
-                       "to": "subnet",
-                       "label": "org.onap.relationships.inventory.network.MemberOf",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "l3-interface-ipv6-address-list",
-                       "to": "instance-group",
-                       "label": "org.onap.relationships.inventory.network.MemberOf",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "l3-interface-ipv6-address-list",
-                       "to": "l3-network",
-                       "label": "org.onap.relationships.inventory.network.MemberOf",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "l3-interface-ipv6-address-list",
-                       "to": "subnet",
-                       "label": "org.onap.relationships.inventory.network.MemberOf",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "ctag-assignment",
-                       "to": "l3-network",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "l3-network",
-                       "to": "instance-group",
-                       "label": "org.onap.relationships.inventory.MemberOf",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "l3-network",
-                       "to": "network-policy",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "l3-network",
-                       "to": "route-table-reference",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "l3-network",
-                       "to": "vpn-binding",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "segmentation-assignment",
-                       "to": "l3-network",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-            "from": "service-instance",
-            "to": "l3-network",
-            "label": "org.onap.relationships.inventory.ComposedOf",
+    "rules": [
+        {
+            "from": "allotted-resource",
+            "to": "allotted-resource",
+            "label": "tosca.relationships.network.BindsTo",
+            "direction": "OUT",
+            "multiplicity": "ONE2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "AAI-1925"
+        },
+        {
+            "from": "allotted-resource",
+            "to": "generic-vnf",
+            "label": "org.onap.relationships.inventory.PartOf",
             "direction": "OUT",
             "multiplicity": "MANY2MANY",
             "contains-other-v": "NONE",
             "delete-other-v": "NONE",
             "prevent-delete": "NONE",
             "default": "true",
-            "description":""
+            "description": ""
         },
         {
-                       "from": "service-instance",
-                       "to": "p-interface",
-                       "label": "org.onap.relationships.inventory.ComposedOf",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "For MDONS Use case"
-               },
-               {
-                       "from": "subnet",
-                       "to": "l3-network",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "lag-interface",
-                       "to": "lag-link",
-                       "label": "tosca.relationships.network.LinksTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "lag-interface",
-                       "to": "logical-link",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "lag-interface",
-                       "to": "p-interface",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "l-interface",
-                       "to": "lag-interface",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "line-of-business",
-                       "to": "generic-vnf",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "l3-interface-ipv4-address-list",
-                       "to": "l-interface",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "l3-interface-ipv6-address-list",
-                       "to": "l-interface",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "l-interface",
-                       "to": "instance-group",
-                       "label": "org.onap.relationships.inventory.MemberOf",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "l-interface",
-                       "to": "l-interface",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "l-interface",
-                       "to": "logical-link",
-                       "label": "tosca.relationships.network.LinksTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "logical-link",
-                       "to": "l-interface",
-                       "label": "org.onap.relationships.inventory.Source",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "false",
-                       "description": ""
-               },
-               {
-                       "from": "logical-link",
-                       "to": "l-interface",
-                       "label": "org.onap.relationships.inventory.Destination",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "false",
-                       "description": ""
-               },
-               {
-                       "from": "sriov-vf",
-                       "to": "l-interface",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "vlan",
-                       "to": "l-interface",
-                       "label": "tosca.relationships.network.LinksTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "logical-link",
-                       "to": "cloud-region",
-                       "label": "org.onap.relationships.inventory.LocatedIn",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "logical-link",
-                       "to": "generic-vnf",
-                       "label": "org.onap.relationships.inventory.BridgedTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "logical-link",
-                       "to": "lag-link",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "logical-link",
-                       "to": "logical-link",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "logical-link",
-                       "to": "pnf",
-                       "label": "org.onap.relationships.inventory.BridgedTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "logical-link",
-                       "to": "pserver",
-                       "label": "org.onap.relationships.inventory.BridgedTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "logical-link",
-                       "to": "vpn-binding",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "model-ver",
-                       "to": "model",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "constrained-element-set",
-                       "to": "model-constraint",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "constrained-element-set",
-                       "to": "model-element",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "model-constraint",
-                       "to": "model-element",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "model-element",
-                       "to": "model-element",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "model-element",
-                       "to": "model-ver",
-                       "label": "org.onap.relationships.inventory.IsA",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "metadatum",
-                       "to": "model-ver",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "model-element",
-                       "to": "model-ver",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "named-query",
-                       "to": "model",
-                       "label": "org.onap.relationships.inventory.AppliesTo",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "named-query-element",
-                       "to": "named-query",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "named-query-element",
-                       "to": "model",
-                       "label": "org.onap.relationships.inventory.IsA",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "named-query-element",
-                       "to": "named-query-element",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "property-constraint",
-                       "to": "named-query-element",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "related-lookup",
-                       "to": "named-query-element",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "l-interface",
-                       "to": "newvce",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "oam-network",
-                       "to": "complex",
-                       "label": "org.onap.relationships.inventory.AppliesTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "oam-network",
-                       "to": "service-capability",
-                       "label": "org.onap.relationships.inventory.AppliesTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "operational-environment",
-                       "to": "operational-environment",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "service-instance",
-                       "to": "owning-entity",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "l-interface",
-                       "to": "p-interface",
-                       "label": "tosca.relationships.network.BindsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "p-interface",
-                       "to": "logical-link",
-                       "label": "tosca.relationships.network.LinksTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "p-interface",
-                       "to": "physical-link",
-                       "label": "tosca.relationships.network.LinksTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "sriov-pf",
-                       "to": "p-interface",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "platform",
-                       "to": "generic-vnf",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "lag-interface",
-                       "to": "pnf",
-                       "label": "tosca.relationships.network.BindsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "p-interface",
-                       "to": "pnf",
-                       "label": "tosca.relationships.network.BindsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "pnf",
-                       "to": "complex",
-                       "label": "org.onap.relationships.inventory.LocatedIn",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "pnf",
-                       "to": "instance-group",
-                       "label": "org.onap.relationships.inventory.MemberOf",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "pnf",
-                       "to": "instance-group",
-                       "label": "org.onap.relationships.inventory.Primary",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "false",
-                       "description": ""
-               },
-               {
-                       "from": "pnf",
-                       "to": "instance-group",
-                       "label": "org.onap.relationships.inventory.Secondary",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "false",
-                       "description": ""
-               },
-               {
-                       "from": "pnf",
-                       "to": "zone",
-                       "label": "org.onap.relationships.inventory.LocatedIn",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "pnf",
-                       "to": "owning-entity",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "profile",
-                       "to": "pnf",
-                       "label": "org.onap.relationships.inventory.supports",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "false",
-                       "description": ""
-               },
-               {
-                       "from": "profile",
-                       "to": "pserver",
-                       "label": "org.onap.relationships.inventory.supports",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "false",
-                       "description": ""
-               },
-               {
-                       "from": "profile",
-                       "to": "vserver",
-                       "label": "org.onap.relationships.inventory.supports",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "cvlan-tag",
-                       "to": "port-group",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "project",
-                       "to": "service-instance",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "lag-interface",
-                       "to": "pserver",
-                       "label": "tosca.relationships.network.BindsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "p-interface",
-                       "to": "pserver",
-                       "label": "tosca.relationships.network.BindsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "pserver",
-                       "to": "availability-zone",
-                       "label": "org.onap.relationships.inventory.MemberOf",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "pserver",
-                       "to": "cloud-region",
-                       "label": "org.onap.relationships.inventory.LocatedIn",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "pserver",
-                       "to": "complex",
-                       "label": "org.onap.relationships.inventory.LocatedIn",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "pserver",
-                       "to": "zone",
-                       "label": "org.onap.relationships.inventory.LocatedIn",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "site-pair",
-                       "to": "routing-instance",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "allotted-resource",
-                       "to": "service-instance",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "metadatum",
-                       "to": "service-instance",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "service-instance",
-                       "to": "allotted-resource",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
+            "from": "allotted-resource",
+            "to": "instance-group",
+            "label": "org.onap.relationships.inventory.MemberOf",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
         {
-            "from": "composed-resource",
-            "to": "service-instance",
-            "label": "org.onap.relationships.inventory.ComposedOf",
+            "from": "allotted-resource",
+            "to": "l3-network",
+            "label": "org.onap.relationships.inventory.PartOf",
             "direction": "OUT",
-            "multiplicity": "MANY2ONE",
-            "contains-other-v": "!${direction}",
-            "delete-other-v": "!${direction}",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
             "prevent-delete": "NONE",
             "default": "true",
             "description": ""
         },
         {
-            "from": "service-instance",
-            "to": "composed-resource",
-            "label": "org.onap.relationships.inventory.BelongsTo",
+            "from": "allotted-resource",
+            "to": "l-interface",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "ONE2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "allotted-resource",
+            "to": "network-policy",
+            "label": "org.onap.relationships.inventory.Uses",
             "direction": "OUT",
             "multiplicity": "ONE2ONE",
             "contains-other-v": "NONE",
             "default": "true",
             "description": ""
         },
-               {
-                       "from": "service-instance",
-                       "to": "instance-group",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "false",
-                       "description": "MSO creates this edge on VNF Group Service creation"
-               },
-               {
-                       "from": "service-instance",
-                       "to": "configuration",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "service-instance",
-                       "to": "connector",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "service-instance",
-                       "to": "ctag-assignment",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "service-instance",
-                       "to": "cvlan-tag",
-                       "label": "org.onap.relationships.inventory.ComposedOf",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "service-instance",
-                       "to": "instance-group",
-                       "label": "org.onap.relationships.inventory.MemberOf",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "service-instance",
-                       "to": "logical-link",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "service-instance",
-                       "to": "pnf",
-                       "label": "org.onap.relationships.inventory.ComposedOf",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "service-instance",
-                       "to": "service-instance",
-                       "label": "org.onap.relationships.inventory.ComposedOf",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "service-instance",
-                       "to": "vlan",
-                       "label": "org.onap.relationships.inventory.ComposedOf",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "service-instance",
-                       "to": "zone",
-                       "label": "org.onap.relationships.inventory.LocatedIn",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "service-instance",
-                       "to": "service-subscription",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description":"service-instance BelongsTo service-subscription"
-               },
-               {
-                       "from": "class-of-service",
-                       "to": "site-pair",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "routing-instance",
-                       "to": "site-pair-set",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "sriov-vf",
-                       "to": "sriov-pf",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "host-route",
-                       "to": "subnet",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "service-subscription",
-                       "to": "tenant",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "tenant",
-                       "to": "l3-network",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "vserver",
-                       "to": "tenant",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "entitlement",
-                       "to": "vce",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "license",
-                       "to": "vce",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "port-group",
-                       "to": "vce",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "service-instance",
-                       "to": "vce",
-                       "label": "org.onap.relationships.inventory.ComposedOf",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "vce",
-                       "to": "availability-zone",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "vce",
-                       "to": "complex",
-                       "label": "org.onap.relationships.inventory.LocatedIn",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "vce",
-                       "to": "vserver",
-                       "label": "tosca.relationships.HostedOn",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "vf-module",
-                       "to": "l3-network",
-                       "label": "org.onap.relationships.inventory.DependsOn",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "vf-module",
-                       "to": "vnfc",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "vf-module",
-                       "to": "volume-group",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "vip-ipv4-address-list",
-                       "to": "instance-group",
-                       "label": "org.onap.relationships.inventory.MemberOf",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "vip-ipv4-address-list",
-                       "to": "subnet",
-                       "label": "org.onap.relationships.inventory.MemberOf",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "vip-ipv6-address-list",
-                       "to": "instance-group",
-                       "label": "org.onap.relationships.inventory.MemberOf",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "vip-ipv6-address-list",
-                       "to": "subnet",
-                       "label": "org.onap.relationships.inventory.MemberOf",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "generic-vnf",
-                       "to": "virtual-data-center",
-                       "label": "org.onap.relationships.inventory.LocatedIn",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "logical-link",
-                       "to": "virtual-data-center",
-                       "label": "org.onap.relationships.inventory.LocatedIn",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "l3-interface-ipv4-address-list",
-                       "to": "vlan",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "l3-interface-ipv6-address-list",
-                       "to": "vlan",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "vlan",
-                       "to": "logical-link",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "vlan",
-                       "to": "multicast-configuration",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "l3-interface-ipv4-address-list",
-                       "to": "vnfc",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "l3-interface-ipv6-address-list",
-                       "to": "vnfc",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "vnfc",
-                       "to": "instance-group",
-                       "label": "org.onap.relationships.inventory.MemberOf",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "vnfc",
-                       "to": "vip-ipv4-address-list",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "vnfc",
-                       "to": "vip-ipv6-address-list",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "tenant",
-                       "to": "volume-group",
-                       "label": "org.onap.relationships.inventory.DependsOn",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "volume-group",
-                       "to": "complex",
-                       "label": "org.onap.relationships.inventory.LocatedIn",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "lag-interface",
-                       "to": "vpls-pe",
-                       "label": "tosca.relationships.network.BindsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "p-interface",
-                       "to": "vpls-pe",
-                       "label": "tosca.relationships.network.BindsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "vpls-pe",
-                       "to": "complex",
-                       "label": "org.onap.relationships.inventory.LocatedIn",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "vpls-pe",
-                       "to": "ctag-pool",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "route-target",
-                       "to": "vpn-binding",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "l-interface",
-                       "to": "vserver",
-                       "label": "tosca.relationships.network.BindsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "vf-module",
-                       "to": "vserver",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "vnfc",
-                       "to": "vserver",
-                       "label": "tosca.relationships.HostedOn",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "vserver",
-                       "to": "flavor",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "vserver",
-                       "to": "image",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "vserver",
-                       "to": "pserver",
-                       "label": "tosca.relationships.HostedOn",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "vserver",
-                       "to": "snapshot",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "vserver",
-                       "to": "volume",
-                       "label": "tosca.relationships.AttachesTo",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "${direction}",
-                       "delete-other-v": "${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "zone",
-                       "to": "complex",
-                       "label": "org.onap.relationships.inventory.LocatedIn",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "configuration",
-                       "to": "l-interface",
-                       "label": "org.onap.relationships.inventory.AppliesTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "configuration",
-                       "to": "pnf",
-                       "label": "org.onap.relationships.inventory.AppliesTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "forwarder",
-                       "to": "forwarding-path",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "forwarding-path",
-                       "to": "service-instance",
-                       "label": "org.onap.relationships.inventory.AppliesTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "forwarder",
-                       "to": "l-interface",
-                       "label": "org.onap.relationships.inventory.ForwardsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "forwarder",
-                       "to": "configuration",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "forwarding-path",
-                       "to": "configuration",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "forwarder",
-                       "to": "lag-interface",
-                       "label": "org.onap.relationships.inventory.ForwardsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "evc",
-                       "to": "configuration",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "forwarder-evc",
-                       "to": "configuration",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "forwarder",
-                       "to": "p-interface",
-                       "label": "org.onap.relationships.inventory.ForwardsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "generic-vnf",
-                       "to": "nos-server",
-                       "label": "tosca.relationships.HostedOn",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "nos-server",
-                       "to": "pserver",
-                       "label": "tosca.relationships.HostedOn",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "nos-server",
-                       "to": "tenant",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "configuration",
-                       "to": "configuration",
-                       "label": "tosca.relationships.network.BindsTo",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "configuration",
-                       "to": "vpn-binding",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "configuration",
-                       "to": "l3-network",
-                       "label": "org.onap.relationships.inventory.PartOf",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "vpn-binding",
-                       "to": "customer",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "service-instance",
-                       "to": "configuration",
-                       "label": "org.onap.relationships.inventory.ComposedOf",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "false",
-                       "description": ""
-               },
-               {
-                       "from": "forwarder",
-                       "to": "generic-vnf",
-                       "label": "org.onap.relationships.inventory.AppliesTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "Points to the generic-vnf(s) involved in this forwarding step."
-               },
-               {
-                       "from": "cloud-region",
-                       "to": "instance-group",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "instance-group",
-                       "to": "collection",
-                       "label": "org.onap.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "service-instance",
-                       "to": "collection",
-                       "label": "org.onap.relationships.inventory.ComposedOf",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "vlan-mapping",
-                       "to": "forwarder-evc",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-        },
-        {
-                       "from": "allotted-resource",
-                       "to": "model-ver",
-                       "label": "org.onap.relationships.inventory.IsA",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "private": "true"
-        },
-        {
-                       "from": "configuration",
-                       "to": "model-ver",
-                       "label": "org.onap.relationships.inventory.IsA",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "private": "true"
-               },
-               {
-                       "from": "connector",
-                       "to": "model-ver",
-                       "label": "org.onap.relationships.inventory.IsA",
-                       "direction": "OUT",
-            "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "private": "true"
-               },
-               {
-                       "from": "generic-vnf",
-                       "to": "model-ver",
-                       "label": "org.onap.relationships.inventory.IsA",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "private": "true"
-               },
-               {
-                       "from": "instance-group",
-                       "to": "model-ver",
-                       "label": "org.onap.relationships.inventory.IsA",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "private": "true"
-               },
-               {
-                       "from": "l3-network",
-                       "to": "model-ver",
-                       "label": "org.onap.relationships.inventory.IsA",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "private": "true"
-               },
-               {
-                       "from": "logical-link",
-                       "to": "model-ver",
-                       "label": "org.onap.relationships.inventory.IsA",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "private": "true"
-               },
-               {
-                       "from": "service-instance",
-                       "to": "model-ver",
-                       "label": "org.onap.relationships.inventory.IsA",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "private": "true"
-               },
-               {
-                       "from": "vf-module",
-                       "to": "model-ver",
-                       "label": "org.onap.relationships.inventory.IsA",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "private": "true"
-               },
-               {
-                       "from": "vnfc",
-                       "to": "model-ver",
-                       "label": "org.onap.relationships.inventory.IsA",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "private": "true"
-               },
-               {
-                       "from": "pnf",
-                       "to": "model-ver",
-                       "label": "org.onap.relationships.inventory.IsA",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "private": "true"
-               },
-               {
-                       "from": "collection",
-                       "to": "model-ver",
-                       "label": "org.onap.relationships.inventory.IsA",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "private": "true"
-               },
-               {
-                       "from": "configuration",
-                       "to": "vnfc",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "vnfc",
-                       "to": "cp",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "${direction}",
-                       "delete-other-v": "${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "cp is child of vnfc"
-               },
-               {
-                       "from": "l3-interface-ipv4-address-list",
-                       "to": "cp",
-                       "label": "org.onap.relationships.inventory.network.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "l3-interface-ipv6-address-list",
-                       "to": "cp",
-                       "label": "org.onap.relationships.inventory.network.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "vip-ipv4-address-list",
-                       "to": "cp",
-                       "label": "org.onap.relationships.inventory.network.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "vip-ipv6-address-list",
-                       "to": "cp",
-                       "label": "org.onap.relationships.inventory.network.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "vlan-tag",
-                       "to": "cloud-region",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "vlan-tag",
-                       "to": "cp",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "l-interface",
-                       "to": "cp",
-                       "label": "tosca.relationships.network.LinksTo",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "l3-network",
-                       "to": "cp",
-                       "label": "tosca.relationships.network.LinksTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "line-of-business",
-                       "to": "l3-network",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "platform",
-                       "to": "l3-network",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "generic-vnf",
-                       "to": "instance-group",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "false",
-                       "description": ""
-               },
-               {
-                       "from": "generic-vnf",
-                       "to": "instance-group",
-                       "label": "org.onap.relationships.inventory.Primary",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "false",
-                       "description": ""
-               },
-               {
-                       "from": "generic-vnf",
-                       "to": "instance-group",
-                       "label": "org.onap.relationships.inventory.Secondary",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "false",
-                       "description": ""
-               },
-               {
-                       "from": "instance-group",
-                       "to": "generic-vnf",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "false",
-                       "description": ""
-               },
-               {
-                       "from": "cloud-region",
-                       "to": "network-technology",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "vrf",
-                       "to": "pnf",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "A vrf belongs to a pnf."
-               },
-               {
-                       "from": "vrf",
-                       "to": "vpn-binding",
-                       "label": "org.onap.relationships.inventory.AppliesTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "A vrf uses a vpn-binding."
-               },
-               {
-                       "from": "vrf",
-                       "to": "l3-network",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "A vrf uses many l3-networks"
-               },
-               {
-                       "from": "vrf",
-                       "to": "l-interface",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "route-target",
-                       "to": "vrf",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "contact",
-                       "to": "generic-vnf",
-                       "label": "org.onap.relationships.inventory.supports",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "aggregate-route",
-                       "to": "l3-network",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "communication-service-profile",
-                       "to": "service-instance",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "service-profile",
-                       "to": "service-instance",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "slice-profile",
-                       "to": "service-instance",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "configuration",
-                       "to": "lag-interface",
-                       "label": "org.onap.relationships.inventory.AppliesTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "configuration",
-                       "to": "instance-group",
-                       "label": "org.onap.relationships.inventory.PartOf",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "owning-entity",
-                       "to": "tenant",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "line-of-business",
-                       "to": "tenant",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "vlan-tag",
-                       "to": "vlan-range",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "A vlan-tag belongs to a vlan-range."
-               },
-               {
-                       "from": "l3-network",
-                       "to": "vlan-tag",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "A l3-network Uses vlan-tag."
-               },
-               {
-                       "from": "l-interface",
-                       "to": "vlan-tag",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "true",
-                       "description": "An sub-interface that uses a vlan-tag."
-               },
-               {
-                       "from": "vlan-range",
-                       "to": "cloud-region",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "A vlan range belongs to a cloud-region."
-               },
-               {
-                       "from": "owning-entity",
-                       "to": "vlan-range",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "An owning-entity uses a vlan-range."
-               },
-               {
-                       "from": "line-of-business",
-                       "to": "vlan-range",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "A line-of uses a vlan-range"
-               },
-               {
-                       "from": "fqdn",
-                       "to": "l3-interface-ipv4-address-list",
-                       "label": "org.onap.relationships.inventory.network.AppliesTo",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "The fqdn that applies to a l3-interface-ipv4-address-list."
-               },
-               {
-                       "from": "fqdn",
-                       "to": "l3-interface-ipv6-address-list",
-                       "label": "org.onap.relationships.inventory.network.AppliesTo",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "The fqdn that applies to a l3-interface-ipv6-address-list."
-               },
-               {
-                       "from": "fqdn",
-                       "to": "vip-ipv4-address-list",
-                       "label": "org.onap.relationships.inventory.network.AppliesTo",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "The fqdn that applies to a vip-ipv4-address-list."
-               },
-               {
-                       "from": "fqdn",
-                       "to": "vip-ipv6-address-list",
-                       "label": "org.onap.relationships.inventory.network.AppliesTo",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "The fqdn that applies to a vip-ipv6-address-list."
-               },
-               {
-                       "from": "fqdn",
-                       "to": "generic-vnf",
-                       "label": "org.onap.relationships.inventory.network.AppliesTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "The fqdn that applies to a generic-vnf."
-               },
-               {
-                       "from": "fqdn",
-                       "to": "fqdn",
-                       "label": "org.onap.relationships.inventory.network.AppliesTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "The dns cname record that applies to an A-record (ipv4) and/or quad-A-record (ipv6)."
-               },
-               {
-                       "from": "activity-state",
-                       "to": "activity",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "An activity-state is tracks the state of an activity."
-               },
-               {
-                       "from": "activity",
-                       "to": "cloud-region",
-                       "label": "org.onap.relationships.inventory.AppliesTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "The activity applies to a cloud-region."
-               },
-               {
-                       "from": "activity",
-                       "to": "mapping",
-                       "label": "org.onap.relationships.inventory.AppliesTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "The reservation information associated with a NAT Pool mapping."
-               },
-               {
-                       "from": "activity",
-                       "to": "network-range",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "An activity is being performed on a network-range."
-               },
-               {
-                       "from": "activity",
-                       "to": "p-interface",
-                       "label": "org.onap.relationships.inventory.AppliesTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "The activity applies to a p-interface."
-               },
-               {
-                       "from": "activity",
-                       "to": "pnf",
-                       "label": "org.onap.relationships.inventory.AppliesTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "The activity applies to a pnf."
-               },
-               {
-                       "from": "activity",
-                       "to": "pserver",
-                       "label": "org.onap.relationships.inventory.AppliesTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "The activity applies to a pserver."
-               },
-               {
-                       "from": "address-family",
-                       "to": "bgp-group",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "Address Family belongs to a bgp-group"
-               },
-               {
-                       "from": "address-family",
-                       "to": "bgp-neighbor",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "Address Family belongs to a bgp-neighbor"
-               },
-               {
-                       "from": "aggregate-route",
-                       "to": "vrf",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "An aggregate-route BelongsTo a vrf."
-               },
-               {
-                       "from": "autonomous-system",
-                       "to": "zone",
-                       "label": "org.onap.relationships.inventory.LocatedIn",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "A local autonomous-system is located in a zone."
-               },
-               {
-                       "from": "bgp-group",
-                       "to": "autonomous-system",
-                       "label": "org.onap.relationships.inventory.Destination",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "false",
-                       "description": "To node-type is destination of bgp-group."
-               },
-               {
-                       "from": "bgp-group",
-                       "to": "autonomous-system",
-                       "label": "org.onap.relationships.inventory.Source",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "true",
-                       "description": "To node-type is source of bgp-group."
-               },
-               {
-                       "from": "bgp-group",
-                       "to": "l3-interface-ipv4-address-list",
-                       "label": "org.onap.relationships.inventory.Destination",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "false",
-                       "description": "To node-type is destination of bgp-group."
-               },
-               {
-                       "from": "bgp-group",
-                       "to": "l3-interface-ipv4-address-list",
-                       "label": "org.onap.relationships.inventory.Source",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "true",
-                       "description": "To node-type is source of bgp-group."
-               },
-               {
-                       "from": "bgp-group",
-                       "to": "l3-interface-ipv6-address-list",
-                       "label": "org.onap.relationships.inventory.Destination",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "false",
-                       "description": "To node-type is destination of bgp-group."
-               },
-               {
-                       "from": "bgp-group",
-                       "to": "l3-interface-ipv6-address-list",
-                       "label": "org.onap.relationships.inventory.Source",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "true",
-                       "description": "To node-type is source of bgp-group."
-               },
-               {
-                       "from": "bgp-group",
-                       "to": "pnf",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "A bgp-group belongs to a pnf."
-               },
-               {
-                       "from": "bgp-group",
-                       "to": "subnet",
-                       "label": "org.onap.relationships.inventory.Destination",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "false",
-                       "description": "To node-type is destination of bgp-group."
-               },
-               {
-                       "from": "bgp-group",
-                       "to": "subnet",
-                       "label": "org.onap.relationships.inventory.Source",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "true",
-                       "description": "To node-type is source of bgp-group."
-               },
-               {
-                       "from": "bgp-group",
-                       "to": "vip-ipv4-address-list",
-                       "label": "org.onap.relationships.inventory.Destination",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "false",
-                       "description": "To node-type is destination of bgp-group."
-               },
-               {
-                       "from": "bgp-group",
-                       "to": "vip-ipv4-address-list",
-                       "label": "org.onap.relationships.inventory.Source",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "true",
-                       "description": "To node-type is source of bgp-group."
-               },
-               {
-                       "from": "bgp-group",
-                       "to": "vip-ipv6-address-list",
-                       "label": "org.onap.relationships.inventory.Destination",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "false",
-                       "description": "To node-type is destination of bgp-group."
-               },
-               {
-                       "from": "bgp-group",
-                       "to": "vip-ipv6-address-list",
-                       "label": "org.onap.relationships.inventory.Source",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "true",
-                       "description": "To node-type is source of bgp-group."
-               },
-               {
-                       "from": "bgp-group",
-                       "to": "vrf",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "A bgp-group belongs to a pnf."
-               },
-               {
-                       "from": "bgp-neighbor",
-                       "to": "autonomous-system",
-                       "label": "org.onap.relationships.inventory.network.MemberOf",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "true",
-                       "description": "bgp-neighbor is a member of an autonomous-system."
-               },
-               {
-                       "from": "bgp-neighbor",
-                       "to": "bgp-group",
-                       "label": "org.onap.relationships.inventory.network.MemberOf",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "true",
-                       "description": "bgp-neighbor is a member of an bgp-group."
-               },
-               {
-                       "from": "bgp-neighbor",
-                       "to": "l3-interface-ipv4-address-list",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "true",
-                       "description": "bgp-neighbor uses To node-type."
-               },
-               {
-                       "from": "bgp-neighbor",
-                       "to": "l3-interface-ipv6-address-list",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "true",
-                       "description": "bgp-neighbor uses To node-type."
-               },
-               {
-                       "from": "bgp-neighbor",
-                       "to": "logical-link",
-                       "label": "tosca.relationships.network.LinksTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "A policy applies to a bgp-neighbor."
-               },
-               {
-                       "from": "bgp-neighbor",
-                       "to": "pnf",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "A bgp-neighbor belongs to a pnf."
-               },
-               {
-                       "from": "bgp-neighbor",
-                       "to": "subnet",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "bgp-neighbor belongs To a subnet."
-               },
-               {
-                       "from": "bgp-neighbor",
-                       "to": "vip-ipv4-address-list",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "true",
-                       "description": "bgp-neighbor uses To node-type."
-               },
-               {
-                       "from": "bgp-neighbor",
-                       "to": "vip-ipv6-address-list",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "true",
-                       "description": "bgp-neighbor uses To node-type."
-               },
-               {
-                       "from": "bgp-neighbor",
-                       "to": "vrf",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "A bgp-neighbor belongs to a vrf."
-               },
-               {
-                       "from": "cable",
-                       "to": "complex",
-                       "label": "org.onap.relationships.inventory.LocatedIn",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "A cable is located in a complex."
-               },
-               {
-                       "from": "cable",
-                       "to": "hardware-catalog-item",
-                       "label": "org.onap.relationships.inventory.IsA",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "true",
-                       "description": "The cable is this item from the hardware-catalog."
-               },
-               {
-                       "from": "cable",
-                       "to": "physical-link",
-                       "label": "org.onap.relationships.inventory.ComposedOf",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "A cable is composed of one or more physical-links."
-               },
-               {
-                       "from": "card-slot",
-                       "to": "chassis",
-                       "label": "org.onap.relationships.inventory.LocatedIn",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "A card-slot is located in a chassis."
-               },
-               {
-                       "from": "card",
-                       "to": "card-slot",
-                       "label": "org.onap.relationships.inventory.LocatedIn",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "A card is located in a card-slot."
-               },
-               {
-                       "from": "card",
-                       "to": "hardware-catalog-item",
-                       "label": "org.onap.relationships.inventory.IsA",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "true",
-                       "description": "The card is described by the hardware-catalog-item."
-               },
-               {
-                       "from": "chassis",
-                       "to": "complex",
-                       "label": "org.onap.relationships.inventory.LocatedIn",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "A chassis LinksTo a complex."
-               },
-               {
-                       "from": "chassis",
-                       "to": "hardware-catalog-item",
-                       "label": "org.onap.relationships.inventory.IsA",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "true",
-                       "description": "The chassis is described by the hardware-catalog-item."
-               },
-               {
-                       "from": "chassis",
-                       "to": "pnf",
-                       "label": "org.onap.relationships.inventory.PartOf",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "A chassis is part of a pnf."
-               },
-               {
-                       "from": "chassis",
-                       "to": "pserver",
-                       "label": "org.onap.relationships.inventory.PartOf",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "A chassis is part of a pserver."
-               },
-               {
-                       "from": "chassis",
-                       "to": "rack",
-                       "label": "org.onap.relationships.inventory.LocatedIn",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "true",
-                       "description": "A chassis is LocatedIn a rack."
-               },
-               {
-                       "from": "chassis",
-                       "to": "rack-unit",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "true",
-                       "description": "A chassis uses space in a rack (aka one or more rack-units)."
-               },
-               {
-                       "from": "cloud-region",
-                       "to": "geo-region",
-                       "label": "org.onap.relationships.inventory.MemberOf",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "The cloud-region associated to a geo-region"
-               },
-               {
-                       "from": "cloud-region",
-                       "to": "policy",
-                       "label": "org.onap.relationships.inventory.Implements",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "a cloud-region implements policies"
-               },
-               {
-                       "from": "cloud-region",
-                       "to": "project",
-                       "label": "org.onap.relationships.inventory.PartOf",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "The cloud-region is part of a project (ex, project that built out the cloud region)."
-               },
-               {
-                       "from": "cloud-region",
-                       "to": "service-instance",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "complex",
-                       "to": "geo-region",
-                       "label": "org.onap.relationships.inventory.MemberOf",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "The complex associated to a geo-region"
-               },
-               {
-                       "from": "configuration",
-                       "to": "bgp-neighbor",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "The configuration Uses bgp-neighbor."
-               },
-               {
-                       "from": "configuration",
-                       "to": "logical-link",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "configuration",
-                       "to": "network-route",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "${direction}",
-                       "default": "true",
-                       "description": "Relates configuration to network-route for static routes."
-               },
-               {
-                       "from": "configuration",
-                       "to": "policy",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "A configuration uses a policy"
-               },
-               {
-                       "from": "configuration",
-                       "to": "subnet",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "A configuration uses a subnet"
-               },
-               {
-                       "from": "configuration",
-                       "to": "vrf",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "A Configuration uses VRFs"
-               },
-               {
-                       "from": "contact",
-                       "to": "cloud-region",
-                       "label": "org.onap.relationships.inventory.Supports",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "${direction}",
-                       "default": "true",
-                       "description": "The contact supports a cloud-region."
-               },
-               {
-                       "from": "contact",
-                       "to": "complex",
-                       "label": "org.onap.relationships.inventory.Supports",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "${direction}",
-                       "default": "true",
-                       "description": "The contact supports a complex."
-               },
-               {
-                       "from": "contact",
-                       "to": "pnf",
-                       "label": "org.onap.relationships.inventory.Supports",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "${direction}",
-                       "default": "true",
-                       "description": "The contact supports a pnf."
-               },
-               {
-                       "from": "contact",
-                       "to": "pserver",
-                       "label": "org.onap.relationships.inventory.Supports",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "${direction}",
-                       "default": "true",
-                       "description": "The contact supports a pserver."
-               },
-               {
-                       "from": "contact",
-                       "to": "zone",
-                       "label": "org.onap.relationships.inventory.Supports",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "${direction}",
-                       "default": "true",
-                       "description": "The contact supports a zone."
-               },
-               {
-                       "from": "generic-vnf",
-                       "to": "bgp-group",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "${direction}",
-                       "delete-other-v": "${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "The bgp-group associated to a generic-vnf."
-               },
-               {
-                       "from": "generic-vnf",
-                       "to": "bgp-neighbor",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "${direction}",
-                       "delete-other-v": "${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "The bgp-neighbor associated to a generic-vnf."
-               },
-               {
-                       "from": "host-aggregate",
-                       "to": "cloud-region",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "host-aggregate",
-                       "to": "pserver",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "hw-component",
-                       "to": "profile",
-                       "label": "org.onap.relationships.inventory.AppliesTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "The profile associated to a hw-component"
-               },
-               {
-                       "from": "instance-group",
-                       "to": "instance-group",
-                       "label": "org.onap.relationships.inventory.AppliesTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "The instance-group associated to an instance-group"
-               },
-               {
-                       "from": "ip-address-list",
-                       "to": "endpoint",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "ip-address-list",
-                       "to": "l3-interface-ipv4-address-list",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "true",
-                       "description": "This edge relates an object-group's ip-address-list through reference from DLP data to an ip-address from FCT in the l3-interface-ipv4-address-list of an R-Leaf's l-interface that is for VLAN 2"
-               },
-               {
-                       "from": "ip-address-list",
-                       "to": "l3-interface-ipv6-address-list",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "true",
-                       "description": "This edge relates an object-group's ip-address-list through reference from DLP data to an ip-address from FCT in the l3-interface-ipv6-address-list of an R-Leaf's l-interface that is for VLAN 2"
-               },
-               {
-                       "from": "ip-address-list",
-                       "to": "policy",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "An ip-address-list BelongsTo a policy."
-               },
-               {
-                       "from": "ip-address-list",
-                       "to": "port-list",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "ip-address-list",
-                       "to": "rule",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "ip-address-list",
-                       "to": "subnet",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "ip-address-list",
-                       "to": "vip-ipv4-address-list",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "true",
-                       "description": "This edge relates an object-group's ip-address-list through reference from DLP data to an ip-address from FCT in the vip-ipv4-address-list of an R-Leaf's l-interface that is for VLAN 2"
-               },
-               {
-                       "from": "ip-address-list",
-                       "to": "vip-ipv6-address-list",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "true",
-                       "description": "This edge relates an object-group's ip-address-list through reference from DLP data to an ip-address from FCT in the vip-ipv6-address-list of an R-Leaf's l-interface that is for VLAN 2"
-               },
-               {
-                       "from": "l3-interface-ipv4-address-list",
-                       "to": "lag-interface",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "A IPv4 address associated with a lag-interface."
-               },
-               {
-                       "from": "l3-interface-ipv4-address-list",
-                       "to": "p-interface",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "A IPv4 address associated with a p-interface."
-               },
-               {
-                       "from": "l3-interface-ipv6-address-list",
-                       "to": "lag-interface",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "A IPv6 address associated with a lag-interface."
-               },
-               {
-                       "from": "l3-interface-ipv6-address-list",
-                       "to": "p-interface",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "A IPv6 address associated with a p-interface."
-               },
-               {
-                       "from": "l3-network",
-                       "to": "l3-network",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "l3-network uses l3-network"
-               },
-               {
-                       "from": "l3-network",
-                       "to": "network-route",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "${direction}",
-                       "default": "true",
-                       "description": "Relates l3-network to network-route for static routes."
-               },
-               {
-                       "from": "lag-interface",
-                       "to": "geo-region",
-                       "label": "org.onap.relationships.inventory.MemberOf",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "The lag-interface associated to a geo-region"
-               },
-               {
-                       "from": "lag-interface",
-                       "to": "l-interface",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "false",
-                       "description": ""
-               },
-               {
-                       "from": "license",
-                       "to": "chassis",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "A license belongs to a chassis."
-               },
-               {
-                       "from": "l-interface",
-                       "to": "next-hop",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "The l-interface that is used by the next-hop."
-               },
-               {
-                       "from": "l-interface",
-                       "to": "pnf",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "A logical interface associated with a pnf."
-               },
-               {
-                       "from": "l-interface",
-                       "to": "pserver",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "A logical interface associated with a pserver."
-               },
-               {
-                       "from": "logical-link",
-                       "to": "port",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "The port associated with a logical-link"
-               },
-               {
-                       "from": "mapping",
-                       "to": "cloud-region",
-                       "label": "org.onap.relationships.inventory.LocatedIn",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "The mapping associated to a cloud-region"
-               },
-               {
-                       "from": "mapping",
-                       "to": "instance-group",
-                       "label": "org.onap.relationships.inventory.Current",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "false",
-                       "description": ""
-               },
-               {
-                       "from": "mapping",
-                       "to": "instance-group",
-                       "label": "org.onap.relationships.inventory.MemberOf",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "The mapping associated to an instance-group"
-               },
-               {
-                       "from": "mapping",
-                       "to": "instance-group",
-                       "label": "org.onap.relationships.inventory.Target",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "false",
-                       "description": ""
-               },
-               {
-                       "from": "mapping",
-                       "to": "mapping",
-                       "label": "org.onap.relationships.inventory.AppliesTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "false",
-                       "description": "The mapping associated to a mapping"
-               },
-               {
-                       "from": "mapping",
-                       "to": "mapping",
-                       "label": "org.onap.relationships.inventory.MemberOf",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "The mapping associated to a mapping"
-               },
-               {
-                       "from": "mapping",
-                       "to": "pnf",
-                       "label": "org.onap.relationships.inventory.MemberOf",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "The mapping associated to a pnf"
-               },
-               {
-                       "from": "mapping",
-                       "to": "policy",
-                       "label": "org.onap.relationships.inventory.MemberOf",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "The mapping associated to a policy"
-               },
-               {
-                       "from": "metadatum",
-                       "to": "profile",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "",
-                       "relationship-properties": ["data-owner","data-source","data-source-version"]
-               },
-               {
-                       "from": "network-range",
-                       "to": "cloud-region",
-                       "label": "org.onap.relationships.inventory.LocatedIn",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "The network-range is located in a cloud-region"
-               },
-               {
-                       "from": "network-range",
-                       "to": "complex",
-                       "label": "org.onap.relationships.inventory.LocatedIn",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "The network-range is located in a complex"
-               },
-               {
-                       "from": "network-range",
-                       "to": "zone",
-                       "label": "org.onap.relationships.inventory.LocatedIn",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "The network-range is located in a zone"
-               },
-               {
-                       "from": "network-route",
-                       "to": "next-hop",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "The network-route that is used by the next-hop."
-               },
-               {
-                       "from": "network-route",
-                       "to": "subnet",
-                       "label": "org.onap.relationships.inventory.MemberOf",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "The route is part of part of a subnet."
-               },
-               {
-                       "from": "next-hop",
-                       "to": "bfd",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "pdu",
-                       "to": "hardware-catalog-item",
-                       "label": "org.onap.relationships.inventory.IsA",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "true",
-                       "description": "The pdu is described by the hardware-catalog-item."
-               },
-               {
-                       "from": "pdu",
-                       "to": "rack",
-                       "label": "org.onap.relationships.inventory.LocatedIn",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "A pdu is located in a building (aka complex)."
-               },
-               {
-                       "from": "pdu",
-                       "to": "rack-unit",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "true",
-                       "description": "A pdu uses space in a rack (aka one or more rack-units)."
-               },
-               {
-                       "from": "pluggable-slot",
-                       "to": "card",
-                       "label": "org.onap.relationships.inventory.LocatedIn",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "A pluggable slot is located in a card."
-               },
-               {
-                       "from": "pluggable-slot",
-                       "to": "chassis",
-                       "label": "org.onap.relationships.inventory.LocatedIn",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "A pluggable-slot is located in a chassis."
-               },
-               {
-                       "from": "pluggable",
-                       "to": "cable",
-                       "label": "org.onap.relationships.inventory.PartOf",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "A pluggable that is intergrated with a cable."
-               },
-               {
-                       "from": "pluggable",
-                       "to": "hardware-catalog-item",
-                       "label": "org.onap.relationships.inventory.IsA",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "true",
-                       "description": "The pluggable is described by the hardware-catalog-item."
-               },
-               {
-                       "from": "pluggable",
-                       "to": "pluggable-slot",
-                       "label": "org.onap.relationships.inventory.LocatedIn",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "A pluggable is located in a pluggable-slot."
-               },
-               {
-                       "from": "pnf",
-                       "to": "autonomous-system",
-                       "label": "org.onap.relationships.inventory.LocatedIn",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "true",
-                       "description": "pnf is located in the autonomous-system."
-               },
-               {
-                       "from": "pnf",
-                       "to": "cloud-region",
-                       "label": "org.onap.relationships.inventory.LocatedIn",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "A pnf is located in (aka supports) a cloud-region."
-               },
-               {
-                       "from": "pnf",
-                       "to": "cloud-region",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "false",
-                       "description": "used for CSP pnf to cloud-region."
-               },
-               {
-                       "from": "pnf",
-                       "to": "hw-component",
-                       "label": "org.onap.relationships.inventory.MemberOf",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "The hw-component associated to a pnf"
-               },
-               {
-                       "from": "pnf",
-                       "to": "policy",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "A pnf uses policies",
-                       "relationship-properties": ["data-owner","data-source","data-source-version"]
-               },
-               {
-                       "from": "pnf",
-                       "to": "project",
-                       "label": "org.onap.relationships.inventory.PartOf",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "The pnf is part of a project (ex, VPMO that ordered the equipment)."
-               },
-               {
-                       "from": "pnf",
-                       "to": "sw-component",
-                       "label": "org.onap.relationships.inventory.MemberOf",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "The sw-component associated to a pnf"
-               },
-               {
-                       "from": "policy",
-                       "to": "address-family",
-                       "label": "org.onap.relationships.inventory.AppliesTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "${direction}",
-                       "default": "true",
-                       "description": "A policy applies to an address family.",
-                       "relationship-properties": ["data-owner","data-source","data-source-version"]
-               },
-               {
-                       "from": "policy",
-                       "to": "bgp-group",
-                       "label": "org.onap.relationships.inventory.AppliesTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "${direction}",
-                       "default": "true",
-                       "description": "A policy applies to a bgp-group."
-               },
-               {
-                       "from": "policy",
-                       "to": "bgp-neighbor",
-                       "label": "org.onap.relationships.inventory.AppliesTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "${direction}",
-                       "default": "true",
-                       "description": "A policy applies to a bgp-neighbor."
-               },
-               {
-                       "from": "policy",
-                       "to": "instance-group",
-                       "label": "org.onap.relationships.inventory.AppliesTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "The policy associated to an instance-group",
-                       "relationship-properties": ["data-owner","data-source","data-source-version"]
-               },
-               {
-                       "from": "policy",
-                       "to": "l3-network",
-                       "label": "org.onap.relationships.inventory.AppliesTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "A policy applies to l3-networks."
-               },
-               {
-                       "from": "policy",
-                       "to": "l-interface",
-                       "label": "org.onap.relationships.inventory.AppliesTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "The policy applies to an l-interface.",
-                       "relationship-properties": ["data-owner","data-source","data-source-version"]
-               },
-               {
-                       "from": "policy",
-                       "to": "rule",
-                       "label": "org.onap.relationships.inventory.Implements",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "${direction}",
-                       "delete-other-v": "${direction}",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "policy",
-                       "to": "vlan-tag",
-                       "label": "org.onap.relationships.inventory.AppliesTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "${direction}",
-                       "default": "true",
-                       "description": "This edge allows for QOS policy to vlan-tag relationship. For a given policy get all vlan tags as well as for a given vlan-tag get all the policies.",
-                       "relationship-properties": ["data-owner","data-source","data-source-version"]
-               },
-               {
-                       "from": "policy",
-                       "to": "vpn-binding",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "A policy uses vpn-bindings"
-               },
-               {
-                       "from": "policy",
-                       "to": "vrf",
-                       "label": "org.onap.relationships.inventory.AppliesTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "",
-                       "relationship-properties": ["data-owner","data-source","data-source-version"]
-               },
-               {
-                       "from": "port-list",
-                       "to": "rule",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "port",
-                       "to": "cable",
-                       "label": "tosca.relationships.network.LinksTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "${direction}",
-                       "default": "true",
-                       "description": "A channel-interface terminates a channel-link."
-               },
-               {
-                       "from": "port",
-                       "to": "card",
-                       "label": "org.onap.relationships.inventory.LocatedIn",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "A port is located in a card."
-               },
-               {
-                       "from": "port",
-                       "to": "chassis",
-                       "label": "org.onap.relationships.inventory.LocatedIn",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "A port is LocatedIn a chassis."
-               },
-               {
-                       "from": "port",
-                       "to": "p-interface",
-                       "label": "org.onap.relationships.inventory.ComposedOf",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "${direction}",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "A port is composed of one or more p-interfaces."
-               },
-               {
-                       "from": "port",
-                       "to": "pluggable",
-                       "label": "org.onap.relationships.inventory.LocatedIn",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "A port is located in a pluggable."
-               },
-               {
-                       "from": "port",
-                       "to": "port",
-                       "label": "org.onap.relationships.inventory.LinksTo",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "A port LinksTo another port."
-               },
-               {
-                       "from": "profile",
-                       "to": "card",
-                       "label": "org.onap.relationships.inventory.AppliesTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "${direction}",
-                       "default": "true",
-                       "description": "The profile (set of characteristics) applies to the card."
-               },
-               {
-                       "from": "profile",
-                       "to": "chassis",
-                       "label": "org.onap.relationships.inventory.AppliesTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "None",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "${direction}",
-                       "default": "true",
-                       "description": "The profile (set of characteristics) applies to the chassis."
-               },
-               {
-                       "from": "profile",
-                       "to": "cloud-region",
-                       "label": "org.onap.relationships.inventory.AppliesTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "profile",
-                       "to": "hardware-catalog-item",
-                       "label": "org.onap.relationships.inventory.AppliesTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "${direction}",
-                       "default": "true",
-                       "description": "A set of characteristics of the hardware-catalog-item."
-               },
-               {
-                       "from": "profile",
-                       "to": "instance-group",
-                       "label": "org.onap.relationships.inventory.AppliesTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "${direction}",
-                       "default": "true",
-                       "description": "A profile (set of characteristics) applies to the instance-group (as a vrrp group)."
-               },
-               {
-                       "from": "profile",
-                       "to": "l3-network",
-                       "label": "org.onap.relationships.inventory.AppliesTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "${direction}",
-                       "default": "true",
-                       "description": "A profile (set of characteristics) applies to the l3-network."
-               },
-               {
-                       "from": "profile",
-                       "to": "lag-interface",
-                       "label": "org.onap.relationships.inventory.AppliesTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "${direction}",
-                       "default": "true",
-                       "description": "A profile (set of characteristics) applies to the lag-interface.",
-                       "relationship-properties": ["data-owner","data-source","data-source-version"]
-               },
-               {
-                       "from": "profile",
-                       "to": "l-interface",
-                       "label": "org.onap.relationships.inventory.AppliesTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "${direction}",
-                       "default": "true",
-                       "description": "A profile (set of characteristics) applies to the l-interface.",
-                       "relationship-properties": ["data-owner","data-source","data-source-version"]
-               },
-               {
-                       "from": "profile",
-                       "to": "logical-link",
-                       "label": "org.onap.relationships.inventory.AppliesTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "${direction}",
-                       "default": "true",
-                       "description": "A profile (set of characteristics) applies to the logical-link."
-               },
-               {
-                       "from": "profile",
-                       "to": "pdu",
-                       "label": "org.onap.relationships.inventory.AppliesTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "None",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "${direction}",
-                       "default": "true",
-                       "description": "The profile (set of characteristics) applies to the pdu."
-               },
-               {
-                       "from": "profile",
-                       "to": "physical-link",
-                       "label": "org.onap.relationships.inventory.AppliesTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "${direction}",
-                       "default": "true",
-                       "description": "A profile (set of characteristics) applies to the physical-link."
-               },
-               {
-                       "from": "profile",
-                       "to": "p-interface",
-                       "label": "org.onap.relationships.inventory.AppliesTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "${direction}",
-                       "default": "true",
-                       "description": "A profile (set of characteristics) applies to the p-interface.",
-                       "relationship-properties": ["data-owner","data-source","data-source-version"]
-               },
-               {
-                       "from": "profile",
-                       "to": "pluggable",
-                       "label": "org.onap.relationships.inventory.AppliesTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "${direction}",
-                       "default": "true",
-                       "description": "The profile (set of characteristics) applies to the pluggable."
-               },
-               {
-                       "from": "profile",
-                       "to": "pnf",
-                       "label": "org.onap.relationships.inventory.AppliesTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "${direction}",
-                       "default": "true",
-                       "description": "A profile (set of characteristics) applies to the pnf.",
-                       "relationship-properties": ["data-owner","data-source","data-source-version"]
-               },
-               {
-                       "from": "profile",
-                       "to": "policy",
-                       "label": "org.onap.relationships.inventory.AppliesTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "${direction}",
-                       "default": "true",
-                       "description": "A profile (set of characteristics) applies to the policy.",
-                       "relationship-properties": ["data-owner","data-source","data-source-version"]
-               },
-               {
-                       "from": "profile",
-                       "to": "pserver",
-                       "label": "org.onap.relationships.inventory.AppliesTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "${direction}",
-                       "default": "true",
-                       "description": "A profile (set of characteristics) applies to the pserver."
-               },
-               {
-                       "from": "profile",
-                       "to": "rack",
-                       "label": "org.onap.relationships.inventory.AppliesTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "${direction}",
-                       "default": "true",
-                       "description": "The profile (set of characteristics) applies to the rack."
-               },
-               {
-                       "from": "profile",
-                       "to": "subnet",
-                       "label": "org.onap.relationships.inventory.AppliesTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "${direction}",
-                       "default": "true",
-                       "description": "A profile (set of characteristics) applies to the subnet."
-               },
-               {
-                       "from": "profile",
-                       "to": "vlan-range",
-                       "label": "org.onap.relationships.inventory.AppliesTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "${direction}",
-                       "default": "true",
-                       "description": "A profile (set of characteristics) applies to the vlan-range."
-               },
-               {
-                       "from": "profile",
-                       "to": "vlan-tag",
-                       "label": "org.onap.relationships.inventory.AppliesTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "${direction}",
-                       "default": "true",
-                       "description": "A profile (set of characteristics) applies to the vlan-tag."
-               },
-               {
-                       "from": "profile",
-                       "to": "vpn-binding",
-                       "label": "org.onap.relationships.inventory.AppliesTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "${direction}",
-                       "default": "true",
-                       "description": "A profile (set of characteristics) applies to the vpn-binding."
-               },
-               {
-                       "from": "profile",
-                       "to": "vrf",
-                       "label": "org.onap.relationships.inventory.AppliesTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "${direction}",
-                       "default": "true",
-                       "description": "A profile (set of characteristics) applies to the vrf.",
-                       "relationship-properties": ["data-owner","data-source","data-source-version"]
-               },
-               {
-                       "from": "pserver",
-                       "to": "hw-component",
-                       "label": "org.onap.relationships.inventory.MemberOf",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "The hw-component associated to a pserver"
-               },
-               {
-                       "from": "pserver",
-                       "to": "policy",
-                       "label": "org.onap.relationships.inventory.Implements",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "pserver",
-                       "to": "project",
-                       "label": "org.onap.relationships.inventory.PartOf",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "The pserver is part of a project (ex, VPMO that ordered the equipment)."
-               },
-               {
-                       "from": "pserver",
-                       "to": "sw-component",
-                       "label": "org.onap.relationships.inventory.MemberOf",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "The sw-component associated to a pserver"
-               },
-               {
-                       "from": "rack",
-                       "to": "complex",
-                       "label": "org.onap.relationships.inventory.LocatedIn",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "A rack is located in a complex (aka building)."
-               },
-               {
-                       "from": "rack",
-                       "to": "hardware-catalog-item",
-                       "label": "org.onap.relationships.inventory.IsA",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "true",
-                       "description": "The rack is this item from the hardware-catalog."
-               },
-               {
-                       "from": "rack",
-                       "to": "instance-group",
-                       "label": "org.onap.relationships.inventory.MemberOf",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "true",
-                       "description": "The rack is a member of the instance-group (rack-group or pod)."
-               },
-               {
-                       "from": "rack-unit",
-                       "to": "rack",
-                       "label": "org.onap.relationships.inventory.LocatedIn",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "A rack-unit is located in a rack."
-               },
-               {
-                       "from": "relationship-component",
-                       "to": "relationship-rule",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "Defines the traversal needed to reach the node of relationship-rule"
-               },
-               {
-                       "from": "relationship-rule",
-                       "to": "policy",
-                       "label": "org.onap.relationships.inventory.AppliesTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "Details relationships policy requires."
-               },
-               {
-                       "from": "relationship-rule",
-                       "to": "profile",
-                       "label": "org.onap.relationships.inventory.AppliesTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "Details relationships profile requires."
-               },
-               {
-                       "from": "rule",
-                       "to": "next-hop",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "The rule that is used by the next-hop. For CG-NAT these are the ACL policies."
-               },
-               {
-                       "from": "selector-list",
-                       "to": "policy",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "selector-list",
-                       "to": "rule",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "service-instance",
-                       "to": "owning-entity",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "false",
-                       "description": "service-instance Uses an owning-entity"
-               },
-               {
-                       "from": "service-instance",
-                       "to": "vrf",
-                       "label": "org.onap.relationships.inventory.ComposedOf",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "${direction}",
-                       "default": "true",
-                       "description": "This edge relates a vrf that is configured on a pnf to the service-instances that the vrf supports."
-               },
-               {
-                       "from": "service-subscription",
-                       "to": "customer",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "service-subscription BelongsTo customer"
-               },
-               {
-                       "from": "subnet",
-                       "to": "zone",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "A fabric subnet belongs to a zone."
-               },
-               {
-                       "from": "sw-component",
-                       "to": "profile",
-                       "label": "org.onap.relationships.inventory.AppliesTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "The profile associated to a sw-component",
-                       "relationship-properties": ["data-owner","data-source","data-source-version"]
-               },
-               {
-                       "from": "validation-audit",
-                       "to": "cloud-region",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "The validation-audit associated to a cloud-region"
-               },
-               {
-                       "from": "validation-audit",
-                       "to": "line-of-business",
-                       "label": "org.onap.relationships.inventory.AppliesTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "The line-of-business associated to a validation-audit"
-               },
-               {
-                       "from": "vlan-characteristic",
-                       "to": "vlan-tag",
-                       "label": "org.onap.relationships.inventory.AppliesTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "vpn-binding",
-                       "to": "aggregate-route",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "A vpn-binding uses many aggregate routes"
-               },
-               {
-                       "from": "vrf",
-                       "to": "network-route",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "${direction}",
-                       "default": "true",
-                       "description": "Relates vrf to network-route for static routes."
-               },
-               {
-                       "from": "vrf",
-                       "to": "next-hop",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "The vrfs that are used by the next-hop."
-               },
-               {
-                       "from": "vserver",
-                       "to": "instance-group",
-                       "label": "org.onap.relationships.inventory.MemberOf",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "vserver",
-                       "to": "sw-component",
-                       "label": "org.onap.relationships.inventory.MemberOf",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "The sw-component associated to a vserver"
-               },
-               {
-                       "from": "zone",
-                       "to": "service-instance",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "false",
-                       "description": ""
-               },
-               {
-                       "from": "service-instance",
-                       "to": "network-route",
-                       "label": "org.onap.relationships.inventory.ComposedOf",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "selector-list",
-                       "to": "object-group",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
+        {
+            "from": "allotted-resource",
+            "to": "vlan",
+            "label": "org.onap.relationships.inventory.PartOf",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "allotted-resource",
+            "to": "vpn-binding",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "tunnel-xconnect",
+            "to": "allotted-resource",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "ONE2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "allotted-resource",
+            "to": "logical-link",
+            "label": "org.onap.relationships.inventory.ComposedOf",
+            "direction": "OUT",
+            "multiplicity": "ONE2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "availability-zone",
+            "to": "complex",
+            "label": "org.onap.relationships.inventory.LocatedIn",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "availability-zone",
+            "to": "service-capability",
+            "label": "org.onap.relationships.inventory.AppliesTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "availability-zone",
+            "to": "cloud-region",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "cloud-region",
+            "to": "complex",
+            "label": "org.onap.relationships.inventory.LocatedIn",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "cloud-region",
+            "to": "l3-network",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "cloud-region",
+            "to": "zone",
+            "label": "org.onap.relationships.inventory.LocatedIn",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "dvs-switch",
+            "to": "cloud-region",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "flavor",
+            "to": "cloud-region",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "group-assignment",
+            "to": "cloud-region",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "image",
+            "to": "cloud-region",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "oam-network",
+            "to": "cloud-region",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "snapshot",
+            "to": "cloud-region",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "tenant",
+            "to": "cloud-region",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "vip-ipv4-address-list",
+            "to": "cloud-region",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "vip-ipv6-address-list",
+            "to": "cloud-region",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "line-of-business",
+            "to": "cloud-region",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "volume-group",
+            "to": "cloud-region",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "complex",
+            "to": "l3-network",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "ctag-pool",
+            "to": "complex",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "configuration",
+            "to": "allotted-resource",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "metadatum",
+            "to": "configuration",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "connector",
+            "to": "virtual-data-center",
+            "label": "org.onap.relationships.inventory.LocatedIn",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "metadatum",
+            "to": "connector",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "element-choice-set",
+            "to": "constrained-element-set",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "ctag-pool",
+            "to": "availability-zone",
+            "label": "org.onap.relationships.inventory.AppliesTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "dvs-switch",
+            "to": "availability-zone",
+            "label": "org.onap.relationships.inventory.AppliesTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "model-element",
+            "to": "element-choice-set",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "entitlement",
+            "to": "generic-vnf",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "generic-vnf",
+            "to": "availability-zone",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "generic-vnf",
+            "to": "complex",
+            "label": "org.onap.relationships.inventory.LocatedIn",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "generic-vnf",
+            "to": "configuration",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "ONE2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "generic-vnf",
+            "to": "ctag-pool",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "generic-vnf",
+            "to": "instance-group",
+            "label": "org.onap.relationships.inventory.MemberOf",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "generic-vnf",
+            "to": "ipsec-configuration",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "generic-vnf",
+            "to": "l3-network",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "generic-vnf",
+            "to": "pnf",
+            "label": "tosca.relationships.HostedOn",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "generic-vnf",
+            "to": "pserver",
+            "label": "tosca.relationships.HostedOn",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "generic-vnf",
+            "to": "cloud-region",
+            "label": "org.onap.relationships.inventory.LocatedIn",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "generic-vnf",
+            "to": "tenant",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "vnfc",
+            "to": "generic-vnf",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "generic-vnf",
+            "to": "vnf-image",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "generic-vnf",
+            "to": "volume-group",
+            "label": "org.onap.relationships.inventory.DependsOn",
+            "direction": "OUT",
+            "multiplicity": "ONE2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "generic-vnf",
+            "to": "vserver",
+            "label": "tosca.relationships.HostedOn",
+            "direction": "OUT",
+            "multiplicity": "ONE2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "lag-interface",
+            "to": "generic-vnf",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "license",
+            "to": "generic-vnf",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "l-interface",
+            "to": "generic-vnf",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "network-profile",
+            "to": "generic-vnf",
+            "label": "org.onap.relationships.inventory.AppliesTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "service-instance",
+            "to": "generic-vnf",
+            "label": "org.onap.relationships.inventory.ComposedOf",
+            "direction": "OUT",
+            "multiplicity": "ONE2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "site-pair-set",
+            "to": "generic-vnf",
+            "label": "org.onap.relationships.inventory.AppliesTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "vf-module",
+            "to": "generic-vnf",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "vf-module",
+            "to": "tenant",
+            "label": "tosca.relationships.HostedOn",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "pserver",
+            "to": "group-assignment",
+            "label": "org.onap.relationships.inventory.MemberOf",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "${direction}",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "tenant",
+            "to": "group-assignment",
+            "label": "org.onap.relationships.inventory.MemberOf",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "metadatum",
+            "to": "image",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "instance-group",
+            "to": "model",
+            "label": "org.onap.relationships.inventory.Targets",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "vig-server",
+            "to": "ipsec-configuration",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "l3-interface-ipv4-address-list",
+            "to": "instance-group",
+            "label": "org.onap.relationships.inventory.network.MemberOf",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "l3-interface-ipv4-address-list",
+            "to": "l3-network",
+            "label": "org.onap.relationships.inventory.network.MemberOf",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "l3-interface-ipv4-address-list",
+            "to": "subnet",
+            "label": "org.onap.relationships.inventory.network.MemberOf",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "l3-interface-ipv6-address-list",
+            "to": "instance-group",
+            "label": "org.onap.relationships.inventory.network.MemberOf",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "l3-interface-ipv6-address-list",
+            "to": "l3-network",
+            "label": "org.onap.relationships.inventory.network.MemberOf",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "l3-interface-ipv6-address-list",
+            "to": "subnet",
+            "label": "org.onap.relationships.inventory.network.MemberOf",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "ctag-assignment",
+            "to": "l3-network",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "l3-network",
+            "to": "instance-group",
+            "label": "org.onap.relationships.inventory.MemberOf",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "l3-network",
+            "to": "network-policy",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "l3-network",
+            "to": "route-table-reference",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "l3-network",
+            "to": "vpn-binding",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "segmentation-assignment",
+            "to": "l3-network",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "service-instance",
+            "to": "l3-network",
+            "label": "org.onap.relationships.inventory.ComposedOf",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "service-instance",
+            "to": "p-interface",
+            "label": "org.onap.relationships.inventory.ComposedOf",
+            "direction": "OUT",
+            "multiplicity": "ONE2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "For MDONS Use case"
+        },
+        {
+            "from": "subnet",
+            "to": "l3-network",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "lag-interface",
+            "to": "lag-link",
+            "label": "tosca.relationships.network.LinksTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "lag-interface",
+            "to": "logical-link",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "lag-interface",
+            "to": "p-interface",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "l-interface",
+            "to": "lag-interface",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "line-of-business",
+            "to": "generic-vnf",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "hidden-on": "line-of-business",
+            "description": ""
+        },
+        {
+            "from": "l3-interface-ipv4-address-list",
+            "to": "l-interface",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "l3-interface-ipv6-address-list",
+            "to": "l-interface",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "l-interface",
+            "to": "instance-group",
+            "label": "org.onap.relationships.inventory.MemberOf",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "l-interface",
+            "to": "l-interface",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "l-interface",
+            "to": "logical-link",
+            "label": "tosca.relationships.network.LinksTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "logical-link",
+            "to": "l-interface",
+            "label": "org.onap.relationships.inventory.Source",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "false",
+            "description": ""
+        },
+        {
+            "from": "logical-link",
+            "to": "l-interface",
+            "label": "org.onap.relationships.inventory.Destination",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "false",
+            "description": ""
+        },
+        {
+            "from": "sriov-vf",
+            "to": "l-interface",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "ONE2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "vlan",
+            "to": "l-interface",
+            "label": "tosca.relationships.network.LinksTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "logical-link",
+            "to": "cloud-region",
+            "label": "org.onap.relationships.inventory.LocatedIn",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "logical-link",
+            "to": "generic-vnf",
+            "label": "org.onap.relationships.inventory.BridgedTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "logical-link",
+            "to": "lag-link",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "logical-link",
+            "to": "logical-link",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "logical-link",
+            "to": "pnf",
+            "label": "org.onap.relationships.inventory.BridgedTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "logical-link",
+            "to": "pserver",
+            "label": "org.onap.relationships.inventory.BridgedTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "logical-link",
+            "to": "vpn-binding",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "model-ver",
+            "to": "model",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "constrained-element-set",
+            "to": "model-constraint",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "constrained-element-set",
+            "to": "model-element",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "model-constraint",
+            "to": "model-element",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "model-element",
+            "to": "model-element",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "model-element",
+            "to": "model-ver",
+            "label": "org.onap.relationships.inventory.IsA",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "metadatum",
+            "to": "model-ver",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "model-element",
+            "to": "model-ver",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "named-query",
+            "to": "model",
+            "label": "org.onap.relationships.inventory.AppliesTo",
+            "direction": "OUT",
+            "multiplicity": "ONE2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "named-query-element",
+            "to": "named-query",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "ONE2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "named-query-element",
+            "to": "model",
+            "label": "org.onap.relationships.inventory.IsA",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "named-query-element",
+            "to": "named-query-element",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "property-constraint",
+            "to": "named-query-element",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "related-lookup",
+            "to": "named-query-element",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "l-interface",
+            "to": "newvce",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "oam-network",
+            "to": "complex",
+            "label": "org.onap.relationships.inventory.AppliesTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "oam-network",
+            "to": "service-capability",
+            "label": "org.onap.relationships.inventory.AppliesTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "operational-environment",
+            "to": "operational-environment",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "service-instance",
+            "to": "owning-entity",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "l-interface",
+            "to": "p-interface",
+            "label": "tosca.relationships.network.BindsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "p-interface",
+            "to": "logical-link",
+            "label": "tosca.relationships.network.LinksTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "p-interface",
+            "to": "physical-link",
+            "label": "tosca.relationships.network.LinksTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "sriov-pf",
+            "to": "p-interface",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "ONE2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "platform",
+            "to": "generic-vnf",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "hidden-on": "platform",
+            "description": ""
+        },
+        {
+            "from": "lag-interface",
+            "to": "pnf",
+            "label": "tosca.relationships.network.BindsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "p-interface",
+            "to": "pnf",
+            "label": "tosca.relationships.network.BindsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "pnf",
+            "to": "complex",
+            "label": "org.onap.relationships.inventory.LocatedIn",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "pnf",
+            "to": "instance-group",
+            "label": "org.onap.relationships.inventory.MemberOf",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "pnf",
+            "to": "instance-group",
+            "label": "org.onap.relationships.inventory.Primary",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "false",
+            "description": ""
+        },
+        {
+            "from": "pnf",
+            "to": "instance-group",
+            "label": "org.onap.relationships.inventory.Secondary",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "false",
+            "description": ""
+        },
+        {
+            "from": "pnf",
+            "to": "zone",
+            "label": "org.onap.relationships.inventory.LocatedIn",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "pnf",
+            "to": "owning-entity",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "profile",
+            "to": "pnf",
+            "label": "org.onap.relationships.inventory.supports",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "false",
+            "description": ""
+        },
+        {
+            "from": "profile",
+            "to": "pserver",
+            "label": "org.onap.relationships.inventory.supports",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "false",
+            "description": ""
+        },
+        {
+            "from": "profile",
+            "to": "vserver",
+            "label": "org.onap.relationships.inventory.supports",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "cvlan-tag",
+            "to": "port-group",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "project",
+            "to": "service-instance",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "ONE2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "hidden-on": "project",
+            "description": ""
+        },
+        {
+            "from": "lag-interface",
+            "to": "pserver",
+            "label": "tosca.relationships.network.BindsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "p-interface",
+            "to": "pserver",
+            "label": "tosca.relationships.network.BindsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "pserver",
+            "to": "availability-zone",
+            "label": "org.onap.relationships.inventory.MemberOf",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "pserver",
+            "to": "cloud-region",
+            "label": "org.onap.relationships.inventory.LocatedIn",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "pserver",
+            "to": "complex",
+            "label": "org.onap.relationships.inventory.LocatedIn",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "pserver",
+            "to": "zone",
+            "label": "org.onap.relationships.inventory.LocatedIn",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "site-pair",
+            "to": "routing-instance",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "allotted-resource",
+            "to": "service-instance",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "metadatum",
+            "to": "service-instance",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "service-instance",
+            "to": "allotted-resource",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
                },
-               {
-                       "from": "zone",
-                       "to": "endpoint",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
+        {
+            "from": "composed-resource",
+            "to": "service-instance",
+            "label": "org.onap.relationships.inventory.ComposedOf",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "service-instance",
+            "to": "composed-resource",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "ONE2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "service-instance",
+            "to": "instance-group",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "ONE2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "false",
+            "description": "MSO creates this edge on VNF Group Service creation"
+        },
+        {
+            "from": "service-instance",
+            "to": "configuration",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "ONE2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "service-instance",
+            "to": "connector",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "service-instance",
+            "to": "ctag-assignment",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "ONE2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "service-instance",
+            "to": "cvlan-tag",
+            "label": "org.onap.relationships.inventory.ComposedOf",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "service-instance",
+            "to": "instance-group",
+            "label": "org.onap.relationships.inventory.MemberOf",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "service-instance",
+            "to": "logical-link",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "service-instance",
+            "to": "pnf",
+            "label": "org.onap.relationships.inventory.ComposedOf",
+            "direction": "OUT",
+            "multiplicity": "ONE2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "service-instance",
+            "to": "service-instance",
+            "label": "org.onap.relationships.inventory.ComposedOf",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "service-instance",
+            "to": "vlan",
+            "label": "org.onap.relationships.inventory.ComposedOf",
+            "direction": "OUT",
+            "multiplicity": "ONE2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "service-instance",
+            "to": "zone",
+            "label": "org.onap.relationships.inventory.LocatedIn",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "service-instance",
+            "to": "service-subscription",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "service-instance BelongsTo service-subscription"
+        },
+        {
+            "from": "class-of-service",
+            "to": "site-pair",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "routing-instance",
+            "to": "site-pair-set",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "sriov-vf",
+            "to": "sriov-pf",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "host-route",
+            "to": "subnet",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "service-subscription",
+            "to": "tenant",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "tenant",
+            "to": "l3-network",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "vserver",
+            "to": "tenant",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "entitlement",
+            "to": "vce",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "license",
+            "to": "vce",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "port-group",
+            "to": "vce",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "service-instance",
+            "to": "vce",
+            "label": "org.onap.relationships.inventory.ComposedOf",
+            "direction": "OUT",
+            "multiplicity": "ONE2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "vce",
+            "to": "availability-zone",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "vce",
+            "to": "complex",
+            "label": "org.onap.relationships.inventory.LocatedIn",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "vce",
+            "to": "vserver",
+            "label": "tosca.relationships.HostedOn",
+            "direction": "OUT",
+            "multiplicity": "ONE2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "vf-module",
+            "to": "l3-network",
+            "label": "org.onap.relationships.inventory.DependsOn",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "vf-module",
+            "to": "vnfc",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "ONE2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "vf-module",
+            "to": "volume-group",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "ONE2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "vip-ipv4-address-list",
+            "to": "instance-group",
+            "label": "org.onap.relationships.inventory.MemberOf",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "vip-ipv4-address-list",
+            "to": "subnet",
+            "label": "org.onap.relationships.inventory.MemberOf",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "vip-ipv6-address-list",
+            "to": "instance-group",
+            "label": "org.onap.relationships.inventory.MemberOf",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "vip-ipv6-address-list",
+            "to": "subnet",
+            "label": "org.onap.relationships.inventory.MemberOf",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "generic-vnf",
+            "to": "virtual-data-center",
+            "label": "org.onap.relationships.inventory.LocatedIn",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "logical-link",
+            "to": "virtual-data-center",
+            "label": "org.onap.relationships.inventory.LocatedIn",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "l3-interface-ipv4-address-list",
+            "to": "vlan",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "l3-interface-ipv6-address-list",
+            "to": "vlan",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "vlan",
+            "to": "logical-link",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "vlan",
+            "to": "multicast-configuration",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "l3-interface-ipv4-address-list",
+            "to": "vnfc",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "l3-interface-ipv6-address-list",
+            "to": "vnfc",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "vnfc",
+            "to": "instance-group",
+            "label": "org.onap.relationships.inventory.MemberOf",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "vnfc",
+            "to": "vip-ipv4-address-list",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "vnfc",
+            "to": "vip-ipv6-address-list",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "tenant",
+            "to": "volume-group",
+            "label": "org.onap.relationships.inventory.DependsOn",
+            "direction": "OUT",
+            "multiplicity": "ONE2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "volume-group",
+            "to": "complex",
+            "label": "org.onap.relationships.inventory.LocatedIn",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "lag-interface",
+            "to": "vpls-pe",
+            "label": "tosca.relationships.network.BindsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "p-interface",
+            "to": "vpls-pe",
+            "label": "tosca.relationships.network.BindsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "vpls-pe",
+            "to": "complex",
+            "label": "org.onap.relationships.inventory.LocatedIn",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "vpls-pe",
+            "to": "ctag-pool",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "route-target",
+            "to": "vpn-binding",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "l-interface",
+            "to": "vserver",
+            "label": "tosca.relationships.network.BindsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "vf-module",
+            "to": "vserver",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "ONE2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "vnfc",
+            "to": "vserver",
+            "label": "tosca.relationships.HostedOn",
+            "direction": "OUT",
+            "multiplicity": "ONE2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "vserver",
+            "to": "flavor",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "vserver",
+            "to": "image",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "vserver",
+            "to": "pserver",
+            "label": "tosca.relationships.HostedOn",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "vserver",
+            "to": "snapshot",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "ONE2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "vserver",
+            "to": "volume",
+            "label": "tosca.relationships.AttachesTo",
+            "direction": "OUT",
+            "multiplicity": "ONE2MANY",
+            "contains-other-v": "${direction}",
+            "delete-other-v": "${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "zone",
+            "to": "complex",
+            "label": "org.onap.relationships.inventory.LocatedIn",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "configuration",
+            "to": "l-interface",
+            "label": "org.onap.relationships.inventory.AppliesTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "configuration",
+            "to": "pnf",
+            "label": "org.onap.relationships.inventory.AppliesTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "forwarder",
+            "to": "forwarding-path",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "forwarding-path",
+            "to": "service-instance",
+            "label": "org.onap.relationships.inventory.AppliesTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "forwarder",
+            "to": "l-interface",
+            "label": "org.onap.relationships.inventory.ForwardsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "forwarder",
+            "to": "configuration",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "ONE2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "forwarding-path",
+            "to": "configuration",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "ONE2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "forwarder",
+            "to": "lag-interface",
+            "label": "org.onap.relationships.inventory.ForwardsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "evc",
+            "to": "configuration",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "ONE2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "forwarder-evc",
+            "to": "configuration",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "ONE2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "forwarder",
+            "to": "p-interface",
+            "label": "org.onap.relationships.inventory.ForwardsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "generic-vnf",
+            "to": "nos-server",
+            "label": "tosca.relationships.HostedOn",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "nos-server",
+            "to": "pserver",
+            "label": "tosca.relationships.HostedOn",
+            "direction": "OUT",
+            "multiplicity": "ONE2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "nos-server",
+            "to": "tenant",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "configuration",
+            "to": "configuration",
+            "label": "tosca.relationships.network.BindsTo",
+            "direction": "OUT",
+            "multiplicity": "ONE2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "configuration",
+            "to": "vpn-binding",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "configuration",
+            "to": "l3-network",
+            "label": "org.onap.relationships.inventory.PartOf",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "vpn-binding",
+            "to": "customer",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "service-instance",
+            "to": "configuration",
+            "label": "org.onap.relationships.inventory.ComposedOf",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "false",
+            "description": ""
+        },
+        {
+            "from": "forwarder",
+            "to": "generic-vnf",
+            "label": "org.onap.relationships.inventory.AppliesTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "Points to the generic-vnf(s) involved in this forwarding step."
+        },
+        {
+            "from": "cloud-region",
+            "to": "instance-group",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "ONE2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "instance-group",
+            "to": "collection",
+            "label": "org.onap.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "ONE2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "service-instance",
+            "to": "collection",
+            "label": "org.onap.relationships.inventory.ComposedOf",
+            "direction": "OUT",
+            "multiplicity": "ONE2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "vlan-mapping",
+            "to": "forwarder-evc",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "allotted-resource",
+            "to": "model-ver",
+            "label": "org.onap.relationships.inventory.IsA",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "!${direction}",
+            "private": "true"
+        },
+        {
+            "from": "configuration",
+            "to": "model-ver",
+            "label": "org.onap.relationships.inventory.IsA",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "!${direction}",
+            "private": "true"
+        },
+        {
+            "from": "connector",
+            "to": "model-ver",
+            "label": "org.onap.relationships.inventory.IsA",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "!${direction}",
+            "private": "true"
+        },
+        {
+            "from": "generic-vnf",
+            "to": "model-ver",
+            "label": "org.onap.relationships.inventory.IsA",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "!${direction}",
+            "private": "true"
+        },
+        {
+            "from": "instance-group",
+            "to": "model-ver",
+            "label": "org.onap.relationships.inventory.IsA",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "!${direction}",
+            "private": "true"
+        },
+        {
+            "from": "l3-network",
+            "to": "model-ver",
+            "label": "org.onap.relationships.inventory.IsA",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "!${direction}",
+            "private": "true"
+        },
+        {
+            "from": "logical-link",
+            "to": "model-ver",
+            "label": "org.onap.relationships.inventory.IsA",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "!${direction}",
+            "private": "true"
+        },
+        {
+            "from": "service-instance",
+            "to": "model-ver",
+            "label": "org.onap.relationships.inventory.IsA",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "!${direction}",
+            "private": "true"
+        },
+        {
+            "from": "vf-module",
+            "to": "model-ver",
+            "label": "org.onap.relationships.inventory.IsA",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "!${direction}",
+            "private": "true"
+        },
+        {
+            "from": "vnfc",
+            "to": "model-ver",
+            "label": "org.onap.relationships.inventory.IsA",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "!${direction}",
+            "private": "true"
+        },
+        {
+            "from": "pnf",
+            "to": "model-ver",
+            "label": "org.onap.relationships.inventory.IsA",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "!${direction}",
+            "private": "true"
+        },
+        {
+            "from": "collection",
+            "to": "model-ver",
+            "label": "org.onap.relationships.inventory.IsA",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "!${direction}",
+            "private": "true"
+        },
+        {
+            "from": "configuration",
+            "to": "vnfc",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "ONE2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "vnfc",
+            "to": "cp",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "ONE2MANY",
+            "contains-other-v": "${direction}",
+            "delete-other-v": "${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "cp is child of vnfc"
+        },
+        {
+            "from": "l3-interface-ipv4-address-list",
+            "to": "cp",
+            "label": "org.onap.relationships.inventory.network.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "l3-interface-ipv6-address-list",
+            "to": "cp",
+            "label": "org.onap.relationships.inventory.network.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "vip-ipv4-address-list",
+            "to": "cp",
+            "label": "org.onap.relationships.inventory.network.Uses",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "vip-ipv6-address-list",
+            "to": "cp",
+            "label": "org.onap.relationships.inventory.network.Uses",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "vlan-tag",
+            "to": "cloud-region",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "vlan-tag",
+            "to": "cp",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "l-interface",
+            "to": "cp",
+            "label": "tosca.relationships.network.LinksTo",
+            "direction": "OUT",
+            "multiplicity": "ONE2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "l3-network",
+            "to": "cp",
+            "label": "tosca.relationships.network.LinksTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "line-of-business",
+            "to": "l3-network",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "platform",
+            "to": "l3-network",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "generic-vnf",
+            "to": "instance-group",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "ONE2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "false",
+            "description": ""
+        },
+        {
+            "from": "generic-vnf",
+            "to": "instance-group",
+            "label": "org.onap.relationships.inventory.Primary",
+            "direction": "OUT",
+            "multiplicity": "ONE2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "false",
+            "description": ""
+        },
+        {
+            "from": "generic-vnf",
+            "to": "instance-group",
+            "label": "org.onap.relationships.inventory.Secondary",
+            "direction": "OUT",
+            "multiplicity": "ONE2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "false",
+            "description": ""
+        },
+        {
+            "from": "instance-group",
+            "to": "generic-vnf",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "false",
+            "description": ""
+        },
+        {
+            "from": "cloud-region",
+            "to": "network-technology",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "vrf",
+            "to": "pnf",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "A vrf belongs to a pnf."
+        },
+        {
+            "from": "vrf",
+            "to": "vpn-binding",
+            "label": "org.onap.relationships.inventory.AppliesTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "A vrf uses a vpn-binding."
+        },
+        {
+            "from": "vrf",
+            "to": "l3-network",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "ONE2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "A vrf uses many l3-networks"
+        },
+        {
+            "from": "vrf",
+            "to": "l-interface",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "ONE2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "route-target",
+            "to": "vrf",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "contact",
+            "to": "generic-vnf",
+            "label": "org.onap.relationships.inventory.supports",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "aggregate-route",
+            "to": "l3-network",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "communication-service-profile",
+            "to": "service-instance",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "ONE2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "service-profile",
+            "to": "service-instance",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "ONE2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "slice-profile",
+            "to": "service-instance",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "configuration",
+            "to": "lag-interface",
+            "label": "org.onap.relationships.inventory.AppliesTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "configuration",
+            "to": "instance-group",
+            "label": "org.onap.relationships.inventory.PartOf",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "owning-entity",
+            "to": "tenant",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "ONE2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "line-of-business",
+            "to": "tenant",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "vlan-tag",
+            "to": "vlan-range",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "A vlan-tag belongs to a vlan-range."
+        },
+        {
+            "from": "l3-network",
+            "to": "vlan-tag",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "A l3-network Uses vlan-tag."
+        },
+        {
+            "from": "l-interface",
+            "to": "vlan-tag",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description": "An sub-interface that uses a vlan-tag."
+        },
+        {
+            "from": "vlan-range",
+            "to": "cloud-region",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "A vlan range belongs to a cloud-region."
+        },
+        {
+            "from": "owning-entity",
+            "to": "vlan-range",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "ONE2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "An owning-entity uses a vlan-range."
+        },
+        {
+            "from": "line-of-business",
+            "to": "vlan-range",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "ONE2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "A line-of uses a vlan-range"
+        },
+        {
+            "from": "fqdn",
+            "to": "l3-interface-ipv4-address-list",
+            "label": "org.onap.relationships.inventory.network.AppliesTo",
+            "direction": "OUT",
+            "multiplicity": "ONE2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "The fqdn that applies to a l3-interface-ipv4-address-list."
+        },
+        {
+            "from": "fqdn",
+            "to": "l3-interface-ipv6-address-list",
+            "label": "org.onap.relationships.inventory.network.AppliesTo",
+            "direction": "OUT",
+            "multiplicity": "ONE2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "The fqdn that applies to a l3-interface-ipv6-address-list."
+        },
+        {
+            "from": "fqdn",
+            "to": "vip-ipv4-address-list",
+            "label": "org.onap.relationships.inventory.network.AppliesTo",
+            "direction": "OUT",
+            "multiplicity": "ONE2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "The fqdn that applies to a vip-ipv4-address-list."
+        },
+        {
+            "from": "fqdn",
+            "to": "vip-ipv6-address-list",
+            "label": "org.onap.relationships.inventory.network.AppliesTo",
+            "direction": "OUT",
+            "multiplicity": "ONE2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "The fqdn that applies to a vip-ipv6-address-list."
+        },
+        {
+            "from": "fqdn",
+            "to": "generic-vnf",
+            "label": "org.onap.relationships.inventory.network.AppliesTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "The fqdn that applies to a generic-vnf."
+        },
+        {
+            "from": "fqdn",
+            "to": "fqdn",
+            "label": "org.onap.relationships.inventory.network.AppliesTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "The dns cname record that applies to an A-record (ipv4) and/or quad-A-record (ipv6)."
+        },
+        {
+            "from": "activity-state",
+            "to": "activity",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "An activity-state is tracks the state of an activity."
+        },
+        {
+            "from": "activity",
+            "to": "cloud-region",
+            "label": "org.onap.relationships.inventory.AppliesTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "The activity applies to a cloud-region."
+        },
+        {
+            "from": "activity",
+            "to": "mapping",
+            "label": "org.onap.relationships.inventory.AppliesTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "The reservation information associated with a NAT Pool mapping."
+        },
+        {
+            "from": "activity",
+            "to": "network-range",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "An activity is being performed on a network-range."
+        },
+        {
+            "from": "activity",
+            "to": "p-interface",
+            "label": "org.onap.relationships.inventory.AppliesTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "The activity applies to a p-interface."
+        },
+        {
+            "from": "activity",
+            "to": "pnf",
+            "label": "org.onap.relationships.inventory.AppliesTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "The activity applies to a pnf."
+        },
+        {
+            "from": "activity",
+            "to": "pserver",
+            "label": "org.onap.relationships.inventory.AppliesTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "The activity applies to a pserver."
+        },
+        {
+            "from": "address-family",
+            "to": "bgp-group",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "Address Family belongs to a bgp-group"
+        },
+        {
+            "from": "address-family",
+            "to": "bgp-neighbor",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "Address Family belongs to a bgp-neighbor"
+        },
+        {
+            "from": "aggregate-route",
+            "to": "vrf",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "An aggregate-route BelongsTo a vrf."
+        },
+        {
+            "from": "autonomous-system",
+            "to": "zone",
+            "label": "org.onap.relationships.inventory.LocatedIn",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "!${direction}",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "A local autonomous-system is located in a zone."
+        },
+        {
+            "from": "bgp-group",
+            "to": "autonomous-system",
+            "label": "org.onap.relationships.inventory.Destination",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "false",
+            "description": "To node-type is destination of bgp-group."
+        },
+        {
+            "from": "bgp-group",
+            "to": "autonomous-system",
+            "label": "org.onap.relationships.inventory.Source",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description": "To node-type is source of bgp-group."
+        },
+        {
+            "from": "bgp-group",
+            "to": "l3-interface-ipv4-address-list",
+            "label": "org.onap.relationships.inventory.Destination",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "false",
+            "description": "To node-type is destination of bgp-group."
+        },
+        {
+            "from": "bgp-group",
+            "to": "l3-interface-ipv4-address-list",
+            "label": "org.onap.relationships.inventory.Source",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description": "To node-type is source of bgp-group."
+        },
+        {
+            "from": "bgp-group",
+            "to": "l3-interface-ipv6-address-list",
+            "label": "org.onap.relationships.inventory.Destination",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "false",
+            "description": "To node-type is destination of bgp-group."
+        },
+        {
+            "from": "bgp-group",
+            "to": "l3-interface-ipv6-address-list",
+            "label": "org.onap.relationships.inventory.Source",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description": "To node-type is source of bgp-group."
+        },
+        {
+            "from": "bgp-group",
+            "to": "pnf",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "A bgp-group belongs to a pnf."
+        },
+        {
+            "from": "bgp-group",
+            "to": "subnet",
+            "label": "org.onap.relationships.inventory.Destination",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "false",
+            "description": "To node-type is destination of bgp-group."
+        },
+        {
+            "from": "bgp-group",
+            "to": "subnet",
+            "label": "org.onap.relationships.inventory.Source",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description": "To node-type is source of bgp-group."
+        },
+        {
+            "from": "bgp-group",
+            "to": "vip-ipv4-address-list",
+            "label": "org.onap.relationships.inventory.Destination",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "false",
+            "description": "To node-type is destination of bgp-group."
+        },
+        {
+            "from": "bgp-group",
+            "to": "vip-ipv4-address-list",
+            "label": "org.onap.relationships.inventory.Source",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description": "To node-type is source of bgp-group."
+        },
+        {
+            "from": "bgp-group",
+            "to": "vip-ipv6-address-list",
+            "label": "org.onap.relationships.inventory.Destination",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "false",
+            "description": "To node-type is destination of bgp-group."
+        },
+        {
+            "from": "bgp-group",
+            "to": "vip-ipv6-address-list",
+            "label": "org.onap.relationships.inventory.Source",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description": "To node-type is source of bgp-group."
+        },
+        {
+            "from": "bgp-group",
+            "to": "vrf",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "A bgp-group belongs to a pnf."
+        },
+        {
+            "from": "bgp-neighbor",
+            "to": "autonomous-system",
+            "label": "org.onap.relationships.inventory.network.MemberOf",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description": "bgp-neighbor is a member of an autonomous-system."
+        },
+        {
+            "from": "bgp-neighbor",
+            "to": "bgp-group",
+            "label": "org.onap.relationships.inventory.network.MemberOf",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description": "bgp-neighbor is a member of an bgp-group."
+        },
+        {
+            "from": "bgp-neighbor",
+            "to": "l3-interface-ipv4-address-list",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description": "bgp-neighbor uses To node-type."
+        },
+        {
+            "from": "bgp-neighbor",
+            "to": "l3-interface-ipv6-address-list",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description": "bgp-neighbor uses To node-type."
+        },
+        {
+            "from": "bgp-neighbor",
+            "to": "logical-link",
+            "label": "tosca.relationships.network.LinksTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "A policy applies to a bgp-neighbor."
+        },
+        {
+            "from": "bgp-neighbor",
+            "to": "pnf",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "A bgp-neighbor belongs to a pnf."
+        },
+        {
+            "from": "bgp-neighbor",
+            "to": "subnet",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "bgp-neighbor belongs To a subnet."
+        },
+        {
+            "from": "bgp-neighbor",
+            "to": "vip-ipv4-address-list",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description": "bgp-neighbor uses To node-type."
+        },
+        {
+            "from": "bgp-neighbor",
+            "to": "vip-ipv6-address-list",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description": "bgp-neighbor uses To node-type."
+        },
+        {
+            "from": "bgp-neighbor",
+            "to": "vrf",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "A bgp-neighbor belongs to a vrf."
+        },
+        {
+            "from": "cable",
+            "to": "complex",
+            "label": "org.onap.relationships.inventory.LocatedIn",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "A cable is located in a complex."
+        },
+        {
+            "from": "cable",
+            "to": "hardware-catalog-item",
+            "label": "org.onap.relationships.inventory.IsA",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description": "The cable is this item from the hardware-catalog."
+        },
+        {
+            "from": "cable",
+            "to": "physical-link",
+            "label": "org.onap.relationships.inventory.ComposedOf",
+            "direction": "OUT",
+            "multiplicity": "ONE2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "A cable is composed of one or more physical-links."
+        },
+        {
+            "from": "card-slot",
+            "to": "chassis",
+            "label": "org.onap.relationships.inventory.LocatedIn",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "A card-slot is located in a chassis."
+        },
+        {
+            "from": "card",
+            "to": "card-slot",
+            "label": "org.onap.relationships.inventory.LocatedIn",
+            "direction": "OUT",
+            "multiplicity": "ONE2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "A card is located in a card-slot."
+        },
+        {
+            "from": "card",
+            "to": "hardware-catalog-item",
+            "label": "org.onap.relationships.inventory.IsA",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description": "The card is described by the hardware-catalog-item."
+        },
+        {
+            "from": "chassis",
+            "to": "complex",
+            "label": "org.onap.relationships.inventory.LocatedIn",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "A chassis LinksTo a complex."
+        },
+        {
+            "from": "chassis",
+            "to": "hardware-catalog-item",
+            "label": "org.onap.relationships.inventory.IsA",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description": "The chassis is described by the hardware-catalog-item."
+        },
+        {
+            "from": "chassis",
+            "to": "pnf",
+            "label": "org.onap.relationships.inventory.PartOf",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "A chassis is part of a pnf."
+        },
+        {
+            "from": "chassis",
+            "to": "pserver",
+            "label": "org.onap.relationships.inventory.PartOf",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "A chassis is part of a pserver."
+        },
+        {
+            "from": "chassis",
+            "to": "rack",
+            "label": "org.onap.relationships.inventory.LocatedIn",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description": "A chassis is LocatedIn a rack."
+        },
+        {
+            "from": "chassis",
+            "to": "rack-unit",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "ONE2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description": "A chassis uses space in a rack (aka one or more rack-units)."
+        },
+        {
+            "from": "cloud-region",
+            "to": "geo-region",
+            "label": "org.onap.relationships.inventory.MemberOf",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "The cloud-region associated to a geo-region"
+        },
+        {
+            "from": "cloud-region",
+            "to": "policy",
+            "label": "org.onap.relationships.inventory.Implements",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "a cloud-region implements policies"
+        },
+        {
+            "from": "cloud-region",
+            "to": "project",
+            "label": "org.onap.relationships.inventory.PartOf",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "The cloud-region is part of a project (ex, project that built out the cloud region)."
+        },
+        {
+            "from": "cloud-region",
+            "to": "service-instance",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "complex",
+            "to": "geo-region",
+            "label": "org.onap.relationships.inventory.MemberOf",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "The complex associated to a geo-region"
+        },
+        {
+            "from": "configuration",
+            "to": "bgp-neighbor",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "The configuration Uses bgp-neighbor."
+        },
+        {
+            "from": "configuration",
+            "to": "logical-link",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "ONE2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "configuration",
+            "to": "network-route",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "${direction}",
+            "default": "true",
+            "description": "Relates configuration to network-route for static routes."
+        },
+        {
+            "from": "configuration",
+            "to": "policy",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "A configuration uses a policy"
+        },
+        {
+            "from": "configuration",
+            "to": "subnet",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "ONE2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "A configuration uses a subnet"
+        },
+        {
+            "from": "configuration",
+            "to": "vrf",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "A Configuration uses VRFs"
+        },
+        {
+            "from": "contact",
+            "to": "cloud-region",
+            "label": "org.onap.relationships.inventory.Supports",
+            "direction": "OUT",
+            "multiplicity": "ONE2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "${direction}",
+            "default": "true",
+            "description": "The contact supports a cloud-region."
+        },
+        {
+            "from": "contact",
+            "to": "complex",
+            "label": "org.onap.relationships.inventory.Supports",
+            "direction": "OUT",
+            "multiplicity": "ONE2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "${direction}",
+            "default": "true",
+            "description": "The contact supports a complex."
+        },
+        {
+            "from": "contact",
+            "to": "pnf",
+            "label": "org.onap.relationships.inventory.Supports",
+            "direction": "OUT",
+            "multiplicity": "ONE2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "${direction}",
+            "default": "true",
+            "description": "The contact supports a pnf."
+        },
+        {
+            "from": "contact",
+            "to": "pserver",
+            "label": "org.onap.relationships.inventory.Supports",
+            "direction": "OUT",
+            "multiplicity": "ONE2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "${direction}",
+            "default": "true",
+            "description": "The contact supports a pserver."
+        },
+        {
+            "from": "contact",
+            "to": "zone",
+            "label": "org.onap.relationships.inventory.Supports",
+            "direction": "OUT",
+            "multiplicity": "ONE2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "${direction}",
+            "default": "true",
+            "description": "The contact supports a zone."
+        },
+        {
+            "from": "generic-vnf",
+            "to": "bgp-group",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "${direction}",
+            "delete-other-v": "${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "The bgp-group associated to a generic-vnf."
+        },
+        {
+            "from": "generic-vnf",
+            "to": "bgp-neighbor",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "${direction}",
+            "delete-other-v": "${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "The bgp-neighbor associated to a generic-vnf."
+        },
+        {
+            "from": "host-aggregate",
+            "to": "cloud-region",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "host-aggregate",
+            "to": "pserver",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "hw-component",
+            "to": "profile",
+            "label": "org.onap.relationships.inventory.AppliesTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "The profile associated to a hw-component"
+        },
+        {
+            "from": "instance-group",
+            "to": "instance-group",
+            "label": "org.onap.relationships.inventory.AppliesTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "The instance-group associated to an instance-group"
+        },
+        {
+            "from": "ip-address-list",
+            "to": "endpoint",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "ip-address-list",
+            "to": "l3-interface-ipv4-address-list",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "ONE2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description": "This edge relates an object-group's ip-address-list through reference from DLP data to an ip-address from FCT in the l3-interface-ipv4-address-list of an R-Leaf's l-interface that is for VLAN 2"
+        },
+        {
+            "from": "ip-address-list",
+            "to": "l3-interface-ipv6-address-list",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "ONE2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description": "This edge relates an object-group's ip-address-list through reference from DLP data to an ip-address from FCT in the l3-interface-ipv6-address-list of an R-Leaf's l-interface that is for VLAN 2"
+        },
+        {
+            "from": "ip-address-list",
+            "to": "policy",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "An ip-address-list BelongsTo a policy."
+        },
+        {
+            "from": "ip-address-list",
+            "to": "port-list",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "ip-address-list",
+            "to": "rule",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "ip-address-list",
+            "to": "subnet",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "ip-address-list",
+            "to": "vip-ipv4-address-list",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "ONE2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description": "This edge relates an object-group's ip-address-list through reference from DLP data to an ip-address from FCT in the vip-ipv4-address-list of an R-Leaf's l-interface that is for VLAN 2"
+        },
+        {
+            "from": "ip-address-list",
+            "to": "vip-ipv6-address-list",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "ONE2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description": "This edge relates an object-group's ip-address-list through reference from DLP data to an ip-address from FCT in the vip-ipv6-address-list of an R-Leaf's l-interface that is for VLAN 2"
+        },
+        {
+            "from": "l3-interface-ipv4-address-list",
+            "to": "lag-interface",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "A IPv4 address associated with a lag-interface."
+        },
+        {
+            "from": "l3-interface-ipv4-address-list",
+            "to": "p-interface",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "A IPv4 address associated with a p-interface."
+        },
+        {
+            "from": "l3-interface-ipv6-address-list",
+            "to": "lag-interface",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "A IPv6 address associated with a lag-interface."
+        },
+        {
+            "from": "l3-interface-ipv6-address-list",
+            "to": "p-interface",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "A IPv6 address associated with a p-interface."
+        },
+        {
+            "from": "l3-network",
+            "to": "l3-network",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "l3-network uses l3-network"
+        },
+        {
+            "from": "l3-network",
+            "to": "network-route",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "${direction}",
+            "default": "true",
+            "description": "Relates l3-network to network-route for static routes."
+        },
+        {
+            "from": "lag-interface",
+            "to": "geo-region",
+            "label": "org.onap.relationships.inventory.MemberOf",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "The lag-interface associated to a geo-region"
+        },
+        {
+            "from": "lag-interface",
+            "to": "l-interface",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "false",
+            "description": ""
+        },
+        {
+            "from": "license",
+            "to": "chassis",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "A license belongs to a chassis."
+        },
+        {
+            "from": "l-interface",
+            "to": "next-hop",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "ONE2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "The l-interface that is used by the next-hop."
+        },
+        {
+            "from": "l-interface",
+            "to": "pnf",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "A logical interface associated with a pnf."
+        },
+        {
+            "from": "l-interface",
+            "to": "pserver",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "A logical interface associated with a pserver."
+        },
+        {
+            "from": "logical-link",
+            "to": "port",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "ONE2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "The port associated with a logical-link"
+        },
+        {
+            "from": "mapping",
+            "to": "cloud-region",
+            "label": "org.onap.relationships.inventory.LocatedIn",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "The mapping associated to a cloud-region"
+        },
+        {
+            "from": "mapping",
+            "to": "instance-group",
+            "label": "org.onap.relationships.inventory.Current",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "false",
+            "description": ""
+        },
+        {
+            "from": "mapping",
+            "to": "instance-group",
+            "label": "org.onap.relationships.inventory.MemberOf",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "The mapping associated to an instance-group"
+        },
+        {
+            "from": "mapping",
+            "to": "instance-group",
+            "label": "org.onap.relationships.inventory.Target",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "false",
+            "description": ""
+        },
+        {
+            "from": "mapping",
+            "to": "mapping",
+            "label": "org.onap.relationships.inventory.AppliesTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "false",
+            "description": "The mapping associated to a mapping"
+        },
+        {
+            "from": "mapping",
+            "to": "mapping",
+            "label": "org.onap.relationships.inventory.MemberOf",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "The mapping associated to a mapping"
+        },
+        {
+            "from": "mapping",
+            "to": "pnf",
+            "label": "org.onap.relationships.inventory.MemberOf",
+            "direction": "OUT",
+            "multiplicity": "ONE2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "The mapping associated to a pnf"
+        },
+        {
+            "from": "mapping",
+            "to": "policy",
+            "label": "org.onap.relationships.inventory.MemberOf",
+            "direction": "OUT",
+            "multiplicity": "ONE2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "The mapping associated to a policy"
+        },
+        {
+            "from": "metadatum",
+            "to": "profile",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "",
+            "relationship-properties": [
+                "data-owner",
+                "data-source",
+                "data-source-version"
+            ]
+        },
+        {
+            "from": "network-range",
+            "to": "cloud-region",
+            "label": "org.onap.relationships.inventory.LocatedIn",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "The network-range is located in a cloud-region"
+        },
+        {
+            "from": "network-range",
+            "to": "complex",
+            "label": "org.onap.relationships.inventory.LocatedIn",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "The network-range is located in a complex"
+        },
+        {
+            "from": "network-range",
+            "to": "zone",
+            "label": "org.onap.relationships.inventory.LocatedIn",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "The network-range is located in a zone"
+        },
+        {
+            "from": "network-route",
+            "to": "next-hop",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "ONE2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "The network-route that is used by the next-hop."
+        },
+        {
+            "from": "network-route",
+            "to": "subnet",
+            "label": "org.onap.relationships.inventory.MemberOf",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "The route is part of part of a subnet."
+        },
+        {
+            "from": "next-hop",
+            "to": "bfd",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "ONE2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "pdu",
+            "to": "hardware-catalog-item",
+            "label": "org.onap.relationships.inventory.IsA",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description": "The pdu is described by the hardware-catalog-item."
+        },
+        {
+            "from": "pdu",
+            "to": "rack",
+            "label": "org.onap.relationships.inventory.LocatedIn",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "A pdu is located in a building (aka complex)."
+        },
+        {
+            "from": "pdu",
+            "to": "rack-unit",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "ONE2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description": "A pdu uses space in a rack (aka one or more rack-units)."
+        },
+        {
+            "from": "pluggable-slot",
+            "to": "card",
+            "label": "org.onap.relationships.inventory.LocatedIn",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "A pluggable slot is located in a card."
+        },
+        {
+            "from": "pluggable-slot",
+            "to": "chassis",
+            "label": "org.onap.relationships.inventory.LocatedIn",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "A pluggable-slot is located in a chassis."
+        },
+        {
+            "from": "pluggable",
+            "to": "cable",
+            "label": "org.onap.relationships.inventory.PartOf",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "!${direction}",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "A pluggable that is intergrated with a cable."
+        },
+        {
+            "from": "pluggable",
+            "to": "hardware-catalog-item",
+            "label": "org.onap.relationships.inventory.IsA",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description": "The pluggable is described by the hardware-catalog-item."
+        },
+        {
+            "from": "pluggable",
+            "to": "pluggable-slot",
+            "label": "org.onap.relationships.inventory.LocatedIn",
+            "direction": "OUT",
+            "multiplicity": "ONE2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "A pluggable is located in a pluggable-slot."
+        },
+        {
+            "from": "pnf",
+            "to": "autonomous-system",
+            "label": "org.onap.relationships.inventory.LocatedIn",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description": "pnf is located in the autonomous-system."
+        },
+        {
+            "from": "pnf",
+            "to": "cloud-region",
+            "label": "org.onap.relationships.inventory.LocatedIn",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "A pnf is located in (aka supports) a cloud-region."
+        },
+        {
+            "from": "pnf",
+            "to": "cloud-region",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "false",
+            "description": "used for CSP pnf to cloud-region."
+        },
+        {
+            "from": "pnf",
+            "to": "hw-component",
+            "label": "org.onap.relationships.inventory.MemberOf",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "The hw-component associated to a pnf"
+        },
+        {
+            "from": "pnf",
+            "to": "policy",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "A pnf uses policies",
+            "relationship-properties": [
+                "data-owner",
+                "data-source",
+                "data-source-version"
+            ]
+        },
+        {
+            "from": "pnf",
+            "to": "project",
+            "label": "org.onap.relationships.inventory.PartOf",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "The pnf is part of a project (ex, VPMO that ordered the equipment)."
+        },
+        {
+            "from": "pnf",
+            "to": "sw-component",
+            "label": "org.onap.relationships.inventory.MemberOf",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "The sw-component associated to a pnf"
+        },
+        {
+            "from": "policy",
+            "to": "address-family",
+            "label": "org.onap.relationships.inventory.AppliesTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "${direction}",
+            "default": "true",
+            "description": "A policy applies to an address family.",
+            "relationship-properties": [
+                "data-owner",
+                "data-source",
+                "data-source-version"
+            ]
+        },
+        {
+            "from": "policy",
+            "to": "bgp-group",
+            "label": "org.onap.relationships.inventory.AppliesTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "${direction}",
+            "default": "true",
+            "description": "A policy applies to a bgp-group."
+        },
+        {
+            "from": "policy",
+            "to": "bgp-neighbor",
+            "label": "org.onap.relationships.inventory.AppliesTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "${direction}",
+            "default": "true",
+            "description": "A policy applies to a bgp-neighbor."
+        },
+        {
+            "from": "policy",
+            "to": "instance-group",
+            "label": "org.onap.relationships.inventory.AppliesTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "The policy associated to an instance-group",
+            "relationship-properties": [
+                "data-owner",
+                "data-source",
+                "data-source-version"
+            ]
+        },
+        {
+            "from": "policy",
+            "to": "l3-network",
+            "label": "org.onap.relationships.inventory.AppliesTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "A policy applies to l3-networks."
+        },
+        {
+            "from": "policy",
+            "to": "l-interface",
+            "label": "org.onap.relationships.inventory.AppliesTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "The policy applies to an l-interface.",
+            "relationship-properties": [
+                "data-owner",
+                "data-source",
+                "data-source-version"
+            ]
+        },
+        {
+            "from": "policy",
+            "to": "rule",
+            "label": "org.onap.relationships.inventory.Implements",
+            "direction": "OUT",
+            "multiplicity": "ONE2MANY",
+            "contains-other-v": "${direction}",
+            "delete-other-v": "${direction}",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "policy",
+            "to": "vlan-tag",
+            "label": "org.onap.relationships.inventory.AppliesTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "${direction}",
+            "default": "true",
+            "description": "This edge allows for QOS policy to vlan-tag relationship. For a given policy get all vlan tags as well as for a given vlan-tag get all the policies.",
+            "relationship-properties": [
+                "data-owner",
+                "data-source",
+                "data-source-version"
+            ]
+        },
+        {
+            "from": "policy",
+            "to": "vpn-binding",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "ONE2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "A policy uses vpn-bindings"
+        },
+        {
+            "from": "policy",
+            "to": "vrf",
+            "label": "org.onap.relationships.inventory.AppliesTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "",
+            "relationship-properties": [
+                "data-owner",
+                "data-source",
+                "data-source-version"
+            ]
+        },
+        {
+            "from": "port-list",
+            "to": "rule",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "port",
+            "to": "cable",
+            "label": "tosca.relationships.network.LinksTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "${direction}",
+            "default": "true",
+            "description": "A channel-interface terminates a channel-link."
+        },
+        {
+            "from": "port",
+            "to": "card",
+            "label": "org.onap.relationships.inventory.LocatedIn",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "A port is located in a card."
+        },
+        {
+            "from": "port",
+            "to": "chassis",
+            "label": "org.onap.relationships.inventory.LocatedIn",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "A port is LocatedIn a chassis."
+        },
+        {
+            "from": "port",
+            "to": "p-interface",
+            "label": "org.onap.relationships.inventory.ComposedOf",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "${direction}",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "A port is composed of one or more p-interfaces."
+        },
+        {
+            "from": "port",
+            "to": "pluggable",
+            "label": "org.onap.relationships.inventory.LocatedIn",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "A port is located in a pluggable."
+        },
+        {
+            "from": "port",
+            "to": "port",
+            "label": "org.onap.relationships.inventory.LinksTo",
+            "direction": "OUT",
+            "multiplicity": "ONE2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "A port LinksTo another port."
+        },
+        {
+            "from": "profile",
+            "to": "card",
+            "label": "org.onap.relationships.inventory.AppliesTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "${direction}",
+            "default": "true",
+            "description": "The profile (set of characteristics) applies to the card."
+        },
+        {
+            "from": "profile",
+            "to": "chassis",
+            "label": "org.onap.relationships.inventory.AppliesTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "None",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "${direction}",
+            "default": "true",
+            "description": "The profile (set of characteristics) applies to the chassis."
+        },
+        {
+            "from": "profile",
+            "to": "cloud-region",
+            "label": "org.onap.relationships.inventory.AppliesTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "profile",
+            "to": "hardware-catalog-item",
+            "label": "org.onap.relationships.inventory.AppliesTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "${direction}",
+            "default": "true",
+            "description": "A set of characteristics of the hardware-catalog-item."
+        },
+        {
+            "from": "profile",
+            "to": "instance-group",
+            "label": "org.onap.relationships.inventory.AppliesTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "${direction}",
+            "default": "true",
+            "description": "A profile (set of characteristics) applies to the instance-group (as a vrrp group)."
+        },
+        {
+            "from": "profile",
+            "to": "l3-network",
+            "label": "org.onap.relationships.inventory.AppliesTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "${direction}",
+            "default": "true",
+            "description": "A profile (set of characteristics) applies to the l3-network."
+        },
+        {
+            "from": "profile",
+            "to": "lag-interface",
+            "label": "org.onap.relationships.inventory.AppliesTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "${direction}",
+            "default": "true",
+            "description": "A profile (set of characteristics) applies to the lag-interface.",
+            "relationship-properties": [
+                "data-owner",
+                "data-source",
+                "data-source-version"
+            ]
+        },
+        {
+            "from": "profile",
+            "to": "l-interface",
+            "label": "org.onap.relationships.inventory.AppliesTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "${direction}",
+            "default": "true",
+            "description": "A profile (set of characteristics) applies to the l-interface.",
+            "relationship-properties": [
+                "data-owner",
+                "data-source",
+                "data-source-version"
+            ]
+        },
+        {
+            "from": "profile",
+            "to": "logical-link",
+            "label": "org.onap.relationships.inventory.AppliesTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "${direction}",
+            "default": "true",
+            "description": "A profile (set of characteristics) applies to the logical-link."
+        },
+        {
+            "from": "profile",
+            "to": "pdu",
+            "label": "org.onap.relationships.inventory.AppliesTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "None",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "${direction}",
+            "default": "true",
+            "description": "The profile (set of characteristics) applies to the pdu."
+        },
+        {
+            "from": "profile",
+            "to": "physical-link",
+            "label": "org.onap.relationships.inventory.AppliesTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "${direction}",
+            "default": "true",
+            "description": "A profile (set of characteristics) applies to the physical-link."
+        },
+        {
+            "from": "profile",
+            "to": "p-interface",
+            "label": "org.onap.relationships.inventory.AppliesTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "${direction}",
+            "default": "true",
+            "description": "A profile (set of characteristics) applies to the p-interface.",
+            "relationship-properties": [
+                "data-owner",
+                "data-source",
+                "data-source-version"
+            ]
+        },
+        {
+            "from": "profile",
+            "to": "pluggable",
+            "label": "org.onap.relationships.inventory.AppliesTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "${direction}",
+            "default": "true",
+            "description": "The profile (set of characteristics) applies to the pluggable."
+        },
+        {
+            "from": "profile",
+            "to": "pnf",
+            "label": "org.onap.relationships.inventory.AppliesTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "${direction}",
+            "default": "true",
+            "description": "A profile (set of characteristics) applies to the pnf.",
+            "relationship-properties": [
+                "data-owner",
+                "data-source",
+                "data-source-version"
+            ]
+        },
+        {
+            "from": "profile",
+            "to": "policy",
+            "label": "org.onap.relationships.inventory.AppliesTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "${direction}",
+            "default": "true",
+            "description": "A profile (set of characteristics) applies to the policy.",
+            "relationship-properties": [
+                "data-owner",
+                "data-source",
+                "data-source-version"
+            ]
+        },
+        {
+            "from": "profile",
+            "to": "pserver",
+            "label": "org.onap.relationships.inventory.AppliesTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "${direction}",
+            "default": "true",
+            "description": "A profile (set of characteristics) applies to the pserver."
+        },
+        {
+            "from": "profile",
+            "to": "rack",
+            "label": "org.onap.relationships.inventory.AppliesTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "${direction}",
+            "default": "true",
+            "description": "The profile (set of characteristics) applies to the rack."
+        },
+        {
+            "from": "profile",
+            "to": "subnet",
+            "label": "org.onap.relationships.inventory.AppliesTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "${direction}",
+            "default": "true",
+            "description": "A profile (set of characteristics) applies to the subnet."
+        },
+        {
+            "from": "profile",
+            "to": "vlan-range",
+            "label": "org.onap.relationships.inventory.AppliesTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "${direction}",
+            "default": "true",
+            "description": "A profile (set of characteristics) applies to the vlan-range."
+        },
+        {
+            "from": "profile",
+            "to": "vlan-tag",
+            "label": "org.onap.relationships.inventory.AppliesTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "${direction}",
+            "default": "true",
+            "description": "A profile (set of characteristics) applies to the vlan-tag."
+        },
+        {
+            "from": "profile",
+            "to": "vpn-binding",
+            "label": "org.onap.relationships.inventory.AppliesTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "${direction}",
+            "default": "true",
+            "description": "A profile (set of characteristics) applies to the vpn-binding."
+        },
+        {
+            "from": "profile",
+            "to": "vrf",
+            "label": "org.onap.relationships.inventory.AppliesTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "${direction}",
+            "default": "true",
+            "description": "A profile (set of characteristics) applies to the vrf.",
+            "relationship-properties": [
+                "data-owner",
+                "data-source",
+                "data-source-version"
+            ]
+        },
+        {
+            "from": "pserver",
+            "to": "hw-component",
+            "label": "org.onap.relationships.inventory.MemberOf",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "The hw-component associated to a pserver"
+        },
+        {
+            "from": "pserver",
+            "to": "policy",
+            "label": "org.onap.relationships.inventory.Implements",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "pserver",
+            "to": "project",
+            "label": "org.onap.relationships.inventory.PartOf",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "The pserver is part of a project (ex, VPMO that ordered the equipment)."
+        },
+        {
+            "from": "pserver",
+            "to": "sw-component",
+            "label": "org.onap.relationships.inventory.MemberOf",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "The sw-component associated to a pserver"
+        },
+        {
+            "from": "rack",
+            "to": "complex",
+            "label": "org.onap.relationships.inventory.LocatedIn",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "A rack is located in a complex (aka building)."
+        },
+        {
+            "from": "rack",
+            "to": "hardware-catalog-item",
+            "label": "org.onap.relationships.inventory.IsA",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description": "The rack is this item from the hardware-catalog."
+        },
+        {
+            "from": "rack",
+            "to": "instance-group",
+            "label": "org.onap.relationships.inventory.MemberOf",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description": "The rack is a member of the instance-group (rack-group or pod)."
+        },
+        {
+            "from": "rack-unit",
+            "to": "rack",
+            "label": "org.onap.relationships.inventory.LocatedIn",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "A rack-unit is located in a rack."
+        },
+        {
+            "from": "relationship-component",
+            "to": "relationship-rule",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "Defines the traversal needed to reach the node of relationship-rule"
+        },
+        {
+            "from": "relationship-rule",
+            "to": "policy",
+            "label": "org.onap.relationships.inventory.AppliesTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "Details relationships policy requires."
+        },
+        {
+            "from": "relationship-rule",
+            "to": "profile",
+            "label": "org.onap.relationships.inventory.AppliesTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "Details relationships profile requires."
+        },
+        {
+            "from": "rule",
+            "to": "next-hop",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "The rule that is used by the next-hop. For CG-NAT these are the ACL policies."
+        },
+        {
+            "from": "selector-list",
+            "to": "policy",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "selector-list",
+            "to": "rule",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "service-instance",
+            "to": "owning-entity",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "false",
+            "hidden-on": "owning-entity",
+            "description": "service-instance Uses an owning-entity"
+        },
+        {
+            "from": "service-instance",
+            "to": "vrf",
+            "label": "org.onap.relationships.inventory.ComposedOf",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "${direction}",
+            "default": "true",
+            "description": "This edge relates a vrf that is configured on a pnf to the service-instances that the vrf supports."
+        },
+        {
+            "from": "service-subscription",
+            "to": "customer",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "service-subscription BelongsTo customer"
+        },
+        {
+            "from": "subnet",
+            "to": "zone",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "A fabric subnet belongs to a zone."
+        },
+        {
+            "from": "sw-component",
+            "to": "profile",
+            "label": "org.onap.relationships.inventory.AppliesTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "The profile associated to a sw-component",
+            "relationship-properties": [
+                "data-owner",
+                "data-source",
+                "data-source-version"
+            ]
+        },
+        {
+            "from": "validation-audit",
+            "to": "cloud-region",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "ONE2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "The validation-audit associated to a cloud-region"
+        },
+        {
+            "from": "validation-audit",
+            "to": "line-of-business",
+            "label": "org.onap.relationships.inventory.AppliesTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "The line-of-business associated to a validation-audit"
+        },
+        {
+            "from": "vlan-characteristic",
+            "to": "vlan-tag",
+            "label": "org.onap.relationships.inventory.AppliesTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "vpn-binding",
+            "to": "aggregate-route",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "ONE2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "A vpn-binding uses many aggregate routes"
+        },
+        {
+            "from": "vrf",
+            "to": "network-route",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "${direction}",
+            "default": "true",
+            "description": "Relates vrf to network-route for static routes."
+        },
+        {
+            "from": "vrf",
+            "to": "next-hop",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "The vrfs that are used by the next-hop."
+        },
+        {
+            "from": "vserver",
+            "to": "instance-group",
+            "label": "org.onap.relationships.inventory.MemberOf",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "vserver",
+            "to": "sw-component",
+            "label": "org.onap.relationships.inventory.MemberOf",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "The sw-component associated to a vserver"
+        },
+        {
+            "from": "zone",
+            "to": "service-instance",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "false",
+            "description": ""
+        },
+        {
+            "from": "service-instance",
+            "to": "network-route",
+            "label": "org.onap.relationships.inventory.ComposedOf",
+            "direction": "OUT",
                        "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "${direction}",
-                       "default": "true",
-                       "description": "",
-                       "relationship-properties": ["data-owner","data-source","data-source-version"]
-               },
+            "contains-other-v": "NONE",
+            "delete-other-v": "${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "selector-list",
+            "to": "object-group",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "zone",
+            "to": "endpoint",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "${direction}",
+            "default": "true",
+            "description": "",
+            "relationship-properties": [
+                "data-owner",
+                "data-source",
+                "data-source-version"
+            ]
+        },
+        {
+            "from": "generic-vnf",
+            "to": "object-group",
+            "label": "org.onap.relationships.inventory.AppliesTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "A relationship that ties the device to the prefix-list/community-list."
+        },
+        {
+            "from": "pnf",
+            "to": "endpoint",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "",
+            "relationship-properties": [
+                "data-owner",
+                "data-source",
+                "data-source-version"
+            ]
+        },
+        {
+            "from": "port-list",
+            "to": "endpoint",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "selector-list",
+            "to": "endpoint",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "mapping",
+            "to": "object-group",
+            "label": "org.onap.relationships.inventory.MemberOf",
+            "direction": "OUT",
+            "multiplicity": "ONE2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "The mapping associated to an object-group"
+        },
+        {
+            "from": "complex",
+            "to": "endpoint",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "${direction}",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "relationship-rule",
+            "to": "endpoint",
+            "label": "org.onap.relationships.inventory.AppliesTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "${direction}",
+            "default": "true",
+            "description": "Details relationships endpoint requires"
+        },
+        {
+            "from": "policy",
+            "to": "object-group",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "",
+            "relationship-properties": [
+                "data-owner",
+                "data-source",
+                "data-source-version"
+            ]
+        },
+        {
+            "from": "object-group",
+            "to": "complex",
+            "label": "org.onap.relationships.inventory.LocatedIn",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "The object-group is located in a complex"
+        },
+        {
+            "from": "pserver",
+            "to": "endpoint",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "${direction}",
+            "default": "true",
+            "description": "",
+            "relationship-properties": [
+                "data-owner",
+                "data-source",
+                "data-source-version"
+            ]
+        },
+        {
+            "from": "relationship-rule",
+            "to": "object-group",
+            "label": "org.onap.relationships.inventory.AppliesTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "Details relationships object-group requires"
+        },
+        {
+            "from": "object-group",
+            "to": "vrf",
+            "label": "org.onap.relationships.inventory.AppliesTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "${direction}",
+            "default": "true",
+            "description": "The object-group to VRF for various route types.",
+            "relationship-properties": [
+                "data-owner",
+                "data-source",
+                "data-source-version"
+            ]
+        },
+        {
+            "from": "profile",
+            "to": "endpoint",
+            "label": "org.onap.relationships.inventory.AppliesTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "${direction}",
+            "default": "true",
+            "description": "A profile (set of characteristics) applies to the endpoint."
+        },
+        {
+            "from": "cloud-region",
+            "to": "endpoint",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "${direction}",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "object-group",
+            "to": "object-group",
+            "label": "org.onap.relationships.inventory.AppliesTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "The object-gorup that applies to an object-group"
+        },
+        {
+            "from": "object-group",
+            "to": "cloud-region",
+            "label": "org.onap.relationships.inventory.LocatedIn",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "The object-group is located in a cloud-region"
+        },
+        {
+            "from": "rule",
+            "to": "object-group",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description": "",
+            "relationship-properties": [
+                "data-owner",
+                "data-source",
+                "data-source-version"
+            ]
+        },
+        {
+            "from": "rule",
+            "to": "object-group",
+            "label": "org.onap.relationships.inventory.AppliesTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "false",
+            "description": "",
+            "relationship-properties": [
+                "data-owner",
+                "data-source",
+                "data-source-version"
+            ]
+        },
+        {
+            "from": "rule",
+            "to": "object-group",
+            "label": "org.onap.relationships.inventory.Source",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "false",
+            "description": "",
+            "relationship-properties": [
+                "data-owner",
+                "data-source",
+                "data-source-version"
+            ]
+        },
+        {
+            "from": "rule",
+            "to": "object-group",
+            "label": "org.onap.relationships.inventory.Destination",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "false",
+            "description": "",
+            "relationship-properties": [
+                "data-owner",
+                "data-source",
+                "data-source-version"
+            ]
+        },
+        {
+            "from": "profile",
+            "to": "object-group",
+            "label": "org.onap.relationships.inventory.AppliesTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "${direction}",
+            "default": "true",
+            "description": "The profile (set of characteristics) classifies the object-group.",
+            "relationship-properties": [
+                "data-owner",
+                "data-source",
+                "data-source-version"
+            ]
+        },
+        {
+            "from": "object-group",
+            "to": "zone",
+            "label": "org.onap.relationships.inventory.LocatedIn",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "The object-group is located in a zone"
+        },
+        {
+            "from": "network-route",
+            "to": "object-group",
+            "label": "org.onap.relationships.inventory.MemberOf",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "${direction}",
+            "default": "true",
+            "description": "The route is part of part of a route-list that is modeled in an object-group."
+        },
         {
-            "from": "generic-vnf",
+            "from": "ip-address-list",
             "to": "object-group",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "object-group",
+            "to": "pnf",
             "label": "org.onap.relationships.inventory.AppliesTo",
             "direction": "OUT",
             "multiplicity": "MANY2MANY",
             "SVC-INFRA": "NONE",
             "prevent-delete": "NONE",
             "default": "true",
-            "description":"A relationship that ties the device to the prefix-list/community-list."
+            "description": "",
+            "relationship-properties": [
+                "data-owner",
+                "data-source",
+                "data-source-version"
+            ]
+        },
+        {
+            "from": "community-list",
+            "to": "object-group",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "port-list",
+            "to": "object-group",
+            "label": "org.onap.relationships.inventory.BelongsTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "!${direction}",
+            "delete-other-v": "!${direction}",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "service-instance",
+            "to": "owning-entity",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "false",
+            "hidden-on": "owning-entity",
+            "description": "service-instance Uses an owning-entity"
+        },
+        {
+            "from": "vrf",
+            "to": "instance-group",
+            "label": "org.onap.relationships.inventory.Primary",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "${direction}",
+            "default": "false",
+            "description": "used for vrf fallback"
+        },
+        {
+            "from": "vrf",
+            "to": "instance-group",
+            "label": "org.onap.relationships.inventory.Secondary",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "${direction}",
+            "default": "false",
+            "description": "used for vrf fallback"
+        },
+        {
+            "from": "platform",
+            "to": "profile",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "ONE2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "Used by Auditing applications to identify appropriate audit models based on the platform associated with the given object"
+        },
+        {
+            "from": "platform",
+            "to": "endpoint",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "ONE2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "Used by Auditing applications to identify appropriate audit models based on the platform associated with the given object"
+        },
+        {
+            "from": "platform",
+            "to": "object-group",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "ONE2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "Used by Auditing applications to identify appropriate audit models based on the platform associated with the given object"
+        },
+        {
+            "from": "platform",
+            "to": "policy",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "ONE2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "Used by Auditing applications to identify appropriate audit models based on the platform associated with the given object"
         },
-               {
-                       "from": "pnf",
-                       "to": "endpoint",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "",
-                       "relationship-properties": ["data-owner","data-source","data-source-version"]
-               },
-               {
-                       "from": "port-list",
-                       "to": "endpoint",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "selector-list",
-                       "to": "endpoint",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "mapping",
-                       "to": "object-group",
-                       "label": "org.onap.relationships.inventory.MemberOf",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "The mapping associated to an object-group"
-               },
-               {
-                       "from": "complex",
-                       "to": "endpoint",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "${direction}",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "relationship-rule",
-                       "to": "endpoint",
-                       "label": "org.onap.relationships.inventory.AppliesTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "${direction}",
-                       "default": "true",
-                       "description": "Details relationships endpoint requires"
-               },
-               {
-                       "from": "policy",
-                       "to": "object-group",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "",
-                       "relationship-properties": ["data-owner","data-source","data-source-version"]
-               },
-               {
-                       "from": "object-group",
-                       "to": "complex",
-                       "label": "org.onap.relationships.inventory.LocatedIn",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "The object-group is located in a complex"
-               },
-               {
-                       "from": "pserver",
-                       "to": "endpoint",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "${direction}",
-                       "default": "true",
-                       "description": "",
-                       "relationship-properties": ["data-owner","data-source","data-source-version"]
-               },
-               {
-                       "from": "relationship-rule",
-                       "to": "object-group",
-                       "label": "org.onap.relationships.inventory.AppliesTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "Details relationships object-group requires"
-               },
-               {
-                       "from": "object-group",
-                       "to": "vrf",
-                       "label": "org.onap.relationships.inventory.AppliesTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "${direction}",
-                       "default": "true",
-                       "description": "The object-group to VRF for various route types.",
-                       "relationship-properties": ["data-owner","data-source","data-source-version"]
-               },
-               {
-                       "from": "profile",
-                       "to": "endpoint",
-                       "label": "org.onap.relationships.inventory.AppliesTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "${direction}",
-                       "default": "true",
-                       "description": "A profile (set of characteristics) applies to the endpoint."
-               },
-               {
-                       "from": "cloud-region",
-                       "to": "endpoint",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "${direction}",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "object-group",
-                       "to": "object-group",
-                       "label": "org.onap.relationships.inventory.AppliesTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "The object-gorup that applies to an object-group"
-               },
-               {
-                       "from": "object-group",
-                       "to": "cloud-region",
-                       "label": "org.onap.relationships.inventory.LocatedIn",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "The object-group is located in a cloud-region"
-               },
-               {
-                       "from": "rule",
-                       "to": "object-group",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "true",
-                       "description": "",
-                       "relationship-properties": ["data-owner","data-source","data-source-version"]
-               },
-               {
-                       "from": "rule",
-                       "to": "object-group",
-                       "label": "org.onap.relationships.inventory.AppliesTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "false",
-                       "description": "",
-                       "relationship-properties": ["data-owner","data-source","data-source-version"]
-               },
-               {
-                       "from": "rule",
-                       "to": "object-group",
-                       "label": "org.onap.relationships.inventory.Source",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "false",
-                       "description": "",
-                       "relationship-properties": ["data-owner","data-source","data-source-version"]
-               },
-               {
-                       "from": "rule",
-                       "to": "object-group",
-                       "label": "org.onap.relationships.inventory.Destination",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "false",
-                       "description": "",
-                       "relationship-properties": ["data-owner","data-source","data-source-version"]
-               },
-               {
-                       "from": "profile",
-                       "to": "object-group",
-                       "label": "org.onap.relationships.inventory.AppliesTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "${direction}",
-                       "default": "true",
-                       "description": "The profile (set of characteristics) classifies the object-group.",
-                       "relationship-properties": ["data-owner","data-source","data-source-version"]
-               },
-               {
-                       "from": "object-group",
-                       "to": "zone",
-                       "label": "org.onap.relationships.inventory.LocatedIn",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "The object-group is located in a zone"
-               },
-               {
-                       "from": "network-route",
-                       "to": "object-group",
-                       "label": "org.onap.relationships.inventory.MemberOf",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "${direction}",
-                       "default": "true",
-                       "description": "The route is part of part of a route-list that is modeled in an object-group."
-               },
-               {
-                       "from": "ip-address-list",
-                       "to": "object-group",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "object-group",
-                       "to": "pnf",
-                       "label": "org.onap.relationships.inventory.AppliesTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": "",
-                       "relationship-properties": ["data-owner","data-source","data-source-version"]
-               },
-               {
-                       "from": "community-list",
-                       "to": "object-group",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "port-list",
-                       "to": "object-group",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description": ""
-               },
-               {
-                       "from": "service-instance",
-                       "to": "owning-entity",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "false",
-                       "description":"service-instance Uses an owning-entity"
-               },{
-                       "from": "vrf",
-                       "to": "instance-group",
-                       "label": "org.onap.relationships.inventory.Primary",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "${direction}",
-                       "default": "false",
-                       "description":"used for vrf fallback"
-               },{
-                       "from": "vrf",
-                       "to": "instance-group",
-                       "label": "org.onap.relationships.inventory.Secondary",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "${direction}",
-                       "default": "false",
-                       "description":"used for vrf fallback"
-               },{
-                       "from": "platform",
-                       "to": "profile",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description":"Used by Auditing applications to identify appropriate audit models based on the platform associated with the given object"
-               },{
-                       "from": "platform",
-                       "to": "endpoint",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description":"Used by Auditing applications to identify appropriate audit models based on the platform associated with the given object"
-               },{
-                       "from": "platform",
-                       "to": "object-group",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description":"Used by Auditing applications to identify appropriate audit models based on the platform associated with the given object"
-               },{
-                       "from": "platform",
-                       "to": "policy",
-                       "label": "org.onap.relationships.inventory.Uses",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description":"Used by Auditing applications to identify appropriate audit models based on the platform associated with the given object"
-               },
         {
             "from": "metadatum",
             "to": "rule",
             "delete-other-v": "!${direction}",
             "prevent-delete": "NONE",
             "default": "true",
-            "description":""
-        },{
+            "description": ""
+        },
+        {
             "from": "class-map-member",
             "to": "parameter-list",
             "label": "org.onap.relationships.inventory.Uses",
             "delete-other-v": "NONE",
             "prevent-delete": "${direction}",
             "default": "true",
-            "description":"class-map-member to parameter-list"
-        },{
+            "description": "class-map-member to parameter-list"
+        },
+        {
             "from": "class-map-member",
             "to": "class-map",
             "label": "org.onap.relationships.inventory.MemberOf",
             "delete-other-v": "NONE",
             "prevent-delete": "!${direction}",
             "default": "true",
-            "description":"Member of class map"
-        },{
+            "description": "Member of class map"
+        },
+        {
             "from": "policy-key-term",
             "to": "parameter-list",
             "label": "org.onap.relationships.inventory.Uses",
             "delete-other-v": "NONE",
             "prevent-delete": "${direction}",
             "default": "true",
-            "description":"policy-key-term to parameter-list"
-        },{
+            "description": "policy-key-term to parameter-list"
+        },
+        {
             "from": "policy-map-member",
             "to": "policy",
             "label": "org.onap.relationships.inventory.MemberOf",
             "delete-other-v": "NONE",
             "prevent-delete": "!${direction}",
             "default": "true",
-            "description":"Member of policy map"
-        },{
+            "description": "Member of policy map"
+        },
+        {
             "from": "policy-map-member",
             "to": "policy-key-term",
             "label": "org.onap.relationships.inventory.Uses",
             "delete-other-v": "NONE",
             "prevent-delete": "${direction}",
             "default": "true",
-            "description":"Policy key term related to policy map member"
-        },{
+            "description": "Policy key term related to policy map member"
+        },
+        {
             "from": "policy-map-member",
             "to": "class-map",
             "label": "org.onap.relationships.inventory.Uses",
             "delete-other-v": "NONE",
             "prevent-delete": "${direction}",
             "default": "true",
-            "description":"Class-map related to policy-map-member"
-        },{
+            "description": "Class-map related to policy-map-member"
+        },
+        {
             "from": "l-interface",
             "to": "object-group",
             "label": "org.onap.relationships.inventory.MemberOf",
             "delete-other-v": "NONE",
             "prevent-delete": "NONE",
             "default": "true",
-            "description":"Member of l-interface"
-        },{
+            "description": "Member of l-interface"
+        },
+        {
             "from": "hold-timer",
             "to": "p-interface",
             "label": "tosca.relationships.network.BindsTo",
             "delete-other-v": "!${direction}",
             "prevent-delete": "NONE",
             "default": "true",
-            "description":"used for generic interface parameters"
-        },{
+            "description": "used for generic interface parameters"
+        },
+        {
             "from": "gig-ether-option",
             "to": "p-interface",
             "label": "tosca.relationships.network.BindsTo",
             "delete-other-v": "!${direction}",
             "prevent-delete": "NONE",
             "default": "true",
-            "description":"used for generic interface parameters"
-        },{
+            "description": "used for generic interface parameters"
+        },
+        {
             "from": "temporary-parameter-list",
             "to": "p-interface",
             "label": "tosca.relationships.network.BindsTo",
             "delete-other-v": "!${direction}",
             "prevent-delete": "NONE",
             "default": "true",
-            "description":"used for generic interface parameters"
-        },{
+            "description": "used for generic interface parameters"
+        },
+        {
             "from": "temporary-parameter-list",
             "to": "l-interface",
             "label": "tosca.relationships.network.BindsTo",
             "delete-other-v": "!${direction}",
             "prevent-delete": "NONE",
             "default": "true",
-            "description":"used for generic interface parameters"
-        },{
+            "description": "used for generic interface parameters"
+        },
+        {
             "from": "aggregated-ether-option",
             "to": "lag-interface",
             "label": "tosca.relationships.network.BindsTo",
             "delete-other-v": "!${direction}",
             "prevent-delete": "NONE",
             "default": "true",
-            "description":"used for generic interface parameters"
-        },{
+            "description": "used for generic interface parameters"
+        },
+        {
             "from": "temporary-parameter-list",
             "to": "lag-interface",
             "label": "tosca.relationships.network.BindsTo",
             "delete-other-v": "!${direction}",
             "prevent-delete": "NONE",
             "default": "true",
-            "description":"used for generic interface parameters"
-        },{
+            "description": "used for generic interface parameters"
+        },
+        {
             "from": "lacp",
             "to": "aggregated-ether-option",
             "label": "tosca.relationships.network.BindsTo",
             "delete-other-v": "!${direction}",
             "prevent-delete": "NONE",
             "default": "true",
-            "description":"used for generic interface parameters"
-        },{
+            "description": "used for generic interface parameters"
+        },
+        {
             "from": "policy",
             "to": "lag-interface",
             "label": "tosca.relationships.network.AppliesTo",
             "delete-other-v": "NONE",
             "prevent-delete": "NONE",
             "default": "true",
-            "description":"used to support NCX-Hub"
-        },{
+            "description": "used to support NCX-Hub"
+        },
+        {
             "from": "esi",
             "to": "lag-interface",
             "label": "tosca.relationships.network.BindsTo",
             "delete-other-v": "!${direction}",
             "prevent-delete": "NONE",
             "default": "true",
-            "description":"used for generic interface parameters"
-        },{
+            "description": "used for generic interface parameters"
+        },
+        {
             "from": "vlan-range",
             "to": "zone",
             "label": "tosca.relationships.network.BelongsTo",
             "delete-other-v": "!${direction}",
             "prevent-delete": "NONE",
             "default": "true",
-            "description":"The vlan-range is located in a zone."
-        },{
+            "description": "The vlan-range is located in a zone."
+        },
+        {
             "from": "zone",
             "to": "zone",
             "label": "tosca.relationships.network.AppliesTo",
             "delete-other-v": "NONE",
             "prevent-delete": "NONE",
             "default": "true",
-            "description":"the zone is associated to another zone."
-        },{
-            "from": "lcmp-unreachable",
+            "description": "the zone is associated to another zone."
+        },
+        {
+            "from": "icmp-unreachable",
             "to": "l-interface",
             "label": "tosca.relationships.network.BindsTo",
             "direction": "OUT",
             "delete-other-v": "!${direction}",
             "prevent-delete": "NONE",
             "default": "true",
-            "description":"used for generic interface"
+            "description": "used for generic interface"
         },{
             "from": "k8s-resource",
             "to": "tenant",
             "prevent-delete": "NONE",
             "default": "true",
             "description":""
+        },
+        {
+            "from": "profile",
+            "to": "rule",
+            "label": "tosca.relationships.network.AppliesTo",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "Supports attaching CSP specific profiles to ACL entries"
+        },
+        {
+            "from": "object-group-member",
+            "to": "object-group",
+            "label": "tosca.relationships.network.MemberOf",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "used for object tracking"
+        },
+        {
+            "from": "object-group-member",
+            "to": "object-group-key-term",
+            "label": "tosca.relationships.network.Uses",
+            "direction": "OUT",
+            "multiplicity": "ONE2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "used for object tracking"
+        },
+        {
+            "from": "object-group-key-term",
+            "to": "parameter-list",
+            "label": "tosca.relationships.network.Uses",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "used for object tracking"
+        },
+        {
+            "from": "bfd",
+            "to": "bgp-neighbor",
+            "label": "tosca.relationships.network.AppliesTo",
+            "direction": "OUT",
+            "multiplicity": "ONE2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "Supports attaching Bi-directional Forwarding Detection to BGP neighbors. Decrease in reconvergence time"
         }
-       ]
+    ]
 }
index 32ab2a1..03044be 100644 (file)
   limitations under the License.
   ============LICENSE_END=========================================================
   --><xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.v25" xml-mapping-metadata-complete="true">
-       <xml-schema element-form-default="QUALIFIED">
-               <xml-ns namespace-uri="http://org.onap.aai.inventory/v25"/>
-       </xml-schema>
-       <java-types>
-               <java-type name="Inventory">
-                       <xml-root-element name="inventory"/>
-                       <java-attributes>
-                               <xml-element java-attribute="search" name="search" type="inventory.aai.onap.org.v25.Search"/>
-                               <xml-element java-attribute="actions" name="actions" type="inventory.aai.onap.org.v25.Actions"/>
-                               <xml-element java-attribute="cloudInfrastructure" name="cloud-infrastructure" type="inventory.aai.onap.org.v25.CloudInfrastructure"/>
-                               <xml-element java-attribute="externalSystem" name="external-system" type="inventory.aai.onap.org.v25.ExternalSystem"/>
-                               <xml-element java-attribute="business" name="business" type="inventory.aai.onap.org.v25.Business"/>
-                               <xml-element java-attribute="serviceDesignAndCreation" name="service-design-and-creation" type="inventory.aai.onap.org.v25.ServiceDesignAndCreation"/>
-                               <xml-element java-attribute="network" name="network" type="inventory.aai.onap.org.v25.Network"/>
-                               <xml-element java-attribute="aaiInternal" name="aai-internal" type="inventory.aai.onap.org.v25.AaiInternal"/>
-                               <xml-element java-attribute="nodes" name="nodes" type="inventory.aai.onap.org.v25.Nodes"/>
-                               <xml-element java-attribute="common" name="common" type="inventory.aai.onap.org.v25.Common"/>
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="Nodes">
-                       <xml-root-element name="nodes"/>
-               </java-type>
-               <java-type name="Search">
-                       <xml-root-element name="search"/>
-                       <java-attributes>
-                               <xml-element java-attribute="edgeTagQueryResult" name="edge-tag-query-result" type="inventory.aai.onap.org.v25.EdgeTagQueryResult"/>
-                               <xml-element java-attribute="edgeTagQueryRequest" name="edge-tag-query-request" type="inventory.aai.onap.org.v25.EdgeTagQueryRequest"/>
-                               <xml-element java-attribute="searchResults" name="search-results" type="inventory.aai.onap.org.v25.SearchResults"/>
-                               <xml-element java-attribute="sdnZoneResponse" name="sdn-zone-response" type="inventory.aai.onap.org.v25.SdnZoneResponse"/>
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="EdgeTagQueryResult">
-                       <xml-root-element name="edge-tag-query-result"/>
-                       <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.onap.org.v25.TaggedInventoryItemList"/>
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="TaggedInventoryItemList">
-                       <xml-root-element name="tagged-inventory-item-list"/>
-                       <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="inventoryItem" name="inventory-item" type="inventory.aai.onap.org.v25.InventoryItem"/>
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="InventoryItem">
-                       <xml-root-element name="inventory-item"/>
-                       <java-attributes>
-                               <xml-element java-attribute="inventoryItemType" name="inventory-item-type" type="java.lang.String"/>
-                               <xml-element java-attribute="inventoryItemLink" name="inventory-item-link" type="java.lang.String"/>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="inventoryItemData" name="inventory-item-data" type="inventory.aai.onap.org.v25.InventoryItemData"/>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.onap.org.v25.TaggedInventoryItemList"/>
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="InventoryItemData">
-                       <xml-root-element name="inventory-item-data"/>
-                       <java-attributes>
-                               <xml-element java-attribute="propertyName" name="property-name" type="java.lang.String"/>
-                               <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String"/>
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="EdgeTagQueryRequest">
-                       <xml-root-element name="edge-tag-query-request"/>
-                       <java-attributes>
-                               <xml-element java-attribute="edgeTag" name="edge-tag" type="java.lang.String"/>
-                               <xml-element java-attribute="resultDetail" name="result-detail" type="java.lang.String"/>
-                               <xml-element java-attribute="startNodeType" name="start-node-type" type="java.lang.String"/>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="startNodeFilter" name="start-node-filter" type="inventory.aai.onap.org.v25.StartNodeFilter"/>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="includeNodeFilter" name="include-node-filter" type="inventory.aai.onap.org.v25.IncludeNodeFilter"/>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilter" name="secondary-filter" type="inventory.aai.onap.org.v25.SecondaryFilter"/>
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="StartNodeFilter">
-                       <xml-root-element name="start-node-filter"/>
-                       <java-attributes>
-                               <xml-element java-attribute="propertyName" name="property-name" type="java.lang.String"/>
-                               <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String"/>
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="IncludeNodeFilter">
-                       <xml-root-element name="include-node-filter"/>
-                       <java-attributes>
-                               <xml-element java-attribute="includeNodeType" name="include-node-type" type="java.lang.String"/>
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="SecondaryFilter">
-                       <xml-root-element name="secondary-filter"/>
-                       <java-attributes>
-                               <xml-element java-attribute="propertyName" name="property-name" type="java.lang.String"/>
-                               <xml-element java-attribute="filterType" name="filter-type" type="java.lang.String"/>
-                               <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String"/>
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="SearchResults">
-                       <xml-root-element name="search-results"/>
-                       <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="resultData" name="result-data" type="inventory.aai.onap.org.v25.ResultData"/>
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="ResultData">
-                       <xml-root-element name="result-data"/>
-                       <java-attributes>
-                               <xml-element java-attribute="resourceType" name="resource-type" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="The specific type of node in the A&amp;AI graph"/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="resourceLink" name="resource-link" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="The URL to the specific resource"/>
-                                       </xml-properties>
-                               </xml-element>
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="SdnZoneResponse">
-                       <xml-root-element name="sdn-zone-response"/>
-                       <java-attributes>
-                               <xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.onap.org.v25.OamNetworks"/>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="azAndDvsSwitches" name="az-and-dvs-switches" type="inventory.aai.onap.org.v25.AzAndDvsSwitches"/>
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="AzAndDvsSwitches">
-                       <xml-root-element name="az-and-dvs-switches"/>
-                       <java-attributes>
-                               <xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.onap.org.v25.DvsSwitches"/>
-                               <xml-element java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.onap.org.v25.AvailabilityZone"/>
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="Actions">
-                       <xml-properties>
-                               <xml-property name="description" value="APIs that are more action related than REST (e.g., notify, update)."/>
-                       </xml-properties>
-                       <xml-root-element name="actions"/>
-                       <java-attributes>
-                               <xml-element java-attribute="update" name="update" type="inventory.aai.onap.org.v25.Update"/>
-                               <xml-element java-attribute="notify" name="notify" type="inventory.aai.onap.org.v25.Notify"/>
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="Update">
-                       <xml-properties>
-                               <xml-property name="description" value="Serves a PATCH like function.  Does not enforce concurrency control.  Clear each usage with AAI team."/>
-                       <xml-property name="requiredProps" value="update-node-type"/>
-            </xml-properties>
-                       <xml-root-element name="update"/>
-                       <java-attributes>
-                               <xml-element java-attribute="updateNodeType" name="update-node-type" required="true" type="java.lang.String"/>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="updateNodeKey" name="update-node-key" type="inventory.aai.onap.org.v25.UpdateNodeKey"/>
-                               <xml-element java-attribute="updateNodeUri" name="update-node-uri" type="java.lang.String"/>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="action" name="action" type="inventory.aai.onap.org.v25.Action"/>
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="Action">
-                       <xml-root-element name="action"/>
-                       <java-attributes>
-                               <xml-element java-attribute="actionType" name="action-type" type="java.lang.String"/>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="actionData" name="action-data" type="inventory.aai.onap.org.v25.ActionData"/>
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="ActionData">
-                       <xml-root-element name="action-data"/>
-                       <java-attributes>
-                               <xml-element java-attribute="propertyName" name="property-name" type="java.lang.String"/>
-                               <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String"/>
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="UpdateNodeKey">
-                       <xml-root-element name="update-node-key"/>
-                       <java-attributes>
-                               <xml-element java-attribute="keyName" name="key-name" type="java.lang.String"/>
-                               <xml-element java-attribute="keyValue" name="key-value" type="java.lang.String"/>
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="Notify">
-                       <xml-root-element name="notify"/>
-                       <java-attributes>
-                               <xml-element java-attribute="eventId" name="event-id" required="true" type="java.lang.String"/>
-                               <xml-element java-attribute="nodeType" name="node-type" type="java.lang.String"/>
-                               <xml-element java-attribute="eventTrigger" name="event-trigger" type="java.lang.String"/>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="keyData" name="key-data" type="inventory.aai.onap.org.v25.KeyData"/>
-                               <xml-element java-attribute="selflink" name="selflink" type="java.lang.String"/>
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="KeyData">
-                       <xml-root-element name="key-data"/>
-                       <java-attributes>
-                               <xml-element java-attribute="keyName" name="key-name" type="java.lang.String"/>
-                               <xml-element java-attribute="keyValue" name="key-value" type="java.lang.String"/>
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="ExternalSystem">
-                       <xml-properties>
-                               <xml-property name="description" value="Namespace for external system."/>
-                       </xml-properties>
-                       <xml-root-element name="external-system"/>
-                       <java-attributes>
-                               <xml-element java-attribute="esrEmsList" name="esr-ems-list" type="inventory.aai.onap.org.v25.EsrEmsList"/>
-                               <xml-element java-attribute="esrVnfmList" name="esr-vnfm-list" type="inventory.aai.onap.org.v25.EsrVnfmList"/>
-                               <xml-element java-attribute="esrNfvoList" name="esr-nfvo-list" type="inventory.aai.onap.org.v25.EsrNfvoList"/>
-                               <xml-element java-attribute="esrThirdpartySdncList" name="esr-thirdparty-sdnc-list" type="inventory.aai.onap.org.v25.EsrThirdpartySdncList"/>
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="EsrEmsList">
-                       <xml-root-element name="esr-ems-list"/>
-                       <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="esrEms" name="esr-ems" type="inventory.aai.onap.org.v25.EsrEms"/>
-                       </java-attributes>
-                       <xml-properties>
-                               <xml-property name="maximumDepth" value="0"/>
-                       </xml-properties>
-               </java-type>
-
-               <java-type name="EsrEms">
-                       <xml-root-element name="esr-ems"/>
-                       <java-attributes>
-                               <xml-element java-attribute="emsId" name="ems-id" required="true" type="java.lang.String" xml-key="true">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Unique ID of EMS."/>
-                                       </xml-properties>
-                               </xml-element>
-                                               <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
-                                               <xml-properties>
-                                                       <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
-                                                                               <xml-property name="ownerCheck" value="N/A"/>
-                                               </xml-properties>
-                                               </xml-element>
-                                                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
-                                               <xml-properties>
-                                                       <xml-property name="description" value="Identifies the upstream source of the data."/>
-                                               </xml-properties>
-                                                       </xml-element>
-                                                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
-                                               <xml-properties>
-                                                       <xml-property name="description" value="Identifies the version of the upstream source."/>
-                                               </xml-properties>
-                                               </xml-element>
-                                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
-                                       <xml-properties>
-                                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="esrSystemInfoList" name="esr-system-info-list" type="inventory.aai.onap.org.v25.EsrSystemInfoList"/>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-                       </java-attributes>
-                       <xml-properties>
-                               <xml-property name="description" value="Persist EMS address information used by EMS driver."/>
-                               <xml-property name="indexedProps" value="ems-id,data-owner,data-source,data-source-version"/>
-                               <xml-property name="searchable" value="ems-id"/>
-                               <xml-property name="container" value="esr-ems-list"/>
-                               <xml-property name="namespace" value="external-system"/>
-                               <xml-property name="requiredProps" value="ems-id"/>
-                               <xml-property name="uriTemplate" value="/external-system/esr-ems-list/esr-ems/{ems-id}"/>
-                                       </xml-properties>
-               </java-type>
-
-               <java-type name="EsrVnfmList">
-                       <xml-root-element name="esr-vnfm-list"/>
-                       <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="esrVnfm" name="esr-vnfm" type="inventory.aai.onap.org.v25.EsrVnfm"/>
-                       </java-attributes>
-            <xml-properties>
-                               <xml-property name="maximumDepth" value="0"/>
-                       </xml-properties>
-               </java-type>
-
-               <java-type name="EsrVnfm">
-                       <xml-root-element name="esr-vnfm"/>
-                       <java-attributes>
-                               <xml-element java-attribute="vnfmId" name="vnfm-id" required="true" type="java.lang.String" xml-key="true">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Unique ID of VNFM."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="vimId" name="vim-id" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="indecate the VIM to deploy VNF."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="certificateUrl" name="certificate-url" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="certificate url of VNFM."/>
-                                       </xml-properties>
-                               </xml-element>
-                                               <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
-                                               <xml-properties>
-                                                       <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
-                                                                               <xml-property name="ownerCheck" value="N/A"/>
-                                               </xml-properties>
-                                               </xml-element>
-                                                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
-                                               <xml-properties>
-                                                       <xml-property name="description" value="Identifies the upstream source of the data."/>
-                                               </xml-properties>
-                                                       </xml-element>
-                                                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
-                                               <xml-properties>
-                                                       <xml-property name="description" value="Identifies the version of the upstream source."/>
-                                               </xml-properties>
-                                               </xml-element>
-                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="esrSystemInfoList" name="esr-system-info-list" type="inventory.aai.onap.org.v25.EsrSystemInfoList"/>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-                       </java-attributes>
-                       <xml-properties>
-                               <xml-property name="description" value="Persist VNFM address information used by VF-C."/>
-                               <xml-property name="indexedProps" value="vnfm-id,data-owner,data-source,data-source-version"/>
-                               <xml-property name="searchable" value="vnfm-id"/>
-                               <xml-property name="container" value="esr-vnfm-list"/>
-                               <xml-property name="namespace" value="external-system"/>
-                               <xml-property name="requiredProps" value="vnfm-id"/>
-                               <xml-property name="uriTemplate" value="/external-system/esr-vnfm-list/esr-vnfm/{vnfm-id}"/>
-                       </xml-properties>
-               </java-type>
-
-               <java-type name="EsrNfvoList">
-                       <xml-root-element name="esr-nfvo-list"/>
-                       <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="esrNfvo" name="esr-nfvo" type="inventory.aai.onap.org.v25.EsrNfvo"/>
-                       </java-attributes>
-            <xml-properties>
-                               <xml-property name="maximumDepth" value="0"/>
-                       </xml-properties>
-               </java-type>
-
-               <java-type name="EsrNfvo">
-                       <xml-root-element name="esr-nfvo"/>
-                       <java-attributes>
-                               <xml-element java-attribute="nfvoId" name="nfvo-id" required="true" type="java.lang.String" xml-key="true">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Unique ID of nfvo."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="apiRoot" name="api-root" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="indecate the api-root."/>
-                                       </xml-properties>
-                               </xml-element>
-                                               <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
-                                               <xml-properties>
-                                                       <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
-                                                                               <xml-property name="ownerCheck" value="N/A"/>
-                                               </xml-properties>
-                                               </xml-element>
-                                                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
-                                               <xml-properties>
-                                                       <xml-property name="description" value="Identifies the upstream source of the data."/>
-                                               </xml-properties>
-                                                       </xml-element>
-                                                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
-                                               <xml-properties>
-                                                       <xml-property name="description" value="Identifies the version of the upstream source."/>
-                                               </xml-properties>
-                                               </xml-element>
-                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="esrSystemInfoList" name="esr-system-info-list" type="inventory.aai.onap.org.v25.EsrSystemInfoList"/>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-                       </java-attributes>
-                       <xml-properties>
-                               <xml-property name="description" value="Persist NFVO address information used by VF-C."/>
-                               <xml-property name="indexedProps" value="nfvo-id,data-owner,data-source,data-source-version"/>
-                               <xml-property name="searchable" value="nfvo-id"/>
-                               <xml-property name="container" value="esr-nfvo-list"/>
-                               <xml-property name="namespace" value="external-system"/>
-                                          <xml-property name="requiredProps" value="nfvo-id"/>
-                                          <xml-property name="uriTemplate" value="/external-system/esr-nfvo-list/esr-nfvo/{nfvo-id}"/>
-                        </xml-properties>
-               </java-type>
-
-
-               <java-type name="EsrThirdpartySdncList">
-                       <xml-root-element name="esr-thirdparty-sdnc-list"/>
-                       <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="esrThirdpartySdnc" name="esr-thirdparty-sdnc" type="inventory.aai.onap.org.v25.EsrThirdpartySdnc"/>
-                       </java-attributes>
-            <xml-properties>
-                               <xml-property name="maximumDepth" value="0"/>
-                       </xml-properties>
-               </java-type>
-
-               <java-type name="EsrThirdpartySdnc">
-                       <xml-root-element name="esr-thirdparty-sdnc"/>
-                       <java-attributes>
-                               <xml-element java-attribute="thirdpartySdncId" name="thirdparty-sdnc-id" required="true" type="java.lang.String" xml-key="true">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Unique ID of SDNC."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="location" name="location" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="used for DC type to indicate the location of SDNC, such as Core or Edge."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="productName" name="product-name" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="password used to access SDNC server."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="domainType" name="domain-type" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Domain type of the SDNC controllerr."/>
-                                       </xml-properties>
-                               </xml-element>
-                                               <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
-                                               <xml-properties>
-                                                       <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
-                                                                               <xml-property name="ownerCheck" value="N/A"/>
-                                               </xml-properties>
-                                               </xml-element>
-                                                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
-                                               <xml-properties>
-                                                       <xml-property name="description" value="Identifies the upstream source of the data."/>
-                                               </xml-properties>
-                                                       </xml-element>
-                                                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
-                                               <xml-properties>
-                                                       <xml-property name="description" value="Identifies the version of the upstream source."/>
-                                               </xml-properties>
-                                               </xml-element>
-                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="esrSystemInfoList" name="esr-system-info-list" type="inventory.aai.onap.org.v25.EsrSystemInfoList"/>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-                       </java-attributes>
-                       <xml-properties>
-                               <xml-property name="description" value="Persist SDNC address information used by ONAP SDNC."/>
-                               <xml-property name="indexedProps" value="data-owner,data-source,data-source-version"/>
-                               <xml-property name="searchable" value="sdnc-id"/>
-                               <xml-property name="container" value="esr-thirdparty-sdnc-list"/>
-                               <xml-property name="namespace" value="external-system"/>
-                                          <xml-property name="requiredProps" value="thirdparty-sdnc-id"/>
-                                      <xml-property name="uriTemplate" value="/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/{thirdparty-sdnc-id}"/>
-                        </xml-properties>
-               </java-type>
-
-               <java-type name="EsrSystemInfoList">
-                       <xml-root-element name="esr-system-info-list"/>
-                       <xml-properties>
-                               <xml-property name="description" value="Collection of persistent block-level external system auth info."/>
-                       </xml-properties>
-                       <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="esrSystemInfo" name="esr-system-info" type="inventory.aai.onap.org.v25.EsrSystemInfo"/>
-                       </java-attributes>
-                       <xml-properties>
-                               <xml-property name="maximumDepth" value="0"/>
-                       </xml-properties>
-               </java-type>
-
-               <java-type name="EsrSystemInfo">
-                       <xml-root-element name="esr-system-info"/>
-                       <java-attributes>
-                               <xml-element java-attribute="esrSystemInfoId" name="esr-system-info-id" required="true" type="java.lang.String" xml-key="true">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Unique ID of esr system info."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="systemName" name="system-name" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="name of external system."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="type" name="type" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="type of external systems."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="vendor" name="vendor" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="vendor of external systems."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="version" name="version" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="version of external systems."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="serviceUrl" name="service-url" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="url used to access external systems."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="userName" name="user-name" required="true" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="username used to access external systems."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="password" name="password" required="true" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="password used to access external systems."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="systemType" name="system-type" required="true" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="it could be vim/vnfm/thirdparty-sdnc/ems-resource/ems-performance/ems-alarm."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="protocol" name="protocol" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="protocol of third party SDNC, for example netconf/snmp."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="sslCacert" name="ssl-cacert" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="ca file content if enabled ssl on auth-url."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element default-value="false" java-attribute="sslInsecure" name="ssl-insecure" type="java.lang.Boolean">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Whether to verify VIM's certificate."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="ipAddress" name="ip-address" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="service IP of ftp server."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="port" name="port" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="service port of ftp server."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="cloudDomain" name="cloud-domain" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="domain info for authentication."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="defaultTenant" name="default-tenant" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="default tenant of VIM."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="passive" name="passive" type="java.lang.Boolean">
-                                       <xml-properties>
-                                               <xml-property name="description" value="ftp passive mode or not."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="remotePath" name="remote-path" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="resource or performance data file path."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="systemStatus" name="system-status" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="the status of external system."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="openstackRegionId" name="openstack-region-id" type="java.lang.String">
-                                       <xml-properties>
-                                                  <xml-property name="description" value="OpenStack region ID used by MultiCloud plugin to interact with an OpenStack instance."/>
-                                       </xml-properties>
-                               </xml-element>
-                                               <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
-                                               <xml-properties>
-                                                       <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
-                                                                               <xml-property name="ownerCheck" value="N/A"/>
-                                               </xml-properties>
-                                               </xml-element>
-                                                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
-                                               <xml-properties>
-                                                       <xml-property name="description" value="Identifies the upstream source of the data."/>
-                                               </xml-properties>
-                                                       </xml-element>
-                                                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
-                                               <xml-properties>
-                                                       <xml-property name="description" value="Identifies the version of the upstream source."/>
-                                               </xml-properties>
-                                               </xml-element>
-                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-                       </java-attributes>
-                       <xml-properties>
-                               <xml-property name="description" value="Persist common address information of external systems."/>
-                               <xml-property name="indexedProps" value="esr-system-info-id,system-name,system-type,data-owner,data-source,data-source-version"/>
-                               <xml-property name="searchable" value="esr-system-info-id,system-name,system-type"/>
-                               <xml-property name="container" value="esr-system-info-list"/>
-                               <xml-property name="dependentOn" value="cloud-region,esr-ems,esr-vnfm,esr-thirdparty-sdnc,ext-aai-network,esr-nfvo"/>
-                               <xml-property name="requiredProps" value="esr-system-info-id,user-name,password,system-type"/>
-                               <xml-property name="uriTemplate" value="/esr-system-info-list/esr-system-info/{esr-system-info-id}"/>
-                        </xml-properties>
-               </java-type>
-
-               <java-type name="HpaCapabilities">
-                       <xml-properties>
-                               <xml-property name="description" value="Collection of HPA Capabilities"/>
-                       </xml-properties>
-                       <xml-root-element name="hpa-capabilities"/>
-                       <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="hpaCapability" name="hpa-capability" type="inventory.aai.onap.org.v25.HpaCapability"/>
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="HpaCapability">
-                       <xml-root-element name="hpa-capability"/>
-                       <java-attributes>
-                               <xml-element java-attribute="hpaCapabilityId" name="hpa-capability-id" required="true" type="java.lang.String" xml-key="true">
-                                       <xml-properties>
-                                               <xml-property name="description" value="UUID to uniquely identify a HPA capability"/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="hpaFeature" name="hpa-feature" required="true" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Name of the HPACapability"/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="hpaVersion" name="hpa-version" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="HPA schema version"/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="architecture" name="architecture" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Hardware architecture"/>
-                                       </xml-properties>
-                               </xml-element>
-                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
-                       <xml-properties>
-                       <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
-                                               <xml-property name="ownerCheck" value="N/A"/>
-                    </xml-properties>
-                </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
-                       <xml-properties>
-                       <xml-property name="description" value="Identifies the upstream source of the data."/>
-                    </xml-properties>
-                       </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
-                       <xml-properties>
-                       <xml-property name="description" value="Identifies the version of the upstream source."/>
-                    </xml-properties>
-                </xml-element>
-                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="hpaFeatureAttributes" name="hpa-feature-attributes" type="inventory.aai.onap.org.v25.HpaFeatureAttributes"/>
-                       </java-attributes>
-                       <xml-properties>
-                               <xml-property name="description" value="Represents a HPA capability"/>
-                               <xml-property name="indexedProps" value="hpa-feature,architecture,hpa-capability-id,data-owner,data-source,data-source-version"/>
-                               <xml-property name="dependentOn" value="flavor,cloud-region"/>
-                               <xml-property name="container" value="hpa-capabilities"/>
-                           <xml-property name="requiredProps" value="hpa-capability-id,hpa-feature"/>
-                <xml-property name="uriTemplate" value="/hpa-capabilities/hpa-capability/{hpa-capability-id}"/>
-             </xml-properties>
-               </java-type>
+    <xml-schema element-form-default="QUALIFIED">
+        <xml-ns namespace-uri="http://org.onap.aai.inventory/v25"/>
+    </xml-schema>
+    <java-types>
+        <java-type name="Inventory">
+            <xml-root-element name="inventory"/>
+            <java-attributes>
+                <xml-element java-attribute="search" name="search" type="inventory.aai.onap.org.v25.Search"/>
+                <xml-element java-attribute="actions" name="actions" type="inventory.aai.onap.org.v25.Actions"/>
+                <xml-element java-attribute="cloudInfrastructure" name="cloud-infrastructure" type="inventory.aai.onap.org.v25.CloudInfrastructure"/>
+                <xml-element java-attribute="externalSystem" name="external-system" type="inventory.aai.onap.org.v25.ExternalSystem"/>
+                <xml-element java-attribute="business" name="business" type="inventory.aai.onap.org.v25.Business"/>
+                <xml-element java-attribute="serviceDesignAndCreation" name="service-design-and-creation" type="inventory.aai.onap.org.v25.ServiceDesignAndCreation"/>
+                <xml-element java-attribute="network" name="network" type="inventory.aai.onap.org.v25.Network"/>
+                <xml-element java-attribute="aaiInternal" name="aai-internal" type="inventory.aai.onap.org.v25.AaiInternal"/>
+                <xml-element java-attribute="nodes" name="nodes" type="inventory.aai.onap.org.v25.Nodes"/>
+                <xml-element java-attribute="common" name="common" type="inventory.aai.onap.org.v25.Common"/>
+            </java-attributes>
+        </java-type>
 
-               <java-type name="HpaFeatureAttributes">
-                       <xml-root-element name="hpa-feature-attributes"/>
-                       <java-attributes>
-                               <xml-element java-attribute="hpaAttributeKey" name="hpa-attribute-key" required="true" type="java.lang.String" xml-key="true">
-                                       <xml-properties>
-                                               <xml-property name="description" value="name of the specific HPA attribute"/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="hpaAttributeValue" name="hpa-attribute-value" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="JSON string specifying the value, unit and type of the specific HPA attribute"/>
-                                       </xml-properties>
-                               </xml-element>
-                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
-                       <xml-properties>
-                       <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
-                                               <xml-property name="ownerCheck" value="N/A"/>
+        <java-type name="Nodes">
+            <xml-root-element name="nodes"/>
+        </java-type>
+        <java-type name="Search">
+            <xml-root-element name="search"/>
+            <java-attributes>
+                <xml-element java-attribute="edgeTagQueryResult" name="edge-tag-query-result" type="inventory.aai.onap.org.v25.EdgeTagQueryResult"/>
+                <xml-element java-attribute="edgeTagQueryRequest" name="edge-tag-query-request" type="inventory.aai.onap.org.v25.EdgeTagQueryRequest"/>
+                <xml-element java-attribute="searchResults" name="search-results" type="inventory.aai.onap.org.v25.SearchResults"/>
+                <xml-element java-attribute="sdnZoneResponse" name="sdn-zone-response" type="inventory.aai.onap.org.v25.SdnZoneResponse"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="EdgeTagQueryResult">
+            <xml-root-element name="edge-tag-query-result"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.onap.org.v25.TaggedInventoryItemList"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="TaggedInventoryItemList">
+            <xml-root-element name="tagged-inventory-item-list"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="inventoryItem" name="inventory-item" type="inventory.aai.onap.org.v25.InventoryItem"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="InventoryItem">
+            <xml-root-element name="inventory-item"/>
+            <java-attributes>
+                <xml-element java-attribute="inventoryItemType" name="inventory-item-type" type="java.lang.String"/>
+                <xml-element java-attribute="inventoryItemLink" name="inventory-item-link" type="java.lang.String"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="inventoryItemData" name="inventory-item-data" type="inventory.aai.onap.org.v25.InventoryItemData"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.onap.org.v25.TaggedInventoryItemList"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="InventoryItemData">
+            <xml-root-element name="inventory-item-data"/>
+            <java-attributes>
+                <xml-element java-attribute="propertyName" name="property-name" type="java.lang.String"/>
+                <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="EdgeTagQueryRequest">
+            <xml-root-element name="edge-tag-query-request"/>
+            <java-attributes>
+                <xml-element java-attribute="edgeTag" name="edge-tag" type="java.lang.String"/>
+                <xml-element java-attribute="resultDetail" name="result-detail" type="java.lang.String"/>
+                <xml-element java-attribute="startNodeType" name="start-node-type" type="java.lang.String"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="startNodeFilter" name="start-node-filter" type="inventory.aai.onap.org.v25.StartNodeFilter"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="includeNodeFilter" name="include-node-filter" type="inventory.aai.onap.org.v25.IncludeNodeFilter"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilter" name="secondary-filter" type="inventory.aai.onap.org.v25.SecondaryFilter"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="StartNodeFilter">
+            <xml-root-element name="start-node-filter"/>
+            <java-attributes>
+                <xml-element java-attribute="propertyName" name="property-name" type="java.lang.String"/>
+                <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="IncludeNodeFilter">
+            <xml-root-element name="include-node-filter"/>
+            <java-attributes>
+                <xml-element java-attribute="includeNodeType" name="include-node-type" type="java.lang.String"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="SecondaryFilter">
+            <xml-root-element name="secondary-filter"/>
+            <java-attributes>
+                <xml-element java-attribute="propertyName" name="property-name" type="java.lang.String"/>
+                <xml-element java-attribute="filterType" name="filter-type" type="java.lang.String"/>
+                <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="SearchResults">
+            <xml-root-element name="search-results"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="resultData" name="result-data" type="inventory.aai.onap.org.v25.ResultData"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ResultData">
+            <xml-root-element name="result-data"/>
+            <java-attributes>
+                <xml-element java-attribute="resourceType" name="resource-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The specific type of node in the A&amp;AI graph"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
-                       <xml-properties>
-                       <xml-property name="description" value="Identifies the upstream source of the data."/>
-                    </xml-properties>
-                       </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
-                       <xml-properties>
-                       <xml-property name="description" value="Identifies the version of the upstream source."/>
+                <xml-element java-attribute="resourceLink" name="resource-link" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The URL to the specific resource"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-                       </java-attributes>
-                       <xml-properties>
-                               <xml-property name="description" value="HPA Capability Feature attributes"/>
-                               <xml-property name="indexedProps" value="hpa-attribute-key,data-owner,data-source,data-source-version"/>
-                               <xml-property name="dependentOn" value="hpa-capability"/>
-                           <xml-property name="requiredProps" value="hpa-attribute-key"/>
-             </xml-properties>
-               </java-type>
+            </java-attributes>
+        </java-type>
 
-        <java-type name="CloudInfrastructure">
+        <java-type name="SdnZoneResponse">
+            <xml-root-element name="sdn-zone-response"/>
+            <java-attributes>
+                <xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.onap.org.v25.OamNetworks"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="azAndDvsSwitches" name="az-and-dvs-switches" type="inventory.aai.onap.org.v25.AzAndDvsSwitches"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="AzAndDvsSwitches">
+            <xml-root-element name="az-and-dvs-switches"/>
+            <java-attributes>
+                <xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.onap.org.v25.DvsSwitches"/>
+                <xml-element java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.onap.org.v25.AvailabilityZone"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Actions">
             <xml-properties>
-                <xml-property name="description" value="Namespace for cloud infrastructure."/>
+                <xml-property name="description" value="APIs that are more action related than REST (e.g., notify, update)."/>
             </xml-properties>
-            <xml-root-element name="cloud-infrastructure"/>
+            <xml-root-element name="actions"/>
             <java-attributes>
-                <xml-element java-attribute="complexes" name="complexes" type="inventory.aai.onap.org.v25.Complexes"/>
-                <xml-element java-attribute="cloudRegions" name="cloud-regions" type="inventory.aai.onap.org.v25.CloudRegions"/>
-                <xml-element java-attribute="networkProfiles" name="network-profiles" type="inventory.aai.onap.org.v25.NetworkProfiles"/>
-                <xml-element java-attribute="pservers" name="pservers" type="inventory.aai.onap.org.v25.Pservers"/>
-                <xml-element java-attribute="endpoints" name="endpoints" type="inventory.aai.onap.org.v25.Endpoints"/>
-                <xml-element java-attribute="virtualDataCenters" name="virtual-data-centers" type="inventory.aai.onap.org.v25.VirtualDataCenters"/>
-                <xml-element java-attribute="operationalEnvironments" name="operational-environments" type="inventory.aai.onap.org.v25.OperationalEnvironments"/>
-                <xml-element java-attribute="geoRegions" name="geo-regions" type="inventory.aai.onap.org.v25.GeoRegions"/>
-                <xml-element java-attribute="networkTechnologies" name="network-technologies" type="inventory.aai.onap.org.v25.NetworkTechnologies"/>
+                <xml-element java-attribute="update" name="update" type="inventory.aai.onap.org.v25.Update"/>
+                <xml-element java-attribute="notify" name="notify" type="inventory.aai.onap.org.v25.Notify"/>
             </java-attributes>
         </java-type>
 
-        <java-type name="CloudRegions">
-            <xml-root-element name="cloud-regions"/>
+        <java-type name="Update">
+            <xml-properties>
+                <xml-property name="description" value="Serves a PATCH like function.  Does not enforce concurrency control.  Clear each usage with AAI team."/>
+                <xml-property name="requiredProps" value="update-node-type"/>
+            </xml-properties>
+            <xml-root-element name="update"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="cloudRegion" name="cloud-region" type="inventory.aai.onap.org.v25.CloudRegion"/>
+                <xml-element java-attribute="updateNodeType" name="update-node-type" required="true" type="java.lang.String"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="updateNodeKey" name="update-node-key" type="inventory.aai.onap.org.v25.UpdateNodeKey"/>
+                <xml-element java-attribute="updateNodeUri" name="update-node-uri" type="java.lang.String"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="action" name="action" type="inventory.aai.onap.org.v25.Action"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Action">
+            <xml-root-element name="action"/>
+            <java-attributes>
+                <xml-element java-attribute="actionType" name="action-type" type="java.lang.String"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="actionData" name="action-data" type="inventory.aai.onap.org.v25.ActionData"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ActionData">
+            <xml-root-element name="action-data"/>
+            <java-attributes>
+                <xml-element java-attribute="propertyName" name="property-name" type="java.lang.String"/>
+                <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="UpdateNodeKey">
+            <xml-root-element name="update-node-key"/>
+            <java-attributes>
+                <xml-element java-attribute="keyName" name="key-name" type="java.lang.String"/>
+                <xml-element java-attribute="keyValue" name="key-value" type="java.lang.String"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Notify">
+            <xml-root-element name="notify"/>
+            <java-attributes>
+                <xml-element java-attribute="eventId" name="event-id" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="nodeType" name="node-type" type="java.lang.String"/>
+                <xml-element java-attribute="eventTrigger" name="event-trigger" type="java.lang.String"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="keyData" name="key-data" type="inventory.aai.onap.org.v25.KeyData"/>
+                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="KeyData">
+            <xml-root-element name="key-data"/>
+            <java-attributes>
+                <xml-element java-attribute="keyName" name="key-name" type="java.lang.String"/>
+                <xml-element java-attribute="keyValue" name="key-value" type="java.lang.String"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ExternalSystem">
+            <xml-properties>
+                <xml-property name="description" value="Namespace for external system."/>
+            </xml-properties>
+            <xml-root-element name="external-system"/>
+            <java-attributes>
+                <xml-element java-attribute="esrEmsList" name="esr-ems-list" type="inventory.aai.onap.org.v25.EsrEmsList"/>
+                <xml-element java-attribute="esrVnfmList" name="esr-vnfm-list" type="inventory.aai.onap.org.v25.EsrVnfmList"/>
+                <xml-element java-attribute="esrNfvoList" name="esr-nfvo-list" type="inventory.aai.onap.org.v25.EsrNfvoList"/>
+                <xml-element java-attribute="esrThirdpartySdncList" name="esr-thirdparty-sdnc-list" type="inventory.aai.onap.org.v25.EsrThirdpartySdncList"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="EsrEmsList">
+            <xml-root-element name="esr-ems-list"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="esrEms" name="esr-ems" type="inventory.aai.onap.org.v25.EsrEms"/>
             </java-attributes>
             <xml-properties>
                 <xml-property name="maximumDepth" value="0"/>
             </xml-properties>
         </java-type>
 
-        <java-type name="CloudRegion">
-            <xml-root-element name="cloud-region"/>
+        <java-type name="EsrEms">
+            <xml-root-element name="esr-ems"/>
             <java-attributes>
-                <xml-element java-attribute="cloudOwner" name="cloud-owner" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="emsId" name="ems-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                                               <xml-property name="description" value="Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname"/>
+                        <xml-property name="description" value="Unique ID of EMS."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="cloudRegionId" name="cloud-region-id" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifier used by the vendor for the region. Second part of composite key"/>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                                                                               <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="cloudType" name="cloud-type" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Type of the cloud (e.g., openstack)"/>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="ownerDefinedType" name="owner-defined-type" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Cloud-owner defined type indicator (e.g., dcp, lcp)"/>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="cloudRegionVersion" name="cloud-region-version" type="java.lang.String">
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Software version employed at the site.  NOTE - THIS FIELD IS NOT KEPT UP TO DATE."/>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="identityUrl" name="identity-url" type="java.lang.String">
+                <xml-element java-attribute="esrSystemInfoList" name="esr-system-info-list" type="inventory.aai.onap.org.v25.EsrSystemInfoList"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Persist EMS address information used by EMS driver."/>
+                <xml-property name="indexedProps" value="ems-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="searchable" value="ems-id"/>
+                <xml-property name="container" value="esr-ems-list"/>
+                <xml-property name="namespace" value="external-system"/>
+                <xml-property name="requiredProps" value="ems-id"/>
+                <xml-property name="uriTemplate" value="/external-system/esr-ems-list/esr-ems/{ems-id}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="EsrVnfmList">
+            <xml-root-element name="esr-vnfm-list"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="esrVnfm" name="esr-vnfm" type="inventory.aai.onap.org.v25.EsrVnfm"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="maximumDepth" value="0"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="EsrVnfm">
+            <xml-root-element name="esr-vnfm"/>
+            <java-attributes>
+                <xml-element java-attribute="vnfmId" name="vnfm-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="URL of the keystone identity service"/>
+                        <xml-property name="description" value="Unique ID of VNFM."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="cloudZone" name="cloud-zone" type="java.lang.String">
+                <xml-element java-attribute="vimId" name="vim-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Zone where the cloud is homed.  NOTE - THIS FIELD IS NOT CORRECTLY POPULATED."/>
+                        <xml-property name="description" value="indecate the VIM to deploy VNF."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="complexName" name="complex-name" type="java.lang.String">
+                <xml-element java-attribute="certificateUrl" name="certificate-url" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="complex name for cloud-region instance.  NOTE - THIS FIELD IS NOT CORRECTLY POPULATED."/>
+                        <xml-property name="description" value="certificate url of VNFM."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="sriovAutomation" name="sriov-automation" type="java.lang.String">
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Whether the cloud region supports (true) or does not support (false) SR-IOV automation."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="cloudExtraInfo" name="cloud-extra-info" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="ESR inputs extra information about the VIM or Cloud which will be decoded by MultiVIM."/>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                                                                               <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="cloudRegionNumber" name="cloud-region-number" type="java.lang.Integer">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Number that maps to the letter at the end of the cloud-region-id."/>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="cloudFunction" name="cloud-function" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Function of cloud-region."/>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="cloudRole" name="cloud-role" type="java.lang.String">
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Role of cloud-region."/>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="opsNote" name="ops-note" type="java.lang.String">
+                <xml-element java-attribute="esrSystemInfoList" name="esr-system-info-list" type="inventory.aai.onap.org.v25.EsrSystemInfoList"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Persist VNFM address information used by VF-C."/>
+                <xml-property name="indexedProps" value="vnfm-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="searchable" value="vnfm-id"/>
+                <xml-property name="container" value="esr-vnfm-list"/>
+                <xml-property name="namespace" value="external-system"/>
+                <xml-property name="requiredProps" value="vnfm-id"/>
+                <xml-property name="uriTemplate" value="/external-system/esr-vnfm-list/esr-vnfm/{vnfm-id}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="EsrNfvoList">
+            <xml-root-element name="esr-nfvo-list"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="esrNfvo" name="esr-nfvo" type="inventory.aai.onap.org.v25.EsrNfvo"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="maximumDepth" value="0"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="EsrNfvo">
+            <xml-root-element name="esr-nfvo"/>
+            <java-attributes>
+                <xml-element java-attribute="nfvoId" name="nfvo-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Notes to aid OPs in troubleshooting, such as attribute aliases or additional descriptions/instructions about an object."/>
+                        <xml-property name="description" value="Unique ID of nfvo."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="cloudRegionNumberDefinition" name="cloud-region-number-definition" type="java.lang.String">
+                <xml-element java-attribute="apiRoot" name="api-root" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The alias used for this cloud."/>
+                        <xml-property name="description" value="indecate the api-root."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="status" name="status" type="java.lang.String">
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Status of cloud-region."/>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                                                                               <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="upgradeCycle" name="upgrade-cycle" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Upgrade cycle for the cloud region. For AIC regions upgrade cycle is designated by A,B,C etc."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
-                    </xml-properties>
-                </xml-element>
-                    <xml-element java-attribute="orchestrationDisabled" name="orchestration-disabled" required="true" type="java.lang.Boolean" default-value="false">
-                    <xml-properties>
-                    <xml-property name="defaultValue" value="false"/>
-                    <xml-property name="description" value="Used to indicate whether orchestration is enabled for this cloud-region."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element default-value="false" java-attribute="inMaint" name="in-maint" required="true" type="java.lang.Boolean">
-                    <xml-properties>
-                        <xml-property name="defaultValue" value="false"/>
-                        <xml-property name="description" value="Used to indicate whether or not cloud-region object is in maintenance mode."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
-                                               <xml-property name="ownerCheck" value="N/A"/>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="volumeGroups" name="volume-groups" type="inventory.aai.onap.org.v25.VolumeGroups"/>
-                <xml-element java-attribute="tenants" name="tenants" type="inventory.aai.onap.org.v25.Tenants"/>
-                <xml-element java-attribute="flavors" name="flavors" type="inventory.aai.onap.org.v25.Flavors"/>
-                <xml-element java-attribute="groupAssignments" name="group-assignments" type="inventory.aai.onap.org.v25.GroupAssignments"/>
-                <xml-element java-attribute="snapshots" name="snapshots" type="inventory.aai.onap.org.v25.Snapshots"/>
-                <xml-element java-attribute="images" name="images" type="inventory.aai.onap.org.v25.Images"/>
-                <xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.onap.org.v25.DvsSwitches"/>
-                <xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.onap.org.v25.OamNetworks"/>
-                <xml-element java-attribute="availabilityZones" name="availability-zones" type="inventory.aai.onap.org.v25.AvailabilityZones"/>
+                <xml-element java-attribute="esrSystemInfoList" name="esr-system-info-list" type="inventory.aai.onap.org.v25.EsrSystemInfoList"/>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-                <xml-element container-type="java.util.ArrayList" java-attribute="vipIpv4AddressList" name="vip-ipv4-address-list" type="inventory.aai.onap.org.v25.VipIpv4AddressList"/>
-                <xml-element container-type="java.util.ArrayList" java-attribute="vipIpv6AddressList" name="vip-ipv6-address-list" type="inventory.aai.onap.org.v25.VipIpv6AddressList"/>
-                <xml-element java-attribute="vlanRanges" name="vlan-ranges" type="inventory.aai.onap.org.v25.VlanRanges"/>
-                <xml-element java-attribute="hostAggregates" name="host-aggregates" type="inventory.aai.onap.org.v25.HostAggregates"/>
-                <xml-element java-attribute="activities" name="activities" type="inventory.aai.onap.org.v25.Activities"/>
-                <xml-element java-attribute="validationAudits" name="validation-audits" type="inventory.aai.onap.org.v25.ValidationAudits"/>
-                               <xml-element java-attribute="hpaCapabilities" name="hpa-capabilities" type="inventory.aai.onap.org.v25.HpaCapabilities">
-                                       <xml-properties>
-                                               <xml-property name="description" value="List of cloud-region specific HPA Capabilities"/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="esrSystemInfoList" name="esr-system-info-list" type="inventory.aai.onap.org.v25.EsrSystemInfoList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="cloud-region designates an installation of a cloud cluster or region or instantiation. In AT&amp;Ts AIC cloud, this could be an LCP or DCP. Cloud regions are uniquely identified by a composite key, cloud-owner + cloud-region-id. The format of the cloud-owner is vendor-cloudname and we will use att-aic for AT&amp;T's AIC."/>
-                <xml-property name="indexedProps" value="cloud-owner,cloud-region-id,cloud-type,owner-defined-type,data-owner,data-source,data-source-version,complex-name,identity-url"/>
-                <xml-property name="nameProps" value="owner-defined-type"/>
-                <xml-property name="container" value="cloud-regions"/>
-                <xml-property name="namespace" value="cloud-infrastructure"/>
-                <xml-property name="uriTemplate" value="/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}"/>
-                <xml-property name="requiredProps" value="cloud-owner,cloud-region-id,orchestration-disabled,in-maint"/>
-             </xml-properties>
+                <xml-property name="description" value="Persist NFVO address information used by VF-C."/>
+                <xml-property name="indexedProps" value="nfvo-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="searchable" value="nfvo-id"/>
+                <xml-property name="container" value="esr-nfvo-list"/>
+                <xml-property name="namespace" value="external-system"/>
+                <xml-property name="requiredProps" value="nfvo-id"/>
+                <xml-property name="uriTemplate" value="/external-system/esr-nfvo-list/esr-nfvo/{nfvo-id}"/>
+            </xml-properties>
         </java-type>
 
-        <java-type name="HostAggregates">
-            <xml-properties>
-                <xml-property name="description" value="Collection of HostAggregates."/>
-            </xml-properties>
-            <xml-root-element name="host-aggregates"/>
+
+        <java-type name="EsrThirdpartySdncList">
+            <xml-root-element name="esr-thirdparty-sdnc-list"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="hostAggregate" name="host-aggregate" type="inventory.aai.onap.org.v25.HostAggregate"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="esrThirdpartySdnc" name="esr-thirdparty-sdnc" type="inventory.aai.onap.org.v25.EsrThirdpartySdnc"/>
             </java-attributes>
+            <xml-properties>
+                <xml-property name="maximumDepth" value="0"/>
+            </xml-properties>
         </java-type>
 
-        <java-type name="HostAggregate">
-            <xml-root-element name="host-aggregate"/>
+        <java-type name="EsrThirdpartySdnc">
+            <xml-root-element name="esr-thirdparty-sdnc"/>
             <java-attributes>
-                <xml-element java-attribute="hostAggregateId" name="host-aggregate-id" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="thirdpartySdncId" name="thirdparty-sdnc-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Unique identifier for the host-aggregate."/>
+                        <xml-property name="description" value="Unique ID of SDNC."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="hostAggregateName" name="host-aggregate-name" required="true" type="java.lang.String">
+                <xml-element java-attribute="location" name="location" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Name of the host-aggregate."/>
+                        <xml-property name="description" value="used for DC type to indicate the location of SDNC, such as Core or Edge."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="productName" name="product-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="password used to access SDNC server."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="domainType" name="domain-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Domain type of the SDNC controllerr."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
-                                               <xml-property name="ownerCheck" value="N/A"/>
+                                                                               <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
+                <xml-element java-attribute="esrSystemInfoList" name="esr-system-info-list" type="inventory.aai.onap.org.v25.EsrSystemInfoList"/>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="describes an hostAggregates"/>
+                <xml-property name="description" value="Persist SDNC address information used by ONAP SDNC."/>
                 <xml-property name="indexedProps" value="data-owner,data-source,data-source-version"/>
-                <xml-property name="dependentOn" value="cloud-region"/>
-                <xml-property name="container" value="host-aggregates"/>
-                <xml-property name="uriTemplate" value="/host-aggregates/host-aggregate/{host-aggregate-id}"/>
-                <xml-property name="requiredProps" value="host-aggregate-id,host-aggregate-name"/>
-                </xml-properties>
+                <xml-property name="searchable" value="sdnc-id"/>
+                <xml-property name="container" value="esr-thirdparty-sdnc-list"/>
+                <xml-property name="namespace" value="external-system"/>
+                <xml-property name="requiredProps" value="thirdparty-sdnc-id"/>
+                <xml-property name="uriTemplate" value="/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/{thirdparty-sdnc-id}"/>
+            </xml-properties>
         </java-type>
 
-        <java-type name="VlanRanges">
-            <xml-root-element name="vlan-ranges"/>
+        <java-type name="EsrSystemInfoList">
+            <xml-root-element name="esr-system-info-list"/>
+            <xml-properties>
+                <xml-property name="description" value="Collection of persistent block-level external system auth info."/>
+            </xml-properties>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="vlanRange" name="vlan-range" type="inventory.aai.onap.org.v25.VlanRange"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="esrSystemInfo" name="esr-system-info" type="inventory.aai.onap.org.v25.EsrSystemInfo"/>
             </java-attributes>
             <xml-properties>
+                <xml-property name="maximumDepth" value="0"/>
             </xml-properties>
         </java-type>
 
-        <java-type name="VlanRange">
-            <xml-root-element name="vlan-range"/>
+        <java-type name="EsrSystemInfo">
+            <xml-root-element name="esr-system-info"/>
             <java-attributes>
-                <xml-element java-attribute="vlanRangeId" name="vlan-range-id" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="esrSystemInfoId" name="esr-system-info-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="vlan id in range UUID."/>
+                        <xml-property name="description" value="Unique ID of esr system info."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="vlanIdLower" name="vlan-id-lower" required="true" type="java.lang.Long">
+                <xml-element java-attribute="systemName" name="system-name" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="vlan id in range lower"/>
+                        <xml-property name="description" value="name of external system."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="vlanIdUpper" name="vlan-id-upper" required="true" type="java.lang.Long">
+                <xml-element java-attribute="type" name="type" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="vlan id in range upper"/>
+                        <xml-property name="description" value="type of external systems."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="vlanType" name="vlan-type" required="true" type="java.lang.String">
+                <xml-element java-attribute="vendor" name="vendor" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="vlan type"/>
+                        <xml-property name="description" value="vendor of external systems."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                <xml-element java-attribute="version" name="version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
-                                               <xml-property name="ownerCheck" value="N/A"/>
+                        <xml-property name="description" value="version of external systems."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="serviceUrl" name="service-url" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                        <xml-property name="description" value="url used to access external systems."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="userName" name="user-name" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                        <xml-property name="description" value="username used to access external systems."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                <xml-element java-attribute="password" name="password" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                        <xml-property name="description" value="password used to access external systems."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="vlanTags" name="vlan-tags" type="inventory.aai.onap.org.v25.VlanTags"/>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-            </java-attributes>
-            <xml-properties>
-                <xml-property name="description" value="Definition of vlan range"/>
-                <xml-property name="indexedProps" value="vlan-range-id,vlan-type,data-owner,data-source,data-source-version"/>
-                <xml-property name="dependentOn" value="cloud-region,zone"/>
-                <xml-property name="container" value="vlan-ranges"/>
-                <xml-property name="uriTemplate" value="/vlan-ranges/vlan-range/{vlan-range-id}"/>
-                <xml-property name="searchable" value="vlan-range-id"/>
-                <xml-property name="requiredProps" value="vlan-range-id,vlan-id-lower,vlan-id-upper,vlan-type"/>
-            </xml-properties>
-        </java-type>
-
-        <java-type name="VolumeGroups">
-            <xml-properties>
-                <xml-property name="description" value="Collection of persistent block-level storage."/>
-            </xml-properties>
-            <xml-root-element name="volume-groups"/>
-            <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="volumeGroup" name="volume-group" type="inventory.aai.onap.org.v25.VolumeGroup"/>
-            </java-attributes>
-        </java-type>
-
-        <java-type name="VolumeGroup">
-            <xml-root-element name="volume-group"/>
-            <java-attributes>
-                <xml-element java-attribute="volumeGroupId" name="volume-group-id" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="systemType" name="system-type" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Unique ID of volume-group."/>
+                        <xml-property name="description" value="it could be vim/vnfm/thirdparty-sdnc/ems-resource/ems-performance/ems-alarm."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="volumeGroupName" name="volume-group-name" type="java.lang.String">
+                <xml-element java-attribute="protocol" name="protocol" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Name of the volume group."/>
+                        <xml-property name="description" value="protocol of third party SDNC, for example netconf/snmp."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
+                <xml-element java-attribute="sslCacert" name="ssl-cacert" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Heat stack id corresponding to this volume-group"/>
+                        <xml-property name="description" value="ca file content if enabled ssl on auth-url."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String">
+                <xml-element default-value="false" java-attribute="sslInsecure" name="ssl-insecure" type="java.lang.Boolean">
                     <xml-properties>
-                        <xml-property name="description" value="String capturing type of vnf, that was intended to identify the SDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ONAP matures."/>
+                        <xml-property name="description" value="Whether to verify VIM's certificate."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                <xml-element java-attribute="ipAddress" name="ip-address" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Orchestration status of this volume-group"/>
+                        <xml-property name="description" value="service IP of ftp server."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String">
+                <xml-element java-attribute="port" name="port" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="captures the id of all the configuration used to customize the resource for the service."/>
+                        <xml-property name="description" value="service port of ftp server."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="vfModuleModelCustomizationId" name="vf-module-model-customization-id" type="java.lang.String">
+                <xml-element java-attribute="cloudDomain" name="cloud-domain" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="helps relate the volume group to the vf-module whose components will require the volume group"/>
+                        <xml-property name="description" value="domain info for authentication."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="defaultTenant" name="default-tenant" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="default tenant of VIM."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="passive" name="passive" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="ftp passive mode or not."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="remotePath" name="remote-path" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="resource or performance data file path."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="systemStatus" name="system-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the status of external system."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="openstackRegionId" name="openstack-region-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="OpenStack region ID used by MultiCloud plugin to interact with an OpenStack instance."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
-                                               <xml-property name="ownerCheck" value="N/A"/>
+                                                                               <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Persistent block-level storage."/>
-                <xml-property name="indexedProps" value="volume-group-name,vnf-type,heat-stack-id,volume-group-id,orchestration-status,data-owner,data-source,data-source-version"/>
-                <xml-property name="searchable" value="volume-group-id,volume-group-name"/>
-                <xml-property name="dependentOn" value="cloud-region"/>
-                <xml-property name="container" value="volume-groups"/>
-                <xml-property name="uriTemplate" value="/volume-groups/volume-group/{volume-group-id}"/>
-                <xml-property name="requiredProps" value="volume-group-id,vnf-type"/>
-             </xml-properties>
+                <xml-property name="description" value="Persist common address information of external systems."/>
+                <xml-property name="indexedProps" value="esr-system-info-id,system-name,system-type,data-owner,data-source,data-source-version"/>
+                <xml-property name="searchable" value="esr-system-info-id,system-name,system-type"/>
+                <xml-property name="container" value="esr-system-info-list"/>
+                <xml-property name="dependentOn" value="cloud-region,esr-ems,esr-vnfm,esr-thirdparty-sdnc,ext-aai-network,esr-nfvo"/>
+                <xml-property name="requiredProps" value="esr-system-info-id,user-name,password,system-type"/>
+                <xml-property name="uriTemplate" value="/esr-system-info-list/esr-system-info/{esr-system-info-id}"/>
+            </xml-properties>
         </java-type>
 
-        <java-type name="RelationshipList">
-            <xml-root-element name="relationship-list"/>
+        <java-type name="HpaCapabilities">
+            <xml-properties>
+                <xml-property name="description" value="Collection of HPA Capabilities"/>
+            </xml-properties>
+            <xml-root-element name="hpa-capabilities"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="relationship" name="relationship" type="inventory.aai.onap.org.v25.Relationship"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="hpaCapability" name="hpa-capability" type="inventory.aai.onap.org.v25.HpaCapability"/>
             </java-attributes>
         </java-type>
 
-        <java-type name="Relationship">
-            <xml-root-element name="relationship"/>
+        <java-type name="HpaCapability">
+            <xml-root-element name="hpa-capability"/>
             <java-attributes>
-                <xml-element java-attribute="relatedTo" name="related-to" type="java.lang.String">
+                <xml-element java-attribute="hpaCapabilityId" name="hpa-capability-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="A keyword provided by A&amp;AI to indicate type of node."/>
+                        <xml-property name="description" value="UUID to uniquely identify a HPA capability"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipLabel" name="relationship-label" type="java.lang.String">
+                <xml-element java-attribute="hpaFeature" name="hpa-feature" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The edge label for this relationship."/>
+                        <xml-property name="description" value="Name of the HPACapability"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relatedLink" name="related-link" type="java.lang.String">
+                <xml-element java-attribute="hpaVersion" name="hpa-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="URL to the object in A&amp;AI."/>
+                        <xml-property name="description" value="HPA schema version"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element container-type="java.util.ArrayList" java-attribute="relationshipData" name="relationship-data" type="inventory.aai.onap.org.v25.RelationshipData"/>
-                <xml-element container-type="java.util.ArrayList" java-attribute="relatedToProperty" name="related-to-property" type="inventory.aai.onap.org.v25.RelatedToProperty"/>
-                <xml-element java-attribute="relationshipProperties" name="relationship-properties" type="inventory.aai.onap.org.v25.RelationshipProperties"/>
-            </java-attributes>
-        </java-type>
-
-        <java-type name="RelatedToProperty">
-            <xml-root-element name="related-to-property"/>
-            <java-attributes>
-                <xml-element java-attribute="propertyKey" name="property-key" type="java.lang.String">
+                <xml-element java-attribute="architecture" name="architecture" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Key part of a key/value pair"/>
+                        <xml-property name="description" value="Hardware architecture"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String">
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Value part of a key/value pair"/>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                                               <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-            </java-attributes>
-        </java-type>
-
-        <java-type name="RelationshipData">
-            <xml-root-element name="relationship-data"/>
-            <java-attributes>
-                <xml-element java-attribute="relationshipKey" name="relationship-key" required="true" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="A keyword provided by A&amp;AI to indicate an attribute."/>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipValue" name="relationship-value" required="true" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Value of the attribute."/>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="hpaFeatureAttributes" name="hpa-feature-attributes" type="inventory.aai.onap.org.v25.HpaFeatureAttributes"/>
             </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Represents a HPA capability"/>
+                <xml-property name="indexedProps" value="hpa-feature,architecture,hpa-capability-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="flavor,cloud-region"/>
+                <xml-property name="container" value="hpa-capabilities"/>
+                <xml-property name="requiredProps" value="hpa-capability-id,hpa-feature"/>
+                <xml-property name="uriTemplate" value="/hpa-capabilities/hpa-capability/{hpa-capability-id}"/>
+            </xml-properties>
         </java-type>
 
-        <java-type name="RelationshipProperties">
-            <xml-root-element name="relationship-properties"/>
+        <java-type name="HpaFeatureAttributes">
+            <xml-root-element name="hpa-feature-attributes"/>
             <java-attributes>
+                <xml-element java-attribute="hpaAttributeKey" name="hpa-attribute-key" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="name of the specific HPA attribute"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="hpaAttributeValue" name="hpa-attribute-value" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="JSON string specifying the value, unit and type of the specific HPA attribute"/>
+                    </xml-properties>
+                </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Key part of a key/value pair"/>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Key part of a key/value pair"/>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Key part of a key/value pair"/>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
             </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="HPA Capability Feature attributes"/>
+                <xml-property name="indexedProps" value="hpa-attribute-key,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="hpa-capability"/>
+                <xml-property name="requiredProps" value="hpa-attribute-key"/>
+            </xml-properties>
         </java-type>
 
-        <java-type name="Complexes">
+        <java-type name="CloudInfrastructure">
             <xml-properties>
-                <xml-property name="description" value="Collection of physical locations that can house cloud-regions."/>
+                <xml-property name="description" value="Namespace for cloud infrastructure."/>
             </xml-properties>
-            <xml-root-element name="complexes"/>
+            <xml-root-element name="cloud-infrastructure"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="complex" name="complex" type="inventory.aai.onap.org.v25.Complex"/>
+                <xml-element java-attribute="complexes" name="complexes" type="inventory.aai.onap.org.v25.Complexes"/>
+                <xml-element java-attribute="cloudRegions" name="cloud-regions" type="inventory.aai.onap.org.v25.CloudRegions"/>
+                <xml-element java-attribute="networkProfiles" name="network-profiles" type="inventory.aai.onap.org.v25.NetworkProfiles"/>
+                <xml-element java-attribute="pservers" name="pservers" type="inventory.aai.onap.org.v25.Pservers"/>
+                <xml-element java-attribute="endpoints" name="endpoints" type="inventory.aai.onap.org.v25.Endpoints"/>
+                <xml-element java-attribute="virtualDataCenters" name="virtual-data-centers" type="inventory.aai.onap.org.v25.VirtualDataCenters"/>
+                <xml-element java-attribute="operationalEnvironments" name="operational-environments" type="inventory.aai.onap.org.v25.OperationalEnvironments"/>
+                <xml-element java-attribute="geoRegions" name="geo-regions" type="inventory.aai.onap.org.v25.GeoRegions"/>
+                <xml-element java-attribute="networkTechnologies" name="network-technologies" type="inventory.aai.onap.org.v25.NetworkTechnologies"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="CloudRegions">
+            <xml-root-element name="cloud-regions"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="cloudRegion" name="cloud-region" type="inventory.aai.onap.org.v25.CloudRegion"/>
             </java-attributes>
             <xml-properties>
                 <xml-property name="maximumDepth" value="0"/>
             </xml-properties>
         </java-type>
 
-        <java-type name="Complex">
-            <xml-root-element name="complex"/>
+        <java-type name="CloudRegion">
+            <xml-root-element name="cloud-region"/>
             <java-attributes>
-                <xml-element java-attribute="physicalLocationId" name="physical-location-id" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="cloudOwner" name="cloud-owner" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Unique identifier for physical location, e.g., CLLI"/>
+                        <xml-property name="description" value="Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="dataCenterCode" name="data-center-code" type="java.lang.String">
+                <xml-element java-attribute="cloudRegionId" name="cloud-region-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Data center code which can be an alternate way to identify a complex"/>
+                        <xml-property name="description" value="Identifier used by the vendor for the region. Second part of composite key"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="complexName" name="complex-name" type="java.lang.String">
+                <xml-element java-attribute="cloudType" name="cloud-type" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Gamma complex name for LCP instance."/>
+                        <xml-property name="description" value="Type of the cloud (e.g., openstack)"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ownerDefinedType" name="owner-defined-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Cloud-owner defined type indicator (e.g., dcp, lcp)"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="cloudRegionVersion" name="cloud-region-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Software version employed at the site.  NOTE - THIS FIELD IS NOT KEPT UP TO DATE."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="identityUrl" name="identity-url" type="java.lang.String">
                         <xml-property name="description" value="URL of the keystone identity service"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                <xml-element java-attribute="cloudZone" name="cloud-zone" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                        <xml-property name="description" value="Zone where the cloud is homed.  NOTE - THIS FIELD IS NOT CORRECTLY POPULATED."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="physicalLocationType" name="physical-location-type" required="true" type="java.lang.String">
+                <xml-element java-attribute="complexName" name="complex-name" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Type, e.g., central office, data center."/>
+                        <xml-property name="description" value="complex name for cloud-region instance.  NOTE - THIS FIELD IS NOT CORRECTLY POPULATED."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="timeZone" name="time-zone" type="java.lang.String">
+                <xml-element java-attribute="sriovAutomation" name="sriov-automation" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The time zone where the complex is located."/>
+                        <xml-property name="description" value="Whether the cloud region supports (true) or does not support (false) SR-IOV automation."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                <xml-element java-attribute="cloudExtraInfo" name="cloud-extra-info" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
-                                               <xml-property name="ownerCheck" value="N/A"/>
+                        <xml-property name="description" value="ESR inputs extra information about the VIM or Cloud which will be decoded by MultiVIM."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="cloudRegionNumber" name="cloud-region-number" type="java.lang.Integer">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                        <xml-property name="description" value="Number that maps to the letter at the end of the cloud-region-id."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="cloudFunction" name="cloud-function" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                        <xml-property name="description" value="Function of cloud-region."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="street1" name="street1" required="true" type="java.lang.String"/>
-                <xml-element java-attribute="street2" name="street2" type="java.lang.String"/>
-                <xml-element java-attribute="city" name="city" required="true" type="java.lang.String"/>
-                <xml-element java-attribute="state" name="state" type="java.lang.String"/>
-                <xml-element java-attribute="postalCode" name="postal-code" required="true" type="java.lang.String"/>
-                <xml-element java-attribute="country" name="country" required="true" type="java.lang.String"/>
-                <xml-element java-attribute="region" name="region" required="true" type="java.lang.String"/>
-                <xml-element java-attribute="latitude" name="latitude" type="java.lang.String"/>
-                <xml-element java-attribute="longitude" name="longitude" type="java.lang.String"/>
-                <xml-element java-attribute="elevation" name="elevation" type="java.lang.String"/>
-                <xml-element java-attribute="lata" name="lata" type="java.lang.String"/>
-                <xml-element java-attribute="racks" name="racks" type="inventory.aai.onap.org.v25.Racks"/>
-                <xml-element java-attribute="cables" name="cables" type="inventory.aai.onap.org.v25.Cables"/>
-                <xml-element java-attribute="ctagPools" name="ctag-pools" type="inventory.aai.onap.org.v25.CtagPools"/>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-            </java-attributes>
-            <xml-properties>
-                <xml-property name="description" value="Collection of physical locations that can house cloud-regions."/>
-                <xml-property name="indexedProps" value="identity-url,data-center-code,complex-name,physical-location-id,data-owner,data-source,data-source-version"/>
-                <xml-property name="searchable" value="physical-location-id,data-center-code,complex-name,street1,street2,postal-code"/>
-                <xml-property name="uniqueProps" value="physical-location-id"/>
-                <xml-property name="container" value="complexes"/>
-                <xml-property name="namespace" value="cloud-infrastructure"/>
-                <xml-property name="uriTemplate" value="/cloud-infrastructure/complexes/complex/{physical-location-id}"/>
-                <xml-property name="requiredProps" value="physical-location-id,physical-location-type,street1,city,postal-code,country,region"/>
-             </xml-properties>
-        </java-type>
-
-        <java-type name="Racks">
-            <xml-root-element name="racks"/>
-            <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="rack" name="rack" type="inventory.aai.onap.org.v25.Rack"/>
-            </java-attributes>
-        </java-type>
-
-        <java-type name="Rack">
-            <xml-root-element name="rack"/>
-            <java-attributes>
-                <xml-element java-attribute="rackName" name="rack-name" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="cloudRole" name="cloud-role" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="A unique name for the rack (within the location)."/>
+                        <xml-property name="description" value="Role of cloud-region."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="rackType" name="rack-type" required="true" type="java.lang.String">
+                <xml-element java-attribute="opsNote" name="ops-note" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The type of rack."/>
+                        <xml-property name="description" value="Notes to aid OPs in troubleshooting, such as attribute aliases or additional descriptions/instructions about an object."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="rackLocation" name="rack-location" required="true" type="java.lang.String">
+                <xml-element java-attribute="cloudRegionNumberDefinition" name="cloud-region-number-definition" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The location of the rack within the building."/>
+                        <xml-property name="description" value="The alias used for this cloud."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="rackPosition" name="rack-position" type="java.lang.String">
+                <xml-element java-attribute="status" name="status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The position of the rack (ex-floor-mounted)."/>
+                        <xml-property name="description" value="Status of cloud-region."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element default-value="false" java-attribute="rackPowerDiversity" name="rack-power-diversity" required="true" type="java.lang.Boolean">
+                <xml-element java-attribute="upgradeCycle" name="upgrade-cycle" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Upgrade cycle for the cloud region. For AIC regions upgrade cycle is designated by A,B,C etc."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="orchestrationDisabled" name="orchestration-disabled" required="true" type="java.lang.Boolean" default-value="false">
                     <xml-properties>
                         <xml-property name="defaultValue" value="false"/>
-                        <xml-property name="description" value=""/>
+                        <xml-property name="description" value="Used to indicate whether orchestration is enabled for this cloud-region."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element default-value="false" java-attribute="inMaint" name="in-maint" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="Used to indicate whether or not cloud-region object is in maintenance mode."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                <xml-element java-attribute="volumeGroups" name="volume-groups" type="inventory.aai.onap.org.v25.VolumeGroups"/>
+                <xml-element java-attribute="tenants" name="tenants" type="inventory.aai.onap.org.v25.Tenants"/>
+                <xml-element java-attribute="flavors" name="flavors" type="inventory.aai.onap.org.v25.Flavors"/>
+                <xml-element java-attribute="groupAssignments" name="group-assignments" type="inventory.aai.onap.org.v25.GroupAssignments"/>
+                <xml-element java-attribute="snapshots" name="snapshots" type="inventory.aai.onap.org.v25.Snapshots"/>
+                <xml-element java-attribute="images" name="images" type="inventory.aai.onap.org.v25.Images"/>
+                <xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.onap.org.v25.DvsSwitches"/>
+                <xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.onap.org.v25.OamNetworks"/>
+                <xml-element java-attribute="availabilityZones" name="availability-zones" type="inventory.aai.onap.org.v25.AvailabilityZones"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vipIpv4AddressList" name="vip-ipv4-address-list" type="inventory.aai.onap.org.v25.VipIpv4AddressList"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vipIpv6AddressList" name="vip-ipv6-address-list" type="inventory.aai.onap.org.v25.VipIpv6AddressList"/>
+                <xml-element java-attribute="vlanRanges" name="vlan-ranges" type="inventory.aai.onap.org.v25.VlanRanges"/>
+                <xml-element java-attribute="hostAggregates" name="host-aggregates" type="inventory.aai.onap.org.v25.HostAggregates"/>
+                <xml-element java-attribute="activities" name="activities" type="inventory.aai.onap.org.v25.Activities"/>
+                <xml-element java-attribute="validationAudits" name="validation-audits" type="inventory.aai.onap.org.v25.ValidationAudits"/>
+                <xml-element java-attribute="hpaCapabilities" name="hpa-capabilities" type="inventory.aai.onap.org.v25.HpaCapabilities">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                        <xml-property name="description" value="List of cloud-region specific HPA Capabilities"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-                <xml-element java-attribute="rackUnits" name="rack-units" type="inventory.aai.onap.org.v25.RackUnits"/>
-                <xml-element java-attribute="pdus" name="pdus" type="inventory.aai.onap.org.v25.Pdus"/>
+                <xml-element java-attribute="esrSystemInfoList" name="esr-system-info-list" type="inventory.aai.onap.org.v25.EsrSystemInfoList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Definition of rack"/>
-                <xml-property name="indexedProps" value="rack-name,data-owner,data-source,data-source-version"/>
-                <xml-property name="dependentOn" value="complex"/>
-                <xml-property name="container" value="racks"/>
-                <xml-property name="uriTemplate" value="/racks/rack/{rack-name}"/>
-                <xml-property name="requiredProps" value="rack-name,rack-type,rack-location,rack-power-diversity"/>
-             </xml-properties>
+                <xml-property name="description" value="cloud-region designates an installation of a cloud cluster or region or instantiation. In AT&amp;Ts AIC cloud, this could be an LCP or DCP. Cloud regions are uniquely identified by a composite key, cloud-owner + cloud-region-id. The format of the cloud-owner is vendor-cloudname and we will use att-aic for AT&amp;T's AIC."/>
+                <xml-property name="indexedProps" value="cloud-owner,cloud-region-id,cloud-type,owner-defined-type,data-owner,data-source,data-source-version,complex-name,identity-url"/>
+                <xml-property name="nameProps" value="owner-defined-type"/>
+                <xml-property name="container" value="cloud-regions"/>
+                <xml-property name="namespace" value="cloud-infrastructure"/>
+                <xml-property name="uriTemplate" value="/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}"/>
+                <xml-property name="requiredProps" value="cloud-owner,cloud-region-id,orchestration-disabled,in-maint"/>
+            </xml-properties>
         </java-type>
 
-        <java-type name="Cables">
-            <xml-root-element name="cables"/>
+        <java-type name="HostAggregates">
+            <xml-properties>
+                <xml-property name="description" value="Collection of HostAggregates."/>
+            </xml-properties>
+            <xml-root-element name="host-aggregates"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="cable" name="cable" type="inventory.aai.onap.org.v25.Cable"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="hostAggregate" name="host-aggregate" type="inventory.aai.onap.org.v25.HostAggregate"/>
             </java-attributes>
         </java-type>
 
-        <java-type name="Cable">
-            <xml-root-element name="cable"/>
+        <java-type name="HostAggregate">
+            <xml-root-element name="host-aggregate"/>
             <java-attributes>
-                <xml-element java-attribute="cableName" name="cable-name" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="hostAggregateId" name="host-aggregate-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="A unique name for the channel-link relative to the physical-link."/>
+                        <xml-property name="description" value="Unique identifier for the host-aggregate."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="cableType" name="cable-type" required="true" type="java.lang.String">
+                <xml-element java-attribute="hostAggregateName" name="host-aggregate-name" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The type of cable."/>
+                        <xml-property name="description" value="Name of the host-aggregate."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Definition of cable"/>
-                <xml-property name="indexedProps" value="cable-name,data-owner,data-source,data-source-version"/>
-                <xml-property name="dependentOn" value="complex"/>
-                <xml-property name="container" value="cables"/>
-                <xml-property name="uriTemplate" value="/cables/cable/{cable-name}"/>
-                <xml-property name="requiredProps" value="cable-name,cable-type"/>
-             </xml-properties>
+                <xml-property name="description" value="describes an hostAggregates"/>
+                <xml-property name="indexedProps" value="data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+                <xml-property name="container" value="host-aggregates"/>
+                <xml-property name="uriTemplate" value="/host-aggregates/host-aggregate/{host-aggregate-id}"/>
+                <xml-property name="requiredProps" value="host-aggregate-id,host-aggregate-name"/>
+            </xml-properties>
         </java-type>
 
-        <java-type name="RackUnits">
-            <xml-root-element name="rack-units"/>
+        <java-type name="VlanRanges">
+            <xml-root-element name="vlan-ranges"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="rackUnit" name="rack-unit" type="inventory.aai.onap.org.v25.RackUnit"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vlanRange" name="vlan-range" type="inventory.aai.onap.org.v25.VlanRange"/>
             </java-attributes>
+            <xml-properties>
+            </xml-properties>
         </java-type>
 
-        <java-type name="RackUnit">
-            <xml-root-element name="rack-unit"/>
+        <java-type name="VlanRange">
+            <xml-root-element name="vlan-range"/>
             <java-attributes>
-                <xml-element java-attribute="rackUnitName" name="rack-unit-name" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="vlanRangeId" name="vlan-range-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="A unique name for the rack-unit (within the rack)."/>
+                        <xml-property name="description" value="vlan id in range UUID."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                <xml-element java-attribute="vlanIdLower" name="vlan-id-lower" required="true" type="java.lang.Long">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
-                                               <xml-property name="ownerCheck" value="N/A"/>
+                        <xml-property name="description" value="vlan id in range lower"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="vlanIdUpper" name="vlan-id-upper" required="true" type="java.lang.Long">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                        <xml-property name="description" value="vlan id in range upper"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="Identifies the version of the upstream source."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-            </java-attributes>
-            <xml-properties>
-                <xml-property name="description" value="Definition of rack-unit"/>
-                <xml-property name="indexedProps" value="rack-unit-name,data-owner,data-source,data-source-version"/>
-                <xml-property name="dependentOn" value="rack"/>
-                <xml-property name="container" value="rack-units"/>
-                <xml-property name="uriTemplate" value="/rack-units/rack-unit/{rack-unit-name}"/>
-                <xml-property name="requiredProps" value="rack-unit-name"/>
-             </xml-properties>
-        </java-type>
-
-        <java-type name="Pdus">
-            <xml-root-element name="pdus"/>
-            <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="pdu" name="pdu" type="inventory.aai.onap.org.v25.Pdu"/>
-            </java-attributes>
-        </java-type>
-
-        <java-type name="Pdu">
-            <xml-root-element name="pdu"/>
-            <java-attributes>
-                <xml-element java-attribute="pduName" name="pdu-name" required="true" type="java.lang.String" xml-key="true">
-                    <xml-properties>
-                        <xml-property name="description" value="A unique name for the power distribution unit."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="pduType" name="pdu-type" required="true" type="java.lang.String">
+                <xml-element java-attribute="vlanType" name="vlan-type" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The type of pdu."/>
+                        <xml-property name="description" value="vlan type"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
+                <xml-element java-attribute="vlanTags" name="vlan-tags" type="inventory.aai.onap.org.v25.VlanTags"/>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Definition of pdu"/>
-                <xml-property name="uniqueProps" value="pdu-name"/>
-                <xml-property name="indexedProps" value="pdu-name,data-owner,data-source,data-source-version"/>
-                <xml-property name="dependentOn" value="rack"/>
-                <xml-property name="container" value="pdus"/>
-                <xml-property name="uriTemplate" value="/pdus/pdu/{pdu-name}"/>
-                <xml-property name="requiredProps" value="pdu-name,pdu-type"/>
+                <xml-property name="description" value="Definition of vlan range"/>
+                <xml-property name="indexedProps" value="vlan-range-id,vlan-type,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="cloud-region,zone"/>
+                <xml-property name="container" value="vlan-ranges"/>
+                <xml-property name="uriTemplate" value="/vlan-ranges/vlan-range/{vlan-range-id}"/>
+                <xml-property name="searchable" value="vlan-range-id"/>
+                <xml-property name="requiredProps" value="vlan-range-id,vlan-id-lower,vlan-id-upper,vlan-type"/>
             </xml-properties>
         </java-type>
 
-        <java-type name="CtagPools">
-            <xml-root-element name="ctag-pools"/>
+        <java-type name="VolumeGroups">
+            <xml-properties>
+                <xml-property name="description" value="Collection of persistent block-level storage."/>
+            </xml-properties>
+            <xml-root-element name="volume-groups"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="ctagPool" name="ctag-pool" type="inventory.aai.onap.org.v25.CtagPool"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="volumeGroup" name="volume-group" type="inventory.aai.onap.org.v25.VolumeGroup"/>
             </java-attributes>
         </java-type>
 
-        <java-type name="CtagPool">
-            <xml-root-element name="ctag-pool"/>
+        <java-type name="VolumeGroup">
+            <xml-root-element name="volume-group"/>
             <java-attributes>
-                <xml-element java-attribute="targetPe" name="target-pe" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="volumeGroupId" name="volume-group-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="The Target provider edge router"/>
+                        <xml-property name="description" value="Unique ID of volume-group."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="availabilityZoneName" name="availability-zone-name" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="volumeGroupName" name="volume-group-name" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Name of the availability zone"/>
+                        <xml-property name="description" value="Name of the volume group."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="ctagPoolPurpose" name="ctag-pool-purpose" required="true" type="java.lang.String">
+                <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Describes what the intended purpose of this pool is."/>
+                        <xml-property name="description" value="Heat stack id corresponding to this volume-group"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="ctagValues" name="ctag-values" type="java.lang.String">
+                <xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Comma separated list of ctags"/>
+                        <xml-property name="description" value="String capturing type of vnf, that was intended to identify the SDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ONAP matures."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Orchestration status of this volume-group"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="captures the id of all the configuration used to customize the resource for the service."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vfModuleModelCustomizationId" name="vf-module-model-customization-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="helps relate the volume group to the vf-module whose components will require the volume group"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="A collection of C tags (vlan tags) grouped for a specific purpose."/>
-                <xml-property name="indexedProps" value="availability-zone-name,data-owner,data-source,data-source-version"/>
-                <xml-property name="dependentOn" value="complex"/>
-                <xml-property name="container" value="ctag-pools"/>
-                <xml-property name="uriTemplate" value="/ctag-pools/ctag-pool/{target-pe}/{availability-zone-name}"/>
-                <xml-property name="requiredProps" value="target-pe,availability-zone-name,ctag-pool-purpose"/>
-             </xml-properties>
+                <xml-property name="description" value="Persistent block-level storage."/>
+                <xml-property name="indexedProps" value="volume-group-name,vnf-type,heat-stack-id,volume-group-id,orchestration-status,data-owner,data-source,data-source-version"/>
+                <xml-property name="searchable" value="volume-group-id,volume-group-name"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+                <xml-property name="container" value="volume-groups"/>
+                <xml-property name="uriTemplate" value="/volume-groups/volume-group/{volume-group-id}"/>
+                <xml-property name="requiredProps" value="volume-group-id,vnf-type"/>
+            </xml-properties>
         </java-type>
 
-        <java-type name="Tenants">
-            <xml-properties>
-                <xml-property name="description" value="Collection of openstack tenants."/>
-            </xml-properties>
-            <xml-root-element name="tenants"/>
+        <java-type name="RelationshipList">
+            <xml-root-element name="relationship-list"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="tenant" name="tenant" type="inventory.aai.onap.org.v25.Tenant"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="relationship" name="relationship" type="inventory.aai.onap.org.v25.Relationship"/>
             </java-attributes>
-            <xml-properties>
-                <xml-property name="maximumDepth" value="0"/>
-            </xml-properties>
         </java-type>
 
-        <java-type name="Tenant">
-            <xml-root-element name="tenant"/>
+        <java-type name="Relationship">
+            <xml-root-element name="relationship"/>
             <java-attributes>
-                <xml-element java-attribute="tenantId" name="tenant-id" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="relatedTo" name="related-to" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Unique id relative to the cloud-region."/>
+                        <xml-property name="description" value="A keyword provided by A&amp;AI to indicate type of node."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="tenantName" name="tenant-name" required="true" type="java.lang.String">
+                <xml-element java-attribute="relationshipLabel" name="relationship-label" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Readable name of tenant"/>
+                        <xml-property name="description" value="The edge label for this relationship."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="tenantContext" name="tenant-context" type="java.lang.String">
+                <xml-element java-attribute="relatedLink" name="related-link" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="This field will store the tenant context."/>
+                        <xml-property name="description" value="URL to the object in A&amp;AI."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="parentId" name="parent-id" type="java.lang.String">
+                <xml-element container-type="java.util.ArrayList" java-attribute="relationshipData" name="relationship-data" type="inventory.aai.onap.org.v25.RelationshipData"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="relatedToProperty" name="related-to-property" type="inventory.aai.onap.org.v25.RelatedToProperty"/>
+                <xml-element java-attribute="relationshipProperties" name="relationship-properties" type="inventory.aai.onap.org.v25.RelationshipProperties"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="RelatedToProperty">
+            <xml-root-element name="related-to-property"/>
+            <java-attributes>
+                <xml-element java-attribute="propertyKey" name="property-key" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="tenant parent-id"/>
+                        <xml-property name="description" value="Key part of a key/value pair"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="productionState" name="production-state" type="java.lang.String">
+                <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Production state"/>
+                        <xml-property name="description" value="Value part of a key/value pair"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="supportModel" name="support-model" type="java.lang.String">
+            </java-attributes>
+        </java-type>
+
+        <java-type name="RelationshipData">
+            <xml-root-element name="relationship-data"/>
+            <java-attributes>
+                <xml-element java-attribute="relationshipKey" name="relationship-key" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Support Model"/>
+                        <xml-property name="description" value="A keyword provided by A&amp;AI to indicate an attribute."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                <xml-element java-attribute="relationshipValue" name="relationship-value" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
-                                               <xml-property name="ownerCheck" value="N/A"/>
+                        <xml-property name="description" value="Value of the attribute."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+            </java-attributes>
+        </java-type>
+
+        <java-type name="RelationshipProperties">
+            <xml-root-element name="relationship-properties"/>
+            <java-attributes>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                        <xml-property name="description" value="Key part of a key/value pair"/>
+                                               <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                        <xml-property name="description" value="Key part of a key/value pair"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                        <xml-property name="description" value="Key part of a key/value pair"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="vservers" name="vservers" type="inventory.aai.onap.org.v25.Vservers"/>
-                <xml-element java-attribute="nosServers" name="nos-servers" type="inventory.aai.onap.org.v25.NosServers"/>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-                <xml-element java-attribute="k8sResources" name="k8s-resources" type="inventory.aai.onap.org.v25.K8sResources"/>
             </java-attributes>
-            <xml-properties>
-                <xml-property name="description" value="Openstack tenant"/>
-                <xml-property name="nameProps" value="tenant-name"/>
-                <xml-property name="indexedProps" value="tenant-name,tenant-id,tenant-context,data-owner,data-source,data-source-version"/>
-                <xml-property name="searchable" value="tenant-id,tenant-name"/>
-                <xml-property name="dependentOn" value="cloud-region"/>
-                <xml-property name="container" value="tenants"/>
-                <xml-property name="uriTemplate" value="/tenants/tenant/{tenant-id}"/>
-                <xml-property name="requiredProps" value="tenant-id,tenant-name"/>
-            </xml-properties>
         </java-type>
 
-        <java-type name="NosServers">
+        <java-type name="Complexes">
             <xml-properties>
-                <xml-property name="description" value="nos-server is the execution environment that will have images, certain versions of VNOS, running on it."/>
+                <xml-property name="description" value="Collection of physical locations that can house cloud-regions."/>
             </xml-properties>
-            <xml-root-element name="nos-servers"/>
+            <xml-root-element name="complexes"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="nosServer" name="nos-server" type="inventory.aai.onap.org.v25.NosServer"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="complex" name="complex" type="inventory.aai.onap.org.v25.Complex"/>
             </java-attributes>
+            <xml-properties>
+                <xml-property name="maximumDepth" value="0"/>
+            </xml-properties>
         </java-type>
 
-        <java-type name="NosServer">
-            <xml-root-element name="nos-server"/>
+        <java-type name="Complex">
+            <xml-root-element name="complex"/>
             <java-attributes>
-                <xml-element java-attribute="nosServerId" name="nos-server-id" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="physicalLocationId" name="physical-location-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Unique identifier for this nos relative to its tenant"/>
+                        <xml-property name="description" value="Unique identifier for physical location, e.g., CLLI"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="nosServerName" name="nos-server-name" required="true" type="java.lang.String">
+                <xml-element java-attribute="dataCenterCode" name="data-center-code" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Name of nos"/>
+                        <xml-property name="description" value="Data center code which can be an alternate way to identify a complex"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="vendor" name="vendor" required="true" type="java.lang.String">
+                <xml-element java-attribute="complexName" name="complex-name" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="uCPE vendor"/>
+                        <xml-property name="description" value="Gamma complex name for LCP instance."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+                <xml-element java-attribute="identityUrl" name="identity-url" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems."/>
+                        <xml-property name="description" value="URL of the keystone identity service"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="nosServerSelflink" name="nos-server-selflink" required="true" type="java.lang.String">
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element default-value="false" java-attribute="inMaint" name="in-maint" required="true" type="java.lang.Boolean">
+                <xml-element java-attribute="physicalLocationType" name="physical-location-type" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="defaultValue" value="false"/>
-                        <xml-property name="description" value="Used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs."/>
+                        <xml-property name="description" value="Type, e.g., central office, data center."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="timeZone" name="time-zone" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The time zone where the complex is located."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
-                    </xml-properties>
-                </xml-element>
+                <xml-element java-attribute="street1" name="street1" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="street2" name="street2" type="java.lang.String"/>
+                <xml-element java-attribute="city" name="city" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="state" name="state" type="java.lang.String"/>
+                <xml-element java-attribute="postalCode" name="postal-code" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="country" name="country" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="region" name="region" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="latitude" name="latitude" type="java.lang.String"/>
+                <xml-element java-attribute="longitude" name="longitude" type="java.lang.String"/>
+                <xml-element java-attribute="elevation" name="elevation" type="java.lang.String"/>
+                <xml-element java-attribute="lata" name="lata" type="java.lang.String"/>
+                <xml-element java-attribute="racks" name="racks" type="inventory.aai.onap.org.v25.Racks"/>
+                <xml-element java-attribute="cables" name="cables" type="inventory.aai.onap.org.v25.Cables"/>
+                <xml-element java-attribute="ctagPools" name="ctag-pools" type="inventory.aai.onap.org.v25.CtagPools"/>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="nos-server is the execution environment that will have images, certain versions of VNOS, running on it."/>
-                <xml-property name="indexedProps" value="nos-server-id,prov-status,data-owner,data-source,data-source-version"/>
-                <xml-property name="dependentOn" value="tenant"/>
-                <xml-property name="nameProps" value="nos-server-name"/>
-                <xml-property name="container" value="nos-servers"/>
-                <xml-property name="uriTemplate" value="/nos-servers/nos-server/{nos-server-id}"/>
-                <xml-property name="requiredProps" value="nos-server-id,nos-server-name,vendor,nos-server-selflink,in-maint"/>
-             </xml-properties>
+                <xml-property name="description" value="Collection of physical locations that can house cloud-regions."/>
+                <xml-property name="indexedProps" value="identity-url,data-center-code,complex-name,physical-location-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="searchable" value="physical-location-id,data-center-code,complex-name,street1,street2,postal-code"/>
+                <xml-property name="uniqueProps" value="physical-location-id"/>
+                <xml-property name="container" value="complexes"/>
+                <xml-property name="namespace" value="cloud-infrastructure"/>
+                <xml-property name="uriTemplate" value="/cloud-infrastructure/complexes/complex/{physical-location-id}"/>
+                <xml-property name="requiredProps" value="physical-location-id,physical-location-type,street1,city,postal-code,country,region"/>
+            </xml-properties>
         </java-type>
 
-        <java-type name="Vservers">
-            <xml-properties>
-                <xml-property name="description" value="Collection of virtual Servers, aka virtual machines or VMs."/>
-            </xml-properties>
-            <xml-root-element name="vservers"/>
+        <java-type name="Racks">
+            <xml-root-element name="racks"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="vserver" name="vserver" type="inventory.aai.onap.org.v25.Vserver"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="rack" name="rack" type="inventory.aai.onap.org.v25.Rack"/>
             </java-attributes>
         </java-type>
 
-        <java-type name="Vserver">
-            <xml-root-element name="vserver"/>
+        <java-type name="Rack">
+            <xml-root-element name="rack"/>
             <java-attributes>
-                <xml-element java-attribute="vserverId" name="vserver-id" required="true" type="java.lang.String" xml-key="true">
-                    <xml-properties>
-                        <xml-property name="description" value="Unique identifier for this vserver relative to its tenant"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="vserverName" name="vserver-name" required="true" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="Name of vserver"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="vserverName2" name="vserver-name2" type="java.lang.String">
+                <xml-element java-attribute="rackName" name="rack-name" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Alternative name of vserver"/>
+                        <xml-property name="description" value="A unique name for the rack (within the location)."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+                <xml-element java-attribute="rackType" name="rack-type" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems."/>
+                        <xml-property name="description" value="The type of rack."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="vserverSelflink" name="vserver-selflink" required="true" type="java.lang.String">
+                <xml-element java-attribute="rackLocation" name="rack-location" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
+                        <xml-property name="description" value="The location of the rack within the building."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element default-value="false" java-attribute="inMaint" name="in-maint" required="true" type="java.lang.Boolean">
+                <xml-element java-attribute="rackPosition" name="rack-position" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="defaultValue" value="false"/>
-                        <xml-property name="description" value="Used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs."/>
+                        <xml-property name="description" value="The position of the rack (ex-floor-mounted)."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element default-value="false" java-attribute="isClosedLoopDisabled" name="is-closed-loop-disabled" required="true" type="java.lang.Boolean">
+                <xml-element default-value="false" java-attribute="rackPowerDiversity" name="rack-power-diversity" required="true" type="java.lang.Boolean">
                     <xml-properties>
                         <xml-property name="defaultValue" value="false"/>
-                        <xml-property name="description" value="Used to indicate whether closed loop function is enabled on this node"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="numa" name="numa" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="Non-uniform memory access optimization, helps prevent memory-bandwidth bottlenecks. Expected values - 1 or 2 identifying memory access"/>
+                        <xml-property name="description" value=""/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="volumes" name="volumes" type="inventory.aai.onap.org.v25.Volumes"/>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v25.LInterfaces"/>
-                <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="Indicator for whether the resource is considered operational.  Valid values are in-service-path and out-of-service-path."/>
-                        <xml-property name="suggestibleOnSearch" value="true"/>
-                    </xml-properties>
-                </xml-element>
+                <xml-element java-attribute="rackUnits" name="rack-units" type="inventory.aai.onap.org.v25.RackUnits"/>
+                <xml-element java-attribute="pdus" name="pdus" type="inventory.aai.onap.org.v25.Pdus"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Virtual Servers, aka virtual machine or VM."/>
-                <xml-property name="nameProps" value="vserver-name"/>
-                <xml-property name="indexedProps" value="is-closed-loop-disabled,prov-status,vserver-name,vserver-id,vserver-name2,data-owner,data-source,data-source-version"/>
-                <xml-property name="searchable" value="vserver-id,vserver-name,vserver-name2,operational-status"/>
-                <xml-property name="dependentOn" value="tenant"/>
-                <xml-property name="container" value="vservers"/>
-                <xml-property name="uriTemplate" value="/vservers/vserver/{vserver-id}"/>
-                <xml-property name="requiredProps" value="vserver-id,vserver-name,vserver-selflink,in-maint,is-closed-loop-disabled"/>
-             </xml-properties>
+                <xml-property name="description" value="Definition of rack"/>
+                <xml-property name="indexedProps" value="rack-name,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="complex"/>
+                <xml-property name="container" value="racks"/>
+                <xml-property name="uriTemplate" value="/racks/rack/{rack-name}"/>
+                <xml-property name="requiredProps" value="rack-name,rack-type,rack-location,rack-power-diversity"/>
+            </xml-properties>
         </java-type>
 
-        <java-type name="LInterfaces">
-            <xml-properties>
-                <xml-property name="description" value="Collection of logical interfaces."/>
-            </xml-properties>
-            <xml-root-element name="l-interfaces"/>
+        <java-type name="Cables">
+            <xml-root-element name="cables"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="lInterface" name="l-interface" type="inventory.aai.onap.org.v25.LInterface"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="cable" name="cable" type="inventory.aai.onap.org.v25.Cable"/>
             </java-attributes>
         </java-type>
 
-        <java-type name="LInterface">
-            <xml-root-element name="l-interface"/>
+        <java-type name="Cable">
+            <xml-root-element name="cable"/>
             <java-attributes>
-                <xml-element java-attribute="interfaceName" name="interface-name" required="true" type="java.lang.String" xml-key="true">
-                    <xml-properties>
-                        <xml-property name="description" value="Name given to the interface"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String">
+                <xml-element java-attribute="cableName" name="cable-name" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="E.g., CUSTOMER, UPLINK, etc."/>
+                        <xml-property name="description" value="A unique name for the channel-link relative to the physical-link."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="v6WanLinkIp" name="v6-wan-link-ip" type="java.lang.String">
+                <xml-element java-attribute="cableType" name="cable-type" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Questionably placed - v6 ip addr of this interface (is in vr-lan-interface from Mary B."/>
+                        <xml-property name="description" value="The type of cable."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                                               <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="interfaceId" name="interface-id" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="ID of interface"/>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="macaddr" name="macaddr" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="MAC address for the interface"/>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="networkName" name="network-name" type="java.lang.String">
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Name of the network"/>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Definition of cable"/>
+                <xml-property name="indexedProps" value="cable-name,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="complex"/>
+                <xml-property name="container" value="cables"/>
+                <xml-property name="uriTemplate" value="/cables/cable/{cable-name}"/>
+                <xml-property name="requiredProps" value="cable-name,cable-type"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="RackUnits">
+            <xml-root-element name="rack-units"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="rackUnit" name="rack-unit" type="inventory.aai.onap.org.v25.RackUnit"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="RackUnit">
+            <xml-root-element name="rack-unit"/>
+            <java-attributes>
+                <xml-element java-attribute="rackUnitName" name="rack-unit-name" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Whether A&amp;AI should be managing this interface of not. Could have value like CUSTOMER"/>
+                        <xml-property name="description" value="A unique name for the rack-unit (within the rack)."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="interfaceDescription" name="interface-description" type="java.lang.String">
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Human friendly text regarding this interface."/>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                                               <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="interfaceType" name="interface-type" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="type to sub-classify the l-interface (ex, loopback)"/>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="isPortMirrored" name="is-port-mirrored" required="true" type="java.lang.Boolean">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="defaultValue" value="false"/>
-                        <xml-property name="description" value="boolean indicatating whether or not port is a mirrored."/>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element default-value="false" java-attribute="inMaint" name="in-maint" required="true" type="java.lang.Boolean">
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Definition of rack-unit"/>
+                <xml-property name="indexedProps" value="rack-unit-name,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="rack"/>
+                <xml-property name="container" value="rack-units"/>
+                <xml-property name="uriTemplate" value="/rack-units/rack-unit/{rack-unit-name}"/>
+                <xml-property name="requiredProps" value="rack-unit-name"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Pdus">
+            <xml-root-element name="pdus"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="pdu" name="pdu" type="inventory.aai.onap.org.v25.Pdu"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Pdu">
+            <xml-root-element name="pdu"/>
+            <java-attributes>
+                <xml-element java-attribute="pduName" name="pdu-name" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="defaultValue" value="false"/>
-                        <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)"/>
+                        <xml-property name="description" value="A unique name for the power distribution unit."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+                <xml-element java-attribute="pduType" name="pdu-type" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Prov Status of the logical interface. Valid values [PREPROV/NVTPROV/PROV]."/>
+                        <xml-property name="description" value="The type of pdu."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element default-value="false" java-attribute="isIpUnnumbered" name="is-ip-unnumbered" required="true" type="java.lang.Boolean">
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="defaultValue" value="false"/>
-                        <xml-property name="description" value="Flag indicating the interface uses the IP Unnumbered configuration."/>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                                               <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="allowedAddressPairs" name="allowed-address-pairs" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Freeform field for storing an ip address, list of ip addresses or a subnet block."/>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="priority" name="priority" type="java.lang.Integer">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Priority used for fail-over. Valid values 1-1024, with 1 being the highest priority."/>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="opsNote" name="ops-note" type="java.lang.String">
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Notes to aid OPs in troubleshooting, such as attribute aliases or additional descriptions/instructions about an object."/>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="interfaceFunction" name="interface-function" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="The function performed by this Linterface"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="l2Multicasting" name="l2-multicasting" required="true" type="java.lang.Boolean">
-                    <xml-properties>
-                        <xml-property name="defaultValue" value="false"/>
-                        <xml-property name="description" value="Identifies l2-multicasting support on an l-interface. true indicates that l2-multicasting is supported; defaulted to false ."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="vlanIdStatementNeeded" name="vlan-id-statement-needed" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="indicates whether the vlan-id-statement needs to be configured for the interface."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="encapsulation" name="encapsulation" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="specifies the encapsulation type"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="transportType" name="transport-type" type="java.lang.String">
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Definition of pdu"/>
+                <xml-property name="uniqueProps" value="pdu-name"/>
+                <xml-property name="indexedProps" value="pdu-name,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="rack"/>
+                <xml-property name="container" value="pdus"/>
+                <xml-property name="uriTemplate" value="/pdus/pdu/{pdu-name}"/>
+                <xml-property name="requiredProps" value="pdu-name,pdu-type"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="CtagPools">
+            <xml-root-element name="ctag-pools"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="ctagPool" name="ctag-pool" type="inventory.aai.onap.org.v25.CtagPool"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="CtagPool">
+            <xml-root-element name="ctag-pool"/>
+            <java-attributes>
+                <xml-element java-attribute="targetPe" name="target-pe" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="specifies the transport type, e.g. L2transport"/>
+                        <xml-property name="description" value="The Target provider edge router"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="encapsulationTagRewrite" name="encapsulation-tag-rewrite" type="java.lang.String">
+                <xml-element java-attribute="availabilityZoneName" name="availability-zone-name" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="used to store the re-write command, e.g.rewrite ingress tag pop 1 symmetric"/>
+                        <xml-property name="description" value="Name of the availability zone"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="mtu" name="mtu" type="java.lang.String">
+                <xml-element java-attribute="ctagPoolPurpose" name="ctag-pool-purpose" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Maximum transmission unit (MTU) is used to determine the maximum size of each packet in any TCP or IP transmission."/>
+                        <xml-property name="description" value="Describes what the intended purpose of this pool is."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="loadInterval" name="load-interval" type="java.lang.String">
+                <xml-element java-attribute="ctagValues" name="ctag-values" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Length of time for which data is used to compute load statistics."/>
+                        <xml-property name="description" value="Comma separated list of ctags"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="vlans" name="vlans" type="inventory.aai.onap.org.v25.Vlans"/>
-                <xml-element java-attribute="sriovVfs" name="sriov-vfs" type="inventory.aai.onap.org.v25.SriovVfs"/>
-                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v25.LInterfaces"/>
-                <xml-element java-attribute="temporaryParameterLists" name="temporary-parameter-lists" type="inventory.aai.onap.org.v25.TemporaryParameterLists"/>
-                <xml-element java-attribute="lcmpUnreachables" name="lcmp-unreachables" type="inventory.aai.onap.org.v25.LcmpUnreachables"/>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v25.L3InterfaceIpv4AddressList"/>
-                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v25.L3InterfaceIpv6AddressList"/>
-                <xml-element java-attribute="adminStatus" name="admin-status" type="java.lang.String">
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Administrative status of the interface. Valid values are 'up', 'down', or 'testing'."/>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Logical interfaces, e.g., a vnic."/>
-                <xml-property name="indexedProps" value="macaddr,interface-id,interface-name,network-name,interface-type,interface-function,interface-role,prov-status,data-owner,data-source,data-source-version"/>
-                <xml-property name="dependentOn" value="generic-vnf,newvce,p-interface,vserver,lag-interface,l-interface,pnf,pserver"/>
-                <xml-property name="nameProps" value="interface-type"/>
-                <xml-property name="container" value="l-interfaces"/>
-                <xml-property name="uriTemplate" value="/l-interfaces/l-interface/{interface-name}"/>
-                <xml-property name="searchable" value="interface-name"/>
-                <xml-property name="requiredProps" value="interface-name,is-port-mirrored,in-maint,is-ip-unnumbered,l2-multicasting"/>
-             </xml-properties>
+                <xml-property name="description" value="A collection of C tags (vlan tags) grouped for a specific purpose."/>
+                <xml-property name="indexedProps" value="availability-zone-name,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="complex"/>
+                <xml-property name="container" value="ctag-pools"/>
+                <xml-property name="uriTemplate" value="/ctag-pools/ctag-pool/{target-pe}/{availability-zone-name}"/>
+                <xml-property name="requiredProps" value="target-pe,availability-zone-name,ctag-pool-purpose"/>
+            </xml-properties>
         </java-type>
 
-        <java-type name="SriovVfs">
+        <java-type name="Tenants">
             <xml-properties>
-                <xml-property name="description" value="Collection of SR-IOV Virtual Functions."/>
+                <xml-property name="description" value="Collection of openstack tenants."/>
             </xml-properties>
-            <xml-root-element name="sriov-vfs"/>
+            <xml-root-element name="tenants"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="sriovVf" name="sriov-vf" type="inventory.aai.onap.org.v25.SriovVf"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="tenant" name="tenant" type="inventory.aai.onap.org.v25.Tenant"/>
             </java-attributes>
+            <xml-properties>
+                <xml-property name="maximumDepth" value="0"/>
+            </xml-properties>
         </java-type>
-        <java-type name="SriovVf">
-            <xml-root-element name="sriov-vf"/>
+
+        <java-type name="Tenant">
+            <xml-root-element name="tenant"/>
             <java-attributes>
-                <xml-element java-attribute="pciId" name="pci-id" required="true" type="java.lang.String" xml-key="true">
-                    <xml-properties>
-                        <xml-property name="description" value="PCI ID used to identify the sriov-vf"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="vfVlanFilter" name="vf-vlan-filter" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="This metadata provides option to specify list of VLAN filters applied on VF to pass the traffic to VM."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="vfMacFilter" name="vf-mac-filter" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="When MAC filters are specified, VF-agent service configures VFs to do MAC level filtering before the traffic is passed to VM."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="vfVlanStrip" name="vf-vlan-strip" type="java.lang.Boolean">
-                    <xml-properties>
-                        <xml-property name="description" value="When this field is set to true, VF will configured to strip the outer TAG before the traffic is passed to VM."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="vfVlanAntiSpoofCheck" name="vf-vlan-anti-spoof-check" type="java.lang.Boolean">
-                    <xml-properties>
-                        <xml-property name="description" value="This option ensures anti VLAN spoof checks are done at the VF level to comply with security. The disable check will also be honored per the VNF needs for trusted VMs."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="vfMacAntiSpoofCheck" name="vf-mac-anti-spoof-check" type="java.lang.Boolean">
-                    <xml-properties>
-                        <xml-property name="description" value="This option ensures anti MAC spoof checks are done at the VF level to comply with security. The disable check will also be honored per the VNF needs for trusted VMs."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="vfMirrors" name="vf-mirrors" type="java.lang.String">
+                <xml-element java-attribute="tenantId" name="tenant-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="This option defines the set of Mirror objects which essentially mirrors the traffic from source to set of collector VNF Ports."/>
+                        <xml-property name="description" value="Unique id relative to the cloud-region."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="vfBroadcastAllow" name="vf-broadcast-allow" type="java.lang.Boolean">
+                <xml-element java-attribute="tenantName" name="tenant-name" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="This option, if set to true, sets the VF in promiscuous mode and allows all broadcast traffic to reach the VM"/>
+                        <xml-property name="description" value="Readable name of tenant"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="vfUnknownMulticastAllow" name="vf-unknown-multicast-allow" type="java.lang.Boolean">
+                <xml-element java-attribute="tenantContext" name="tenant-context" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="This option, if set to true, sets the VF in promiscuous mode and allows unknown multicast traffic to reach the VM"/>
+                        <xml-property name="description" value="This field will store the tenant context."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="vfUnknownUnicastAllow" name="vf-unknown-unicast-allow" type="java.lang.Boolean">
+                <xml-element java-attribute="parentId" name="parent-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="This option, if set to true, sets the VF in promiscuous mode and allows unknown unicast traffic to reach the VM"/>
+                        <xml-property name="description" value="tenant parent-id"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="vfInsertStag" name="vf-insert-stag" type="java.lang.Boolean">
+                <xml-element java-attribute="productionState" name="production-state" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="This option, if set to true, instructs to insert outer tag after traffic comes out of VM."/>
+                        <xml-property name="description" value="Production state"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="vfLinkStatus" name="vf-link-status" type="java.lang.String">
+                <xml-element java-attribute="supportModel" name="support-model" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="This option is used to set the link status.  Valid values as of 1607 are on, off, and auto."/>
+                        <xml-property name="description" value="Support Model"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="Neutron network id of the interface"/>
-                    </xml-properties>
-                </xml-element>
+                <xml-element java-attribute="vservers" name="vservers" type="inventory.aai.onap.org.v25.Vservers"/>
+                <xml-element java-attribute="nosServers" name="nos-servers" type="inventory.aai.onap.org.v25.NosServers"/>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
+                <xml-element java-attribute="k8sResources" name="k8s-resources" type="inventory.aai.onap.org.v25.K8sResources"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="SR-IOV Virtual Function (not to be confused with virtual network function)"/>
-                <xml-property name="indexedProps" value="pci-id,vf-vlan-filter,vf-mac-filter,vf-vlan-strip,neutron-network-id,data-owner,data-source,data-source-version"/>
-                <xml-property name="dependentOn" value="l-interface"/>
-                <xml-property name="container" value="sriov-vfs"/>
-                <xml-property name="uriTemplate" value="/sriov-vfs/sriov-vf/{pci-id}"/>
-                <xml-property name="requiredProps" value="pci-id"/>
-             </xml-properties>
+                <xml-property name="description" value="Openstack tenant"/>
+                <xml-property name="nameProps" value="tenant-name"/>
+                <xml-property name="indexedProps" value="tenant-name,tenant-id,tenant-context,data-owner,data-source,data-source-version"/>
+                <xml-property name="searchable" value="tenant-id,tenant-name"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+                <xml-property name="container" value="tenants"/>
+                <xml-property name="uriTemplate" value="/tenants/tenant/{tenant-id}"/>
+                <xml-property name="requiredProps" value="tenant-id,tenant-name"/>
+            </xml-properties>
         </java-type>
 
-        <java-type name="L3InterfaceIpv4AddressList">
-            <xml-root-element name="l3-interface-ipv4-address-list"/>
+        <java-type name="NosServers">
+            <xml-properties>
+                <xml-property name="description" value="nos-server is the execution environment that will have images, certain versions of VNOS, running on it."/>
+            </xml-properties>
+            <xml-root-element name="nos-servers"/>
             <java-attributes>
-                <xml-element java-attribute="l3InterfaceIpv4Address" name="l3-interface-ipv4-address" required="true" type="java.lang.String" xml-key="true">
-                    <xml-properties>
-                        <xml-property name="description" value="IP address"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="l3InterfaceIpv4PrefixLength" name="l3-interface-ipv4-prefix-length" type="java.lang.Long">
-                    <xml-properties>
-                        <xml-property name="description" value="Prefix length, 32 for single address"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
-                    <xml-properties>
-                        <xml-property name="description" value="Inner VLAN tag"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
+                <xml-element container-type="java.util.ArrayList" java-attribute="nosServer" name="nos-server" type="inventory.aai.onap.org.v25.NosServer"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="NosServer">
+            <xml-root-element name="nos-server"/>
+            <java-attributes>
+                <xml-element java-attribute="nosServerId" name="nos-server-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Outer VLAN tag"/>
+                        <xml-property name="description" value="Unique identifier for this nos relative to its tenant"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="isFloating" name="is-floating" type="java.lang.Boolean">
+                <xml-element java-attribute="nosServerName" name="nos-server-name" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Indicator of fixed or floating address"/>
+                        <xml-property name="description" value="Name of nos"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                <xml-element java-attribute="vendor" name="vendor" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                        <xml-property name="description" value="uCPE vendor"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
+                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Neutron network id of the interface that address belongs to"/>
+                        <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String">
+                <xml-element java-attribute="nosServerSelflink" name="nos-server-selflink" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Neutron id of subnet that address belongs to"/>
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="opsNote" name="ops-note" type="java.lang.String">
+                <xml-element default-value="false" java-attribute="inMaint" name="in-maint" required="true" type="java.lang.Boolean">
                     <xml-properties>
-                        <xml-property name="description" value="Notes to aid OPs in troubleshooting, such as attribute aliases or additional descriptions/instructions about an object."/>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="Used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="IPv4 Address Range"/>
-                <xml-property name="indexedProps" value="l3-interface-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id,vlan-id-outer,data-owner,data-source,data-source-version"/>
-                <xml-property name="dependentOn" value="vlan,l-interface,vnfc,cp,lag-interface,p-interface"/>
-                <xml-property name="uriTemplate" value="/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}"/>
-                <xml-property name="requiredProps" value="l3-interface-ipv4-address"/>
-             </xml-properties>
+                <xml-property name="description" value="nos-server is the execution environment that will have images, certain versions of VNOS, running on it."/>
+                <xml-property name="indexedProps" value="nos-server-id,prov-status,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="tenant"/>
+                <xml-property name="nameProps" value="nos-server-name"/>
+                <xml-property name="container" value="nos-servers"/>
+                <xml-property name="uriTemplate" value="/nos-servers/nos-server/{nos-server-id}"/>
+                <xml-property name="requiredProps" value="nos-server-id,nos-server-name,vendor,nos-server-selflink,in-maint"/>
+            </xml-properties>
         </java-type>
 
-        <java-type name="Vlans">
-            <xml-root-element name="vlans"/>
+        <java-type name="Vservers">
+            <xml-properties>
+                <xml-property name="description" value="Collection of virtual Servers, aka virtual machines or VMs."/>
+            </xml-properties>
+            <xml-root-element name="vservers"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="vlan" name="vlan" type="inventory.aai.onap.org.v25.Vlan"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vserver" name="vserver" type="inventory.aai.onap.org.v25.Vserver"/>
             </java-attributes>
         </java-type>
 
-        <java-type name="Vlan">
-            <xml-root-element name="vlan"/>
+        <java-type name="Vserver">
+            <xml-root-element name="vserver"/>
             <java-attributes>
-                <xml-element java-attribute="vlanInterface" name="vlan-interface" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="vserverId" name="vserver-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="String that identifies the interface"/>
+                        <xml-property name="description" value="Unique identifier for this vserver relative to its tenant"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
+                <xml-element java-attribute="vserverName" name="vserver-name" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Inner VLAN tag"/>
+                        <xml-property name="description" value="Name of vserver"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
+                <xml-element java-attribute="vserverName2" name="vserver-name2" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Outer VLAN tag"/>
+                        <xml-property name="description" value="Alternative name of vserver"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                        <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String">
+                <xml-element java-attribute="vserverSelflink" name="vserver-selflink" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Captures the numeric part of the speed"/>
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
+                <xml-element default-value="false" java-attribute="inMaint" name="in-maint" required="true" type="java.lang.Boolean">
                     <xml-properties>
-                        <xml-property name="description" value="Captures the units corresponding to the speed"/>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="Used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="vlanType" name="vlan-type" type="java.lang.String">
+                <xml-element default-value="false" java-attribute="isClosedLoopDisabled" name="is-closed-loop-disabled" required="true" type="java.lang.Boolean">
                     <xml-properties>
-                        <xml-property name="description" value="The type of vlan (eg. vxlan)"/>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="Used to indicate whether closed loop function is enabled on this node"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="vlanDescription" name="vlan-description" type="java.lang.String">
+                <xml-element java-attribute="numa" name="numa" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used to describe (the service associated with) the vlan"/>
+                        <xml-property name="description" value="Non-uniform memory access optimization, helps prevent memory-bandwidth bottlenecks. Expected values - 1 or 2 identifying memory access"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="backdoorConnection" name="backdoor-connection" type="java.lang.String">
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Whether customer is going to use this VLAN for backdoor connection to another customer premise device."/>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                                               <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="vpnKey" name="vpn-key" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="This indicates the customers VPN ID associated with this vlan"/>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Status of a vnf's vlan interface, on which the customer circuit resides, mastered by SDN-C."/>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element default-value="false" java-attribute="inMaint" name="in-maint" required="true" type="java.lang.Boolean">
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="defaultValue" value="false"/>
-                        <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)"/>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+                <xml-element java-attribute="volumes" name="volumes" type="inventory.aai.onap.org.v25.Volumes"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
+                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v25.LInterfaces"/>
+                <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Prov Status of the VLAN configuration related to a logical interface. Valid values [PREPROV/NVTPROV/PROV]."/>
+                        <xml-property name="description" value="Indicator for whether the resource is considered operational.  Valid values are in-service-path and out-of-service-path."/>
+                        <xml-property name="suggestibleOnSearch" value="true"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element default-value="false" java-attribute="isIpUnnumbered" name="is-ip-unnumbered" required="true" type="java.lang.Boolean">
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Virtual Servers, aka virtual machine or VM."/>
+                <xml-property name="nameProps" value="vserver-name"/>
+                <xml-property name="indexedProps" value="is-closed-loop-disabled,prov-status,vserver-name,vserver-id,vserver-name2,data-owner,data-source,data-source-version"/>
+                <xml-property name="searchable" value="vserver-id,vserver-name,vserver-name2,operational-status"/>
+                <xml-property name="dependentOn" value="tenant"/>
+                <xml-property name="container" value="vservers"/>
+                <xml-property name="uriTemplate" value="/vservers/vserver/{vserver-id}"/>
+                <xml-property name="requiredProps" value="vserver-id,vserver-name,vserver-selflink,in-maint,is-closed-loop-disabled"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="LInterfaces">
+            <xml-properties>
+                <xml-property name="description" value="Collection of logical interfaces."/>
+            </xml-properties>
+            <xml-root-element name="l-interfaces"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="lInterface" name="l-interface" type="inventory.aai.onap.org.v25.LInterface"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="LInterface">
+            <xml-root-element name="l-interface"/>
+            <java-attributes>
+                <xml-element java-attribute="interfaceName" name="interface-name" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="defaultValue" value="false"/>
-                        <xml-property name="description" value="Flag indicating the interface uses the IP Unnumbered configuration."/>
+                        <xml-property name="description" value="Name given to the interface"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element default-value="false" java-attribute="isPrivate" name="is-private" required="true" type="java.lang.Boolean">
+                <xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="defaultValue" value="false"/>
-                        <xml-property name="description" value="Private VLAN indicator."/>
+                        <xml-property name="description" value="E.g., CUSTOMER, UPLINK, etc."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                <xml-element java-attribute="v6WanLinkIp" name="v6-wan-link-ip" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
-                                               <xml-property name="ownerCheck" value="N/A"/>
+                        <xml-property name="description" value="Questionably placed - v6 ip addr of this interface (is in vr-lan-interface from Mary B."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="interfaceId" name="interface-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                        <xml-property name="description" value="ID of interface"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v25.L3InterfaceIpv4AddressList"/>
-                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v25.L3InterfaceIpv6AddressList"/>
-            </java-attributes>
-            <xml-properties>
-                <xml-property name="description" value="Definition of vlan"/>
-                <xml-property name="indexedProps" value="vlan-interface,vlan-id-inner,vpn-key,orchestration-status,prov-status,vlan-id-outer,vlan-type,data-owner,data-source,data-source-version"/>
-                <xml-property name="dependentOn" value="l-interface"/>
-                <xml-property name="container" value="vlans"/>
-                <xml-property name="uriTemplate" value="/vlans/vlan/{vlan-interface}"/>
-                <xml-property name="requiredProps" value="vlan-interface,in-maint,is-ip-unnumbered,is-private"/>
-             </xml-properties>
-        </java-type>
-
-        <java-type name="L3InterfaceIpv6AddressList">
-            <xml-root-element name="l3-interface-ipv6-address-list"/>
-            <java-attributes>
-                <xml-element java-attribute="l3InterfaceIpv6Address" name="l3-interface-ipv6-address" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="macaddr" name="macaddr" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="IP address"/>
+                        <xml-property name="description" value="MAC address for the interface"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="l3InterfaceIpv6PrefixLength" name="l3-interface-ipv6-prefix-length" type="java.lang.Long">
+                <xml-element java-attribute="networkName" name="network-name" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Prefix length, 128 for single address"/>
+                        <xml-property name="description" value="Name of the network"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
+                <xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Inner VLAN tag"/>
+                        <xml-property name="description" value="Whether A&amp;AI should be managing this interface of not. Could have value like CUSTOMER"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
+                <xml-element java-attribute="interfaceDescription" name="interface-description" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Outer VLAN tag"/>
+                        <xml-property name="description" value="Human friendly text regarding this interface."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="isFloating" name="is-floating" type="java.lang.Boolean">
+                <xml-element java-attribute="interfaceType" name="interface-type" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Indicator of fixed or floating address"/>
+                        <xml-property name="description" value="type to sub-classify the l-interface (ex, loopback)"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="isPortMirrored" name="is-port-mirrored" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="boolean indicatating whether or not port is a mirrored."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
+                <xml-element default-value="false" java-attribute="inMaint" name="in-maint" required="true" type="java.lang.Boolean">
                     <xml-properties>
-                        <xml-property name="description" value="Neutron network id of the interface that address belongs to"/>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String">
+                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Neutron id of subnet that address belongs to"/>
+                        <xml-property name="description" value="Prov Status of the logical interface. Valid values [PREPROV/NVTPROV/PROV]."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="opsNote" name="ops-note" type="java.lang.String">
+                <xml-element default-value="false" java-attribute="isIpUnnumbered" name="is-ip-unnumbered" required="true" type="java.lang.Boolean">
                     <xml-properties>
-                        <xml-property name="description" value="Notes to aid OPs in troubleshooting, such as attribute aliases or additional descriptions/instructions about an object."/>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="Flag indicating the interface uses the IP Unnumbered configuration."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                <xml-element java-attribute="allowedAddressPairs" name="allowed-address-pairs" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
-                                               <xml-property name="ownerCheck" value="N/A"/>
+                        <xml-property name="description" value="Freeform field for storing an ip address, list of ip addresses or a subnet block."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="priority" name="priority" type="java.lang.Integer">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                        <xml-property name="description" value="Priority used for fail-over. Valid values 1-1024, with 1 being the highest priority."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="opsNote" name="ops-note" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                        <xml-property name="description" value="Notes to aid OPs in troubleshooting, such as attribute aliases or additional descriptions/instructions about an object."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-            </java-attributes>
-            <xml-properties>
-                <xml-property name="description" value="IPv6 Address Range"/>
-                <xml-property name="indexedProps" value="l3-interface-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id,vlan-id-outer,data-owner,data-source,data-source-version"/>
-                <xml-property name="dependentOn" value="vlan,l-interface,vnfc,cp,lag-interface,p-interface"/>
-                <xml-property name="uriTemplate" value="/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}"/>
-                <xml-property name="requiredProps" value="l3-interface-ipv6-address"/>
-            </xml-properties>
-        </java-type>
-
-        <java-type name="Volumes">
-            <xml-properties>
-                <xml-property name="description" value="Collection of ephemeral Block storage volumes."/>
-            </xml-properties>
-            <xml-root-element name="volumes"/>
-            <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="volume" name="volume" type="inventory.aai.onap.org.v25.Volume"/>
-            </java-attributes>
-        </java-type>
-
-        <java-type name="Volume">
-            <xml-root-element name="volume"/>
-            <java-attributes>
-                <xml-element java-attribute="volumeId" name="volume-id" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="interfaceFunction" name="interface-function" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Unique ID of block storage volume relative to the vserver."/>
+                        <xml-property name="description" value="The function performed by this Linterface"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="volumeSelflink" name="volume-selflink" required="true" type="java.lang.String">
+                <xml-element java-attribute="l2Multicasting" name="l2-multicasting" required="true" type="java.lang.Boolean">
                     <xml-properties>
-                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="Identifies l2-multicasting support on an l-interface. true indicates that l2-multicasting is supported; defaulted to false ."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                <xml-element java-attribute="vlanIdStatementNeeded" name="vlan-id-statement-needed" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
-                                               <xml-property name="ownerCheck" value="N/A"/>
+                        <xml-property name="description" value="indicates whether the vlan-id-statement needs to be configured for the interface."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="encapsulation" name="encapsulation" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                        <xml-property name="description" value="specifies the encapsulation type"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="transportType" name="transport-type" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                        <xml-property name="description" value="specifies the transport type, e.g. L2transport"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                <xml-element java-attribute="encapsulationTagRewrite" name="encapsulation-tag-rewrite" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                        <xml-property name="description" value="used to store the re-write command, e.g.rewrite ingress tag pop 1 symmetric"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-            </java-attributes>
-            <xml-properties>
-                <xml-property name="description" value="Ephemeral Block storage volume."/>
-                <xml-property name="indexedProps" value="volume-id,data-owner,data-source,data-source-version"/>
-                <xml-property name="dependentOn" value="vserver"/>
-                <xml-property name="container" value="volumes"/>
-                <xml-property name="uriTemplate" value="/volumes/volume/{volume-id}"/>
-                <xml-property name="requiredProps" value="volume-id,volume-selflink"/>
-             </xml-properties>
+                <xml-element java-attribute="mtu" name="mtu" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Maximum transmission unit (MTU) is used to determine the maximum size of each packet in any TCP or IP transmission."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="loadInterval" name="load-interval" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Length of time for which data is used to compute load statistics."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                                               <xml-property name="ownerCheck" value="N/A"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlans" name="vlans" type="inventory.aai.onap.org.v25.Vlans"/>
+                <xml-element java-attribute="sriovVfs" name="sriov-vfs" type="inventory.aai.onap.org.v25.SriovVfs"/>
+                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v25.LInterfaces"/>
+                <xml-element java-attribute="temporaryParameterLists" name="temporary-parameter-lists" type="inventory.aai.onap.org.v25.TemporaryParameterLists"/>
+                <xml-element java-attribute="icmpUnreachables" name="icmp-unreachables" type="inventory.aai.onap.org.v25.IcmpUnreachables"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v25.L3InterfaceIpv4AddressList"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v25.L3InterfaceIpv6AddressList"/>
+                <xml-element java-attribute="adminStatus" name="admin-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Administrative status of the interface. Valid values are 'up', 'down', or 'testing'."/>
+                    </xml-properties>
+                </xml-element>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Logical interfaces, e.g., a vnic."/>
+                <xml-property name="indexedProps" value="macaddr,interface-id,interface-name,network-name,interface-type,interface-function,interface-role,prov-status,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="generic-vnf,newvce,p-interface,vserver,lag-interface,l-interface,pnf,pserver"/>
+                <xml-property name="nameProps" value="interface-type"/>
+                <xml-property name="container" value="l-interfaces"/>
+                <xml-property name="uriTemplate" value="/l-interfaces/l-interface/{interface-name}"/>
+                <xml-property name="searchable" value="interface-name"/>
+                <xml-property name="requiredProps" value="interface-name,is-port-mirrored,in-maint,is-ip-unnumbered,l2-multicasting"/>
+            </xml-properties>
         </java-type>
 
-        <java-type name="Flavors">
+        <java-type name="SriovVfs">
             <xml-properties>
-                <xml-property name="description" value="Collection of openstack flavors."/>
+                <xml-property name="description" value="Collection of SR-IOV Virtual Functions."/>
             </xml-properties>
-            <xml-root-element name="flavors"/>
+            <xml-root-element name="sriov-vfs"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="flavor" name="flavor" type="inventory.aai.onap.org.v25.Flavor"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="sriovVf" name="sriov-vf" type="inventory.aai.onap.org.v25.SriovVf"/>
             </java-attributes>
         </java-type>
-
-        <java-type name="Flavor">
-            <xml-root-element name="flavor"/>
+        <java-type name="SriovVf">
+            <xml-root-element name="sriov-vf"/>
             <java-attributes>
-                <xml-element java-attribute="flavorId" name="flavor-id" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="pciId" name="pci-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Flavor id, expected to be unique across cloud-region."/>
+                        <xml-property name="description" value="PCI ID used to identify the sriov-vf"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="flavorName" name="flavor-name" required="true" type="java.lang.String">
+                <xml-element java-attribute="vfVlanFilter" name="vf-vlan-filter" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Flavor name"/>
+                        <xml-property name="description" value="This metadata provides option to specify list of VLAN filters applied on VF to pass the traffic to VM."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="flavorVcpus" name="flavor-vcpus" type="java.lang.Integer">
+                <xml-element java-attribute="vfMacFilter" name="vf-mac-filter" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Number of CPUs"/>
+                        <xml-property name="description" value="When MAC filters are specified, VF-agent service configures VFs to do MAC level filtering before the traffic is passed to VM."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="flavorRam" name="flavor-ram" type="java.lang.Integer">
+                <xml-element java-attribute="vfVlanStrip" name="vf-vlan-strip" type="java.lang.Boolean">
                     <xml-properties>
-                        <xml-property name="description" value="Amount of memory"/>
+                        <xml-property name="description" value="When this field is set to true, VF will configured to strip the outer TAG before the traffic is passed to VM."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="flavorDisk" name="flavor-disk" type="java.lang.Integer">
+                <xml-element java-attribute="vfVlanAntiSpoofCheck" name="vf-vlan-anti-spoof-check" type="java.lang.Boolean">
                     <xml-properties>
-                        <xml-property name="description" value="Disk space"/>
+                        <xml-property name="description" value="This option ensures anti VLAN spoof checks are done at the VF level to comply with security. The disable check will also be honored per the VNF needs for trusted VMs."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="flavorEphemeral" name="flavor-ephemeral" type="java.lang.Integer">
+                <xml-element java-attribute="vfMacAntiSpoofCheck" name="vf-mac-anti-spoof-check" type="java.lang.Boolean">
                     <xml-properties>
-                        <xml-property name="description" value="Amount of ephemeral disk space"/>
+                        <xml-property name="description" value="This option ensures anti MAC spoof checks are done at the VF level to comply with security. The disable check will also be honored per the VNF needs for trusted VMs."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="flavorSwap" name="flavor-swap" type="java.lang.String">
+                <xml-element java-attribute="vfMirrors" name="vf-mirrors" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="amount of swap space allocation"/>
+                        <xml-property name="description" value="This option defines the set of Mirror objects which essentially mirrors the traffic from source to set of collector VNF Ports."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="flavorIsPublic" name="flavor-is-public" type="java.lang.Boolean">
+                <xml-element java-attribute="vfBroadcastAllow" name="vf-broadcast-allow" type="java.lang.Boolean">
                     <xml-properties>
-                        <xml-property name="description" value="whether flavor is available to all users or private to the tenant it was created in."/>
+                        <xml-property name="description" value="This option, if set to true, sets the VF in promiscuous mode and allows all broadcast traffic to reach the VM"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="flavorSelflink" name="flavor-selflink" required="true" type="java.lang.String">
+                <xml-element java-attribute="vfUnknownMulticastAllow" name="vf-unknown-multicast-allow" type="java.lang.Boolean">
                     <xml-properties>
-                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
+                        <xml-property name="description" value="This option, if set to true, sets the VF in promiscuous mode and allows unknown multicast traffic to reach the VM"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="flavorDisabled" name="flavor-disabled" type="java.lang.Boolean">
+                <xml-element java-attribute="vfUnknownUnicastAllow" name="vf-unknown-unicast-allow" type="java.lang.Boolean">
                     <xml-properties>
-                        <xml-property name="description" value="Boolean as to whether this flavor is no longer enabled"/>
+                        <xml-property name="description" value="This option, if set to true, sets the VF in promiscuous mode and allows unknown unicast traffic to reach the VM"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vfInsertStag" name="vf-insert-stag" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="This option, if set to true, instructs to insert outer tag after traffic comes out of VM."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vfLinkStatus" name="vf-link-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="This option is used to set the link status.  Valid values as of 1607 are on, off, and auto."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="hpaCapabilities" name="hpa-capabilities" type="inventory.aai.onap.org.v25.HpaCapabilities">
-                                       <xml-properties>
-                                               <xml-property name="description" value="List of flavor specific HPA Capabilities"/>
-                                       </xml-properties>
-                               </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
+                <xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Neutron network id of the interface"/>
+                    </xml-properties>
+                </xml-element>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Openstack flavor."/>
-                <xml-property name="nameProps" value="flavor-name"/>
-                <xml-property name="indexedProps" value="flavor-name,flavor-id,data-owner,data-source,data-source-version"/>
-                <xml-property name="dependentOn" value="cloud-region"/>
-                <xml-property name="container" value="flavors"/>
-                <xml-property name="uriTemplate" value="/flavors/flavor/{flavor-id}"/>
-                <xml-property name="requiredProps" value="flavor-id,flavor-name,flavor-selflink"/>
-             </xml-properties>
-        </java-type>
-
-        <java-type name="Snapshots">
-            <xml-properties>
-                <xml-property name="description" value="Collection of openstack snapshots"/>
+                <xml-property name="description" value="SR-IOV Virtual Function (not to be confused with virtual network function)"/>
+                <xml-property name="indexedProps" value="pci-id,vf-vlan-filter,vf-mac-filter,vf-vlan-strip,neutron-network-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="l-interface"/>
+                <xml-property name="container" value="sriov-vfs"/>
+                <xml-property name="uriTemplate" value="/sriov-vfs/sriov-vf/{pci-id}"/>
+                <xml-property name="requiredProps" value="pci-id"/>
             </xml-properties>
-            <xml-root-element name="snapshots"/>
-            <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="snapshot" name="snapshot" type="inventory.aai.onap.org.v25.Snapshot"/>
-            </java-attributes>
         </java-type>
 
-        <java-type name="Snapshot">
-            <xml-root-element name="snapshot"/>
+        <java-type name="L3InterfaceIpv4AddressList">
+            <xml-root-element name="l3-interface-ipv4-address-list"/>
             <java-attributes>
-                <xml-element java-attribute="snapshotId" name="snapshot-id" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="l3InterfaceIpv4Address" name="l3-interface-ipv4-address" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Snapshot id, this is the key UUID assoc associated in glance with the snapshots."/>
+                        <xml-property name="description" value="IP address"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="snapshotName" name="snapshot-name" type="java.lang.String">
+                <xml-element java-attribute="l3InterfaceIpv4PrefixLength" name="l3-interface-ipv4-prefix-length" type="java.lang.Long">
                     <xml-properties>
-                        <xml-property name="description" value="Snapshot name"/>
+                        <xml-property name="description" value="Prefix length, 32 for single address"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="snapshotArchitecture" name="snapshot-architecture" type="java.lang.String">
+                <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
                     <xml-properties>
-                        <xml-property name="description" value="Operating system architecture"/>
+                        <xml-property name="description" value="Inner VLAN tag"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="snapshotOsDistro" name="snapshot-os-distro" type="java.lang.String">
+                <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
                     <xml-properties>
-                        <xml-property name="description" value="The common name of the operating system distribution in lowercase"/>
+                        <xml-property name="description" value="Outer VLAN tag"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="snapshotOsVersion" name="snapshot-os-version" type="java.lang.String">
+                <xml-element java-attribute="isFloating" name="is-floating" type="java.lang.Boolean">
                     <xml-properties>
-                        <xml-property name="description" value="The operating system version as specified by the distributor."/>
+                        <xml-property name="description" value="Indicator of fixed or floating address"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="application" name="application" type="java.lang.String">
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The application that the image instantiates."/>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="applicationVendor" name="application-vendor" type="java.lang.String">
+                <xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The vendor of the application."/>
+                        <xml-property name="description" value="Neutron network id of the interface that address belongs to"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="applicationVersion" name="application-version" type="java.lang.String">
+                <xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The version of the application."/>
+                        <xml-property name="description" value="Neutron id of subnet that address belongs to"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="snapshotSelflink" name="snapshot-selflink" type="java.lang.String">
+                <xml-element java-attribute="opsNote" name="ops-note" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
+                        <xml-property name="description" value="Notes to aid OPs in troubleshooting, such as attribute aliases or additional descriptions/instructions about an object."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="prevSnapshotId" name="prev-snapshot-id" type="java.lang.String">
+                <xml-element java-attribute="l3InterfaceIpv4SriovAddress" name="l3-interface-ipv4-sriov-address" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="This field contains the UUID of the previous snapshot (if any)."/>
+                        <xml-property name="description" value="Used to hold the real IP V4 address data for the OMC vservers’ SRIOV l-interfaces."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="l3InterfaceIpv4SriovPrefixLength" name="l3-interface-ipv4-sriov-prefix-length" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Prefix length for SRIOV interfaces, 32 for single address."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
-                    </xml-properties>
-                </xml-element>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Openstack snapshot"/>
-                <xml-property name="nameProps" value="snapshot-name"/>
-                <xml-property name="uniqueProps" value="snapshot-id"/>
-                <xml-property name="indexedProps" value="application,snapshot-name,application-vendor,snapshot-id,application-version,prev-snapshot-id,data-owner,data-source,data-source-version"/>
-                <xml-property name="dependentOn" value="cloud-region"/>
-                <xml-property name="container" value="snapshots"/>
-                <xml-property name="uriTemplate" value="/snapshots/snapshot/{snapshot-id}"/>
-                <xml-property name="requiredProps" value="snapshot-id"/>
+                <xml-property name="description" value="IPv4 Address Range"/>
+                <xml-property name="indexedProps" value="l3-interface-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id,vlan-id-outer,data-owner,data-source,data-source-version,l3-interface-ipv4-sriov-address"/>
+                <xml-property name="dependentOn" value="vlan,l-interface,vnfc,cp,lag-interface,p-interface"/>
+                <xml-property name="uriTemplate" value="/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}"/>
+                <xml-property name="requiredProps" value="l3-interface-ipv4-address"/>
             </xml-properties>
         </java-type>
 
-        <java-type name="GroupAssignments">
-            <xml-properties>
-                <xml-property name="description" value="Collection of openstack group assignments"/>
-            </xml-properties>
-            <xml-root-element name="group-assignments"/>
+        <java-type name="Vlans">
+            <xml-root-element name="vlans"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="groupAssignment" name="group-assignment" type="inventory.aai.onap.org.v25.GroupAssignment"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vlan" name="vlan" type="inventory.aai.onap.org.v25.Vlan"/>
             </java-attributes>
         </java-type>
 
-        <java-type name="GroupAssignment">
-            <xml-root-element name="group-assignment"/>
+        <java-type name="Vlan">
+            <xml-root-element name="vlan"/>
             <java-attributes>
-                <xml-element java-attribute="groupId" name="group-id" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="vlanInterface" name="vlan-interface" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Group id, expected to be unique across cloud-region."/>
+                        <xml-property name="description" value="String that identifies the interface"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="groupType" name="group-type" required="true" type="java.lang.String">
+                <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
                     <xml-properties>
-                        <xml-property name="description" value="Group type - the type of group this instance refers to"/>
+                        <xml-property name="description" value="Inner VLAN tag"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="groupName" name="group-name" required="true" type="java.lang.String">
+                <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
                     <xml-properties>
-                        <xml-property name="description" value="Group name - name assigned to the group"/>
+                        <xml-property name="description" value="Outer VLAN tag"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="groupDescription" name="group-description" type="java.lang.String">
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Group description - description of the group"/>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                <xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
-                                               <xml-property name="ownerCheck" value="N/A"/>
+                        <xml-property name="description" value="Captures the numeric part of the speed"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                        <xml-property name="description" value="Captures the units corresponding to the speed"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="Identifies the version of the upstream source."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-            </java-attributes>
-            <xml-properties>
-                <xml-property name="description" value="Openstack group-assignment used to store exclusivity groups (EG)."/>
-                <xml-property name="nameProps" value="group-name"/>
-                <xml-property name="indexedProps" value="group-id,group-type,group-name,data-owner,data-source,data-source-version"/>
-                <xml-property name="searchable" value="group-id,group-name"/>
-                <xml-property name="dependentOn" value="cloud-region"/>
-                <xml-property name="container" value="group-assignments"/>
-                <xml-property name="uriTemplate" value="/group-assignments/group-assignment/{group-id}"/>
-                <xml-property name="requiredProps" value="group-id,group-type,group-name"/>
-              </xml-properties>
-        </java-type>
-
-        <java-type name="Images">
-            <xml-properties>
-                <xml-property name="description" value="Collectio of Openstack images."/>
-            </xml-properties>
-            <xml-root-element name="images"/>
-            <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="image" name="image" type="inventory.aai.onap.org.v25.Image"/>
-            </java-attributes>
-        </java-type>
-
-        <java-type name="Image">
-            <xml-root-element name="image"/>
-            <java-attributes>
-                <xml-element java-attribute="imageId" name="image-id" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="vlanType" name="vlan-type" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Image id, expected to be unique across cloud region"/>
+                        <xml-property name="description" value="The type of vlan (eg. vxlan)"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="imageName" name="image-name" required="true" type="java.lang.String">
+                <xml-element java-attribute="vlanDescription" name="vlan-description" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Image name"/>
+                        <xml-property name="description" value="Used to describe (the service associated with) the vlan"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="imageArchitecture" name="image-architecture" type="java.lang.String">
+                <xml-element java-attribute="backdoorConnection" name="backdoor-connection" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Operating system architecture."/>
+                        <xml-property name="description" value="Whether customer is going to use this VLAN for backdoor connection to another customer premise device."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="imageOsDistro" name="image-os-distro" required="true" type="java.lang.String">
+                <xml-element java-attribute="vpnKey" name="vpn-key" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The common name of the operating system distribution in lowercase"/>
+                        <xml-property name="description" value="This indicates the customers VPN ID associated with this vlan"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="imageOsVersion" name="image-os-version" required="true" type="java.lang.String">
+                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The operating system version as specified by the distributor."/>
+                        <xml-property name="description" value="Status of a vnf's vlan interface, on which the customer circuit resides, mastered by SDN-C."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="application" name="application" type="java.lang.String">
+                <xml-element default-value="false" java-attribute="inMaint" name="in-maint" required="true" type="java.lang.Boolean">
                     <xml-properties>
-                        <xml-property name="description" value="The application that the image instantiates."/>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="applicationVendor" name="application-vendor" type="java.lang.String">
+                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The vendor of the application."/>
+                        <xml-property name="description" value="Prov Status of the VLAN configuration related to a logical interface. Valid values [PREPROV/NVTPROV/PROV]."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="applicationVersion" name="application-version" type="java.lang.String">
+                <xml-element default-value="false" java-attribute="isIpUnnumbered" name="is-ip-unnumbered" required="true" type="java.lang.Boolean">
                     <xml-properties>
-                        <xml-property name="description" value="The version of the application."/>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="Flag indicating the interface uses the IP Unnumbered configuration."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="imageSelflink" name="image-selflink" required="true" type="java.lang.String">
+                <xml-element default-value="false" java-attribute="isPrivate" name="is-private" required="true" type="java.lang.Boolean">
                     <xml-properties>
-                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="Private VLAN indicator."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
-                    </xml-properties>
-                </xml-element>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-                <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v25.Metadata"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v25.L3InterfaceIpv4AddressList"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v25.L3InterfaceIpv6AddressList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Openstack image."/>
-                <xml-property name="nameProps" value="image-name"/>
-                <xml-property name="indexedProps" value="application,image-name,application-vendor,image-id,application-version,data-owner,data-source,data-source-version"/>
-                <xml-property name="dependentOn" value="cloud-region"/>
-                <xml-property name="container" value="images"/>
-                <xml-property name="uriTemplate" value="/images/image/{image-id}"/>
-                <xml-property name="requiredProps" value="image-id,image-name,image-os-distro,image-os-version,image-selflink"/>
-             </xml-properties>
-        </java-type>
-
-        <java-type name="Metadata">
-            <xml-properties>
-                <xml-property name="description" value="Collection of metadatum (key/value pairs)"/>
+                <xml-property name="description" value="Definition of vlan"/>
+                <xml-property name="indexedProps" value="vlan-interface,vlan-id-inner,vpn-key,orchestration-status,prov-status,vlan-id-outer,vlan-type,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="l-interface"/>
+                <xml-property name="container" value="vlans"/>
+                <xml-property name="uriTemplate" value="/vlans/vlan/{vlan-interface}"/>
+                <xml-property name="requiredProps" value="vlan-interface,in-maint,is-ip-unnumbered,is-private"/>
             </xml-properties>
-            <xml-root-element name="metadata"/>
-            <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="metadatum" name="metadatum" type="inventory.aai.onap.org.v25.Metadatum"/>
-            </java-attributes>
         </java-type>
 
-        <java-type name="Metadatum">
-            <xml-root-element name="metadatum"/>
+        <java-type name="L3InterfaceIpv6AddressList">
+            <xml-root-element name="l3-interface-ipv6-address-list"/>
             <java-attributes>
-                <xml-element java-attribute="metaname" name="metaname" required="true" type="java.lang.String" xml-key="true"/>
-                <xml-element java-attribute="metaval" name="metaval" required="true" type="java.lang.String"/>
-                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                <xml-element java-attribute="l3InterfaceIpv6Address" name="l3-interface-ipv6-address" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
-                                               <xml-property name="ownerCheck" value="N/A"/>
+                        <xml-property name="description" value="IP address"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="l3InterfaceIpv6PrefixLength" name="l3-interface-ipv6-prefix-length" type="java.lang.Long">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                        <xml-property name="description" value="Prefix length, 128 for single address"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                        <xml-property name="description" value="Inner VLAN tag"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Outer VLAN tag"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="isFloating" name="is-floating" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicator of fixed or floating address"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-            </java-attributes>
-            <xml-properties>
-                <xml-property name="description" value="Key/value pairs"/>
-                <xml-property name="indexedProps" value="metaname,data-owner,data-source,data-source-version"/>
-                <xml-property name="dependentOn" value="image,service-instance,connector,configuration,model-ver,profile,rule"/>
-                <xml-property name="container" value="metadata"/>
-                <xml-property name="uriTemplate" value="/metadata/metadatum/{metaname}"/>
-                <xml-property name="requiredProps" value="metaname,metaval"/>
-             </xml-properties>
-        </java-type>
-
-        <java-type name="DvsSwitches">
-            <xml-properties>
-                <xml-property name="description" value="Collection of digital virtual switch metadata used for vmWare VCEs and GenericVnfs."/>
-            </xml-properties>
-            <xml-root-element name="dvs-switches"/>
-            <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="dvsSwitch" name="dvs-switch" type="inventory.aai.onap.org.v25.DvsSwitch"/>
-            </java-attributes>
-        </java-type>
-
-        <java-type name="DvsSwitch">
-            <xml-root-element name="dvs-switch"/>
-            <java-attributes>
-                <xml-element java-attribute="switchName" name="switch-name" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="DVS switch name"/>
+                        <xml-property name="description" value="Neutron network id of the interface that address belongs to"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="vcenterUrl" name="vcenter-url" required="true" type="java.lang.String">
+                <xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="URL used to reach the vcenter"/>
+                        <xml-property name="description" value="Neutron id of subnet that address belongs to"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="opsNote" name="ops-note" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Notes to aid OPs in troubleshooting, such as attribute aliases or additional descriptions/instructions about an object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="l3InterfaceIpv6SriovAddress" name="l3-interface-ipv6-sriov-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used to hold the real IP V6 address data for the OMC vservers’ SRIOV l-interfaces."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="l3InterfaceIpv6SriovPrefixLength" name="l3-interface-ipv6-sriov-prefix-length" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Prefix length for SRIOV interfaces, 128 for single address."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
-                    </xml-properties>
-                </xml-element>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Digital virtual switch metadata, used by SDN-C to configure VCEs.  A&amp;AI needs to receive this data from the PO deployment team and administer it using the provisioningTool.sh into A&amp;AI. "/>
-                <xml-property name="indexedProps" value="vcenter-url,switch-name,data-owner,data-source,data-source-version"/>
-                <xml-property name="dependentOn" value="cloud-region"/>
-                <xml-property name="container" value="dvs-switches"/>
-                <xml-property name="uriTemplate" value="/dvs-switches/dvs-switch/{switch-name}"/>
-                <xml-property name="requiredProps" value="switch-name,vcenter-url"/>
-             </xml-properties>
+                <xml-property name="description" value="IPv6 Address Range"/>
+                <xml-property name="indexedProps" value="l3-interface-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id,vlan-id-outer,data-owner,data-source,data-source-version,l3-interface-ipv6-sriov-address"/>
+                <xml-property name="dependentOn" value="vlan,l-interface,vnfc,cp,lag-interface,p-interface"/>
+                <xml-property name="uriTemplate" value="/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}"/>
+                <xml-property name="requiredProps" value="l3-interface-ipv6-address"/>
+            </xml-properties>
         </java-type>
 
-        <java-type name="NetworkProfiles">
+        <java-type name="Volumes">
             <xml-properties>
-                <xml-property name="description" value="Collection of network profiles"/>
+                <xml-property name="description" value="Collection of ephemeral Block storage volumes."/>
             </xml-properties>
-            <xml-root-element name="network-profiles"/>
+            <xml-root-element name="volumes"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="networkProfile" name="network-profile" type="inventory.aai.onap.org.v25.NetworkProfile"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="volume" name="volume" type="inventory.aai.onap.org.v25.Volume"/>
             </java-attributes>
         </java-type>
 
-        <java-type name="NetworkProfile">
-            <xml-root-element name="network-profile"/>
+        <java-type name="Volume">
+            <xml-root-element name="volume"/>
             <java-attributes>
-                <xml-element java-attribute="nmProfileName" name="nm-profile-name" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="volumeId" name="volume-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Unique name of network profile."/>
+                        <xml-property name="description" value="Unique ID of block storage volume relative to the vserver."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="communityString" name="community-string" type="java.lang.String">
+                <xml-element java-attribute="volumeSelflink" name="volume-selflink" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Encrypted SNMP community string"/>
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Network profile populated by SDN-GP for SNMP"/>
-                <xml-property name="indexedProps" value="nm-profile-name,data-owner,data-source,data-source-version"/>
-                <xml-property name="container" value="network-profiles"/>
-                <xml-property name="namespace" value="cloud-infrastructure"/>
-                <xml-property name="uriTemplate" value="/cloud-infrastructure/network-profiles/network-profile/{nm-profile-name}"/>
-                <xml-property name="requiredProps" value="nm-profile-name"/>
-             </xml-properties>
+                <xml-property name="description" value="Ephemeral Block storage volume."/>
+                <xml-property name="indexedProps" value="volume-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="vserver"/>
+                <xml-property name="container" value="volumes"/>
+                <xml-property name="uriTemplate" value="/volumes/volume/{volume-id}"/>
+                <xml-property name="requiredProps" value="volume-id,volume-selflink"/>
+            </xml-properties>
         </java-type>
 
-        <java-type name="Pservers">
+        <java-type name="Flavors">
             <xml-properties>
-                <xml-property name="description" value="Collection of compute hosts."/>
+                <xml-property name="description" value="Collection of openstack flavors."/>
             </xml-properties>
-            <xml-root-element name="pservers"/>
+            <xml-root-element name="flavors"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="pserver" name="pserver" type="inventory.aai.onap.org.v25.Pserver"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="flavor" name="flavor" type="inventory.aai.onap.org.v25.Flavor"/>
             </java-attributes>
-            <xml-properties>
-                <xml-property name="maximumDepth" value="0"/>
-            </xml-properties>
         </java-type>
 
-        <java-type name="Pserver">
-            <xml-root-element name="pserver"/>
+        <java-type name="Flavor">
+            <xml-root-element name="flavor"/>
             <java-attributes>
-                <xml-element java-attribute="hostname" name="hostname" required="true" type="java.lang.String" xml-key="true">
-                    <xml-properties>
-                        <xml-property name="description" value="Value from executing hostname on the compute node."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="ptniiEquipName" name="ptnii-equip-name" type="java.lang.String">
+                <xml-element java-attribute="flavorId" name="flavor-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="PTNII name"/>
+                        <xml-property name="description" value="Flavor id, expected to be unique across cloud-region."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="numberOfCpus" name="number-of-cpus" type="java.lang.Integer">
+                <xml-element java-attribute="flavorName" name="flavor-name" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Number of cpus"/>
+                        <xml-property name="description" value="Flavor name"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="diskInGigabytes" name="disk-in-gigabytes" type="java.lang.Integer">
+                <xml-element java-attribute="flavorVcpus" name="flavor-vcpus" type="java.lang.Integer">
                     <xml-properties>
-                        <xml-property name="description" value="Disk size, in GBs"/>
+                        <xml-property name="description" value="Number of CPUs"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="ramInMegabytes" name="ram-in-megabytes" type="java.lang.Integer">
+                <xml-element java-attribute="flavorRam" name="flavor-ram" type="java.lang.Integer">
                     <xml-properties>
-                        <xml-property name="description" value="RAM size, in MBs"/>
+                        <xml-property name="description" value="Amount of memory"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="equipType" name="equip-type" type="java.lang.String">
+                <xml-element java-attribute="flavorDisk" name="flavor-disk" type="java.lang.Integer">
                     <xml-properties>
-                        <xml-property name="description" value="Equipment type.  Source of truth should define valid values."/>
+                        <xml-property name="description" value="Disk space"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="equipVendor" name="equip-vendor" type="java.lang.String">
+                <xml-element java-attribute="flavorEphemeral" name="flavor-ephemeral" type="java.lang.Integer">
                     <xml-properties>
-                        <xml-property name="description" value="Equipment vendor.  Source of truth should define valid values."/>
+                        <xml-property name="description" value="Amount of ephemeral disk space"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="equipModel" name="equip-model" type="java.lang.String">
+                <xml-element java-attribute="flavorSwap" name="flavor-swap" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Equipment model.  Source of truth should define valid values."/>
+                        <xml-property name="description" value="amount of swap space allocation"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="fqdn" name="fqdn" type="java.lang.String">
+                <xml-element java-attribute="flavorIsPublic" name="flavor-is-public" type="java.lang.Boolean">
                     <xml-properties>
-                        <xml-property name="description" value="Fully-qualified domain name"/>
+                        <xml-property name="description" value="whether flavor is available to all users or private to the tenant it was created in."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="pserverSelflink" name="pserver-selflink" type="java.lang.String">
+                <xml-element java-attribute="flavorSelflink" name="flavor-selflink" required="true" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="Used to configure device, also used for troubleshooting and is IP used for traps generated by device."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="serialNumber" name="serial-number" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="Serial number, may be queried"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="ipaddressV4Loopback0" name="ipaddress-v4-loopback-0" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="IPV4 Loopback 0 address"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="ipaddressV6Loopback0" name="ipaddress-v6-loopback-0" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="IPV6 Loopback 0 address"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="ipaddressV4Aim" name="ipaddress-v4-aim" type="java.lang.String">
+                <xml-element java-attribute="flavorDisabled" name="flavor-disabled" type="java.lang.Boolean">
                     <xml-properties>
-                        <xml-property name="description" value="IPV4 AIM address"/>
+                        <xml-property name="description" value="Boolean as to whether this flavor is no longer enabled"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="ipaddressV6Aim" name="ipaddress-v6-aim" type="java.lang.String">
+                <xml-element java-attribute="hpaCapabilities" name="hpa-capabilities" type="inventory.aai.onap.org.v25.HpaCapabilities">
                     <xml-properties>
-                        <xml-property name="description" value="IPV6 AIM address"/>
+                        <xml-property name="description" value="List of flavor specific HPA Capabilities"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="ipaddressV6Oam" name="ipaddress-v6-oam" type="java.lang.String">
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="IPV6 OAM address"/>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                                               <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="invStatus" name="inv-status" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="CANOPI's inventory status.  Only set with values exactly as defined by CANOPI."/>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="pserverId" name="pserver-id" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="ID of Pserver"/>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="internetTopology" name="internet-topology" type="java.lang.String">
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="internet topology of Pserver"/>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element default-value="false" java-attribute="inMaint" name="in-maint" required="true" type="java.lang.Boolean">
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Openstack flavor."/>
+                <xml-property name="nameProps" value="flavor-name"/>
+                <xml-property name="indexedProps" value="flavor-name,flavor-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+                <xml-property name="container" value="flavors"/>
+                <xml-property name="uriTemplate" value="/flavors/flavor/{flavor-id}"/>
+                <xml-property name="requiredProps" value="flavor-id,flavor-name,flavor-selflink"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Snapshots">
+            <xml-properties>
+                <xml-property name="description" value="Collection of openstack snapshots"/>
+            </xml-properties>
+            <xml-root-element name="snapshots"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="snapshot" name="snapshot" type="inventory.aai.onap.org.v25.Snapshot"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Snapshot">
+            <xml-root-element name="snapshot"/>
+            <java-attributes>
+                <xml-element java-attribute="snapshotId" name="snapshot-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="defaultValue" value="false"/>
-                        <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs."/>
+                        <xml-property name="description" value="Snapshot id, this is the key UUID assoc associated in glance with the snapshots."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                <xml-element java-attribute="snapshotName" name="snapshot-name" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                        <xml-property name="description" value="Snapshot name"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="pserverName2" name="pserver-name2" type="java.lang.String">
+                <xml-element java-attribute="snapshotArchitecture" name="snapshot-architecture" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="alternative pserver name"/>
+                        <xml-property name="description" value="Operating system architecture"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="purpose" name="purpose" type="java.lang.String">
+                <xml-element java-attribute="snapshotOsDistro" name="snapshot-os-distro" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="purpose of pserver"/>
+                        <xml-property name="description" value="The common name of the operating system distribution in lowercase"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+                <xml-element java-attribute="snapshotOsVersion" name="snapshot-os-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Prov Status of this device (not under canopi control) Valid values [PREPROV/NVTPROV/PROV]"/>
+                        <xml-property name="description" value="The operating system version as specified by the distributor."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
+                <xml-element java-attribute="application" name="application" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Indicates who owns and or manages the device."/>
+                        <xml-property name="description" value="The application that the image instantiates."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="hostProfile" name="host-profile" type="java.lang.String">
+                <xml-element java-attribute="applicationVendor" name="application-vendor" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The host profile that defines the configuration of the pserver."/>
+                        <xml-property name="description" value="The vendor of the application."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="role" name="role" type="java.lang.String">
+                <xml-element java-attribute="applicationVersion" name="application-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The role performed by the pserver."/>
+                        <xml-property name="description" value="The version of the application."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="function" name="function" type="java.lang.String">
+                <xml-element java-attribute="snapshotSelflink" name="snapshot-selflink" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The function performed by the pserver."/>
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="opsNote" name="ops-note" type="java.lang.String">
+                <xml-element java-attribute="prevSnapshotId" name="prev-snapshot-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Notes to aid OPs in troubleshooting, such as attribute aliases or additional descriptions/instructions about an object."/>
+                        <xml-property name="description" value="This field contains the UUID of the previous snapshot (if any)."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Indicator for whether the resource is considered operational.  Valid values are in-service-path and out-of-service-path."/>
-                        <xml-property name="suggestibleOnSearch" value="true"/>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-                <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v25.PInterfaces"/>
-                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v25.LInterfaces"/>
-                <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v25.LagInterfaces"/>
-                <xml-element java-attribute="activities" name="activities" type="inventory.aai.onap.org.v25.Activities"/>
-                <xml-element container-type="java.util.ArrayList" java-attribute="hpaCapacity" name="hpa-capacity" type="inventory.aai.onap.org.v25.HpaCapacity"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Compute host whose hostname must be unique and must exactly match what is sent as a relationship to a vserver."/>
-                <xml-property name="nameProps" value="pserver-name2,fqdn"/>
-                <xml-property name="indexedProps" value="hostname,pserver-id,pserver-name2,inv-status,fqdn,prov-status,ptnii-equip-name,equip-model,equip-vendor,function,data-owner,data-source,data-source-version,role"/>
-                <xml-property name="searchable" value="hostname,pserver-name2,pserver-id,ipv4-oam-address,operational-status"/>
-                <xml-property name="uniqueProps" value="hostname"/>
-                <xml-property name="container" value="pservers"/>
-                <xml-property name="namespace" value="cloud-infrastructure"/>
-                <xml-property name="uriTemplate" value="/cloud-infrastructure/pservers/pserver/{hostname}"/>
-                <xml-property name="requiredProps" value="hostname,in-maint"/>
-             </xml-properties>
+                <xml-property name="description" value="Openstack snapshot"/>
+                <xml-property name="nameProps" value="snapshot-name"/>
+                <xml-property name="uniqueProps" value="snapshot-id"/>
+                <xml-property name="indexedProps" value="application,snapshot-name,application-vendor,snapshot-id,application-version,prev-snapshot-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+                <xml-property name="container" value="snapshots"/>
+                <xml-property name="uriTemplate" value="/snapshots/snapshot/{snapshot-id}"/>
+                <xml-property name="requiredProps" value="snapshot-id"/>
+            </xml-properties>
         </java-type>
 
-        <java-type name="HpaCapacity">
-            <xml-root-element name="hpa-capacity"/>
+        <java-type name="GroupAssignments">
+            <xml-properties>
+                <xml-property name="description" value="Collection of openstack group assignments"/>
+            </xml-properties>
+            <xml-root-element name="group-assignments"/>
             <java-attributes>
-                <xml-element java-attribute="hpaCapacityKey" name="hpa-capacity-key" required="true" type="java.lang.String" xml-key="true">
+                <xml-element container-type="java.util.ArrayList" java-attribute="groupAssignment" name="group-assignment" type="inventory.aai.onap.org.v25.GroupAssignment"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="GroupAssignment">
+            <xml-root-element name="group-assignment"/>
+            <java-attributes>
+                <xml-element java-attribute="groupId" name="group-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Composite key formed with hpaFeature and append list of hpaFeatureAttributes needed for capacity check"/>
+                        <xml-property name="description" value="Group id, expected to be unique across cloud-region."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="hpaCapacityValue" name="hpa-capacity-value" type="java.lang.String">
+                <xml-element java-attribute="groupType" name="group-type" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="JSON string specifying the capacity (total,free), unit and metadata of the specific HPA attribute"/>
+                        <xml-property name="description" value="Group type - the type of group this instance refers to"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="groupName" name="group-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Group name - name assigned to the group"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="groupDescription" name="group-description" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Group description - description of the group"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
-                       <xml-properties>
-                       <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
-                       <xml-properties>
-                       <xml-property name="description" value="Identifies the upstream source of the data."/>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
-                       </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
-                       <xml-properties>
-                       <xml-property name="description" value="Identifies the version of the upstream source."/>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="HPA Capacity information for compute node"/>
-                <xml-property name="indexedProps" value="hpa-capacity-key,data-owner,data-source,data-source-version"/>
-                <xml-property name="dependentOn" value="pserver"/>
-                <xml-property name="requiredProps" value="hpa-capacity-key"/>
+                <xml-property name="description" value="Openstack group-assignment used to store exclusivity groups (EG)."/>
+                <xml-property name="nameProps" value="group-name"/>
+                <xml-property name="indexedProps" value="group-id,group-type,group-name,data-owner,data-source,data-source-version"/>
+                <xml-property name="searchable" value="group-id,group-name"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+                <xml-property name="container" value="group-assignments"/>
+                <xml-property name="uriTemplate" value="/group-assignments/group-assignment/{group-id}"/>
+                <xml-property name="requiredProps" value="group-id,group-type,group-name"/>
             </xml-properties>
         </java-type>
 
-        <java-type name="PInterfaces">
+        <java-type name="Images">
             <xml-properties>
-                <xml-property name="description" value="Collection of physical interfaces."/>
+                <xml-property name="description" value="Collectio of Openstack images."/>
             </xml-properties>
-            <xml-root-element name="p-interfaces"/>
+            <xml-root-element name="images"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="pInterface" name="p-interface" type="inventory.aai.onap.org.v25.PInterface"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="image" name="image" type="inventory.aai.onap.org.v25.Image"/>
             </java-attributes>
         </java-type>
 
-        <java-type name="PInterface">
-            <xml-root-element name="p-interface"/>
+        <java-type name="Image">
+            <xml-root-element name="image"/>
             <java-attributes>
-                <xml-element java-attribute="interfaceName" name="interface-name" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="imageId" name="image-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Name that identifies the physical interface"/>
+                        <xml-property name="description" value="Image id, expected to be unique across cloud region"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="interfaceName2" name="interface-name2" type="java.lang.String">
+                <xml-element java-attribute="imageName" name="image-name" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Alternate name that identifies the physical interface"/>
+                        <xml-property name="description" value="Image name"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+                <xml-element java-attribute="imageArchitecture" name="image-architecture" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="URL to endpoint where AAI can get more details."/>
+                        <xml-property name="description" value="Operating system architecture."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String">
+                <xml-element java-attribute="imageOsDistro" name="image-os-distro" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Captures the numeric part of the speed"/>
+                        <xml-property name="description" value="The common name of the operating system distribution in lowercase"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
+                <xml-element java-attribute="imageOsVersion" name="image-os-version" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Captures the units corresponding to the speed"/>
+                        <xml-property name="description" value="The operating system version as specified by the distributor."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="portDescription" name="port-description" type="java.lang.String">
+                <xml-element java-attribute="application" name="application" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Nature of the services and connectivity on this port."/>
+                        <xml-property name="description" value="The application that the image instantiates."/>
                     </xml-properties>
                 </xml-element>
-               <xml-element java-attribute="domainType" name="domain-type" type="java.lang.String">
-                   <xml-properties>
-                       <xml-property name="description" value="Domain type of the SDNC controllerr."/>
-                   </xml-properties>
-               </xml-element>
-                <xml-element java-attribute="equipmentIdentifier" name="equipment-identifier" type="java.lang.String">
+                <xml-element java-attribute="applicationVendor" name="application-vendor" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="CLEI or other specification for p-interface hardware."/>
+                        <xml-property name="description" value="The vendor of the application."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String">
+                <xml-element java-attribute="applicationVersion" name="application-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Role specification for p-interface hardware."/>
+                        <xml-property name="description" value="The version of the application."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="interfaceType" name="interface-type" type="java.lang.String">
+                <xml-element java-attribute="imageSelflink" name="image-selflink" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Indicates the physical properties of the interface."/>
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
                     </xml-properties>
                 </xml-element>
-               <xml-element java-attribute="networkInterfaceType" name="network-interface-type" type="java.lang.String">
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Indicates the physical properties of the interface."/>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                                               <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-               <xml-element java-attribute="bandwidthAttributes" name="bandwidth-attributes" type="inventory.aai.onap.org.v25.BandwidthAttributes">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The data structure to indicate value of available bandwidth. Applicable only for ENNI."/>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems."/>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="macAddress" name="mac-addresss" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="MAC Address of the p-interface."/>
-                                       </xml-properties>
-                               </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element default-value="false" java-attribute="inMaint" name="in-maint" required="true" type="java.lang.Boolean">
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
+                <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v25.Metadata"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Openstack image."/>
+                <xml-property name="nameProps" value="image-name"/>
+                <xml-property name="indexedProps" value="application,image-name,application-vendor,image-id,application-version,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+                <xml-property name="container" value="images"/>
+                <xml-property name="uriTemplate" value="/images/image/{image-id}"/>
+                <xml-property name="requiredProps" value="image-id,image-name,image-os-distro,image-os-version,image-selflink"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Metadata">
+            <xml-properties>
+                <xml-property name="description" value="Collection of metadatum (key/value pairs)"/>
+            </xml-properties>
+            <xml-root-element name="metadata"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="metadatum" name="metadatum" type="inventory.aai.onap.org.v25.Metadatum"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Metadatum">
+            <xml-root-element name="metadatum"/>
+            <java-attributes>
+                <xml-element java-attribute="metaname" name="metaname" required="true" type="java.lang.String" xml-key="true"/>
+                <xml-element java-attribute="metaval" name="metaval" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="defaultValue" value="false"/>
-                        <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)"/>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                                               <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="invStatus" name="inv-status" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="inventory status"/>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="opsNote" name="ops-note" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Notes to aid OPs in troubleshooting, such as attribute aliases or additional descriptions/instructions about an object."/>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
-                 <xml-element java-attribute="interfaceFunction" name="interface-function" type="java.lang.String">
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The function performed by this pInterface"/>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="macaddr" name="macaddr" type="java.lang.String">
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Key/value pairs"/>
+                <xml-property name="indexedProps" value="metaname,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="image,service-instance,connector,configuration,model-ver,profile,rule"/>
+                <xml-property name="container" value="metadata"/>
+                <xml-property name="uriTemplate" value="/metadata/metadatum/{metaname}"/>
+                <xml-property name="requiredProps" value="metaname,metaval"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="DvsSwitches">
+            <xml-properties>
+                <xml-property name="description" value="Collection of digital virtual switch metadata used for vmWare VCEs and GenericVnfs."/>
+            </xml-properties>
+            <xml-root-element name="dvs-switches"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="dvsSwitch" name="dvs-switch" type="inventory.aai.onap.org.v25.DvsSwitch"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="DvsSwitch">
+            <xml-root-element name="dvs-switch"/>
+            <java-attributes>
+                <xml-element java-attribute="switchName" name="switch-name" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="MAC address for the interface"/>
+                        <xml-property name="description" value="DVS switch name"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="networkRef" name="network-ref" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the network-ref of this p-interface. Derived from ietf-restconf-notification that identifies a termination-point."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="transparent" name="transparent" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the transparent value of this p-interface."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="oper Status of this p-interface."/>
-                                       </xml-properties>
-                               </xml-element>
-                <xml-element java-attribute="interDomainPlugId" name="inter-domain-plug-id" type="java.lang.Integer">
+                <xml-element java-attribute="vcenterUrl" name="vcenter-url" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="connect interdomain link"/>
+                        <xml-property name="description" value="URL used to reach the vcenter"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="encapsulation" name="encapsulation" type="java.lang.String">
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="specifies the encapsulation type"/>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                                               <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="adminState" name="admin-state" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="At interface inventory, set to value reflecting the state at initial configuration"/>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="loadInterval" name="load-interval" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Length of time for which data is used to compute load statistics."/>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="lldp" name="lldp" type="java.lang.String">
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Link Layer Discovery Protocol, link layer protocol used by network devices for advertising their identity, capabilities, and neighbors on a local area network based on IEEE 802 technology. Values, enable, disable, NULL"/>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="dampening" name="dampening" type="java.lang.String">
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Digital virtual switch metadata, used by SDN-C to configure VCEs.  A&amp;AI needs to receive this data from the PO deployment team and administer it using the provisioningTool.sh into A&amp;AI. "/>
+                <xml-property name="indexedProps" value="vcenter-url,switch-name,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+                <xml-property name="container" value="dvs-switches"/>
+                <xml-property name="uriTemplate" value="/dvs-switches/dvs-switch/{switch-name}"/>
+                <xml-property name="requiredProps" value="switch-name,vcenter-url"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="NetworkProfiles">
+            <xml-properties>
+                <xml-property name="description" value="Collection of network profiles"/>
+            </xml-properties>
+            <xml-root-element name="network-profiles"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="networkProfile" name="network-profile" type="inventory.aai.onap.org.v25.NetworkProfile"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="NetworkProfile">
+            <xml-root-element name="network-profile"/>
+            <java-attributes>
+                <xml-element java-attribute="nmProfileName" name="nm-profile-name" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="specifies the dampening configuration to slow down the operation of automation scripts executed on the device. Values, NULL (dampening not configured) DEFAULT (dampening w/o options) configures as â€˜dampening’ dampening options configures dampening w/ options"/>
+                        <xml-property name="description" value="Unique name of network profile."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="communityString" name="community-string" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Encrypted SNMP community string"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-                <xml-element java-attribute="sriovPfs" name="sriov-pfs" type="inventory.aai.onap.org.v25.SriovPfs"/>
-                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v25.LInterfaces"/>
-                <xml-element java-attribute="activities" name="activities" type="inventory.aai.onap.org.v25.Activities"/>
-                <xml-element java-attribute="holdTimers" name="hold-timers" type="inventory.aai.onap.org.v25.HoldTimers"/>
-                <xml-element java-attribute="gigEtherOptions" name="gig-ether-options" type="inventory.aai.onap.org.v25.GigEtherOptions"/>
-                <xml-element java-attribute="temporaryParameterLists" name="temporary-parameter-lists" type="inventory.aai.onap.org.v25.TemporaryParameterLists"/>
-                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v25.L3InterfaceIpv4AddressList"/>
-                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v25.L3InterfaceIpv6AddressList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Physical interface (e.g., nic)"/>
-                <xml-property name="indexedProps" value="interface-name,prov-status,network-ref,operational-status,interface-function,interface-role,interface-name2,data-owner,data-source,data-source-version,interface-type,macaddr,inv-status"/>
-                <xml-property name="uiEditableProps" value="prov-status,port-description"/>
-                <xml-property name="nameProps" value="prov-status"/>
-                <xml-property name="dependentOn" value="vpls-pe,pserver,pnf"/>
-                <xml-property name="container" value="p-interfaces"/>
-                <xml-property name="uriTemplate" value="/p-interfaces/p-interface/{interface-name}"/>
-                <xml-property name="searchable" value="interface-name"/>
-                <xml-property name="requiredProps" value="interface-name,in-maint"/>
-             </xml-properties>
+                <xml-property name="description" value="Network profile populated by SDN-GP for SNMP"/>
+                <xml-property name="indexedProps" value="nm-profile-name,data-owner,data-source,data-source-version"/>
+                <xml-property name="container" value="network-profiles"/>
+                <xml-property name="namespace" value="cloud-infrastructure"/>
+                <xml-property name="uriTemplate" value="/cloud-infrastructure/network-profiles/network-profile/{nm-profile-name}"/>
+                <xml-property name="requiredProps" value="nm-profile-name"/>
+            </xml-properties>
         </java-type>
 
-        <java-type name="LagInterfaces">
+        <java-type name="Pservers">
             <xml-properties>
-                <xml-property name="description" value="Collection of link aggregate interfaces."/>
+                <xml-property name="description" value="Collection of compute hosts."/>
             </xml-properties>
-            <xml-root-element name="lag-interfaces"/>
+            <xml-root-element name="pservers"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="lagInterface" name="lag-interface" type="inventory.aai.onap.org.v25.LagInterface"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="pserver" name="pserver" type="inventory.aai.onap.org.v25.Pserver"/>
             </java-attributes>
+            <xml-properties>
+                <xml-property name="maximumDepth" value="0"/>
+            </xml-properties>
         </java-type>
 
-        <java-type name="LagInterface">
-            <xml-root-element name="lag-interface"/>
+        <java-type name="Pserver">
+            <xml-root-element name="pserver"/>
             <java-attributes>
-                <xml-element java-attribute="interfaceName" name="interface-name" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="hostname" name="hostname" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Name that identifies the link aggregate interface"/>
+                        <xml-property name="description" value="Value from executing hostname on the compute node."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="interfaceDescription" name="interface-description" type="java.lang.String">
+                <xml-element java-attribute="ptniiEquipName" name="ptnii-equip-name" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Human friendly text regarding this interface."/>
+                        <xml-property name="description" value="PTNII name"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                <xml-element java-attribute="numberOfCpus" name="number-of-cpus" type="java.lang.Integer">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                        <xml-property name="description" value="Number of cpus"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String">
+                <xml-element java-attribute="diskInGigabytes" name="disk-in-gigabytes" type="java.lang.Integer">
                     <xml-properties>
-                        <xml-property name="description" value="Captures the numeric part of the speed"/>
+                        <xml-property name="description" value="Disk size, in GBs"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
+                <xml-element java-attribute="ramInMegabytes" name="ram-in-megabytes" type="java.lang.Integer">
                     <xml-properties>
-                        <xml-property name="description" value="Captures the units corresponding to the speed"/>
+                        <xml-property name="description" value="RAM size, in MBs"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="interfaceId" name="interface-id" type="java.lang.String">
+                <xml-element java-attribute="equipType" name="equip-type" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="ID of interface"/>
+                        <xml-property name="description" value="Equipment type.  Source of truth should define valid values."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String">
+                <xml-element java-attribute="equipVendor" name="equip-vendor" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Role assigned to this Interface, should use values as defined in ONAP Yang models."/>
+                        <xml-property name="description" value="Equipment vendor.  Source of truth should define valid values."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+                <xml-element java-attribute="equipModel" name="equip-model" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems."/>
+                        <xml-property name="description" value="Equipment model.  Source of truth should define valid values."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element default-value="false" java-attribute="inMaint" name="in-maint" required="true" type="java.lang.Boolean">
+                <xml-element java-attribute="fqdn" name="fqdn" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="defaultValue" value="false"/>
-                        <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)"/>
+                        <xml-property name="description" value="Fully-qualified domain name"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="lacpSystemId" name="lacp-system-id" type="java.lang.String">
+                <xml-element java-attribute="pserverSelflink" name="pserver-selflink" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The system id used by the LACP protocol."/>
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="opsNote" name="ops-note" type="java.lang.String">
+                <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Notes to aid OPs in troubleshooting, such as attribute aliases or additional descriptions/instructions about an object."/>
+                        <xml-property name="description" value="Used to configure device, also used for troubleshooting and is IP used for traps generated by device."/>
                     </xml-properties>
                 </xml-element>
-                 <xml-element java-attribute="interfaceFunction" name="interface-function" type="java.lang.String">
+                <xml-element java-attribute="serialNumber" name="serial-number" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The function performed by this Lag interface"/>
+                        <xml-property name="description" value="Serial number, may be queried"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="minLinks" name="min-links" type="java.lang.Integer">
+                <xml-element java-attribute="ipaddressV4Loopback0" name="ipaddress-v4-loopback-0" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Minimum links in service before a LAG should be taken out of service"/>
+                        <xml-property name="description" value="IPV4 Loopback 0 address"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                <xml-element java-attribute="ipaddressV6Loopback0" name="ipaddress-v6-loopback-0" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
-                                               <xml-property name="ownerCheck" value="N/A"/>
+                        <xml-property name="description" value="IPV6 Loopback 0 address"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="ipaddressV4Aim" name="ipaddress-v4-aim" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                        <xml-property name="description" value="IPV4 AIM address"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="ipaddressV6Aim" name="ipaddress-v6-aim" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                        <xml-property name="description" value="IPV6 AIM address"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="interfaceType" name="interface-type" type="java.lang.String">
+                <xml-element java-attribute="ipaddressV6Oam" name="ipaddress-v6-oam" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used to identify the type of lag-interface."/>
+                        <xml-property name="description" value="IPV6 OAM address"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="encapsulation" name="encapsulation" type="java.lang.String">
+                <xml-element java-attribute="invStatus" name="inv-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="specifies the encapsulation type"/>
+                        <xml-property name="description" value="CANOPI's inventory status.  Only set with values exactly as defined by CANOPI."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="flexibleVlanTagging" name="flexible-vlan-tagging" type="java.lang.String">
+                <xml-element java-attribute="pserverId" name="pserver-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Specifies support for simultaneous transmission of 802.1Q VLAN single-tag and dual-tag frames on logical interfaces on the same Ethernet port, and on pseudowire logical interfaces."/>
+                        <xml-property name="description" value="ID of Pserver"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="mtu" name="mtu" type="java.lang.String">
+                <xml-element java-attribute="internetTopology" name="internet-topology" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Maximum transmission unit (MTU) is used to determine the maximum size of each packet in any TCP or IP transmission."/>
+                        <xml-property name="description" value="internet topology of Pserver"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="loadInterval" name="load-interval" type="java.lang.String">
+                <xml-element default-value="false" java-attribute="inMaint" name="in-maint" required="true" type="java.lang.Boolean">
                     <xml-properties>
-                        <xml-property name="description" value="Length of time for which data is used to compute load statistics."/>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="loggingEvent" name="logging-event" type="java.lang.String">
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Enables system logging of interface state-change events Values, * NULL (not enabled/configured) Link-status future options, i.e. default, enable, trunk-status."/>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="dampening" name="dampening" type="java.lang.String">
+                <xml-element java-attribute="pserverName2" name="pserver-name2" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="throttles interface flapping events to prevent excessive churn and processing of routing tables. Values, NULL (dampening not configured DEFAULT (dampening w/o options) configures as â€˜dampening’ dampening options configures dampening w/ options"/>
+                        <xml-property name="description" value="alternative pserver name"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v25.LInterfaces"/>
-                <xml-element java-attribute="aggregatedEtherOptions" name="aggregated-ether-options" type="inventory.aai.onap.org.v25.AggregatedEtherOptions"/>
-                <xml-element java-attribute="temporaryParameterLists" name="temporary-parameter-lists" type="inventory.aai.onap.org.v25.TemporaryParameterLists"/>
-                <xml-element java-attribute="esis" name="esis" type="inventory.aai.onap.org.v25.Esis"/>
-                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v25.L3InterfaceIpv4AddressList"/>
-                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v25.L3InterfaceIpv6AddressList"/>
-            </java-attributes>
-            <xml-properties>
-                <xml-property name="description" value="Link aggregate interface"/>
-                <xml-property name="indexedProps" value="interface-name,interface-id,interface-role,interface-function,prov-status,data-owner,data-source,data-source-version,interface-type"/>
-                <xml-property name="uiEditableProps" value="prov-status"/>
-                <xml-property name="dependentOn" value="generic-vnf,pserver,vpls-pe,pnf"/>
-                <xml-property name="container" value="lag-interfaces"/>
-                <xml-property name="uriTemplate" value="/lag-interfaces/lag-interface/{interface-name}"/>
-                <xml-property name="requiredProps" value="interface-name,in-maint"/>
-             </xml-properties>
-        </java-type>
-
-        <java-type name="Endpoints">
-            <xml-properties>
-                <xml-property name="description" value="Collection of endpoints."/>
-            </xml-properties>
-            <xml-root-element name="endpoints"/>
-            <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="endpoint" name="endpoint" type="inventory.aai.onap.org.v25.Endpoint"/>
-            </java-attributes>
-        </java-type>
-
-        <java-type name="Endpoint">
-            <xml-root-element name="endpoint"/>
-            <java-attributes>
-                <xml-element java-attribute="endpointId" name="endpoint-id" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="purpose" name="purpose" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Unique identifier for the endpoint."/>
+                        <xml-property name="description" value="purpose of pserver"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="endpointName" name="endpoint-name" type="java.lang.String">
+                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Name of the endpoint."/>
+                        <xml-property name="description" value="Prov Status of this device (not under canopi control) Valid values [PREPROV/NVTPROV/PROV]"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="endpointType" name="endpoint-type" type="java.lang.String">
+                <xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Type of the endpoint. Expected values are DNS, ETCD, Kubernetes, etc."/>
+                        <xml-property name="description" value="Indicates who owns and or manages the device."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="endpointName2" name="endpoint-name2" type="java.lang.String">
+                <xml-element java-attribute="hostProfile" name="host-profile" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Alternate name of the endpoint"/>
+                        <xml-property name="description" value="The host profile that defines the configuration of the pserver."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="role" name="role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The role performed by the pserver."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="function" name="function" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The function performed by the pserver."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="opsNote" name="ops-note" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Notes to aid OPs in troubleshooting, such as attribute aliases or additional descriptions/instructions about an object."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                        <xml-property name="description" value="Indicator for whether the resource is considered operational.  Valid values are in-service-path and out-of-service-path."/>
+                        <xml-property name="suggestibleOnSearch" value="true"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-                <xml-element container-type="java.util.ArrayList" java-attribute="ipAddressList" name="ip-address-list" type="inventory.aai.onap.org.v25.IpAddressList"/>
-                <xml-element container-type="java.util.ArrayList" java-attribute="portList" name="port-list" type="inventory.aai.onap.org.v25.PortList"/>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="selectorList" name="selector-list" type="inventory.aai.onap.org.v25.SelectorList"/>
+                <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v25.PInterfaces"/>
+                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v25.LInterfaces"/>
+                <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v25.LagInterfaces"/>
+                <xml-element java-attribute="activities" name="activities" type="inventory.aai.onap.org.v25.Activities"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="hpaCapacity" name="hpa-capacity" type="inventory.aai.onap.org.v25.HpaCapacity"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="describes an endpoints"/>
+                <xml-property name="description" value="Compute host whose hostname must be unique and must exactly match what is sent as a relationship to a vserver."/>
+                <xml-property name="nameProps" value="pserver-name2,fqdn"/>
+                <xml-property name="indexedProps" value="hostname,pserver-id,pserver-name2,inv-status,fqdn,prov-status,ptnii-equip-name,equip-model,equip-vendor,function,data-owner,data-source,data-source-version,role"/>
+                <xml-property name="searchable" value="hostname,pserver-name2,pserver-id,ipv4-oam-address,operational-status"/>
+                <xml-property name="uniqueProps" value="hostname"/>
+                <xml-property name="container" value="pservers"/>
                 <xml-property name="namespace" value="cloud-infrastructure"/>
-                <xml-property name="container" value="endpoints"/>
-                <xml-property name="uriTemplate" value="/cloud-infrastructure/endpoints/endpoint/{endpoint-id}"/>
-                <xml-property name="requiredProps" value="endpoint-id"/>
-                               <xml-property name="indexedProps" value="data-owner,data-source,data-source-version"/>
-                </xml-properties>
-        </java-type>
-
-        <java-type name="Activities">
-            <xml-properties>
-                <xml-property name="description" value="Collection of activities."/>
+                <xml-property name="uriTemplate" value="/cloud-infrastructure/pservers/pserver/{hostname}"/>
+                <xml-property name="requiredProps" value="hostname,in-maint"/>
             </xml-properties>
-            <xml-root-element name="activities"/>
-            <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="activity" name="activity" type="inventory.aai.onap.org.v25.Activity"/>
-            </java-attributes>
         </java-type>
 
-        <java-type name="Activity">
-            <xml-root-element name="activity"/>
+        <java-type name="HpaCapacity">
+            <xml-root-element name="hpa-capacity"/>
             <java-attributes>
-                <xml-element java-attribute="activityId" name="activity-id" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="hpaCapacityKey" name="hpa-capacity-key" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Unique id for the activity. (UUID)"/>
+                        <xml-property name="description" value="Composite key formed with hpaFeature and append list of hpaFeatureAttributes needed for capacity check"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="activityType" name="activity-type" required="true" type="java.lang.String">
+                <xml-element java-attribute="hpaCapacityValue" name="hpa-capacity-value" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Type of activity (ex, provisioning)."/>
+                        <xml-property name="description" value="JSON string specifying the capacity (total,free), unit and metadata of the specific HPA attribute"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="activityName" name="activity-name" required="false" type="java.lang.String">
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Name of the activity."/>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                                               <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="activityCreator" name="activity-creator" required="false" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Application that created the activity."/>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="activityDescription" name="activity-description" required="false" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Description of activity."/>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="activityTimeStamp" name="timestamp" required="false" type="java.lang.String">
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Date and Time activity is created."/>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="currentState" name="current-state" type="java.lang.String">
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="HPA Capacity information for compute node"/>
+                <xml-property name="indexedProps" value="hpa-capacity-key,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="pserver"/>
+                <xml-property name="requiredProps" value="hpa-capacity-key"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="PInterfaces">
+            <xml-properties>
+                <xml-property name="description" value="Collection of physical interfaces."/>
+            </xml-properties>
+            <xml-root-element name="p-interfaces"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="pInterface" name="p-interface" type="inventory.aai.onap.org.v25.PInterface"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="PInterface">
+            <xml-root-element name="p-interface"/>
+            <java-attributes>
+                <xml-element java-attribute="interfaceName" name="interface-name" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Current state of the activity."/>
+                        <xml-property name="description" value="Name that identifies the physical interface"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="reflectedState" name="reflected-state" type="java.lang.String">
+                <xml-element java-attribute="interfaceName2" name="interface-name2" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="State reflected by the database."/>
+                        <xml-property name="description" value="Alternate name that identifies the physical interface"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="activityRole" name="activity-role" type="java.lang.String">
+                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Role"/>
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="activityFunction" name="activity-function" type="java.lang.String">
+                <xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Function"/>
+                        <xml-property name="description" value="Captures the numeric part of the speed"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="timestampLastUpdated" name="timestamp-last-updated" type="java.lang.String">
+                <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Date/time last updated"/>
+                        <xml-property name="description" value="Captures the units corresponding to the speed"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="timestampExpiration" name="timestamp-expiration" type="java.lang.String">
+                <xml-element java-attribute="portDescription" name="port-description" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Date/time expires"/>
+                        <xml-property name="description" value="Nature of the services and connectivity on this port."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                <xml-element java-attribute="domainType" name="domain-type" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
-                                               <xml-property name="ownerCheck" value="N/A"/>
+                        <xml-property name="description" value="Domain type of the SDNC controllerr."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="equipmentIdentifier" name="equipment-identifier" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                        <xml-property name="description" value="CLEI or other specification for p-interface hardware."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                        <xml-property name="description" value="Role specification for p-interface hardware."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                <xml-element java-attribute="interfaceType" name="interface-type" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                        <xml-property name="description" value="Indicates the physical properties of the interface."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="activityStates" name="activity-states" type="inventory.aai.onap.org.v25.ActivityStates"/>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-            </java-attributes>
-            <xml-properties>
-                <xml-property name="description" value="describes an activities"/>
-                <xml-property name="uniqueProps" value="activity-id"/>
-                <xml-property name="dependentOn" value="pserver,pnf,cloud-region,p-interface,network-range"/>
-                <xml-property name="container" value="activities"/>
-                <xml-property name="uriTemplate" value="/activities/activity/{activity-id}"/>
-                <xml-property name="requiredProps" value="activity-id,activity-type"/>
-                               <xml-property name="indexedProps" value="data-owner,data-source,data-source-version"/>
-             </xml-properties>
-        </java-type>
-
-        <java-type name="ActivityStates">
-            <xml-properties>
-                <xml-property name="description" value="Collection of activity-states"/>
-            </xml-properties>
-            <xml-root-element name="activity-states"/>
-            <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="activityState" name="activity-state" type="inventory.aai.onap.org.v25.ActivityState"/>
-            </java-attributes>
-        </java-type>
-
-        <java-type name="ActivityState">
-            <xml-root-element name="activity-state"/>
-            <java-attributes>
-                <xml-element java-attribute="stateOrder" name="state-order" required="true" type="java.lang.Integer" xml-key="true">
+                <xml-element java-attribute="networkInterfaceType" name="network-interface-type" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Order for the activity state."/>
+                        <xml-property name="description" value="Indicates the physical properties of the interface."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="stateName" name="state-name" required="true" type="java.lang.String">
+                <xml-element java-attribute="bandwidthAttributes" name="bandwidth-attributes" type="inventory.aai.onap.org.v25.BandwidthAttributes">
                     <xml-properties>
-                        <xml-property name="description" value="Name of the activity state (ex, NVT-PROV)."/>
+                        <xml-property name="description" value="The data structure to indicate value of available bandwidth. Applicable only for ENNI."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="stateView" name="state-view" type="java.lang.String">
+                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="View of the activity state."/>
+                        <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="macAddress" name="mac-addresss" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="MAC Address of the p-interface."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                <xml-element default-value="false" java-attribute="inMaint" name="in-maint" required="true" type="java.lang.Boolean">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
-                                               <xml-property name="ownerCheck" value="N/A"/>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="invStatus" name="inv-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                        <xml-property name="description" value="inventory status"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="opsNote" name="ops-note" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                        <xml-property name="description" value="Notes to aid OPs in troubleshooting, such as attribute aliases or additional descriptions/instructions about an object."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-            </java-attributes>
-            <xml-properties>
-                <xml-property name="description" value="describes an activities"/>
-                <xml-property name="uniqueProps" value="state-order"/>
-                <xml-property name="dependentOn" value="activity"/>
-                <xml-property name="container" value="activity-states"/>
-                <xml-property name="uriTemplate" value="/activity-states/activity-state/{state-order}"/>
-                <xml-property name="requiredProps" value="state-order,state-name"/>
-                               <xml-property name="indexedProps" value="data-owner,data-source,data-source-version"/>
-             </xml-properties>
-        </java-type>
-
-
-       <java-type name="BandwidthAttributes">
-            <xml-properties>
-                <xml-property name="description" value="Collection of bandwidth attribute. Added for ENNI in MDONS use case."/>
-            </xml-properties>
-            <xml-root-element name="bandwidth-attributes"/>
-            <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="bandwidthAttribute" name="bandwidth-attribute" type="inventory.aai.onap.org.v25.BandwidthAttribute"/>
-            </java-attributes>
-        </java-type>
-        <java-type name="BandwidthAttribute">
-            <xml-root-element name="bandwidth-attribute"/>
-            <java-attributes>
-                <xml-element java-attribute="bwaId" name="bwa-id" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="interfaceFunction" name="interface-function" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Id that identifies the bandwidth attribute"/>
+                        <xml-property name="description" value="The function performed by this pInterface"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+                <xml-element java-attribute="macaddr" name="macaddr" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Store the link to get more information for this object."/>
+                        <xml-property name="description" value="MAC address for the interface"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
-                       <xml-properties>
-                       <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
-                                               <xml-property name="ownerCheck" value="N/A"/>
+                <xml-element java-attribute="networkRef" name="network-ref" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the network-ref of this p-interface. Derived from ietf-restconf-notification that identifies a termination-point."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
-                       <xml-properties>
-                       <xml-property name="description" value="Identifies the upstream source of the data."/>
+                <xml-element java-attribute="transparent" name="transparent" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the transparent value of this p-interface."/>
                     </xml-properties>
-                       </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
-                       <xml-properties>
-                       <xml-property name="description" value="Identifies the version of the upstream source."/>
+                </xml-element>
+                <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="oper Status of this p-interface."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                <xml-element java-attribute="interDomainPlugId" name="inter-domain-plug-id" type="java.lang.Integer">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                        <xml-property name="description" value="connect interdomain link"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-                <xml-element java-attribute="availableBandwidthMap" name="available-bandwidth-map" type="inventory.aai.onap.org.v25.AvailableBandwidthMap"/>
-                <!--xml-element java-attribute="OTNLabelRestrictions" name="otn-label-restrictions" type="inventory.aai.onap.org.v25.OTNLabelRestrictions"/-->
-            </java-attributes>
-            <xml-properties>
-                <xml-property name="description" value="Instance of a bandwidth-attribute"/>
-                <xml-property name="indexedProps" value="bwa-id,data-owner,data-source,data-source-version"/>
-                <xml-property name="searchable" value="bwa-id"/>
-                <xml-property name="uniqueProps" value="bwa-id"/>
-                <xml-property name="container" value="bandwidth-attributes"/>
-                <!--<xml-property name="dependentOn" value="pnf,p-interface"/>-->
-                <xml-property name="dependentOn" value="p-interface"/>
-                <xml-property name="requiredProps" value="bwa-id"/>
-                <xml-property name="uriTemplate" value="/bandwidth-attributes/bandwidth-attribute/{bwa-id}"/>
-            </xml-properties>
-        </java-type>
-
-       <java-type name="AvailableBandwidthMap">
-            <xml-properties>
-                <xml-property name="description" value="Collection of Available Bandwidth. Added for ENNI in MDONS use case."/>
-            </xml-properties>
-            <xml-root-element name="available-bandwidth-map"/>
-            <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="availableBandwidth" name="available-bandwidth" type="inventory.aai.onap.org.v25.AvailableBandwidth"/>
-            </java-attributes>
-       </java-type>
-        <java-type name="AvailableBandwidth">
-            <xml-root-element name="available-bandwidth"/>
-            <java-attributes>
-               <xml-element java-attribute="abId" name="ab-id" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="encapsulation" name="encapsulation" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Id that identifies the attribute"/>
+                        <xml-property name="description" value="specifies the encapsulation type"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="oduType" name="odu-type" type="java.lang.String">
+                <xml-element java-attribute="adminState" name="admin-state" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="ODU Type that identifies the ODU Eg. ODU0, ODU1, ODU2, ODU3, ODU4"/>
+                        <xml-property name="description" value="At interface inventory, set to value reflecting the state at initial configuration"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="number" name="number" type="java.lang.Integer">
+                <xml-element java-attribute="loadInterval" name="load-interval" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The value of available bandwidth. Applicable only for ENNI."/>
+                        <xml-property name="description" value="Length of time for which data is used to compute load statistics."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+                <xml-element java-attribute="lldp" name="lldp" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Store the link to get more information for this object."/>
+                        <xml-property name="description" value="Link Layer Discovery Protocol, link layer protocol used by network devices for advertising their identity, capabilities, and neighbors on a local area network based on IEEE 802 technology. Values, enable, disable, NULL"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dampening" name="dampening" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="specifies the dampening configuration to slow down the operation of automation scripts executed on the device. Values, NULL (dampening not configured) DEFAULT (dampening w/o options) configures as â€˜dampening’ dampening options configures dampening w/ options"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="mtu" name="mtu" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Maximum transmission unit (MTU) is used to determine the maximum size of each packet in any TCP or IP transmission."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
-                       <xml-properties>
-                       <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
-                       <xml-properties>
-                       <xml-property name="description" value="Identifies the upstream source of the data."/>
-                    </xml-properties>
-                       </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
-                       <xml-properties>
-                       <xml-property name="description" value="Identifies the version of the upstream source."/>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
+                <xml-element java-attribute="sriovPfs" name="sriov-pfs" type="inventory.aai.onap.org.v25.SriovPfs"/>
+                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v25.LInterfaces"/>
+                <xml-element java-attribute="activities" name="activities" type="inventory.aai.onap.org.v25.Activities"/>
+                <xml-element java-attribute="holdTimers" name="hold-timers" type="inventory.aai.onap.org.v25.HoldTimers"/>
+                <xml-element java-attribute="gigEtherOptions" name="gig-ether-options" type="inventory.aai.onap.org.v25.GigEtherOptions"/>
+                <xml-element java-attribute="temporaryParameterLists" name="temporary-parameter-lists" type="inventory.aai.onap.org.v25.TemporaryParameterLists"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v25.L3InterfaceIpv4AddressList"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v25.L3InterfaceIpv6AddressList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Instance of an available-bandwidth-map"/>
-                <xml-property name="indexedProps" value="ab-id,data-owner,data-source,data-source-version"/>
-                <xml-property name="searchable" value="ab-id"/>
-                <xml-property name="uniqueProps" value="ab-id"/>
-                <xml-property name="container" value="available-bandwidth-map"/>
-                <xml-property name="dependentOn" value="bandwidth-attribute"/>
-                <xml-property name="requiredProps" value="ab-id"/>
+                <xml-property name="description" value="Physical interface (e.g., nic)"/>
+                <xml-property name="indexedProps" value="interface-name,prov-status,network-ref,operational-status,interface-function,interface-role,interface-name2,data-owner,data-source,data-source-version,interface-type,macaddr,inv-status"/>
+                <xml-property name="uiEditableProps" value="prov-status,port-description"/>
+                <xml-property name="nameProps" value="prov-status"/>
+                <xml-property name="dependentOn" value="vpls-pe,pserver,pnf"/>
+                <xml-property name="container" value="p-interfaces"/>
+                <xml-property name="uriTemplate" value="/p-interfaces/p-interface/{interface-name}"/>
+                <xml-property name="searchable" value="interface-name"/>
+                <xml-property name="requiredProps" value="interface-name,in-maint"/>
             </xml-properties>
         </java-type>
 
-       <!--java-type name="OTNLabelRestrictions">
+        <java-type name="LagInterfaces">
             <xml-properties>
-                <xml-property name="description" value="Collection of Label Restriction. Added for ENNI in MDONS use case."/>
+                <xml-property name="description" value="Collection of link aggregate interfaces."/>
             </xml-properties>
-            <xml-root-element name="otn-label-restrictions"/>
+            <xml-root-element name="lag-interfaces"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="OTNLabelRestriction" name="otn-label-restriction" type="inventory.aai.onap.org.v25.OTNLabelRestriction"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="lagInterface" name="lag-interface" type="inventory.aai.onap.org.v25.LagInterface"/>
             </java-attributes>
         </java-type>
-        <java-type name="OTNLabelRestriction">
-            <xml-root-element name="otn-label-restriction"/>
+
+        <java-type name="LagInterface">
+            <xml-root-element name="lag-interface"/>
             <java-attributes>
-                <xml-element java-attribute="lrId" name="lr-id" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="interfaceName" name="interface-name" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Id that identifies the label restriction"/>
+                        <xml-property name="description" value="Name that identifies the link aggregate interface"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="rangeBitmap" name="range-bitmap" type="java.lang.String">
+                <xml-element java-attribute="interfaceDescription" name="interface-description" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Bitmap of available labels starting from label-start to label-end."/>
+                        <xml-property name="description" value="Human friendly text regarding this interface."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="labelStep" name="label-step" type="java.lang.Integer">
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Step of labels in label range."/>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+                <xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Store the link to get more information for this object."/>
+                        <xml-property name="description" value="Captures the numeric part of the speed"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
-                       <xml-properties>
-                       <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
-                       <xml-property name="ownerCheck" value="N/A"/>
+                <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Captures the units corresponding to the speed"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
-                       <xml-properties>
-                       <xml-property name="description" value="Identifies the upstream source of the data."/>
-                    </xml-properties>
-                       </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
-                       <xml-properties>
-                       <xml-property name="description" value="Identifies the version of the upstream source."/>
+                <xml-element java-attribute="interfaceId" name="interface-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ID of interface"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                <xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-            </java-attributes>
-            <xml-properties>
-                <xml-property name="description" value="Instance of a otn-label-restriction attribute"/>
-                <xml-property name="indexedProps" value="lr-id,data-owner,data-source,data-source-version"/>
-                <xml-property name="searchable" value="lr-id"/>
-                <xml-property name="uniqueProps" value="lr-id"/>
-                <xml-property name="container" value="otn-label-restrictions"/>
-                <xml-property name="dependentOn" value="bandwidth-attribute"/>
-                <xml-property name="requiredProps" value="lr-id"/>
-            </xml-properties>
-        </java-type-->
-
-        <java-type name="Vrfs">
-            <xml-root-element name="vrfs"/>
-            <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="vrf" name="vrf" type="inventory.aai.onap.org.v25.Vrf"/>
-            </java-attributes>
-            <xml-properties>
-            </xml-properties>
-        </java-type>
-
-        <java-type name="Vrf">
-            <xml-root-element name="vrf"/>
-            <java-attributes>
-                <xml-element java-attribute="vrfId" name="vrf-id" required="true" type="java.lang.String" xml-key="true">
-                    <xml-properties>
-                        <xml-property name="description" value="VRF UUID."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="vrfName" name="vrf-name" required="true" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="VRF Name"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="vrfDescription" name="vrf-description" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="VRF Description"/>
+                        <xml-property name="description" value="Role assigned to this Interface, should use values as defined in ONAP Yang models."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="routeDistinguisher" name="route-distinguisher" type="java.lang.String">
+                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Route Distinguisher"/>
+                        <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="vrfType" name="vrf-type" type="java.lang.String">
+                <xml-element default-value="false" java-attribute="inMaint" name="in-maint" required="true" type="java.lang.Boolean">
                     <xml-properties>
-                        <xml-property name="description" value="The type of vrf (bridge-domain as an example)"/>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="vrfAddressFamily" name="vrf-address-family" type="java.lang.String">
+                <xml-element java-attribute="lacpSystemId" name="lacp-system-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="IP address family (v6/v4/both)"/>
+                        <xml-property name="description" value="The system id used by the LACP protocol."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="opsNote" name="ops-note" type="java.lang.String">
                         <xml-property name="description" value="Notes to aid OPs in troubleshooting, such as attribute aliases or additional descriptions/instructions about an object."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="vrfRole" name="vrf-role" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="Indicator for the use of this physical link"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="vrfFunction" name="vrf-function" type="java.lang.String">
+                <xml-element java-attribute="interfaceFunction" name="interface-function" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The function performed by this Linterface"/>
+                        <xml-property name="description" value="The function performed by this Lag interface"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="vrfGroupName" name="vrf-group-name" type="java.lang.String">
+                <xml-element java-attribute="minLinks" name="min-links" type="java.lang.Integer">
                     <xml-properties>
-                        <xml-property name="description" value="Bridge domain group name"/>
+                        <xml-property name="description" value="Minimum links in service before a LAG should be taken out of service"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="bestExternal" name="best-external" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="Identifies best-external vrf, best-external=Y if the conditions are met.  otherwise, best-external = N"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="maxPrefixV4" name="max-prefix-v4" type="java.lang.Integer">
-                    <xml-properties>
-                        <xml-property name="description" value="Max prefix for IPv4."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="maxPrefixV6" name="max-prefix-v6" type="java.lang.Integer">
-                    <xml-properties>
-                        <xml-property name="description" value="Max prefix for IPv6."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="maxPrefixThresholdV4" name="max-prefix-threshold-v4" type="java.lang.Integer">
-                    <xml-properties>
-                        <xml-property name="description" value="Max prefix threshold for IPv4."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="maxPrefixThresholdV6" name="max-prefix-threshold-v6" type="java.lang.Integer">
-                    <xml-properties>
-                        <xml-property name="description" value="Max prefix threshold for IPv6."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="labelModeV4" name="label-mode-v4" type="java.lang.String">
+                <xml-element java-attribute="interfaceType" name="interface-type" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Label mode for IPv4."/>
+                        <xml-property name="description" value="Used to identify the type of lag-interface."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="labelModeV6" name="label-mode-v6" type="java.lang.String">
+                <xml-element java-attribute="encapsulation" name="encapsulation" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Label mode for IPv6."/>
+                        <xml-property name="description" value="specifies the encapsulation type"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="maxPathsV4" name="max-paths-v4" type="java.lang.Integer">
+                <xml-element java-attribute="flexibleVlanTagging" name="flexible-vlan-tagging" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="stores maximum number of paths for IPv4."/>
+                        <xml-property name="description" value="Specifies support for simultaneous transmission of 802.1Q VLAN single-tag and dual-tag frames on logical interfaces on the same Ethernet port, and on pseudowire logical interfaces."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="maxPathsV6" name="max-paths-v6" type="java.lang.Integer">
+                <xml-element java-attribute="mtu" name="mtu" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="stores maximum number of paths for IPv6."/>
+                        <xml-property name="description" value="Maximum transmission unit (MTU) is used to determine the maximum size of each packet in any TCP or IP transmission."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="v4MaxPathType" name="v4-max-path-type" type="java.lang.String">
+                <xml-element java-attribute="loadInterval" name="load-interval" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Type of v4-max-path"/>
+                        <xml-property name="description" value="Length of time for which data is used to compute load statistics."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="v6MaxPathType" name="v6-max-path-type" type="java.lang.String">
+                <xml-element java-attribute="loggingEvent" name="logging-event" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Type of v6-max-path"/>
+                        <xml-property name="description" value="Enables system logging of interface state-change events Values, * NULL (not enabled/configured) Link-status future options, i.e. default, enable, trunk-status."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="configurationStatus" name="configuration-status" type="java.lang.String">
+                <xml-element java-attribute="dampening" name="dampening" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Configuration status of the vrf"/>
+                        <xml-property name="description" value="throttles interface flapping events to prevent excessive churn and processing of routing tables. Values, NULL (dampening not configured DEFAULT (dampening w/o options) configures as â€˜dampening’ dampening options configures dampening w/ options"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="bgpGroups" name="bgp-groups" type="inventory.aai.onap.org.v25.BgpGroups"/>
-                <xml-element java-attribute="bgpNeighbors" name="bgp-neighbors" type="inventory.aai.onap.org.v25.BgpNeighbors"/>
-                <xml-element java-attribute="aggregateRoutes" name="aggregate-routes" type="inventory.aai.onap.org.v25.AggregateRoutes"/>
-                <xml-element java-attribute="routeTargets" name="route-targets" type="inventory.aai.onap.org.v25.RouteTargets"/>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
+                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v25.LInterfaces"/>
+                <xml-element java-attribute="aggregatedEtherOptions" name="aggregated-ether-options" type="inventory.aai.onap.org.v25.AggregatedEtherOptions"/>
+                <xml-element java-attribute="temporaryParameterLists" name="temporary-parameter-lists" type="inventory.aai.onap.org.v25.TemporaryParameterLists"/>
+                <xml-element java-attribute="esis" name="esis" type="inventory.aai.onap.org.v25.Esis"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v25.L3InterfaceIpv4AddressList"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v25.L3InterfaceIpv6AddressList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Definition of vrf"/>
-                <xml-property name="indexedProps" value="vrf-id,vrf-role,vrf-function,data-owner,data-source,data-source-version"/>
-                <xml-property name="nameProps" value="vrf-name"/>
-                <xml-property name="dependentOn" value="pnf"/>
-                <xml-property name="container" value="vrfs"/>
-                <xml-property name="uriTemplate" value="/vrfs/vrf/{vrf-id}"/>
-                <xml-property name="requiredProps" value="vrf-id,vrf-name"/>
-             </xml-properties>
+                <xml-property name="description" value="Link aggregate interface"/>
+                <xml-property name="indexedProps" value="interface-name,interface-id,interface-role,interface-function,prov-status,data-owner,data-source,data-source-version,interface-type"/>
+                <xml-property name="uiEditableProps" value="prov-status"/>
+                <xml-property name="dependentOn" value="generic-vnf,pserver,vpls-pe,pnf"/>
+                <xml-property name="container" value="lag-interfaces"/>
+                <xml-property name="uriTemplate" value="/lag-interfaces/lag-interface/{interface-name}"/>
+                <xml-property name="requiredProps" value="interface-name,in-maint"/>
+            </xml-properties>
         </java-type>
 
-        <java-type name="OamNetworks">
+        <java-type name="Endpoints">
             <xml-properties>
-                <xml-property name="description" value="Collection of OAM networks, to be deprecated shortly.  Do not use for new purposes. "/>
+                <xml-property name="description" value="Collection of endpoints."/>
             </xml-properties>
-            <xml-root-element name="oam-networks"/>
+            <xml-root-element name="endpoints"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="oamNetwork" name="oam-network" type="inventory.aai.onap.org.v25.OamNetwork"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="endpoint" name="endpoint" type="inventory.aai.onap.org.v25.Endpoint"/>
             </java-attributes>
         </java-type>
 
-        <java-type name="OamNetwork">
-            <xml-root-element name="oam-network"/>
+        <java-type name="Endpoint">
+            <xml-root-element name="endpoint"/>
             <java-attributes>
-                <xml-element java-attribute="networkUuid" name="network-uuid" required="true" type="java.lang.String" xml-key="true">
-                    <xml-properties>
-                        <xml-property name="description" value="UUID of the network. Unique across a cloud-region"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="networkName" name="network-name" required="true" type="java.lang.String">
+                <xml-element java-attribute="endpointId" name="endpoint-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Name of the network."/>
+                        <xml-property name="description" value="Unique identifier for the endpoint."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="cvlanTag" name="cvlan-tag" required="true" type="java.lang.Long">
+                <xml-element java-attribute="endpointName" name="endpoint-name" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="cvlan-id"/>
+                        <xml-property name="description" value="Name of the endpoint."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="ipv4OamGatewayAddress" name="ipv4-oam-gateway-address" type="java.lang.String">
+                <xml-element java-attribute="endpointType" name="endpoint-type" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for VNF firewall rule so customer cannot send customer traffic over this oam network"/>
+                        <xml-property name="description" value="Type of the endpoint. Expected values are DNS, ETCD, Kubernetes, etc."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="ipv4OamGatewayAddressPrefixLength" name="ipv4-oam-gateway-address-prefix-length" type="java.lang.Integer">
+                <xml-element java-attribute="endpointName2" name="endpoint-name2" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for VNF firewall rule so customer cannot send customer traffic over this oam network"/>
+                        <xml-property name="description" value="Alternate name of the endpoint"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="ipAddressList" name="ip-address-list" type="inventory.aai.onap.org.v25.IpAddressList"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="portList" name="port-list" type="inventory.aai.onap.org.v25.PortList"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="selectorList" name="selector-list" type="inventory.aai.onap.org.v25.SelectorList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="OAM network, to be deprecated shortly.  Do not use for new purposes. "/>
-                <xml-property name="nameProps" value="network-name"/>
-                <xml-property name="indexedProps" value="cvlan-tag,network-uuid,network-name,data-owner,data-source,data-source-version"/>
-                <xml-property name="dependentOn" value="cloud-region"/>
-                <xml-property name="container" value="oam-networks"/>
-                <xml-property name="uriTemplate" value="/oam-networks/oam-network/{network-uuid}"/>
-                <xml-property name="requiredProps" value="network-uuid,network-name,cvlan-tag"/>
+                <xml-property name="description" value="describes an endpoints"/>
+                <xml-property name="namespace" value="cloud-infrastructure"/>
+                <xml-property name="container" value="endpoints"/>
+                <xml-property name="uriTemplate" value="/cloud-infrastructure/endpoints/endpoint/{endpoint-id}"/>
+                <xml-property name="requiredProps" value="endpoint-id"/>
+                <xml-property name="indexedProps" value="data-owner,data-source,data-source-version"/>
             </xml-properties>
         </java-type>
 
-        <java-type name="ValidationAudits">
+        <java-type name="Activities">
             <xml-properties>
-                <xml-property name="description" value="Collection of validation-audit"/>
+                <xml-property name="description" value="Collection of activities."/>
             </xml-properties>
-            <xml-root-element name="validation-audits"/>
+            <xml-root-element name="activities"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="validationAudit" name="validation-audit" type="inventory.aai.onap.org.v25.ValidationAudit"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="activity" name="activity" type="inventory.aai.onap.org.v25.Activity"/>
             </java-attributes>
         </java-type>
-         <java-type name="ValidationAudit">
-            <xml-root-element name="validation-audit"/>
+
+        <java-type name="Activity">
+            <xml-root-element name="activity"/>
             <java-attributes>
-                <xml-element java-attribute="validationId" name="validation-id" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="activityId" name="activity-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Validation-Audit UUID"/>
+                        <xml-property name="description" value="Unique id for the activity. (UUID)"/>
                     </xml-properties>
                 </xml-element>
-                 <xml-element java-attribute="validationRequestId" name="validation-request-id"  type="java.lang.String" >
+                <xml-element java-attribute="activityType" name="activity-type" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Request-id to retrieve data from client related to the specified audit"/>
+                        <xml-property name="description" value="Type of activity (ex, provisioning)."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="validationStatus" name="validation-status"  type="java.lang.String" >
+                <xml-element java-attribute="activityName" name="activity-name" required="false" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Status of the audit"/>
+                        <xml-property name="description" value="Name of the activity."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="validationPhase" name="validation-phase"  type="java.lang.String" >
+                <xml-element java-attribute="activityCreator" name="activity-creator" required="false" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Phase in the lifecycle of the configuration"/>
+                        <xml-property name="description" value="Application that created the activity."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                <xml-element java-attribute="activityDescription" name="activity-description" required="false" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
-                                               <xml-property name="ownerCheck" value="N/A"/>
+                        <xml-property name="description" value="Description of activity."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="activityTimeStamp" name="timestamp" required="false" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                        <xml-property name="description" value="Date and Time activity is created."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="currentState" name="current-state" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                        <xml-property name="description" value="Current state of the activity."/>
                     </xml-properties>
                 </xml-element>
-                   <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                <xml-element java-attribute="reflectedState" name="reflected-state" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                        <xml-property name="description" value="State reflected by the database."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-           </java-attributes>
-              <xml-properties>
-                <xml-property name="description" value="validation audit, value of validation status"/>
-                <xml-property name="indexedProps" value="validation-id,data-owner,data-source,data-source-version"/>
-                <xml-property name="uniqueProps" value="validation-id"/>
-                <xml-property name="dependentOn" value="cloud-region"/>
-                <xml-property name="container" value="validation-audits"/>
-                <xml-property name="uriTemplate" value="/validation-audits/validation-audit/{validation-id}"/>
-                <xml-property name="requiredProps" value="validation-id"/>
-             </xml-properties>
-        </java-type>
-
-        <java-type name="AvailabilityZones">
-            <xml-properties>
-                <xml-property name="description" value="Collection of availability zones"/>
-            </xml-properties>
-            <xml-root-element name="availability-zones"/>
-            <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.onap.org.v25.AvailabilityZone"/>
-            </java-attributes>
-        </java-type>
-
-        <java-type name="AvailabilityZone">
-            <xml-root-element name="availability-zone"/>
-            <java-attributes>
-                <xml-element java-attribute="availabilityZoneName" name="availability-zone-name" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="activityRole" name="activity-role" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Name of the availability zone.  Unique across a cloud region"/>
+                        <xml-property name="description" value="Role"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="hypervisorType" name="hypervisor-type" required="true" type="java.lang.String">
+                <xml-element java-attribute="activityFunction" name="activity-function" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Type of hypervisor.  Source of truth should define valid values."/>
+                        <xml-property name="description" value="Function"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
+                <xml-element java-attribute="timestampLastUpdated" name="timestamp-last-updated" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="State that indicates whether the availability zone should be used, etc.  Source of truth should define valid values."/>
+                        <xml-property name="description" value="Date/time last updated"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="timestampExpiration" name="timestamp-expiration" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Date/time expires"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
+                <xml-element java-attribute="activityStates" name="activity-states" type="inventory.aai.onap.org.v25.ActivityStates"/>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Availability zone, a collection of compute hosts/pservers"/>
-                <xml-property name="indexedProps" value="availability-zone-name,data-owner,data-source,data-source-version"/>
-                <xml-property name="dependentOn" value="cloud-region"/>
-                <xml-property name="container" value="availability-zones"/>
-                <xml-property name="uriTemplate" value="/availability-zones/availability-zone/{availability-zone-name}"/>
-                <xml-property name="requiredProps" value="availability-zone-name,hypervisor-type"/>
-             </xml-properties>
+                <xml-property name="description" value="describes an activities"/>
+                <xml-property name="uniqueProps" value="activity-id"/>
+                <xml-property name="dependentOn" value="pserver,pnf,cloud-region,p-interface,network-range"/>
+                <xml-property name="container" value="activities"/>
+                <xml-property name="uriTemplate" value="/activities/activity/{activity-id}"/>
+                <xml-property name="requiredProps" value="activity-id,activity-type"/>
+                <xml-property name="indexedProps" value="data-owner,data-source,data-source-version"/>
+            </xml-properties>
         </java-type>
 
-        <java-type name="VirtualDataCenters">
+        <java-type name="ActivityStates">
             <xml-properties>
-                <xml-property name="description" value="Virtual organization of cloud infrastructure elements in a data center context"/>
+                <xml-property name="description" value="Collection of activity-states"/>
             </xml-properties>
-            <xml-root-element name="virtual-data-centers"/>
+            <xml-root-element name="activity-states"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="virtualDataCenter" name="virtual-data-center" type="inventory.aai.onap.org.v25.VirtualDataCenter"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="activityState" name="activity-state" type="inventory.aai.onap.org.v25.ActivityState"/>
             </java-attributes>
         </java-type>
 
-        <java-type name="VirtualDataCenter">
-            <xml-root-element name="virtual-data-center"/>
+        <java-type name="ActivityState">
+            <xml-root-element name="activity-state"/>
             <java-attributes>
-                <xml-element java-attribute="vdcId" name="vdc-id" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="stateOrder" name="state-order" required="true" type="java.lang.Integer" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Unique ID of the vdc"/>
+                        <xml-property name="description" value="Order for the activity state."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="vdcName" name="vdc-name" required="true" type="java.lang.String">
+                <xml-element java-attribute="stateName" name="state-name" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Name of the virtual data center"/>
+                        <xml-property name="description" value="Name of the activity state (ex, NVT-PROV)."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="stateView" name="state-view" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="View of the activity state."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
-                    </xml-properties>
-                </xml-element>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Virtual organization of cloud infrastructure elements in a data center context"/>
-                <xml-property name="nameProps" value="vdc-name"/>
-                <xml-property name="indexedProps" value="vdc-name,vdc-id,data-owner,data-source,data-source-version"/>
-                <xml-property name="container" value="virtual-data-centers"/>
-                <xml-property name="namespace" value="cloud-infrastructure"/>
-                <xml-property name="uriTemplate" value="/cloud-infrastructure/virtual-data-centers/virtual-data-center/{vdc-id}"/>
-                <xml-property name="requiredProps" value="vdc-id,vdc-name"/>
-             </xml-properties>
-        </java-type>
-
-        <java-type name="Business">
-            <xml-properties>
-                <xml-property name="description" value="Namespace for business related constructs"/>
+                <xml-property name="description" value="describes an activities"/>
+                <xml-property name="uniqueProps" value="state-order"/>
+                <xml-property name="dependentOn" value="activity"/>
+                <xml-property name="container" value="activity-states"/>
+                <xml-property name="uriTemplate" value="/activity-states/activity-state/{state-order}"/>
+                <xml-property name="requiredProps" value="state-order,state-name"/>
+                <xml-property name="indexedProps" value="data-owner,data-source,data-source-version"/>
             </xml-properties>
-            <xml-root-element name="business"/>
-            <java-attributes>
-                <xml-element java-attribute="connectors" name="connectors" type="inventory.aai.onap.org.v25.Connectors"/>
-                <xml-element java-attribute="customers" name="customers" type="inventory.aai.onap.org.v25.Customers"/>
-                <xml-element java-attribute="linesOfBusiness" name="lines-of-business" type="inventory.aai.onap.org.v25.LinesOfBusiness"/>
-                <xml-element java-attribute="owningEntities" name="owning-entities" type="inventory.aai.onap.org.v25.OwningEntities"/>
-                <xml-element java-attribute="platforms" name="platforms" type="inventory.aai.onap.org.v25.Platforms"/>
-                <xml-element java-attribute="projects" name="projects" type="inventory.aai.onap.org.v25.Projects"/>
-
-                               <xml-element java-attribute="spPartners" name="sp-partners" type="inventory.aai.onap.org.v25.SpPartners"/>
-            </java-attributes>
         </java-type>
 
-        <java-type name="Projects">
+
+        <java-type name="BandwidthAttributes">
             <xml-properties>
-                <xml-property name="description" value="Collection of projects"/>
+                <xml-property name="description" value="Collection of bandwidth attribute. Added for ENNI in MDONS use case."/>
             </xml-properties>
-            <xml-root-element name="projects"/>
+            <xml-root-element name="bandwidth-attributes"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="project" name="project" type="inventory.aai.onap.org.v25.Project"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="bandwidthAttribute" name="bandwidth-attribute" type="inventory.aai.onap.org.v25.BandwidthAttribute"/>
             </java-attributes>
         </java-type>
-
-        <java-type name="Project">
-            <xml-root-element name="project"/>
+        <java-type name="BandwidthAttribute">
+            <xml-root-element name="bandwidth-attribute"/>
             <java-attributes>
-                <xml-element java-attribute="projectName" name="project-name" required="true" type="java.lang.String" xml-key="true">
-                    <xml-properties>
-                        <xml-property name="description" value="Name of the project deploying a service"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="projectType" name="project-type" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="Type of project (ex, VPMO)"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="projectState" name="project-state" type="java.lang.String">
+                <xml-element java-attribute="bwaId" name="bwa-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Current state of the project."/>
+                        <xml-property name="description" value="Id that identifies the bandwidth attribute"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="description" name="description" type="java.lang.String">
+                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Description of the project."/>
+                        <xml-property name="description" value="Store the link to get more information for this object."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
+                <xml-element java-attribute="availableBandwidthMap" name="available-bandwidth-map" type="inventory.aai.onap.org.v25.AvailableBandwidthMap"/>
+                <!--xml-element java-attribute="OTNLabelRestrictions" name="otn-label-restrictions" type="inventory.aai.onap.org.v25.OTNLabelRestrictions"/-->
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="describes the project"/>
-                <xml-property name="indexedProps" value="project-name,data-owner,data-source,data-source-version"/>
-                <xml-property name="uniqueProps" value="project-name"/>
-                <xml-property name="container" value="projects"/>
-                <xml-property name="namespace" value="business"/>
-                <xml-property name="uriTemplate" value="/business/projects/project/{project-name}"/>
-                <xml-property name="requiredProps" value="project-name"/>
-             </xml-properties>
+                <xml-property name="description" value="Instance of a bandwidth-attribute"/>
+                <xml-property name="indexedProps" value="bwa-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="searchable" value="bwa-id"/>
+                <xml-property name="uniqueProps" value="bwa-id"/>
+                <xml-property name="container" value="bandwidth-attributes"/>
+                <!--<xml-property name="dependentOn" value="pnf,p-interface"/>-->
+                <xml-property name="dependentOn" value="p-interface"/>
+                <xml-property name="requiredProps" value="bwa-id"/>
+                <xml-property name="uriTemplate" value="/bandwidth-attributes/bandwidth-attribute/{bwa-id}"/>
+            </xml-properties>
         </java-type>
 
-        <java-type name="Connectors">
+        <java-type name="AvailableBandwidthMap">
             <xml-properties>
-                <xml-property name="description" value="Collection of resource instances used to connect a variety of disparate inventory widgets"/>
+                <xml-property name="description" value="Collection of Available Bandwidth. Added for ENNI in MDONS use case."/>
             </xml-properties>
-            <xml-root-element name="connectors"/>
+            <xml-root-element name="available-bandwidth-map"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="connector" name="connector" type="inventory.aai.onap.org.v25.Connector"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="availableBandwidth" name="available-bandwidth" type="inventory.aai.onap.org.v25.AvailableBandwidth"/>
             </java-attributes>
         </java-type>
-
-        <java-type name="Connector">
-            <xml-root-element name="connector"/>
+        <java-type name="AvailableBandwidth">
+            <xml-root-element name="available-bandwidth"/>
             <java-attributes>
-                <xml-element java-attribute="resourceInstanceId" name="resource-instance-id" required="true" type="java.lang.String" xml-key="true">
-                    <xml-properties>
-                        <xml-property name="description" value="Unique id of resource instance."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
+                <xml-element java-attribute="abId" name="ab-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="the ASDC model id for this resource or service model."/>
-                        <xml-property name="visibility" value="deployment"/>
-                        <xml-property name="requires" value="model-version-id"/>
-                        <xml-property name="dbAlias" value="model-invariant-id-local"/>
+                        <xml-property name="description" value="Id that identifies the attribute"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
+                <xml-element java-attribute="oduType" name="odu-type" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="the ASDC model version for this resource or service model."/>
-                        <xml-property name="visibility" value="deployment"/>
-                        <xml-property name="requires" value="model-invariant-id"/>
-                        <xml-property name="dbAlias" value="model-version-id-local"/>
-                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
+                        <xml-property name="description" value="ODU Type that identifies the ODU Eg. ODU0, ODU1, ODU2, ODU3, ODU4"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String">
+                <xml-element java-attribute="number" name="number" type="java.lang.Integer">
                     <xml-properties>
-                        <xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget."/>
+                        <xml-property name="description" value="The value of available bandwidth. Applicable only for ENNI."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="widgetModelVersion" name="widget-model-version" type="java.lang.String">
+                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget."/>
+                        <xml-property name="description" value="Store the link to get more information for this object."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-                <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v25.Metadata"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Collection of resource instances used to connect a variety of disparate inventory widgets"/>
-                <xml-property name="indexedProps" value="resource-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,data-owner,data-source,data-source-version"/>
-                <xml-property name="container" value="connectors"/>
-                <xml-property name="namespace" value="business"/>
-                <xml-property name="uriTemplate" value="/business/connectors/connector/{resource-instance-id}"/>
-                <xml-property name="requiredProps" value="resource-instance-id"/>
-             </xml-properties>
+                <xml-property name="description" value="Instance of an available-bandwidth-map"/>
+                <xml-property name="indexedProps" value="ab-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="searchable" value="ab-id"/>
+                <xml-property name="uniqueProps" value="ab-id"/>
+                <xml-property name="container" value="available-bandwidth-map"/>
+                <xml-property name="dependentOn" value="bandwidth-attribute"/>
+                <xml-property name="requiredProps" value="ab-id"/>
+            </xml-properties>
         </java-type>
 
-        <java-type name="Customers">
+        <!--java-type name="OTNLabelRestrictions">
             <xml-properties>
-                <xml-property name="description" value="Collection of customer identifiers to provide linkage back to BSS information."/>
+                <xml-property name="description" value="Collection of Label Restriction. Added for ENNI in MDONS use case."/>
             </xml-properties>
-            <xml-root-element name="customers"/>
+            <xml-root-element name="otn-label-restrictions"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="customer" name="customer" type="inventory.aai.onap.org.v25.Customer"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="OTNLabelRestriction" name="otn-label-restriction" type="inventory.aai.onap.org.v25.OTNLabelRestriction"/>
             </java-attributes>
-            <xml-properties>
-                <xml-property name="maximumDepth" value="0"/>
-            </xml-properties>
         </java-type>
-
-        <java-type name="Customer">
-            <xml-root-element name="customer"/>
+        <java-type name="OTNLabelRestriction">
+            <xml-root-element name="otn-label-restriction"/>
             <java-attributes>
-                <xml-element java-attribute="globalCustomerId" name="global-customer-id" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="lrId" name="lr-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Global customer id used across ONAP to uniquely identify customer."/>
+                        <xml-property name="description" value="Id that identifies the label restriction"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="subscriberName" name="subscriber-name" required="true" type="java.lang.String">
+                <xml-element java-attribute="rangeBitmap" name="range-bitmap" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Subscriber name, an alternate way to retrieve a customer."/>
+                        <xml-property name="description" value="Bitmap of available labels starting from label-start to label-end."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="subscriberType" name="subscriber-type" required="true" type="java.lang.String">
+                <xml-element java-attribute="labelStep" name="label-step" type="java.lang.Integer">
                     <xml-properties>
-                        <xml-property name="description" value="Subscriber type, a way to provide VID with only the INFRA customers."/>
-                        <xml-property name="defaultValue" value="CUST"/>
+                        <xml-property name="description" value="Step of labels in label range."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
-                                               <xml-property name="ownerCheck" value="N/A"/>
+                        <xml-property name="description" value="Store the link to get more information for this object."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                       <xml-properties>
+                       <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                       <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
+                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                       <xml-properties>
+                       <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                       </xml-element>
                                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                       <xml-properties>
+                       <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="serviceSubscriptions" name="service-subscriptions" type="inventory.aai.onap.org.v25.ServiceSubscriptions"/>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="customer identifiers to provide linkage back to BSS information."/>
-                <xml-property name="nameProps" value="subscriber-name"/>
-                <xml-property name="indexedProps" value="subscriber-name,global-customer-id,subscriber-type,data-owner,data-source,data-source-version"/>
-                <xml-property name="searchable" value="global-customer-id,subscriber-name"/>
-                <xml-property name="uniqueProps" value="global-customer-id"/>
-                <xml-property name="container" value="customers"/>
-                <xml-property name="namespace" value="business"/>
-                <xml-property name="uriTemplate" value="/business/customers/customer/{global-customer-id}"/>
-                <xml-property name="requiredProps" value="global-customer-id,subscriber-name,subscriber-type"/>
-             </xml-properties>
-        </java-type>
-
-        <java-type name="LinesOfBusiness">
-            <xml-properties>
-                <xml-property name="description" value="Collection of lines-of-business"/>
+                <xml-property name="description" value="Instance of a otn-label-restriction attribute"/>
+                <xml-property name="indexedProps" value="lr-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="searchable" value="lr-id"/>
+                <xml-property name="uniqueProps" value="lr-id"/>
+                <xml-property name="container" value="otn-label-restrictions"/>
+                <xml-property name="dependentOn" value="bandwidth-attribute"/>
+                <xml-property name="requiredProps" value="lr-id"/>
             </xml-properties>
-            <xml-root-element name="lines-of-business"/>
+        </java-type-->
+
+        <java-type name="Vrfs">
+            <xml-root-element name="vrfs"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="lineOfBusiness" name="line-of-business" type="inventory.aai.onap.org.v25.LineOfBusiness"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vrf" name="vrf" type="inventory.aai.onap.org.v25.Vrf"/>
             </java-attributes>
+            <xml-properties>
+            </xml-properties>
         </java-type>
 
-        <java-type name="LineOfBusiness">
-            <xml-root-element name="line-of-business"/>
+        <java-type name="Vrf">
+            <xml-root-element name="vrf"/>
             <java-attributes>
-                <xml-element java-attribute="lineOfBusinessName" name="line-of-business-name" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="vrfId" name="vrf-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Name of the line-of-business (product)"/>
+                        <xml-property name="description" value="VRF UUID."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                <xml-element java-attribute="vrfName" name="vrf-name" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
-                                               <xml-property name="ownerCheck" value="N/A"/>
+                        <xml-property name="description" value="VRF Name"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="vrfDescription" name="vrf-description" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                        <xml-property name="description" value="VRF Description"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="routeDistinguisher" name="route-distinguisher" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                        <xml-property name="description" value="Route Distinguisher"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vrfType" name="vrf-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The type of vrf (bridge-domain as an example)"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vrfAddressFamily" name="vrf-address-family" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="IP address family (v6/v4/both)"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="opsNote" name="ops-note" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Notes to aid OPs in troubleshooting, such as attribute aliases or additional descriptions/instructions about an object."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-            </java-attributes>
-            <xml-properties>
-                <xml-property name="description" value="describes a line-of-business"/>
-                <xml-property name="indexedProps" value="line-of-business-name,data-owner,data-source,data-source-version"/>
-                <xml-property name="uniqueProps" value="line-of-business-name"/>
-                <xml-property name="container" value="lines-of-business"/>
-                <xml-property name="namespace" value="business"/>
-                <xml-property name="uriTemplate" value="/business/lines-of-business/line-of-business/{line-of-business-name}"/>
-                <xml-property name="requiredProps" value="line-of-business-name"/>
-             </xml-properties>
-        </java-type>
-
-        <java-type name="OwningEntities">
-            <xml-properties>
-                <xml-property name="description" value="Collection of owning-entities"/>
-            </xml-properties>
-            <xml-root-element name="owning-entities"/>
-            <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="owningEntity" name="owning-entity" type="inventory.aai.onap.org.v25.OwningEntity"/>
-            </java-attributes>
-        </java-type>
-
-        <java-type name="OwningEntity">
-            <xml-root-element name="owning-entity"/>
-            <java-attributes>
-                <xml-element java-attribute="owningEntityId" name="owning-entity-id" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="vrfRole" name="vrf-role" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="UUID of an owning entity"/>
+                        <xml-property name="description" value="Indicator for the use of this physical link"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="owningEntityName" name="owning-entity-name" required="true" type="java.lang.String">
+                <xml-element java-attribute="vrfFunction" name="vrf-function" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Owning entity name"/>
+                        <xml-property name="description" value="The function performed by this Linterface"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vrfGroupName" name="vrf-group-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Bridge domain group name"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                <xml-element java-attribute="bestExternal" name="best-external" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                        <xml-property name="description" value="Identifies best-external vrf, best-external=Y if the conditions are met.  otherwise, best-external = N"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-            </java-attributes>
-            <xml-properties>
-                <xml-property name="description" value="describes an owning-entity"/>
-                <xml-property name="indexedProps" value="owning-entity-id,owning-entity-name,data-owner,data-source,data-source-version"/>
-                <xml-property name="searchable" value="owning-entity-id"/>
-                <xml-property name="uniqueProps" value="owning-entity-id,owning-entity-name"/>
-                <xml-property name="container" value="owning-entities"/>
-                <xml-property name="namespace" value="business"/>
-                <xml-property name="uriTemplate" value="/business/owning-entities/owning-entity/{owning-entity-id}"/>
-                <xml-property name="requiredProps" value="owning-entity-id,owning-entity-name"/>
-            </xml-properties>
-        </java-type>
-
-        <java-type name="Platforms">
-            <xml-properties>
-                <xml-property name="description" value="Collection of platforms"/>
-            </xml-properties>
-            <xml-root-element name="platforms"/>
-            <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="platform" name="platform" type="inventory.aai.onap.org.v25.Platform"/>
-            </java-attributes>
-        </java-type>
-
-        <java-type name="Platform">
-            <xml-root-element name="platform"/>
-            <java-attributes>
-                <xml-element java-attribute="platformName" name="platform-name" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="maxPrefixV4" name="max-prefix-v4" type="java.lang.Integer">
                     <xml-properties>
-                        <xml-property name="description" value="Name of the platform"/>
+                        <xml-property name="description" value="Max prefix for IPv4."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                <xml-element java-attribute="maxPrefixV6" name="max-prefix-v6" type="java.lang.Integer">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
-                                               <xml-property name="ownerCheck" value="N/A"/>
+                        <xml-property name="description" value="Max prefix for IPv6."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="maxPrefixThresholdV4" name="max-prefix-threshold-v4" type="java.lang.Integer">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                        <xml-property name="description" value="Max prefix threshold for IPv4."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="maxPrefixThresholdV6" name="max-prefix-threshold-v6" type="java.lang.Integer">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                        <xml-property name="description" value="Max prefix threshold for IPv6."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                <xml-element java-attribute="labelModeV4" name="label-mode-v4" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                        <xml-property name="description" value="Label mode for IPv4."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-            </java-attributes>
-            <xml-properties>
-                <xml-property name="description" value="describes a platform"/>
-                <xml-property name="indexedProps" value="platform-name,data-owner,data-source,data-source-version"/>
-                <xml-property name="uniqueProps" value="platform-name"/>
-                <xml-property name="container" value="platforms"/>
-                <xml-property name="namespace" value="business"/>
-                <xml-property name="uriTemplate" value="/business/platforms/platform/{platform-name}"/>
-                <xml-property name="requiredProps" value="platform-name"/>
-             </xml-properties>
-        </java-type>
-
-        <java-type name="ServiceSubscriptions">
-            <xml-properties>
-                <xml-property name="description" value="Collection of objects that group service instances."/>
-            </xml-properties>
-            <xml-root-element name="service-subscriptions"/>
-            <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="serviceSubscription" name="service-subscription" type="inventory.aai.onap.org.v25.ServiceSubscription"/>
-            </java-attributes>
-        </java-type>
-
-        <java-type name="ServiceSubscription">
-            <xml-root-element name="service-subscription"/>
-            <java-attributes>
-                <xml-element java-attribute="serviceType" name="service-type" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="labelModeV6" name="label-mode-v6" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Value defined by orchestration to identify this service across ONAP."/>
+                        <xml-property name="description" value="Label mode for IPv6."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="tempUbSubAccountId" name="temp-ub-sub-account-id" type="java.lang.String">
+                <xml-element java-attribute="maxPathsV4" name="max-paths-v4" type="java.lang.Integer">
                     <xml-properties>
-                        <xml-property name="description" value="This property will be deleted from A&amp;AI in the near future. Only stop gap solution."/>
+                        <xml-property name="description" value="stores maximum number of paths for IPv4."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                <xml-element java-attribute="maxPathsV6" name="max-paths-v6" type="java.lang.Integer">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
-                                               <xml-property name="ownerCheck" value="N/A"/>
+                        <xml-property name="description" value="stores maximum number of paths for IPv6."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="v4MaxPathType" name="v4-max-path-type" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                        <xml-property name="description" value="Type of v4-max-path"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="v6MaxPathType" name="v6-max-path-type" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                        <xml-property name="description" value="Type of v6-max-path"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                <xml-element java-attribute="configurationStatus" name="configuration-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                        <xml-property name="description" value="Configuration status of the vrf"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="serviceInstances" name="service-instances" type="inventory.aai.onap.org.v25.ServiceInstances">
-                </xml-element>
+                <xml-element java-attribute="bgpGroups" name="bgp-groups" type="inventory.aai.onap.org.v25.BgpGroups"/>
+                <xml-element java-attribute="bgpNeighbors" name="bgp-neighbors" type="inventory.aai.onap.org.v25.BgpNeighbors"/>
+                <xml-element java-attribute="aggregateRoutes" name="aggregate-routes" type="inventory.aai.onap.org.v25.AggregateRoutes"/>
+                <xml-element java-attribute="routeTargets" name="route-targets" type="inventory.aai.onap.org.v25.RouteTargets"/>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Object that group service instances."/>
-                <xml-property name="indexedProps" value="service-type,data-owner,data-source,data-source-version"/>
-                <xml-property name="dependentOn" value="customer"/>
-                <xml-property name="container" value="service-subscriptions"/>
-                <xml-property name="crossEntityReference" value="service-instance,service-type"/>
-                <xml-property name="uriTemplate" value="/service-subscriptions/service-subscription/{service-type}"/>
-                <xml-property name="requiredProps" value="service-type"/>
-             </xml-properties>
+                <xml-property name="description" value="Definition of vrf"/>
+                <xml-property name="indexedProps" value="vrf-id,vrf-role,vrf-function,data-owner,data-source,data-source-version"/>
+                <xml-property name="nameProps" value="vrf-name"/>
+                <xml-property name="dependentOn" value="pnf"/>
+                <xml-property name="container" value="vrfs"/>
+                <xml-property name="uriTemplate" value="/vrfs/vrf/{vrf-id}"/>
+                <xml-property name="requiredProps" value="vrf-id,vrf-name"/>
+            </xml-properties>
         </java-type>
 
-        <java-type name="ServiceInstances">
+        <java-type name="OamNetworks">
             <xml-properties>
-                <xml-property name="description" value="Collection of service instances"/>
+                <xml-property name="description" value="Collection of OAM networks, to be deprecated shortly.  Do not use for new purposes. "/>
             </xml-properties>
-            <xml-root-element name="service-instances"/>
+            <xml-root-element name="oam-networks"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="serviceInstance" name="service-instance" type="inventory.aai.onap.org.v25.ServiceInstance"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="oamNetwork" name="oam-network" type="inventory.aai.onap.org.v25.OamNetwork"/>
             </java-attributes>
         </java-type>
 
-        <java-type name="ServiceInstance">
-            <xml-root-element name="service-instance"/>
+        <java-type name="OamNetwork">
+            <xml-root-element name="oam-network"/>
             <java-attributes>
-                <xml-element java-attribute="serviceInstanceId" name="service-instance-id" required="true" type="java.lang.String" xml-key="true">
-                    <xml-properties>
-                        <xml-property name="description" value="Uniquely identifies this instance of a service"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="serviceInstanceName" name="service-instance-name" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="This field will store a name assigned to the service-instance."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="serviceType" name="service-type" required="false" type="java.lang.String">
+                <xml-element java-attribute="networkUuid" name="network-uuid" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="String capturing type of service."/>
+                        <xml-property name="description" value="UUID of the network. Unique across a cloud-region"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="serviceRole" name="service-role" required="false" type="java.lang.String">
+                <xml-element java-attribute="networkName" name="network-name" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="String capturing the service role."/>
+                        <xml-property name="description" value="Name of the network."/>
                     </xml-properties>
                 </xml-element>
-               <xml-element java-attribute="serviceRate" name="service-rate" type="java.lang.String">
+                <xml-element java-attribute="cvlanTag" name="cvlan-tag" required="true" type="java.lang.Long">
                     <xml-properties>
-                        <xml-property name="description" value="Rate of the service instance."/>
+                        <xml-property name="description" value="cvlan-id"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="serviceLayer" name="service-layer" type="java.lang.String">
+                <xml-element java-attribute="ipv4OamGatewayAddress" name="ipv4-oam-gateway-address" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Definition of the service layer."/>
+                        <xml-property name="description" value="Used for VNF firewall rule so customer cannot send customer traffic over this oam network"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="dueDate" name="due-date" type="java.lang.String">
+                <xml-element java-attribute="ipv4OamGatewayAddressPrefixLength" name="ipv4-oam-gateway-address-prefix-length" type="java.lang.Integer">
                     <xml-properties>
-                        <xml-property name="description" value="Due date of the service creation."/>
+                        <xml-property name="description" value="Used for VNF firewall rule so customer cannot send customer traffic over this oam network"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="endDate" name="end-date" type="java.lang.String">
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="End date of the service creation."/>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                                               <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="environmentContext" name="environment-context" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="This field will store the environment context assigned to the service-instance."/>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="workloadContext" name="workload-context" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="This field will store the workload context assigned to the service-instance."/>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="createdAt" name="created-at" required="false" type="java.lang.String">
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="create time of Network Service."/>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="updatedAt" name="updated-at" required="false" type="java.lang.String">
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="OAM network, to be deprecated shortly.  Do not use for new purposes. "/>
+                <xml-property name="nameProps" value="network-name"/>
+                <xml-property name="indexedProps" value="cvlan-tag,network-uuid,network-name,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+                <xml-property name="container" value="oam-networks"/>
+                <xml-property name="uriTemplate" value="/oam-networks/oam-network/{network-uuid}"/>
+                <xml-property name="requiredProps" value="network-uuid,network-name,cvlan-tag"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="ValidationAudits">
+            <xml-properties>
+                <xml-property name="description" value="Collection of validation-audit"/>
+            </xml-properties>
+            <xml-root-element name="validation-audits"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="validationAudit" name="validation-audit" type="inventory.aai.onap.org.v25.ValidationAudit"/>
+            </java-attributes>
+        </java-type>
+        <java-type name="ValidationAudit">
+            <xml-root-element name="validation-audit"/>
+            <java-attributes>
+                <xml-element java-attribute="validationId" name="validation-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="last update of Network Service."/>
+                        <xml-property name="description" value="Validation-Audit UUID"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="description" name="description" required="false" type="java.lang.String">
+                <xml-element java-attribute="validationRequestId" name="validation-request-id"  type="java.lang.String" >
                     <xml-properties>
-                        <xml-property name="description" value="short description for service-instance."/>
+                        <xml-property name="description" value="Request-id to retrieve data from client related to the specified audit"/>
                     </xml-properties>
                 </xml-element>
-                <!-- for storing the nsd_id create edge between services -->
-                <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
+                <xml-element java-attribute="validationStatus" name="validation-status"  type="java.lang.String" >
                     <xml-properties>
-                        <xml-property name="description" value="the ASDC model id for this resource or service model."/>
-                        <xml-property name="visibility" value="deployment"/>
-                        <xml-property name="requires" value="model-version-id"/>
-                        <xml-property name="dbAlias" value="model-invariant-id-local"/>
+                        <xml-property name="description" value="Status of the audit"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
+                <xml-element java-attribute="validationPhase" name="validation-phase"  type="java.lang.String" >
                     <xml-properties>
-                        <xml-property name="description" value="the ASDC model version for this resource or service model."/>
-                        <xml-property name="visibility" value="deployment"/>
-                        <xml-property name="requires" value="model-invariant-id"/>
-                        <xml-property name="dbAlias" value="model-version-id-local"/>
-                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
+                        <xml-property name="description" value="Phase in the lifecycle of the configuration"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String">
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="the ASDC model version for this resource or service model."/>
-                        <xml-property name="visibility" value="internal"/>
-                        <xml-property name="dataCopy" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version"/>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                                               <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget."/>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="widgetModelVersion" name="widget-model-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget."/>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="bandwidthTotal" name="bandwidth-total" type="java.lang.String">
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Indicates the total bandwidth to be used for this service."/>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="bandwidthUpWan1" name="bandwidth-up-wan1" type="java.lang.String">
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="validation audit, value of validation status"/>
+                <xml-property name="indexedProps" value="validation-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="uniqueProps" value="validation-id"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+                <xml-property name="container" value="validation-audits"/>
+                <xml-property name="uriTemplate" value="/validation-audits/validation-audit/{validation-id}"/>
+                <xml-property name="requiredProps" value="validation-id"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="AvailabilityZones">
+            <xml-properties>
+                <xml-property name="description" value="Collection of availability zones"/>
+            </xml-properties>
+            <xml-root-element name="availability-zones"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.onap.org.v25.AvailabilityZone"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="AvailabilityZone">
+            <xml-root-element name="availability-zone"/>
+            <java-attributes>
+                <xml-element java-attribute="availabilityZoneName" name="availability-zone-name" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="indicates the upstream bandwidth this service will use on the WAN1 port of the physical device."/>
+                        <xml-property name="description" value="Name of the availability zone.  Unique across a cloud region"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="bandwidthDownWan1" name="bandwidth-down-wan1" type="java.lang.String">
+                <xml-element java-attribute="hypervisorType" name="hypervisor-type" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="indicates the downstream bandwidth this service will use on the WAN1 port of the physical device."/>
+                        <xml-property name="description" value="Type of hypervisor.  Source of truth should define valid values."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="bandwidthUpWan2" name="bandwidth-up-wan2" type="java.lang.String">
+                <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="indicates the upstream bandwidth this service will use on the WAN2 port of the physical device."/>
+                        <xml-property name="description" value="State that indicates whether the availability zone should be used, etc.  Source of truth should define valid values."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="bandwidthDownWan2" name="bandwidth-down-wan2" type="java.lang.String">
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="indicates the downstream bandwidth this service will use on the WAN2 port of the physical device."/>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                                               <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="vhnPortalUrl" name="vhn-portal-url" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="URL customers will use to access the vHN Portal."/>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="serviceInstanceLocationId" name="service-instance-location-id" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="An identifier that customers assign to the location where this service is being used."/>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="Path to the controller object."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="Orchestration status of this service."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="inputParameters" name="input-parameters" required="false" type="java.lang.String">
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Availability zone, a collection of compute hosts/pservers"/>
+                <xml-property name="indexedProps" value="availability-zone-name,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+                <xml-property name="container" value="availability-zones"/>
+                <xml-property name="uriTemplate" value="/availability-zones/availability-zone/{availability-zone-name}"/>
+                <xml-property name="requiredProps" value="availability-zone-name,hypervisor-type"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="VirtualDataCenters">
+            <xml-properties>
+                <xml-property name="description" value="Virtual organization of cloud infrastructure elements in a data center context"/>
+            </xml-properties>
+            <xml-root-element name="virtual-data-centers"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="virtualDataCenter" name="virtual-data-center" type="inventory.aai.onap.org.v25.VirtualDataCenter"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="VirtualDataCenter">
+            <xml-root-element name="virtual-data-center"/>
+            <java-attributes>
+                <xml-element java-attribute="vdcId" name="vdc-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="String capturing request parameters from SO to pass to Closed Loop."/>
+                        <xml-property name="description" value="Unique ID of the vdc"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="serviceFunction" name="service-function" type="java.lang.String">
+                <xml-element java-attribute="vdcName" name="vdc-name" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="String capturing function of the service."/>
+                        <xml-property name="description" value="Name of the virtual data center"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-                <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v25.Metadata"/>
-                <xml-element java-attribute="allottedResources" name="allotted-resources" type="inventory.aai.onap.org.v25.AllottedResources"/>
-                <xml-element java-attribute="composedResources" name="composed-resources" type="inventory.aai.onap.org.v25.ComposedResources"/>
-                <xml-element java-attribute="communicationServiceProfiles" name="communication-service-profiles" type="inventory.aai.onap.org.v25.CommunicationServiceProfiles"/>
-                <xml-element java-attribute="serviceProfiles" name="service-profiles" type="inventory.aai.onap.org.v25.ServiceProfiles"/>
-                <xml-element java-attribute="sliceProfiles" name="slice-profiles" type="inventory.aai.onap.org.v25.SliceProfiles"/>
-            <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
-                <xml-properties>
-                    <xml-property name="description" value="Indicator for whether the resource is considered operational.  Valid values are in-service-path and out-of-service-path."/>
-                    <xml-property name="suggestibleOnSearch" value="true"/>
-                </xml-properties>
-            </xml-element>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Instance of a service"/>
-                <xml-property name="indexedProps" value="service-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,service-instance-name,service-instance-location-id,orchestration-status,environment-context,workload-context,data-owner,data-source,data-source-version"/>
-                <xml-property name="nameProps" value="service-instance-name"/>
-                <xml-property name="searchable" value="service-instance-id,service-instance-name,operational-status"/>
-                <xml-property name="uniqueProps" value="service-instance-id"/>
-                <xml-property name="dependentOn" value="service-subscription"/>
-                <xml-property name="container" value="service-instances"/>
-                <xml-property name="uriTemplate" value="/service-instances/service-instance/{service-instance-id}"/>
-                <xml-property name="requiredProps" value="service-instance-id"/>
-             </xml-properties>
+                <xml-property name="description" value="Virtual organization of cloud infrastructure elements in a data center context"/>
+                <xml-property name="nameProps" value="vdc-name"/>
+                <xml-property name="indexedProps" value="vdc-name,vdc-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="container" value="virtual-data-centers"/>
+                <xml-property name="namespace" value="cloud-infrastructure"/>
+                <xml-property name="uriTemplate" value="/cloud-infrastructure/virtual-data-centers/virtual-data-center/{vdc-id}"/>
+                <xml-property name="requiredProps" value="vdc-id,vdc-name"/>
+            </xml-properties>
         </java-type>
 
-        <java-type name="ServiceDesignAndCreation">
+        <java-type name="Business">
             <xml-properties>
-                <xml-property name="description" value="Namespace for objects managed by ASDC"/>
+                <xml-property name="description" value="Namespace for business related constructs"/>
             </xml-properties>
-            <xml-root-element name="service-design-and-creation"/>
+            <xml-root-element name="business"/>
             <java-attributes>
-                <xml-element java-attribute="vnfImages" name="vnf-images" type="inventory.aai.onap.org.v25.VnfImages"/>
-                <xml-element java-attribute="services" name="services" type="inventory.aai.onap.org.v25.Services"/>
-                <xml-element java-attribute="serviceCapabilities" name="service-capabilities" type="inventory.aai.onap.org.v25.ServiceCapabilities"/>
-                <xml-element java-attribute="models" name="models" type="inventory.aai.onap.org.v25.Models"/>
-                <xml-element java-attribute="namedQueries" name="named-queries" type="inventory.aai.onap.org.v25.NamedQueries"/>
+                <xml-element java-attribute="connectors" name="connectors" type="inventory.aai.onap.org.v25.Connectors"/>
+                <xml-element java-attribute="customers" name="customers" type="inventory.aai.onap.org.v25.Customers"/>
+                <xml-element java-attribute="linesOfBusiness" name="lines-of-business" type="inventory.aai.onap.org.v25.LinesOfBusiness"/>
+                <xml-element java-attribute="owningEntities" name="owning-entities" type="inventory.aai.onap.org.v25.OwningEntities"/>
+                <xml-element java-attribute="platforms" name="platforms" type="inventory.aai.onap.org.v25.Platforms"/>
+                <xml-element java-attribute="projects" name="projects" type="inventory.aai.onap.org.v25.Projects"/>
+
+                <xml-element java-attribute="spPartners" name="sp-partners" type="inventory.aai.onap.org.v25.SpPartners"/>
             </java-attributes>
         </java-type>
 
-        <java-type name="VnfImages">
+        <java-type name="Projects">
             <xml-properties>
-                <xml-property name="description" value="Collection of image objects that pertain to a VNF that doesn't have associated vservers.  This is a kludge."/>
+                <xml-property name="description" value="Collection of projects"/>
             </xml-properties>
-            <xml-root-element name="vnf-images"/>
+            <xml-root-element name="projects"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="vnfImage" name="vnf-image" type="inventory.aai.onap.org.v25.VnfImage"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="project" name="project" type="inventory.aai.onap.org.v25.Project"/>
             </java-attributes>
         </java-type>
 
-        <java-type name="VnfImage">
-            <xml-root-element name="vnf-image"/>
+        <java-type name="Project">
+            <xml-root-element name="project"/>
             <java-attributes>
-                <xml-element java-attribute="vnfImageUuid" name="vnf-image-uuid" required="true" type="java.lang.String" xml-key="true">
-                    <xml-properties>
-                        <xml-property name="description" value="Unique ID of this asset"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="application" name="application" required="true" type="java.lang.String">
+                <xml-element java-attribute="projectName" name="project-name" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="The application that the image instantiates."/>
+                        <xml-property name="description" value="Name of the project deploying a service"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="applicationVendor" name="application-vendor" required="true" type="java.lang.String">
+                <xml-element java-attribute="projectType" name="project-type" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The vendor of the application."/>
+                        <xml-property name="description" value="Type of project (ex, VPMO)"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="applicationVersion" name="application-version" type="java.lang.String">
+                <xml-element java-attribute="projectState" name="project-state" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The version of the application."/>
+                        <xml-property name="description" value="Current state of the project."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+                <xml-element java-attribute="description" name="description" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
+                        <xml-property name="description" value="Description of the project."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Image object that pertain to a VNF that doesn't have associated vservers.  This is a kludge."/>
-                <xml-property name="indexedProps" value="application,vnf-image-uuid,application-vendor,application-version,data-owner,data-source,data-source-version"/>
-                <xml-property name="uniqueProps" value="vnf-image-uuid"/>
-                <xml-property name="container" value="vnf-images"/>
-                <xml-property name="namespace" value="service-design-and-creation"/>
-                <xml-property name="uriTemplate" value="/service-design-and-creation/vnf-images/vnf-image/{vnf-image-uuid}"/>
-                <xml-property name="requiredProps" value="vnf-image-uuid,application,application-vendor"/>
-             </xml-properties>
+                <xml-property name="description" value="describes the project"/>
+                <xml-property name="indexedProps" value="project-name,data-owner,data-source,data-source-version"/>
+                <xml-property name="uniqueProps" value="project-name"/>
+                <xml-property name="container" value="projects"/>
+                <xml-property name="namespace" value="business"/>
+                <xml-property name="uriTemplate" value="/business/projects/project/{project-name}"/>
+                <xml-property name="requiredProps" value="project-name"/>
+            </xml-properties>
         </java-type>
 
-        <java-type name="Services">
+        <java-type name="Connectors">
             <xml-properties>
-                <xml-property name="description" value="Collection of service model definitions.  Likely to be deprecated in favor of models from ASDC."/>
+                <xml-property name="description" value="Collection of resource instances used to connect a variety of disparate inventory widgets"/>
             </xml-properties>
-            <xml-root-element name="services"/>
+            <xml-root-element name="connectors"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="service" name="service" type="inventory.aai.onap.org.v25.Service"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="connector" name="connector" type="inventory.aai.onap.org.v25.Connector"/>
             </java-attributes>
         </java-type>
 
-        <java-type name="Service">
-            <xml-root-element name="service"/>
+        <java-type name="Connector">
+            <xml-root-element name="connector"/>
             <java-attributes>
-                <xml-element java-attribute="serviceId" name="service-id" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="resourceInstanceId" name="resource-instance-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="This gets defined by others to provide a unique ID for the service, we accept what is sent."/>
+                        <xml-property name="description" value="Unique id of resource instance."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="serviceDescription" name="service-description" required="true" type="java.lang.String">
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Description of the service"/>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="serviceSelflink" name="service-selflink" type="java.lang.String">
+                <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
+                        <xml-property name="description" value="the ASDC model id for this resource or service model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-version-id"/>
+                        <xml-property name="dbAlias" value="model-invariant-id-local"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                        <xml-property name="description" value="the ASDC model version for this resource or service model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="serviceVersion" name="service-version" type="java.lang.String">
+                <xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="service version"/>
+                        <xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="widgetModelVersion" name="widget-model-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
+                <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v25.Metadata"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Stand-in for service model definitions.  Likely to be deprecated in favor of models from ASDC.  Does not strictly map to ASDC services."/>
-                <xml-property name="indexedProps" value="service-description,service-id,data-owner,data-source,data-source-version"/>
-                <xml-property name="container" value="services"/>
-                <xml-property name="namespace" value="service-design-and-creation"/>
-                <xml-property name="uriTemplate" value="/service-design-and-creation/services/service/{service-id}"/>
-                <xml-property name="requiredProps" value="service-id,service-description"/>
-             </xml-properties>
+                <xml-property name="description" value="Collection of resource instances used to connect a variety of disparate inventory widgets"/>
+                <xml-property name="indexedProps" value="resource-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,data-owner,data-source,data-source-version"/>
+                <xml-property name="container" value="connectors"/>
+                <xml-property name="namespace" value="business"/>
+                <xml-property name="uriTemplate" value="/business/connectors/connector/{resource-instance-id}"/>
+                <xml-property name="requiredProps" value="resource-instance-id"/>
+            </xml-properties>
         </java-type>
 
-        <java-type name="ServiceCapabilities">
+        <java-type name="Customers">
             <xml-properties>
-                <xml-property name="description" value="Collection of service capabilities."/>
+                <xml-property name="description" value="Collection of customer identifiers to provide linkage back to BSS information."/>
             </xml-properties>
-            <xml-root-element name="service-capabilities"/>
+            <xml-root-element name="customers"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="serviceCapability" name="service-capability" type="inventory.aai.onap.org.v25.ServiceCapability"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="customer" name="customer" type="inventory.aai.onap.org.v25.Customer"/>
             </java-attributes>
+            <xml-properties>
+                <xml-property name="maximumDepth" value="0"/>
+            </xml-properties>
         </java-type>
 
-        <java-type name="ServiceCapability">
-            <xml-root-element name="service-capability"/>
+        <java-type name="Customer">
+            <xml-root-element name="customer"/>
             <java-attributes>
-                <xml-element java-attribute="serviceType" name="service-type" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="globalCustomerId" name="global-customer-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="This gets defined by others to provide a unique ID for the service, we accept what is sent."/>
+                        <xml-property name="description" value="Global customer id used across ONAP to uniquely identify customer."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="subscriberName" name="subscriber-name" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="String capturing type of vnf, that was intended to identify the SDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ONAP matures."/>
+                        <xml-property name="description" value="Subscriber name, an alternate way to retrieve a customer."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="subscriberType" name="subscriber-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Subscriber type, a way to provide VID with only the INFRA customers."/>
+                        <xml-property name="defaultValue" value="CUST"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
+                <xml-element java-attribute="serviceSubscriptions" name="service-subscriptions" type="inventory.aai.onap.org.v25.ServiceSubscriptions"/>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Early definition of server/resource pairings, likely to be replaced by models.  No new use should be made of this."/>
-                <xml-property name="indexedProps" value="service-type,vnf-type,data-owner,data-source,data-source-version"/>
-                <xml-property name="container" value="service-capabilities"/>
-                <xml-property name="namespace" value="service-design-and-creation"/>
-                <xml-property name="uriTemplate" value="/service-design-and-creation/service-capabilities/service-capability/{service-type}/{vnf-type}"/>
-                <xml-property name="requiredProps" value="service-type,vnf-type"/>
+                <xml-property name="description" value="customer identifiers to provide linkage back to BSS information."/>
+                <xml-property name="nameProps" value="subscriber-name"/>
+                <xml-property name="indexedProps" value="subscriber-name,global-customer-id,subscriber-type,data-owner,data-source,data-source-version"/>
+                <xml-property name="searchable" value="global-customer-id,subscriber-name"/>
+                <xml-property name="uniqueProps" value="global-customer-id"/>
+                <xml-property name="container" value="customers"/>
+                <xml-property name="namespace" value="business"/>
+                <xml-property name="uriTemplate" value="/business/customers/customer/{global-customer-id}"/>
+                <xml-property name="requiredProps" value="global-customer-id,subscriber-name,subscriber-type"/>
             </xml-properties>
         </java-type>
 
-        <java-type name="Network">
-            <xml-properties>
-                <xml-property name="description" value="Namespace for network inventory resources."/>
-            </xml-properties>
-            <xml-root-element name="network"/>
-            <java-attributes>
-                <xml-element java-attribute="logicalLinks" name="logical-links" type="inventory.aai.onap.org.v25.LogicalLinks"/>
-                <xml-element java-attribute="sitePairSets" name="site-pair-sets" type="inventory.aai.onap.org.v25.SitePairSets"/>
-                <xml-element java-attribute="vpnBindings" name="vpn-bindings" type="inventory.aai.onap.org.v25.VpnBindings"/>
-                <xml-element java-attribute="vplsPes" name="vpls-pes" type="inventory.aai.onap.org.v25.VplsPes"/>
-                <xml-element java-attribute="multicastConfigurations" name="multicast-configurations" type="inventory.aai.onap.org.v25.MulticastConfigurations"/>
-                <xml-element java-attribute="vces" name="vces" type="inventory.aai.onap.org.v25.Vces"/>
-                <xml-element java-attribute="vnfcs" name="vnfcs" type="inventory.aai.onap.org.v25.Vnfcs"/>
-                <xml-element java-attribute="l3Networks" name="l3-networks" type="inventory.aai.onap.org.v25.L3Networks"/>
-                <xml-element java-attribute="networkPolicies" name="network-policies" type="inventory.aai.onap.org.v25.NetworkPolicies"/>
-                <xml-element java-attribute="genericVnfs" name="generic-vnfs" type="inventory.aai.onap.org.v25.GenericVnfs"/>
-                <xml-element java-attribute="lagLinks" name="lag-links" type="inventory.aai.onap.org.v25.LagLinks"/>
-                <xml-element java-attribute="newvces" name="newvces" type="inventory.aai.onap.org.v25.Newvces"/>
-                <xml-element java-attribute="pnfs" name="pnfs" type="inventory.aai.onap.org.v25.Pnfs"/>
-                <xml-element java-attribute="chassies" name="chassies" type="inventory.aai.onap.org.v25.Chassies"/>
-                <xml-element java-attribute="physicalLinks" name="physical-links" type="inventory.aai.onap.org.v25.PhysicalLinks"/>
-                <xml-element java-attribute="ipsecConfigurations" name="ipsec-configurations" type="inventory.aai.onap.org.v25.IpsecConfigurations"/>
-                <xml-element java-attribute="routeTableReferences" name="route-table-references" type="inventory.aai.onap.org.v25.RouteTableReferences"/>
-                <xml-element java-attribute="instanceGroups" name="instance-groups" type="inventory.aai.onap.org.v25.InstanceGroups"/>
-                <xml-element java-attribute="zones" name="zones" type="inventory.aai.onap.org.v25.Zones"/>
-                <xml-element java-attribute="autonomousSystems" name="autonomous-systems" type="inventory.aai.onap.org.v25.AutonomousSystems"/>
-                               <xml-element java-attribute="networkRanges" name="network-ranges" type="inventory.aai.onap.org.v25.NetworkRanges"/>
-                               <xml-element java-attribute="mappings" name="mappings" type="inventory.aai.onap.org.v25.Mappings"/>
-                               <xml-element java-attribute="hwComponents" name="hw-components" type="inventory.aai.onap.org.v25.HwComponents"/>
-                               <xml-element java-attribute="swComponents" name="sw-components" type="inventory.aai.onap.org.v25.SwComponents"/>
-                               <xml-element java-attribute="networkRoutes" name="network-routes" type="inventory.aai.onap.org.v25.NetworkRoutes"/>
-                <xml-element java-attribute="configurations" name="configurations" type="inventory.aai.onap.org.v25.Configurations"/>
-                <xml-element java-attribute="forwardingPaths" name="forwarding-paths" type="inventory.aai.onap.org.v25.ForwardingPaths"/>
-                <xml-element java-attribute="collections" name="collections" type="inventory.aai.onap.org.v25.Collections"/>
-                               <xml-element java-attribute="nextHops" name="next-hops" type="inventory.aai.onap.org.v25.NextHops"/>
-                               <xml-element java-attribute="bfds" name="bfds" type="inventory.aai.onap.org.v25.Bfds"/>
-                               <xml-element java-attribute="fqdns" name="fqdns" type="inventory.aai.onap.org.v25.Fqdns"/>
-                <xml-element java-attribute="connectivities" name="connectivities" type="inventory.aai.onap.org.v25.Connectivities"/>
-                <xml-element java-attribute="lanPortConfigs" name="lan-port-configs" type="inventory.aai.onap.org.v25.LanPortConfigs"/>
-                <xml-element java-attribute="networkResources" name="network-resources" type="inventory.aai.onap.org.v25.NetworkResources"/>
-                <xml-element java-attribute="siteResources" name="site-resources" type="inventory.aai.onap.org.v25.SiteResources"/>
-                <xml-element java-attribute="sdwanVpns" name="sdwan-vpns" type="inventory.aai.onap.org.v25.SdwanVpns"/>
-                <xml-element java-attribute="devices" name="devices" type="inventory.aai.onap.org.v25.Devices"/>
-                <xml-element java-attribute="wanPortConfigs" name="wan-port-configs" type="inventory.aai.onap.org.v25.WanPortConfigs"/>
-                <xml-element java-attribute="extAaiNetworks" name="ext-aai-networks" type="inventory.aai.onap.org.v25.ExtAaiNetworks"/>
-                <xml-element java-attribute="labelRestrictions" name="label-restrictions" type="inventory.aai.onap.org.v25.LabelRestrictions"/>
-                <xml-element java-attribute="unis" name="unis" type="inventory.aai.onap.org.v25.Unis"/>
-                <xml-element java-attribute="teLinkAttributes" name="te-link-attributes" type="inventory.aai.onap.org.v25.TeLinkAttributes"/>
-               <xml-element java-attribute="interlayerAttachments" name="interlayer-attachments" type="inventory.aai.onap.org.v25.InterlayerAttachments"/>
-                <xml-element java-attribute="tunnelTerminationPoints" name="tunnel-termination-points" type="inventory.aai.onap.org.v25.TunnelTerminationPoints"/>
-            </java-attributes>
-        </java-type>
-        <java-type name="Configurations">
+        <java-type name="LinesOfBusiness">
             <xml-properties>
-                <xml-property name="description" value="Collection of configurations"/>
+                <xml-property name="description" value="Collection of lines-of-business"/>
             </xml-properties>
-            <xml-root-element name="configurations"/>
+            <xml-root-element name="lines-of-business"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="configuration" name="configuration" type="inventory.aai.onap.org.v25.Configuration"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="lineOfBusiness" name="line-of-business" type="inventory.aai.onap.org.v25.LineOfBusiness"/>
             </java-attributes>
         </java-type>
 
-        <java-type name="Configuration">
-            <xml-root-element name="configuration"/>
+        <java-type name="LineOfBusiness">
+            <xml-root-element name="line-of-business"/>
             <java-attributes>
-                <xml-element java-attribute="configurationId" name="configuration-id" required="true" type="java.lang.String" xml-key="true">
-                    <xml-properties>
-                        <xml-property name="description" value="UUID assigned to configuration."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
+                <xml-element java-attribute="lineOfBusinessName" name="line-of-business-name" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Indicates the entity that will manage this feature. Could be an organization or the name of the application as well."/>
+                        <xml-property name="description" value="Name of the line-of-business (product)"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="configurationName" name="configuration-name" type="java.lang.String">
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Name of the configuration."/>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                                               <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="configurationType" name="configuration-type" required="true" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="port-mirroring-configuration."/>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="configurationSubType" name="configuration-sub-type" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="vprobe, pprobe."/>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="the ASDC model id for this resource or service model."/>
-                        <xml-property name="visibility" value="deployment"/>
-                        <xml-property name="requires" value="model-version-id"/>
-                        <xml-property name="dbAlias" value="model-invariant-id-local"/>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="describes a line-of-business"/>
+                <xml-property name="indexedProps" value="line-of-business-name,data-owner,data-source,data-source-version"/>
+                <xml-property name="uniqueProps" value="line-of-business-name"/>
+                <xml-property name="container" value="lines-of-business"/>
+                <xml-property name="namespace" value="business"/>
+                <xml-property name="uriTemplate" value="/business/lines-of-business/line-of-business/{line-of-business-name}"/>
+                <xml-property name="requiredProps" value="line-of-business-name"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="OwningEntities">
+            <xml-properties>
+                <xml-property name="description" value="Collection of owning-entities"/>
+            </xml-properties>
+            <xml-root-element name="owning-entities"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="owningEntity" name="owning-entity" type="inventory.aai.onap.org.v25.OwningEntity"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="OwningEntity">
+            <xml-root-element name="owning-entity"/>
+            <java-attributes>
+                <xml-element java-attribute="owningEntityId" name="owning-entity-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="the ASDC model version for this resource or service model."/>
-                        <xml-property name="visibility" value="deployment"/>
-                        <xml-property name="requires" value="model-invariant-id"/>
-                        <xml-property name="dbAlias" value="model-version-id-local"/>
-                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
+                        <xml-property name="description" value="UUID of an owning entity"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                <xml-element java-attribute="owningEntityName" name="owning-entity-name" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Orchestration status of the configuration."/>
+                        <xml-property name="description" value="Owning entity name"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Indicator for whether the resource is considered operational."/>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                                               <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="configurationSelflink" name="configuration-selflink" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="URL to endpoint where AAI can get more details from SDN-GC."/>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="id of  the configuration used to customize the resource"/>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="tunnelBandwidth" name="tunnel-bandwidth" type="java.lang.String">
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="DHV Site Effective Bandwidth"/>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="vendorAllowedMaxBandwidth" name="vendor-allowed-max-bandwidth" type="java.lang.String">
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="describes an owning-entity"/>
+                <xml-property name="indexedProps" value="owning-entity-id,owning-entity-name,data-owner,data-source,data-source-version"/>
+                <xml-property name="searchable" value="owning-entity-id"/>
+                <xml-property name="uniqueProps" value="owning-entity-id,owning-entity-name"/>
+                <xml-property name="container" value="owning-entities"/>
+                <xml-property name="namespace" value="business"/>
+                <xml-property name="uriTemplate" value="/business/owning-entities/owning-entity/{owning-entity-id}"/>
+                <xml-property name="requiredProps" value="owning-entity-id,owning-entity-name"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Platforms">
+            <xml-properties>
+                <xml-property name="description" value="Collection of platforms"/>
+            </xml-properties>
+            <xml-root-element name="platforms"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="platform" name="platform" type="inventory.aai.onap.org.v25.Platform"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Platform">
+            <xml-root-element name="platform"/>
+            <java-attributes>
+                <xml-element java-attribute="platformName" name="platform-name" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Velocloud Nominal Throughput - VNT"/>
+                        <xml-property name="description" value="Name of the platform"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="configPolicyName" name="config-policy-name" type="java.lang.String">
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used to capture the name of the fabric configuration policy that was used to generate the payload sent to PINC for fabric configuration."/>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                                               <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="configurationRole" name="configuration-role" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used to categorize the configuration."/>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="configurationFunction" name="configuration-function" type="java.lang.String">
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used to categorize the configuration."/>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="primaryRole" name="primary-role" type="java.lang.Boolean">
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="describes a platform"/>
+                <xml-property name="indexedProps" value="platform-name,data-owner,data-source,data-source-version"/>
+                <xml-property name="uniqueProps" value="platform-name"/>
+                <xml-property name="container" value="platforms"/>
+                <xml-property name="namespace" value="business"/>
+                <xml-property name="uriTemplate" value="/business/platforms/platform/{platform-name}"/>
+                <xml-property name="requiredProps" value="platform-name"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="ServiceSubscriptions">
+            <xml-properties>
+                <xml-property name="description" value="Collection of objects that group service instances."/>
+            </xml-properties>
+            <xml-root-element name="service-subscriptions"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="serviceSubscription" name="service-subscription" type="inventory.aai.onap.org.v25.ServiceSubscription"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ServiceSubscription">
+            <xml-root-element name="service-subscription"/>
+            <java-attributes>
+                <xml-element java-attribute="serviceType" name="service-type" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Used by some configurations to identify if it's filling a primary role."/>
+                        <xml-property name="description" value="Value defined by orchestration to identify this service across ONAP."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="orchestrationVersion" name="orchestration-version" type="java.lang.String">
+                <xml-element java-attribute="tempUbSubAccountId" name="temp-ub-sub-account-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used to categorize the configuration."/>
+                        <xml-property name="description" value="This property will be deleted from A&amp;AI in the near future. Only stop gap solution."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceInstances" name="service-instances" type="inventory.aai.onap.org.v25.ServiceInstances">
+                </xml-element>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-                <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v25.Metadata"/>
-                <xml-element java-attribute="forwarderEvcs" name="forwarder-evcs" type="inventory.aai.onap.org.v25.ForwarderEvcs"/>
-                <xml-element java-attribute="evcs" name="evcs" type="inventory.aai.onap.org.v25.Evcs"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Generic configuration object."/>
-                <xml-property name="indexedProps" value="configuration-id,configuration-name,configuration-type,model-invariant-id,model-version-id,orchestration-status,configuration-role,configuration-function,orchestration-version,data-owner,data-source,data-source-version"/>
-                <xml-property name="uniqueProps" value="configuration-id"/>
-                <xml-property name="container" value="configurations"/>
-                <xml-property name="namespace" value="network"/>
-                <xml-property name="uriTemplate" value="/network/configurations/configuration/{configuration-id}"/>
-                <xml-property name="requiredProps" value="configuration-id,configuration-type"/>
-             </xml-properties>
+                <xml-property name="description" value="Object that group service instances."/>
+                <xml-property name="indexedProps" value="service-type,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="customer"/>
+                <xml-property name="container" value="service-subscriptions"/>
+                <xml-property name="crossEntityReference" value="service-instance,service-type"/>
+                <xml-property name="uriTemplate" value="/service-subscriptions/service-subscription/{service-type}"/>
+                <xml-property name="requiredProps" value="service-type"/>
+            </xml-properties>
         </java-type>
 
-        <java-type name="LogicalLinks">
+        <java-type name="ServiceInstances">
             <xml-properties>
-                <xml-property name="description" value="Collection of logical connections"/>
+                <xml-property name="description" value="Collection of service instances"/>
             </xml-properties>
-            <xml-root-element name="logical-links"/>
+            <xml-root-element name="service-instances"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="logicalLink" name="logical-link" type="inventory.aai.onap.org.v25.LogicalLink"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="serviceInstance" name="service-instance" type="inventory.aai.onap.org.v25.ServiceInstance"/>
             </java-attributes>
         </java-type>
 
-        <java-type name="LogicalLink">
-            <xml-root-element name="logical-link"/>
+        <java-type name="ServiceInstance">
+            <xml-root-element name="service-instance"/>
             <java-attributes>
-                <xml-element java-attribute="linkName" name="link-name" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="serviceInstanceId" name="service-instance-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="e.g., evc-name, or vnf-nameA_interface-nameA_vnf-nameZ_interface-nameZ"/>
+                        <xml-property name="description" value="Uniquely identifies this instance of a service"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element default-value="false" java-attribute="inMaint" name="in-maint" required="true" type="java.lang.Boolean">
+                <xml-element java-attribute="serviceInstanceName" name="service-instance-name" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="defaultValue" value="false"/>
-                        <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs."/>
+                        <xml-property name="description" value="This field will store a name assigned to the service-instance."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="linkType" name="link-type" required="true" type="java.lang.String">
+                <xml-element java-attribute="serviceType" name="service-type" required="false" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Type of logical link, e.g., evc"/>
+                        <xml-property name="description" value="String capturing type of service."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String">
+                <xml-element java-attribute="serviceRole" name="service-role" required="false" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Captures the numeric part of the speed"/>
+                        <xml-property name="description" value="String capturing the service role."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
+                <xml-element java-attribute="serviceRate" name="service-rate" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Captures the units corresponding to the speed"/>
+                        <xml-property name="description" value="Rate of the service instance."/>
                     </xml-properties>
                 </xml-element>
-               <xml-element java-attribute="availableCapacity" name="available-capacity" type="java.lang.String">
+                <xml-element java-attribute="serviceLayer" name="service-layer" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Captures the units corresponding to the speed"/>
+                        <xml-property name="description" value="Definition of the service layer."/>
                     </xml-properties>
                 </xml-element>
-               <xml-element java-attribute="adminState" name="admin-state" type="java.lang.String">
+                <xml-element java-attribute="dueDate" name="due-date" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Captures the administrative state of the link"/>
+                        <xml-property name="description" value="Due date of the service creation."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="ipVersion" name="ip-version" type="java.lang.String">
+                <xml-element java-attribute="endDate" name="end-date" type="java.lang.String">
                     <xml-properties>
-                                               <xml-property name="description" value="v4, v6, or ds for dual stack"/>
+                        <xml-property name="description" value="End date of the service creation."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="routingProtocol" name="routing-protocol" type="java.lang.String">
+                <xml-element java-attribute="environmentContext" name="environment-context" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="For example, static or BGP"/>
+                        <xml-property name="description" value="This field will store the environment context assigned to the service-instance."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                <xml-element java-attribute="workloadContext" name="workload-context" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                        <xml-property name="description" value="This field will store the workload context assigned to the service-instance."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
+                <xml-element java-attribute="createdAt" name="created-at" required="false" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="the ASDC model id for this resource or service model."/>
-                        <xml-property name="visibility" value="deployment"/>
-                        <xml-property name="requires" value="model-version-id"/>
-                        <xml-property name="dbAlias" value="model-invariant-id-local"/>
+                        <xml-property name="description" value="create time of Network Service."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
+                <xml-element java-attribute="updatedAt" name="updated-at" required="false" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="the ASDC model version for this resource or service model."/>
-                        <xml-property name="visibility" value="deployment"/>
-                        <xml-property name="requires" value="model-invariant-id"/>
-                        <xml-property name="dbAlias" value="model-version-id-local"/>
-                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
+                        <xml-property name="description" value="last update of Network Service."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String">
+                <xml-element java-attribute="description" name="description" required="false" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget."/>
+                        <xml-property name="description" value="short description for service-instance."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="widgetModelVersion" name="widget-model-version" type="java.lang.String">
+                <!-- for storing the nsd_id create edge between services -->
+                <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget."/>
+                        <xml-property name="description" value="the ASDC model id for this resource or service model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-version-id"/>
+                        <xml-property name="dbAlias" value="model-invariant-id-local"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
+                <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Indication of operational status of the logical link."/>
+                        <xml-property name="description" value="the ASDC model version for this resource or service model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+                <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Trigger for operational monitoring of this VNF by BAU Service Assurance systems."/>
+                        <xml-property name="description" value="the ASDC model version for this resource or service model."/>
+                        <xml-property name="visibility" value="internal"/>
+                        <xml-property name="dataCopy" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="linkRole" name="link-role" type="java.lang.String">
+                <xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Indication of the network use of the logical link."/>
+                        <xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="linkName2" name="link-name2" type="java.lang.String">
+                <xml-element java-attribute="widgetModelVersion" name="widget-model-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Alias or alternate name (CLCI or D1 name)."/>
+                        <xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="linkId" name="link-id" type="java.lang.String">
+                <xml-element java-attribute="bandwidthTotal" name="bandwidth-total" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="UUID of the logical-link, SDNC generates this."/>
+                        <xml-property name="description" value="Indicates the total bandwidth to be used for this service."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="circuitId" name="circuit-id" type="java.lang.String">
+                <xml-element java-attribute="bandwidthUpWan1" name="bandwidth-up-wan1" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Circuit id"/>
+                        <xml-property name="description" value="indicates the upstream bandwidth this service will use on the WAN1 port of the physical device."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="purpose" name="purpose" type="java.lang.String">
+                <xml-element java-attribute="bandwidthDownWan1" name="bandwidth-down-wan1" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Reason for this entity, role it is playing"/>
+                        <xml-property name="description" value="indicates the downstream bandwidth this service will use on the WAN1 port of the physical device."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="linkDescription" name="link-description" type="java.lang.String">
+                <xml-element java-attribute="bandwidthUpWan2" name="bandwidth-up-wan2" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Descriptor to identify the path of the link. In the format of ptn-ii-a_interface-a|ptn-ii-b_interface-b"/>
+                        <xml-property name="description" value="indicates the upstream bandwidth this service will use on the WAN2 port of the physical device."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="segmentId" name="segment-id" type="java.lang.String">
+                <xml-element java-attribute="bandwidthDownWan2" name="bandwidth-down-wan2" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="A segment-id assigned to the logical-link (ex, esi for ethernet segments)."/>
+                        <xml-property name="description" value="indicates the downstream bandwidth this service will use on the WAN2 port of the physical device."/>
                     </xml-properties>
                 </xml-element>
-                 <xml-element java-attribute="linkFunction" name="link-function" type="java.lang.String">
+                <xml-element java-attribute="vhnPortalUrl" name="vhn-portal-url" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The function performed by this logical link"/>
+                        <xml-property name="description" value="URL customers will use to access the vHN Portal."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                <xml-element java-attribute="serviceInstanceLocationId" name="service-instance-location-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
-                                               <xml-property name="ownerCheck" value="N/A"/>
+                        <xml-property name="description" value="An identifier that customers assign to the location where this service is being used."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                        <xml-property name="description" value="Path to the controller object."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-            </java-attributes>
-            <xml-properties>
-                <xml-property name="description" value="Logical links generally connect l-interfaces but are used to express logical connectivity between two points"/>
-                <xml-property name="indexedProps" value="link-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,link-id,prov-status,circuit-id,link-function,link-type,purpose,operational-status,link-role,link-description,data-owner,data-source,data-source-version"/>
-                <xml-property name="nameProps" value="link-description"/>
-                <xml-property name="uniqueProps" value="link-id"/>
-                <xml-property name="container" value="logical-links"/>
-                <xml-property name="namespace" value="network"/>
-                <xml-property name="searchable" value="link-name"/>
-                <xml-property name="uriTemplate" value="/network/logical-links/logical-link/{link-name}"/>
-                <xml-property name="requiredProps" value="link-name,in-maint,link-type"/>
-             </xml-properties>
-        </java-type>
-
-        <java-type name="SitePairSets">
-            <xml-properties>
-                <xml-property name="description" value="Collection of sets of instances for probes related to generic-vnf"/>
-            </xml-properties>
-            <xml-root-element name="site-pair-sets"/>
-            <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="sitePairSet" name="site-pair-set" type="inventory.aai.onap.org.v25.SitePairSet"/>
-            </java-attributes>
-        </java-type>
-
-        <java-type name="SitePairSet">
-            <xml-root-element name="site-pair-set"/>
-            <java-attributes>
-                <xml-element java-attribute="sitePairSetId" name="site-pair-set-id" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Unique id of site pair set."/>
+                        <xml-property name="description" value="Orchestration status of this service."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="inputParameters" name="input-parameters" required="false" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="String capturing request parameters from SO to pass to Closed Loop."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceFunction" name="service-function" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="String capturing function of the service."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
+                <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v25.Metadata"/>
+                <xml-element java-attribute="allottedResources" name="allotted-resources" type="inventory.aai.onap.org.v25.AllottedResources"/>
+                <xml-element java-attribute="composedResources" name="composed-resources" type="inventory.aai.onap.org.v25.ComposedResources"/>
+                <xml-element java-attribute="communicationServiceProfiles" name="communication-service-profiles" type="inventory.aai.onap.org.v25.CommunicationServiceProfiles"/>
+                <xml-element java-attribute="serviceProfiles" name="service-profiles" type="inventory.aai.onap.org.v25.ServiceProfiles"/>
+                <xml-element java-attribute="sliceProfiles" name="slice-profiles" type="inventory.aai.onap.org.v25.SliceProfiles"/>
+                <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                        <xml-property name="description" value="Indicator for whether the resource is considered operational.  Valid values are in-service-path and out-of-service-path."/>
+                        <xml-property name="suggestibleOnSearch" value="true"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="routingInstances" name="routing-instances" type="inventory.aai.onap.org.v25.RoutingInstances"/>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Set of instances for probes used to measure service level agreements"/>
-                <xml-property name="indexedProps" value="site-pair-set-id,data-owner,data-source,data-source-version"/>
-                <xml-property name="uniqueProps" value="site-pair-set-id"/>
-                <xml-property name="container" value="site-pair-sets"/>
-                <xml-property name="namespace" value="network"/>
-                <xml-property name="uriTemplate" value="/network/site-pair-sets/site-pair-set/{site-pair-set-id}"/>
-                <xml-property name="requiredProps" value="site-pair-set-id"/>
-             </xml-properties>
+                <xml-property name="description" value="Instance of a service"/>
+                <xml-property name="indexedProps" value="service-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,service-instance-name,service-instance-location-id,orchestration-status,environment-context,workload-context,data-owner,data-source,data-source-version"/>
+                <xml-property name="nameProps" value="service-instance-name"/>
+                <xml-property name="searchable" value="service-instance-id,service-instance-name,operational-status"/>
+                <xml-property name="uniqueProps" value="service-instance-id"/>
+                <xml-property name="dependentOn" value="service-subscription"/>
+                <xml-property name="container" value="service-instances"/>
+                <xml-property name="uriTemplate" value="/service-instances/service-instance/{service-instance-id}"/>
+                <xml-property name="requiredProps" value="service-instance-id"/>
+            </xml-properties>
         </java-type>
 
-        <java-type name="RoutingInstances">
+        <java-type name="ServiceDesignAndCreation">
             <xml-properties>
-                <xml-property name="description" value="set of probes related to generic-vnf routing instance"/>
+                <xml-property name="description" value="Namespace for objects managed by ASDC"/>
             </xml-properties>
-            <xml-root-element name="routing-instances"/>
+            <xml-root-element name="service-design-and-creation"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="routingInstance" name="routing-instance" type="inventory.aai.onap.org.v25.RoutingInstance"/>
+                <xml-element java-attribute="vnfImages" name="vnf-images" type="inventory.aai.onap.org.v25.VnfImages"/>
+                <xml-element java-attribute="services" name="services" type="inventory.aai.onap.org.v25.Services"/>
+                <xml-element java-attribute="serviceCapabilities" name="service-capabilities" type="inventory.aai.onap.org.v25.ServiceCapabilities"/>
+                <xml-element java-attribute="models" name="models" type="inventory.aai.onap.org.v25.Models"/>
+                <xml-element java-attribute="namedQueries" name="named-queries" type="inventory.aai.onap.org.v25.NamedQueries"/>
             </java-attributes>
         </java-type>
 
-        <java-type name="RoutingInstance">
-            <xml-root-element name="routing-instance"/>
+        <java-type name="VnfImages">
+            <xml-properties>
+                <xml-property name="description" value="Collection of image objects that pertain to a VNF that doesn't have associated vservers.  This is a kludge."/>
+            </xml-properties>
+            <xml-root-element name="vnf-images"/>
             <java-attributes>
-                <xml-element java-attribute="routingInstanceId" name="routing-instance-id" required="true" type="java.lang.String" xml-key="true">
+                <xml-element container-type="java.util.ArrayList" java-attribute="vnfImage" name="vnf-image" type="inventory.aai.onap.org.v25.VnfImage"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="VnfImage">
+            <xml-root-element name="vnf-image"/>
+            <java-attributes>
+                <xml-element java-attribute="vnfImageUuid" name="vnf-image-uuid" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Unique id of routing instance"/>
+                        <xml-property name="description" value="Unique ID of this asset"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="rpmOwner" name="rpm-owner" type="java.lang.String">
+                <xml-element java-attribute="application" name="application" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="rpm owner"/>
+                        <xml-property name="description" value="The application that the image instantiates."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="applicationVendor" name="application-vendor" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The vendor of the application."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="applicationVersion" name="application-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The version of the application."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="sitePairs" name="site-pairs" type="inventory.aai.onap.org.v25.SitePairs"/>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-               <xml-property name="description" value="Collection of routing tables, interfaces, and routing protocol parameters."/>
-                <xml-property name="indexedProps" value="routing-instance-id,data-owner,data-source,data-source-version"/>
-                <xml-property name="dependentOn" value="site-pair-set"/>
-                <xml-property name="container" value="routing-instances"/>
-                <xml-property name="uriTemplate" value="/routing-instances/routing-instance/{routing-instance-id}"/>
-             </xml-properties>
+                <xml-property name="description" value="Image object that pertain to a VNF that doesn't have associated vservers.  This is a kludge."/>
+                <xml-property name="indexedProps" value="application,vnf-image-uuid,application-vendor,application-version,data-owner,data-source,data-source-version"/>
+                <xml-property name="uniqueProps" value="vnf-image-uuid"/>
+                <xml-property name="container" value="vnf-images"/>
+                <xml-property name="namespace" value="service-design-and-creation"/>
+                <xml-property name="uriTemplate" value="/service-design-and-creation/vnf-images/vnf-image/{vnf-image-uuid}"/>
+                <xml-property name="requiredProps" value="vnf-image-uuid,application,application-vendor"/>
+            </xml-properties>
         </java-type>
 
-        <java-type name="SitePairs">
+        <java-type name="Services">
             <xml-properties>
-                <xml-property name="description" value="probe within a set"/>
+                <xml-property name="description" value="Collection of service model definitions.  Likely to be deprecated in favor of models from ASDC."/>
             </xml-properties>
-            <xml-root-element name="site-pairs"/>
+            <xml-root-element name="services"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="sitePair" name="site-pair" type="inventory.aai.onap.org.v25.SitePair"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="service" name="service" type="inventory.aai.onap.org.v25.Service"/>
             </java-attributes>
         </java-type>
 
-        <java-type name="SitePair">
-            <xml-root-element name="site-pair"/>
+        <java-type name="Service">
+            <xml-root-element name="service"/>
             <java-attributes>
-                <xml-element java-attribute="sitePairId" name="site-pair-id" required="true" type="java.lang.String" xml-key="true">
-                    <xml-properties>
-                        <xml-property name="description" value="unique identifier of probe"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="sourceIp" name="source-ip" type="java.lang.String">
+                <xml-element java-attribute="serviceId" name="service-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Prefix address"/>
+                        <xml-property name="description" value="This gets defined by others to provide a unique ID for the service, we accept what is sent."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="destinationIp" name="destination-ip" type="java.lang.String">
+                <xml-element java-attribute="serviceDescription" name="service-description" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Prefix address"/>
+                        <xml-property name="description" value="Description of the service"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="ipVersion" name="ip-version" type="java.lang.String">
+                <xml-element java-attribute="serviceSelflink" name="service-selflink" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="ip version, v4, v6"/>
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="destinationHostname" name="destination-hostname" type="java.lang.String">
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Hostname of the destination equipment to which SLAs are measured against."/>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="destinationEquipType" name="destination-equip-type" type="java.lang.String">
+                <xml-element java-attribute="serviceVersion" name="service-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The type of destinatination equipment. Could be Router, UCPE, etc."/>
+                        <xml-property name="description" value="service version"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="classesOfService" name="classes-of-service" type="inventory.aai.onap.org.v25.ClassesOfService"/>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="indexedProps" value="site-pair-id,data-owner,data-source,data-source-version"/>
-                <xml-property name="uniqueProps" value="site-pair-id"/>
-                <xml-property name="dependentOn" value="routing-instance"/>
-                <xml-property name="container" value="site-pairs"/>
-                <xml-property name="uriTemplate" value="/site-pairs/site-pair/{site-pair-id}"/>
+                <xml-property name="description" value="Stand-in for service model definitions.  Likely to be deprecated in favor of models from ASDC.  Does not strictly map to ASDC services."/>
+                <xml-property name="indexedProps" value="service-description,service-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="container" value="services"/>
+                <xml-property name="namespace" value="service-design-and-creation"/>
+                <xml-property name="uriTemplate" value="/service-design-and-creation/services/service/{service-id}"/>
+                <xml-property name="requiredProps" value="service-id,service-description"/>
             </xml-properties>
         </java-type>
 
-        <java-type name="ClassesOfService">
+        <java-type name="ServiceCapabilities">
             <xml-properties>
-                <xml-property name="description" value="class-of-service of probe"/>
+                <xml-property name="description" value="Collection of service capabilities."/>
             </xml-properties>
-            <xml-root-element name="classes-of-service"/>
+            <xml-root-element name="service-capabilities"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="classOfService" name="class-of-service" type="inventory.aai.onap.org.v25.ClassOfService"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="serviceCapability" name="service-capability" type="inventory.aai.onap.org.v25.ServiceCapability"/>
             </java-attributes>
         </java-type>
 
-        <java-type name="ClassOfService">
-            <xml-root-element name="class-of-service"/>
+        <java-type name="ServiceCapability">
+            <xml-root-element name="service-capability"/>
             <java-attributes>
-                <xml-element java-attribute="cos" name="cos" required="true" type="java.lang.String" xml-key="true">
-                    <xml-properties>
-                        <xml-property name="description" value="unique identifier of probe"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="probeId" name="probe-id" type="java.lang.String">
+                <xml-element java-attribute="serviceType" name="service-type" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="identifier of probe"/>
+                        <xml-property name="description" value="This gets defined by others to provide a unique ID for the service, we accept what is sent."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="probeType" name="probe-type" type="java.lang.String">
+                <xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="type of probe"/>
+                        <xml-property name="description" value="String capturing type of vnf, that was intended to identify the SDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ONAP matures."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-               <xml-property name="description" value="Captures data and voice protocols to differentiate the types of payloads contained in the packet being transmitted."/>
-                <xml-property name="indexedProps" value="cos,data-owner,data-source,data-source-version"/>
-                <xml-property name="dependentOn" value="site-pair"/>
-                <xml-property name="container" value="classes-of-service"/>
-                <xml-property name="uriTemplate" value="/classes-of-service/class-of-service/{cos}"/>
+                <xml-property name="description" value="Early definition of server/resource pairings, likely to be replaced by models.  No new use should be made of this."/>
+                <xml-property name="indexedProps" value="service-type,vnf-type,data-owner,data-source,data-source-version"/>
+                <xml-property name="container" value="service-capabilities"/>
+                <xml-property name="namespace" value="service-design-and-creation"/>
+                <xml-property name="uriTemplate" value="/service-design-and-creation/service-capabilities/service-capability/{service-type}/{vnf-type}"/>
+                <xml-property name="requiredProps" value="service-type,vnf-type"/>
             </xml-properties>
         </java-type>
 
-        <java-type name="VpnBindings">
-            <xml-root-element name="vpn-bindings"/>
+        <java-type name="Network">
+            <xml-properties>
+                <xml-property name="description" value="Namespace for network inventory resources."/>
+            </xml-properties>
+            <xml-root-element name="network"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="vpnBinding" name="vpn-binding" type="inventory.aai.onap.org.v25.VpnBinding"/>
+                <xml-element java-attribute="logicalLinks" name="logical-links" type="inventory.aai.onap.org.v25.LogicalLinks"/>
+                <xml-element java-attribute="sitePairSets" name="site-pair-sets" type="inventory.aai.onap.org.v25.SitePairSets"/>
+                <xml-element java-attribute="vpnBindings" name="vpn-bindings" type="inventory.aai.onap.org.v25.VpnBindings"/>
+                <xml-element java-attribute="vplsPes" name="vpls-pes" type="inventory.aai.onap.org.v25.VplsPes"/>
+                <xml-element java-attribute="multicastConfigurations" name="multicast-configurations" type="inventory.aai.onap.org.v25.MulticastConfigurations"/>
+                <xml-element java-attribute="vces" name="vces" type="inventory.aai.onap.org.v25.Vces"/>
+                <xml-element java-attribute="vnfcs" name="vnfcs" type="inventory.aai.onap.org.v25.Vnfcs"/>
+                <xml-element java-attribute="l3Networks" name="l3-networks" type="inventory.aai.onap.org.v25.L3Networks"/>
+                <xml-element java-attribute="networkPolicies" name="network-policies" type="inventory.aai.onap.org.v25.NetworkPolicies"/>
+                <xml-element java-attribute="genericVnfs" name="generic-vnfs" type="inventory.aai.onap.org.v25.GenericVnfs"/>
+                <xml-element java-attribute="lagLinks" name="lag-links" type="inventory.aai.onap.org.v25.LagLinks"/>
+                <xml-element java-attribute="newvces" name="newvces" type="inventory.aai.onap.org.v25.Newvces"/>
+                <xml-element java-attribute="pnfs" name="pnfs" type="inventory.aai.onap.org.v25.Pnfs"/>
+                <xml-element java-attribute="chassies" name="chassies" type="inventory.aai.onap.org.v25.Chassies"/>
+                <xml-element java-attribute="physicalLinks" name="physical-links" type="inventory.aai.onap.org.v25.PhysicalLinks"/>
+                <xml-element java-attribute="ipsecConfigurations" name="ipsec-configurations" type="inventory.aai.onap.org.v25.IpsecConfigurations"/>
+                <xml-element java-attribute="routeTableReferences" name="route-table-references" type="inventory.aai.onap.org.v25.RouteTableReferences"/>
+                <xml-element java-attribute="instanceGroups" name="instance-groups" type="inventory.aai.onap.org.v25.InstanceGroups"/>
+                <xml-element java-attribute="zones" name="zones" type="inventory.aai.onap.org.v25.Zones"/>
+                <xml-element java-attribute="autonomousSystems" name="autonomous-systems" type="inventory.aai.onap.org.v25.AutonomousSystems"/>
+                <xml-element java-attribute="networkRanges" name="network-ranges" type="inventory.aai.onap.org.v25.NetworkRanges"/>
+                <xml-element java-attribute="mappings" name="mappings" type="inventory.aai.onap.org.v25.Mappings"/>
+                <xml-element java-attribute="hwComponents" name="hw-components" type="inventory.aai.onap.org.v25.HwComponents"/>
+                <xml-element java-attribute="swComponents" name="sw-components" type="inventory.aai.onap.org.v25.SwComponents"/>
+                <xml-element java-attribute="networkRoutes" name="network-routes" type="inventory.aai.onap.org.v25.NetworkRoutes"/>
+                <xml-element java-attribute="configurations" name="configurations" type="inventory.aai.onap.org.v25.Configurations"/>
+                <xml-element java-attribute="forwardingPaths" name="forwarding-paths" type="inventory.aai.onap.org.v25.ForwardingPaths"/>
+                <xml-element java-attribute="collections" name="collections" type="inventory.aai.onap.org.v25.Collections"/>
+                <xml-element java-attribute="nextHops" name="next-hops" type="inventory.aai.onap.org.v25.NextHops"/>
+                <xml-element java-attribute="bfds" name="bfds" type="inventory.aai.onap.org.v25.Bfds"/>
+                <xml-element java-attribute="fqdns" name="fqdns" type="inventory.aai.onap.org.v25.Fqdns"/>
+                <xml-element java-attribute="connectivities" name="connectivities" type="inventory.aai.onap.org.v25.Connectivities"/>
+                <xml-element java-attribute="lanPortConfigs" name="lan-port-configs" type="inventory.aai.onap.org.v25.LanPortConfigs"/>
+                <xml-element java-attribute="networkResources" name="network-resources" type="inventory.aai.onap.org.v25.NetworkResources"/>
+                <xml-element java-attribute="siteResources" name="site-resources" type="inventory.aai.onap.org.v25.SiteResources"/>
+                <xml-element java-attribute="sdwanVpns" name="sdwan-vpns" type="inventory.aai.onap.org.v25.SdwanVpns"/>
+                <xml-element java-attribute="devices" name="devices" type="inventory.aai.onap.org.v25.Devices"/>
+                <xml-element java-attribute="wanPortConfigs" name="wan-port-configs" type="inventory.aai.onap.org.v25.WanPortConfigs"/>
+                <xml-element java-attribute="extAaiNetworks" name="ext-aai-networks" type="inventory.aai.onap.org.v25.ExtAaiNetworks"/>
+                <xml-element java-attribute="labelRestrictions" name="label-restrictions" type="inventory.aai.onap.org.v25.LabelRestrictions"/>
+                <xml-element java-attribute="unis" name="unis" type="inventory.aai.onap.org.v25.Unis"/>
+                <xml-element java-attribute="teLinkAttributes" name="te-link-attributes" type="inventory.aai.onap.org.v25.TeLinkAttributes"/>
+                <xml-element java-attribute="interlayerAttachments" name="interlayer-attachments" type="inventory.aai.onap.org.v25.InterlayerAttachments"/>
+                <xml-element java-attribute="tunnelTerminationPoints" name="tunnel-termination-points" type="inventory.aai.onap.org.v25.TunnelTerminationPoints"/>
+            </java-attributes>
+        </java-type>
+        <java-type name="Configurations">
+            <xml-properties>
+                <xml-property name="description" value="Collection of configurations"/>
+            </xml-properties>
+            <xml-root-element name="configurations"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="configuration" name="configuration" type="inventory.aai.onap.org.v25.Configuration"/>
             </java-attributes>
         </java-type>
 
-        <java-type name="VpnBinding">
-            <xml-root-element name="vpn-binding"/>
+        <java-type name="Configuration">
+            <xml-root-element name="configuration"/>
             <java-attributes>
-                <xml-element java-attribute="vpnId" name="vpn-id" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="configurationId" name="configuration-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="VPN ID, globally unique within A&amp;AI"/>
+                        <xml-property name="description" value="UUID assigned to configuration."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="vpnName" name="vpn-name" required="true" type="java.lang.String">
+                <xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="VPN Name"/>
+                        <xml-property name="description" value="Indicates the entity that will manage this feature. Could be an organization or the name of the application as well."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="vpnPlatform" name="vpn-platform" type="java.lang.String">
+                <xml-element java-attribute="configurationName" name="configuration-name" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="the platform associated with the VPN example AVPN, Mobility"/>
+                        <xml-property name="description" value="Name of the configuration."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="vpnType" name="vpn-type" type="java.lang.String">
+                <xml-element java-attribute="configurationType" name="configuration-type" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Type of the vpn, should be taken from enumerated/valid values"/>
+                        <xml-property name="description" value="port-mirroring-configuration."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="vpnRegion" name="vpn-region" type="java.lang.String">
+                <xml-element java-attribute="configurationSubType" name="configuration-sub-type" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="region of customer vpn"/>
+                        <xml-property name="description" value="vprobe, pprobe."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="customerVpnId" name="customer-vpn-id" type="java.lang.String">
+                <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="id for this customer vpn"/>
+                        <xml-property name="description" value="the ASDC model id for this resource or service model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-version-id"/>
+                        <xml-property name="dbAlias" value="model-invariant-id-local"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="routeDistinguisher" name="route-distinguisher" type="java.lang.String">
+                <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used to distinguish the distinct VPN routes of separate customers who connect to the provider in an MPLS network."/>
+                        <xml-property name="description" value="the ASDC model version for this resource or service model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="accessProviderId" name="access-provider-id" type="java.lang.String">
+                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Store the id of the access provider of this vpn."/>
+                        <xml-property name="description" value="Orchestration status of the configuration."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="accessClientId" name="access-client-id" type="java.lang.String">
+                <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Store the id of the access client of this vpn."/>
+                        <xml-property name="description" value="Indicator for whether the resource is considered operational."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="accessTopologyId" name="access-topology-id" type="java.lang.String">
+                <xml-element java-attribute="configurationSelflink" name="configuration-selflink" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Store the id of the access topology of this vpn."/>
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details from SDN-GC."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="srcAccessNodeId" name="src-access-node-id" type="java.lang.String">
+                <xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Store the id of the src-access-node of this vpn."/>
+                        <xml-property name="description" value="id of  the configuration used to customize the resource"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="srcAccessLtpId" name="src-access-ltp-id" type="java.lang.String">
+                <xml-element java-attribute="tunnelBandwidth" name="tunnel-bandwidth" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Store the id of the src-access-ltp of this vpn."/>
+                        <xml-property name="description" value="DHV Site Effective Bandwidth"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="dstAccessNodeId" name="dst-access-node-id" type="java.lang.String">
+                <xml-element java-attribute="vendorAllowedMaxBandwidth" name="vendor-allowed-max-bandwidth" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Store the id of the dst-access-node of this vpn."/>
+                        <xml-property name="description" value="Velocloud Nominal Throughput - VNT"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="dstAccessLtpId" name="dst-access-ltp-id" type="java.lang.String">
+                <xml-element java-attribute="configPolicyName" name="config-policy-name" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Store the id of the dst-access-ltp of this vpn."/>
+                        <xml-property name="description" value="Used to capture the name of the fabric configuration policy that was used to generate the payload sent to PINC for fabric configuration."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Store the operational-status of this vpn service."/>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="adminStatus" name="admin-status" type="java.lang.String">
+                <xml-element java-attribute="configurationRole" name="configuration-role" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Store the admin-status of this vpn service."/>
+                        <xml-property name="description" value="Used to categorize the configuration."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="protectionType" name="protection-type" type="java.lang.String">
+                <xml-element java-attribute="configurationFunction" name="configuration-function" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Store the protection-type of this vpn service."/>
+                        <xml-property name="description" value="Used to categorize the configuration."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="sliceId" name="slice-id" type="java.lang.String">
+                <xml-element java-attribute="primaryRole" name="primary-role" type="java.lang.Boolean">
                     <xml-properties>
-                        <xml-property name="description" value="Store the ID of the transport slice to which this vpn service may belong."/>
+                        <xml-property name="description" value="Used by some configurations to identify if it's filling a primary role."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="switchingType" name="switching-type" type="java.lang.String">
+                <xml-element java-attribute="orchestrationVersion" name="orchestration-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Store the type of multiplexing used for this vpn service."/>
+                        <xml-property name="description" value="Used to categorize the configuration."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="srcTpn" name="src-tpn" type="java.lang.String">
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Store source tributary port number of the underlay OTN tunnel realizing this vpn service."/>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                                               <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="dstTpn" name="dst-tpn" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Store destination tributary port number of the underlay OTN tunnel realizing this vpn service."/>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the model-customization-id for this object."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="the ASDC model id for this resource or service model."/>
-                                               <xml-property name="visibility" value="deployment"/>
-                                               <xml-property name="requires" value="model-version-id"/>
-                                               <xml-property name="dbAlias" value="model-invariant-id-local"/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="the ASDC model version for this resource or service model."/>
-                                               <xml-property name="visibility" value="deployment"/>
-                                               <xml-property name="requires" value="model-invariant-id"/>
-                                               <xml-property name="dbAlias" value="model-version-id-local"/>
-                                               <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
-                                       </xml-properties>
-                               </xml-element>
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="maxPrefixV4" name="max-prefix-v4" type="java.lang.Integer">
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
+                <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v25.Metadata"/>
+                <xml-element java-attribute="forwarderEvcs" name="forwarder-evcs" type="inventory.aai.onap.org.v25.ForwarderEvcs"/>
+                <xml-element java-attribute="evcs" name="evcs" type="inventory.aai.onap.org.v25.Evcs"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Generic configuration object."/>
+                <xml-property name="indexedProps" value="configuration-id,configuration-name,configuration-type,model-invariant-id,model-version-id,orchestration-status,configuration-role,configuration-function,orchestration-version,data-owner,data-source,data-source-version"/>
+                <xml-property name="uniqueProps" value="configuration-id"/>
+                <xml-property name="container" value="configurations"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/configurations/configuration/{configuration-id}"/>
+                <xml-property name="requiredProps" value="configuration-id,configuration-type"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="LogicalLinks">
+            <xml-properties>
+                <xml-property name="description" value="Collection of logical connections"/>
+            </xml-properties>
+            <xml-root-element name="logical-links"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="logicalLink" name="logical-link" type="inventory.aai.onap.org.v25.LogicalLink"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="LogicalLink">
+            <xml-root-element name="logical-link"/>
+            <java-attributes>
+                <xml-element java-attribute="linkName" name="link-name" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Max prefix for IPv4."/>
+                        <xml-property name="description" value="e.g., evc-name, or vnf-nameA_interface-nameA_vnf-nameZ_interface-nameZ"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="maxPrefixV6" name="max-prefix-v6" type="java.lang.Integer">
+                <xml-element default-value="false" java-attribute="inMaint" name="in-maint" required="true" type="java.lang.Boolean">
                     <xml-properties>
-                        <xml-property name="description" value="Max prefix for IPv6."/>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="maxPrefixThreshold" name="max-prefix-threshold" type="java.lang.Integer">
+                <xml-element java-attribute="linkType" name="link-type" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Max prefix threshold."/>
+                        <xml-property name="description" value="Type of logical link, e.g., evc"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="labelModeV4" name="label-mode-v4" type="java.lang.String">
+                <xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Label mode for IPv4."/>
+                        <xml-property name="description" value="Captures the numeric part of the speed"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="labelModeV6" name="label-mode-v6" type="java.lang.String">
+                <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Label mode for IPv6."/>
+                        <xml-property name="description" value="Captures the units corresponding to the speed"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="vpnDescription" name="vpn-description" type="java.lang.String">
+                <xml-element java-attribute="availableCapacity" name="available-capacity" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The description of the vpn."/>
+                        <xml-property name="description" value="Captures the units corresponding to the speed"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="vxlanNetworkId" name="vxlan-network-id" type="java.lang.String">
+                <xml-element java-attribute="adminState" name="admin-state" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="A VNI associated with the VPN."/>
+                        <xml-property name="description" value="Captures the administrative state of the link"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="opsNote" name="ops-note" type="java.lang.String">
+                <xml-element java-attribute="ipVersion" name="ip-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Notes to aid OPs in troubleshooting, such as attribute aliases or additional descriptions/instructions about an object."/>
+                        <xml-property name="description" value="v4, v6, or ds for dual stack"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="maxPath" name="max-path" type="java.lang.String">
+                <xml-element java-attribute="routingProtocol" name="routing-protocol" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="A variable BGP max AS path length."/>
+                        <xml-property name="description" value="For example, static or BGP"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="maxPathsV4" name="max-paths-v4" type="java.lang.Integer">
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="stores maximum number of paths for IPv4."/>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="maxPathsV6" name="max-paths-v6" type="java.lang.Integer">
+                <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="stores maximum number of paths for IPv6."/>
+                        <xml-property name="description" value="the ASDC model id for this resource or service model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-version-id"/>
+                        <xml-property name="dbAlias" value="model-invariant-id-local"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC model version for this resource or service model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="widgetModelVersion" name="widget-model-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indication of operational status of the logical link."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Trigger for operational monitoring of this VNF by BAU Service Assurance systems."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="linkRole" name="link-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indication of the network use of the logical link."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="linkName2" name="link-name2" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Alias or alternate name (CLCI or D1 name)."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="linkId" name="link-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="UUID of the logical-link, SDNC generates this."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="circuitId" name="circuit-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Circuit id"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="purpose" name="purpose" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Reason for this entity, role it is playing"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="linkDescription" name="link-description" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Descriptor to identify the path of the link. In the format of ptn-ii-a_interface-a|ptn-ii-b_interface-b"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="segmentId" name="segment-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="A segment-id assigned to the logical-link (ex, esi for ethernet segments)."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="linkFunction" name="link-function" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The function performed by this logical link"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="routeTargets" name="route-targets" type="inventory.aai.onap.org.v25.RouteTargets"/>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList">
-                    <xml-properties>
-                        <xml-property name="description" value="l3-networks relate to vpn-bindings"/>
-                    </xml-properties>
-                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="VPN binding"/>
-                <xml-property name="nameProps" value="vpn-name,vpn-type"/>
-                <xml-property name="indexedProps" value="vpn-name,vpn-id,vpn-type,access-provider-id,access-client-id,access-topology-id,src-access-node-id,src-access-ltp-id,dst-access-node-id,dst-access-ltp-id,operational-status,model-invariant-id,model-version-id,data-owner,data-source,data-source-version"/>
-                <xml-property name="searchable" value="vpn-id,vpn-name"/>
-                <xml-property name="uniqueProps" value="vpn-id"/>
-                <xml-property name="container" value="vpn-bindings"/>
+                <xml-property name="description" value="Logical links generally connect l-interfaces but are used to express logical connectivity between two points"/>
+                <xml-property name="indexedProps" value="link-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,link-id,prov-status,circuit-id,link-function,link-type,purpose,operational-status,link-role,link-description,data-owner,data-source,data-source-version"/>
+                <xml-property name="nameProps" value="link-description"/>
+                <xml-property name="uniqueProps" value="link-id"/>
+                <xml-property name="container" value="logical-links"/>
                 <xml-property name="namespace" value="network"/>
-                <xml-property name="uriTemplate" value="/network/vpn-bindings/vpn-binding/{vpn-id}"/>
-                <xml-property name="requiredProps" value="vpn-id,vpn-name"/>
+                <xml-property name="searchable" value="link-name"/>
+                <xml-property name="uriTemplate" value="/network/logical-links/logical-link/{link-name}"/>
+                <xml-property name="requiredProps" value="link-name,in-maint,link-type"/>
             </xml-properties>
         </java-type>
 
-        <java-type name="VplsPes">
+        <java-type name="SitePairSets">
             <xml-properties>
-                <xml-property name="description" value="Collection of VPLS Provider Edge routers"/>
+                <xml-property name="description" value="Collection of sets of instances for probes related to generic-vnf"/>
             </xml-properties>
-            <xml-root-element name="vpls-pes"/>
+            <xml-root-element name="site-pair-sets"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="vplsPe" name="vpls-pe" type="inventory.aai.onap.org.v25.VplsPe"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="sitePairSet" name="site-pair-set" type="inventory.aai.onap.org.v25.SitePairSet"/>
             </java-attributes>
         </java-type>
 
-        <java-type name="VplsPe">
-            <xml-root-element name="vpls-pe"/>
+        <java-type name="SitePairSet">
+            <xml-root-element name="site-pair-set"/>
             <java-attributes>
-                <xml-element java-attribute="equipmentName" name="equipment-name" required="true" type="java.lang.String" xml-key="true"/>
-                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="Trigger for operational monitoring of this VNF by BAU Service Assurance systems."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by GenericVnf (v4-loopback0-ip-address)."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="Client should send valid enumerated value, e.g., VPLS-PE."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
+                <xml-element java-attribute="sitePairSetId" name="site-pair-set-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Temporary location for stag to get to VCE"/>
+                        <xml-property name="description" value="Unique id of site pair set."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
+                <xml-element java-attribute="routingInstances" name="routing-instances" type="inventory.aai.onap.org.v25.RoutingInstances"/>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-                <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v25.PInterfaces"/>
-                <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v25.LagInterfaces"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="VPLS Provider Edge routers."/>
-                <xml-property name="indexedProps" value="prov-status,equipment-name,vlan-id-outer,data-owner,data-source,data-source-version"/>
-                <xml-property name="container" value="vpls-pes"/>
+                <xml-property name="description" value="Set of instances for probes used to measure service level agreements"/>
+                <xml-property name="indexedProps" value="site-pair-set-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="uniqueProps" value="site-pair-set-id"/>
+                <xml-property name="container" value="site-pair-sets"/>
                 <xml-property name="namespace" value="network"/>
-                <xml-property name="uriTemplate" value="/network/vpls-pes/vpls-pe/{equipment-name}"/>
-                <xml-property name="requiredProps" value="equipment-name"/>
+                <xml-property name="uriTemplate" value="/network/site-pair-sets/site-pair-set/{site-pair-set-id}"/>
+                <xml-property name="requiredProps" value="site-pair-set-id"/>
             </xml-properties>
         </java-type>
 
-        <java-type name="MulticastConfigurations">
+        <java-type name="RoutingInstances">
             <xml-properties>
-                <xml-property name="description" value="multicast configuration of generic-vnf ip-address"/>
+                <xml-property name="description" value="set of probes related to generic-vnf routing instance"/>
             </xml-properties>
-            <xml-root-element name="multicast-configurations"/>
+            <xml-root-element name="routing-instances"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="multicastConfiguration" name="multicast-configuration" type="inventory.aai.onap.org.v25.MulticastConfiguration"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="routingInstance" name="routing-instance" type="inventory.aai.onap.org.v25.RoutingInstance"/>
             </java-attributes>
         </java-type>
 
-        <java-type name="MulticastConfiguration">
-            <xml-root-element name="multicast-configuration"/>
+        <java-type name="RoutingInstance">
+            <xml-root-element name="routing-instance"/>
             <java-attributes>
-                <xml-element java-attribute="multicastConfigurationId" name="multicast-configuration-id" required="true" type="java.lang.String" xml-key="true">
-                    <xml-properties>
-                        <xml-property name="description" value="Unique id of multicast configuration."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="multicastProtocol" name="multicast-protocol" required="true" type="java.lang.String">
+                <xml-element java-attribute="routingInstanceId" name="routing-instance-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="protocol of multicast configuration"/>
+                        <xml-property name="description" value="Unique id of routing instance"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="rpType" name="rp-type" required="true" type="java.lang.String">
+                <xml-element java-attribute="rpmOwner" name="rpm-owner" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="rp type of multicast configuration"/>
+                        <xml-property name="description" value="rpm owner"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
+                <xml-element java-attribute="sitePairs" name="site-pairs" type="inventory.aai.onap.org.v25.SitePairs"/>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                   <xml-property name="description" value="Groups different VLANs that are on different logical interfaces on the same VNF. Multicast is the delivery of information to a group of destinations simultaneously, using the most efficient strategy to deliver messages over each link of the network only once, and create copies only when the links to the destinations split."/>
-                <xml-property name="indexedProps" value="multicast-configuration-id,data-owner,data-source,data-source-version"/>
-                <xml-property name="uniqueProps" value="multicast-configuration-id"/>
-                <xml-property name="container" value="multicast-configurations"/>
-                <xml-property name="namespace" value="network"/>
-                <xml-property name="uriTemplate" value="/network/multicast-configurations/multicast-configuration/{multicast-configuration-id}"/>
+                <xml-property name="description" value="Collection of routing tables, interfaces, and routing protocol parameters."/>
+                <xml-property name="indexedProps" value="routing-instance-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="site-pair-set"/>
+                <xml-property name="container" value="routing-instances"/>
+                <xml-property name="uriTemplate" value="/routing-instances/routing-instance/{routing-instance-id}"/>
             </xml-properties>
         </java-type>
 
-        <java-type name="Vces">
+        <java-type name="SitePairs">
             <xml-properties>
-                <xml-property name="description" value="Collection of Virtual Customer Edge Routers, used specifically for Gamma.  This object is deprecated."/>
+                <xml-property name="description" value="probe within a set"/>
             </xml-properties>
-            <xml-root-element name="vces"/>
+            <xml-root-element name="site-pairs"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="vce" name="vce" type="inventory.aai.onap.org.v25.Vce"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="sitePair" name="site-pair" type="inventory.aai.onap.org.v25.SitePair"/>
             </java-attributes>
         </java-type>
 
-        <java-type name="Vce">
-            <xml-root-element name="vce"/>
+        <java-type name="SitePair">
+            <xml-root-element name="site-pair"/>
             <java-attributes>
-                <xml-element java-attribute="vnfId" name="vnf-id" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="sitePairId" name="site-pair-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Unique id of VNF.  This is unique across the graph."/>
+                        <xml-property name="description" value="unique identifier of probe"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="vnfName" name="vnf-name" required="true" type="java.lang.String">
+                <xml-element java-attribute="sourceIp" name="source-ip" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Name of VNF."/>
+                        <xml-property name="description" value="Prefix address"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="vnfName2" name="vnf-name2" type="java.lang.String">
+                <xml-element java-attribute="destinationIp" name="destination-ip" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Alternate name of VNF."/>
+                        <xml-property name="description" value="Prefix address"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String">
+                <xml-element java-attribute="ipVersion" name="ip-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="String capturing type of vnf, that was intended to identify the SDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ONAP matures."/>
+                        <xml-property name="description" value="ip version, v4, v6"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="serviceId" name="service-id" type="java.lang.String">
+                <xml-element java-attribute="destinationHostname" name="destination-hostname" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Unique identifier of service, does not strictly map to ASDC services, SOON TO BE DEPRECATED."/>
+                        <xml-property name="description" value="Hostname of the destination equipment to which SLAs are measured against."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="regionalResourceZone" name="regional-resource-zone" type="java.lang.String">
+                <xml-element java-attribute="destinationEquipType" name="destination-equip-type" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Regional way of organizing pservers, source of truth should define values"/>
+                        <xml-property name="description" value="The type of destinatination equipment. Could be Router, UCPE, etc."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems."/>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                                               <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="Indicator for whether the resource is considered operational"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="OBSOLETE -  do not use"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="Network role being played by this VNF"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="Orchestration status of this VNF, mastered by MSO"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="vpeId" name="vpe-id" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Unique ID of VPE connected to this VCE."/>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="v6VceWanAddress" name="v6-vce-wan-address" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Valid v6 IP address for the WAN Link on this router.  Implied length of /64."/>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Address tail-f uses to configure vce, also used for troubleshooting and is IP used for traps generated by VCE."/>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                <xml-element java-attribute="classesOfService" name="classes-of-service" type="inventory.aai.onap.org.v25.ClassesOfService"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="indexedProps" value="site-pair-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="uniqueProps" value="site-pair-id"/>
+                <xml-property name="dependentOn" value="routing-instance"/>
+                <xml-property name="container" value="site-pairs"/>
+                <xml-property name="uriTemplate" value="/site-pairs/site-pair/{site-pair-id}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="ClassesOfService">
+            <xml-properties>
+                <xml-property name="description" value="class-of-service of probe"/>
+            </xml-properties>
+            <xml-root-element name="classes-of-service"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="classOfService" name="class-of-service" type="inventory.aai.onap.org.v25.ClassOfService"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ClassOfService">
+            <xml-root-element name="class-of-service"/>
+            <java-attributes>
+                <xml-element java-attribute="cos" name="cos" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                        <xml-property name="description" value="unique identifier of probe"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="ipv4Loopback0Address" name="ipv4-loopback0-address" type="java.lang.String">
+                <xml-element java-attribute="probeId" name="probe-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Loopback0 address"/>
+                        <xml-property name="description" value="identifier of probe"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="entitlementResourceUuid" name="entitlement-resource-uuid" type="java.lang.String">
+                <xml-element java-attribute="probeType" name="probe-type" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="OBSOLETE -  see child relationships"/>
+                        <xml-property name="description" value="type of probe"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="portGroups" name="port-groups" type="inventory.aai.onap.org.v25.PortGroups"/>
-                <xml-element java-attribute="licenses" name="licenses" type="inventory.aai.onap.org.v25.Licenses"/>
-                <xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.onap.org.v25.Entitlements"/>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Virtual Customer Edge Router, used specifically for Gamma.  This object is deprecated."/>
-                <xml-property name="nameProps" value="vnf-name"/>
-                <xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,regional-resource-zone,vpe-id,prov-status,service-id,orchestration-status,data-owner,data-source,data-source-version"/>
-                <xml-property name="searchable" value="vnf-id,vnf-name,vnf-name2"/>
-                <xml-property name="uniqueProps" value="vnf-id"/>
-                <xml-property name="container" value="vces"/>
-                <xml-property name="namespace" value="network"/>
-                <xml-property name="extends" value="vnf"/>
-                <xml-property name="uriTemplate" value="/network/vces/vce/{vnf-id}"/>
-                <xml-property name="requiredProps" value="vnf-id,vnf-name,vnf-type"/>
-             </xml-properties>
+                <xml-property name="description" value="Captures data and voice protocols to differentiate the types of payloads contained in the packet being transmitted."/>
+                <xml-property name="indexedProps" value="cos,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="site-pair"/>
+                <xml-property name="container" value="classes-of-service"/>
+                <xml-property name="uriTemplate" value="/classes-of-service/class-of-service/{cos}"/>
+            </xml-properties>
         </java-type>
 
-        <java-type name="PortGroups">
-            <xml-root-element name="port-groups"/>
+        <java-type name="VpnBindings">
+            <xml-root-element name="vpn-bindings"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="portGroup" name="port-group" type="inventory.aai.onap.org.v25.PortGroup"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vpnBinding" name="vpn-binding" type="inventory.aai.onap.org.v25.VpnBinding"/>
             </java-attributes>
         </java-type>
 
-        <java-type name="PortGroup">
-            <xml-root-element name="port-group"/>
+        <java-type name="VpnBinding">
+            <xml-root-element name="vpn-binding"/>
             <java-attributes>
-                <xml-element java-attribute="interfaceId" name="interface-id" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="vpnId" name="vpn-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Unique ID of the interface"/>
+                        <xml-property name="description" value="VPN ID, globally unique within A&amp;AI"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
+                <xml-element java-attribute="vpnName" name="vpn-name" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Neutron network id of this Interface"/>
+                        <xml-property name="description" value="VPN Name"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="neutronNetworkName" name="neutron-network-name" type="java.lang.String">
+                <xml-element java-attribute="vpnPlatform" name="vpn-platform" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Neutron network name of this Interface"/>
+                        <xml-property name="description" value="the platform associated with the VPN example AVPN, Mobility"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String">
+                <xml-element java-attribute="vpnType" name="vpn-type" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Role assigned to this Interface, should use values as defined in ECOMP Yang models."/>
+                        <xml-property name="description" value="Type of the vpn, should be taken from enumerated/valid values"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                <xml-element java-attribute="vpnRegion" name="vpn-region" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                        <xml-property name="description" value="region of customer vpn"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="portGroupId" name="port-group-id" type="java.lang.String">
+                <xml-element java-attribute="customerVpnId" name="customer-vpn-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Unique ID for port group in vmware"/>
+                        <xml-property name="description" value="id for this customer vpn"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="portGroupName" name="port-group-name" type="java.lang.String">
+                <xml-element java-attribute="routeDistinguisher" name="route-distinguisher" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Likely to duplicate value of neutron network name"/>
+                        <xml-property name="description" value="Used to distinguish the distinct VPN routes of separate customers who connect to the provider in an MPLS network."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="switchName" name="switch-name" type="java.lang.String">
+                <xml-element java-attribute="accessProviderId" name="access-provider-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="DVS or standard switch name (should be non-null for port groups associated with DVS)"/>
+                        <xml-property name="description" value="Store the id of the access provider of this vpn."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" required="true" type="java.lang.String">
+                <xml-element java-attribute="accessClientId" name="access-client-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Orchestration status of this VNF, mastered by MSO"/>
+                        <xml-property name="description" value="Store the id of the access client of this vpn."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
+                <xml-element java-attribute="accessTopologyId" name="access-topology-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO"/>
+                        <xml-property name="description" value="Store the id of the access topology of this vpn."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String">
+                <xml-element java-attribute="srcAccessNodeId" name="src-access-node-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE"/>
+                        <xml-property name="description" value="Store the id of the src-access-node of this vpn."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                <xml-element java-attribute="srcAccessLtpId" name="src-access-ltp-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
-                                               <xml-property name="ownerCheck" value="N/A"/>
+                        <xml-property name="description" value="Store the id of the src-access-ltp of this vpn."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dstAccessNodeId" name="dst-access-node-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                        <xml-property name="description" value="Store the id of the dst-access-node of this vpn."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dstAccessLtpId" name="dst-access-ltp-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                        <xml-property name="description" value="Store the id of the dst-access-ltp of this vpn."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="cvlanTags" name="cvlan-tags" type="inventory.aai.onap.org.v25.CvlanTags"/>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-            </java-attributes>
-            <xml-properties>
-                <xml-property name="description" value="Used to capture the network interfaces of this VCE"/>
-                <xml-property name="nameProps" value="port-group-name"/>
-                <xml-property name="indexedProps" value="port-group-id,heat-stack-id,interface-id,switch-name,interface-role,orchestration-status,data-owner,data-source,data-source-version,neutron-network-id"/>
-                <xml-property name="dependentOn" value="vce"/>
-                <xml-property name="container" value="port-groups"/>
-                <xml-property name="uriTemplate" value="/port-groups/port-group/{interface-id}"/>
-                <xml-property name="requiredProps" value="interface-id,orchestration-status"/>
-             </xml-properties>
-        </java-type>
-
-        <java-type name="CvlanTags">
-            <xml-root-element name="cvlan-tags"/>
-            <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="cvlanTagEntry" name="cvlan-tag-entry" type="inventory.aai.onap.org.v25.CvlanTagEntry"/>
-            </java-attributes>
-        </java-type>
-
-        <java-type name="CvlanTagEntry">
-            <xml-root-element name="cvlan-tag-entry"/>
-            <java-attributes>
-                <xml-element java-attribute="cvlanTag" name="cvlan-tag" required="true" type="java.lang.Long" xml-key="true">
+                <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="See mis-na-virtualization-platform.yang"/>
+                        <xml-property name="description" value="Store the operational-status of this vpn service."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                <xml-element java-attribute="adminStatus" name="admin-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
-                                               <xml-property name="ownerCheck" value="N/A"/>
+                        <xml-property name="description" value="Store the admin-status of this vpn service."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="protectionType" name="protection-type" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                        <xml-property name="description" value="Store the protection-type of this vpn service."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="sliceId" name="slice-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                        <xml-property name="description" value="Store the ID of the transport slice to which this vpn service may belong."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                <xml-element java-attribute="switchingType" name="switching-type" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                        <xml-property name="description" value="Store the type of multiplexing used for this vpn service."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-            </java-attributes>
-            <xml-properties>
-                <xml-property name="dependentOn" value="port-group"/>
-                <xml-property name="indexedProps" value="cvlan-tag,data-owner,data-source,data-source-version"/>
-                <xml-property name="container" value="cvlan-tags"/>
-                <xml-property name="uriTemplate" value="/cvlan-tags/cvlan-tag/{cvlan-tag}"/>
-            </xml-properties>
-        </java-type>
-
-
-        <java-type name="Vnfcs">
-            <xml-properties>
-                <xml-property name="description" value="virtual network components associated with a vserver from application controller."/>
-            </xml-properties>
-            <xml-root-element name="vnfcs"/>
-            <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="vnfc" name="vnfc" type="inventory.aai.onap.org.v25.Vnfc"/>
-            </java-attributes>
-        </java-type>
-
-        <java-type name="Vnfc">
-            <xml-root-element name="vnfc"/>
-            <java-attributes>
-                <xml-element java-attribute="vnfcName" name="vnfc-name" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="srcTpn" name="src-tpn" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Unique ID of vnfc."/>
+                        <xml-property name="description" value="Store source tributary port number of the underlay OTN tunnel realizing this vpn service."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="nfcNamingCode" name="nfc-naming-code" required="true" type="java.lang.String">
+                <xml-element java-attribute="dstTpn" name="dst-tpn" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Short code that is used in naming instances of the item being modeled"/>
+                        <xml-property name="description" value="Store destination tributary port number of the underlay OTN tunnel realizing this vpn service."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="nfcFunction" name="nfc-function" required="true" type="java.lang.String">
+                <xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="English description of function that the specific resource deployment is providing. Assigned as part of the customization of a resource in a service"/>
+                        <xml-property name="description" value="Store the model-customization-id for this object."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+                <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="prov status of this vnfc"/>
+                        <xml-property name="description" value="the ASDC model id for this resource or service model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-version-id"/>
+                        <xml-property name="dbAlias" value="model-invariant-id-local"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Orchestration status of this VNF, mastered by APP-C"/>
+                        <xml-property name="description" value="the ASDC model version for this resource or service model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="ipaddressV4OamVip" name="ipaddress-v4-oam-vip" type="java.lang.String">
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Oam V4 vip address of this vnfc"/>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element default-value="false" java-attribute="inMaint" name="in-maint" required="true" type="java.lang.Boolean">
+                <xml-element java-attribute="maxPrefixV4" name="max-prefix-v4" type="java.lang.Integer">
                     <xml-properties>
-                        <xml-property name="defaultValue" value="false"/>
-                        <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)"/>
+                        <xml-property name="description" value="Max prefix for IPv4."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element default-value="false" java-attribute="isClosedLoopDisabled" name="is-closed-loop-disabled" required="true" type="java.lang.Boolean">
+                <xml-element java-attribute="maxPrefixV6" name="max-prefix-v6" type="java.lang.Integer">
                     <xml-properties>
-                        <xml-property name="defaultValue" value="false"/>
-                        <xml-property name="description" value="used to indicate whether closed loop function is enabled on this node"/>
+                        <xml-property name="description" value="Max prefix for IPv6."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="groupNotation" name="group-notation" type="java.lang.String">
+                <xml-element java-attribute="maxPrefixThreshold" name="max-prefix-threshold" type="java.lang.Integer">
                     <xml-properties>
-                        <xml-property name="description" value="Group notation of VNFC"/>
+                        <xml-property name="description" value="Max prefix threshold."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
+                <xml-element java-attribute="labelModeV4" name="label-mode-v4" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="the ASDC model id for this resource or service model."/>
-                        <xml-property name="visibility" value="deployment"/>
-                        <xml-property name="requires" value="model-version-id"/>
-                        <xml-property name="dbAlias" value="model-invariant-id-local"/>
+                        <xml-property name="description" value="Label mode for IPv4."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
+                <xml-element java-attribute="labelModeV6" name="label-mode-v6" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="the ASDC model version for this resource or service model."/>
-                        <xml-property name="visibility" value="deployment"/>
-                        <xml-property name="requires" value="model-invariant-id"/>
-                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                        <xml-property name="description" value="Label mode for IPv6."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String">
+                <xml-element java-attribute="vpnDescription" name="vpn-description" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="captures the id of all the configuration used to customize the resource for the service."/>
+                        <xml-property name="description" value="The description of the vpn."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vxlanNetworkId" name="vxlan-network-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="A VNI associated with the VPN."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="opsNote" name="ops-note" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Notes to aid OPs in troubleshooting, such as attribute aliases or additional descriptions/instructions about an object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="maxPath" name="max-path" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="A variable BGP max AS path length."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="maxPathsV4" name="max-paths-v4" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="stores maximum number of paths for IPv4."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="maxPathsV6" name="max-paths-v6" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="stores maximum number of paths for IPv6."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                <xml-element java-attribute="routeTargets" name="route-targets" type="inventory.aai.onap.org.v25.RouteTargets"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                        <xml-property name="description" value="l3-networks relate to vpn-bindings"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-                <xml-element java-attribute="cps" name="cps" type="inventory.aai.onap.org.v25.Cps"/>
-                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v25.L3InterfaceIpv4AddressList"/>
-                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v25.L3InterfaceIpv6AddressList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="indexedProps" value="vnfc-name,prov-status,nfc-function,nfc-naming-code,ipaddress-v4-oam-vip,is-closed-loop-disabled,group-notation,model-invariant-id,model-version-id,orchestration-status,data-owner,data-source,data-source-version"/>
-                <xml-property name="searchable" value="vnfc-name"/>
-                <xml-property name="container" value="vnfcs"/>
+                <xml-property name="description" value="VPN binding"/>
+                <xml-property name="nameProps" value="vpn-name,vpn-type"/>
+                <xml-property name="indexedProps" value="vpn-name,vpn-id,vpn-type,access-provider-id,access-client-id,access-topology-id,src-access-node-id,src-access-ltp-id,dst-access-node-id,dst-access-ltp-id,operational-status,model-invariant-id,model-version-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="searchable" value="vpn-id,vpn-name"/>
+                <xml-property name="uniqueProps" value="vpn-id"/>
+                <xml-property name="container" value="vpn-bindings"/>
                 <xml-property name="namespace" value="network"/>
-                <xml-property name="uriTemplate" value="/network/vnfcs/vnfc/{vnfc-name}"/>
+                <xml-property name="uriTemplate" value="/network/vpn-bindings/vpn-binding/{vpn-id}"/>
+                <xml-property name="requiredProps" value="vpn-id,vpn-name"/>
             </xml-properties>
         </java-type>
 
-        <java-type name="L3Networks">
-            <xml-root-element name="l3-networks"/>
+        <java-type name="VplsPes">
+            <xml-properties>
+                <xml-property name="description" value="Collection of VPLS Provider Edge routers"/>
+            </xml-properties>
+            <xml-root-element name="vpls-pes"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="l3Network" name="l3-network" type="inventory.aai.onap.org.v25.L3Network"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vplsPe" name="vpls-pe" type="inventory.aai.onap.org.v25.VplsPe"/>
             </java-attributes>
         </java-type>
 
-        <java-type name="L3Network">
-            <xml-root-element name="l3-network"/>
+        <java-type name="VplsPe">
+            <xml-root-element name="vpls-pe"/>
             <java-attributes>
-                <xml-element java-attribute="networkId" name="network-id" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="equipmentName" name="equipment-name" required="true" type="java.lang.String" xml-key="true"/>
+                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Network ID, should be uuid. Unique across A&amp;AI."/>
+                        <xml-property name="description" value="Trigger for operational monitoring of this VNF by BAU Service Assurance systems."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="networkName" name="network-name" type="java.lang.String">
+                <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Name of the network, governed by some naming convention.."/>
+                        <xml-property name="description" value="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by GenericVnf (v4-loopback0-ip-address)."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="networkType" name="network-type" type="java.lang.String">
+                <xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Type of the network - who defines these values?"/>
+                        <xml-property name="description" value="Client should send valid enumerated value, e.g., VPLS-PE."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="networkRole" name="network-role" type="java.lang.String">
+                <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
                     <xml-properties>
-                        <xml-property name="description" value="Role the network plans - who defines these values?"/>
+                        <xml-property name="description" value="Temporary location for stag to get to VCE"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="networkTechnology" name="network-technology" type="java.lang.String">
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Network technology - who defines these values?"/>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                                               <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="description" name="description" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="text used for documentation"/>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Neutron network id of this Interface"/>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element default-value="false" java-attribute="isBoundToVpn" name="is-bound-to-vpn" required="true" type="java.lang.Boolean">
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="defaultValue" value="false"/>
-                        <xml-property name="description" value="Set to true if bound to VPN"/>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="serviceId" name="service-id" type="java.lang.String">
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
+                <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v25.PInterfaces"/>
+                <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v25.LagInterfaces"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="VPLS Provider Edge routers."/>
+                <xml-property name="indexedProps" value="prov-status,equipment-name,vlan-id-outer,data-owner,data-source,data-source-version"/>
+                <xml-property name="container" value="vpls-pes"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/vpls-pes/vpls-pe/{equipment-name}"/>
+                <xml-property name="requiredProps" value="equipment-name"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="MulticastConfigurations">
+            <xml-properties>
+                <xml-property name="description" value="multicast configuration of generic-vnf ip-address"/>
+            </xml-properties>
+            <xml-root-element name="multicast-configurations"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="multicastConfiguration" name="multicast-configuration" type="inventory.aai.onap.org.v25.MulticastConfiguration"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="MulticastConfiguration">
+            <xml-root-element name="multicast-configuration"/>
+            <java-attributes>
+                <xml-element java-attribute="multicastConfigurationId" name="multicast-configuration-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Unique identifier of service from ASDC.  Does not strictly map to ASDC services.  SOON TO BE DEPRECATED"/>
+                        <xml-property name="description" value="Unique id of multicast configuration."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="networkRoleInstance" name="network-role-instance" type="java.lang.Long">
+                <xml-element java-attribute="multicastProtocol" name="multicast-protocol" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="network role instance"/>
+                        <xml-property name="description" value="protocol of multicast configuration"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                <xml-element java-attribute="rpType" name="rp-type" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                        <xml-property name="description" value="rp type of multicast configuration"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Orchestration status of this VNF, mastered by MSO"/>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                                               <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO"/>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE"/>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="contrailNetworkFqdn" name="contrail-network-fqdn" type="java.lang.String">
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Contrail FQDN for the network"/>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Groups different VLANs that are on different logical interfaces on the same VNF. Multicast is the delivery of information to a group of destinations simultaneously, using the most efficient strategy to deliver messages over each link of the network only once, and create copies only when the links to the destinations split."/>
+                <xml-property name="indexedProps" value="multicast-configuration-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="uniqueProps" value="multicast-configuration-id"/>
+                <xml-property name="container" value="multicast-configurations"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/multicast-configurations/multicast-configuration/{multicast-configuration-id}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Vces">
+            <xml-properties>
+                <xml-property name="description" value="Collection of Virtual Customer Edge Routers, used specifically for Gamma.  This object is deprecated."/>
+            </xml-properties>
+            <xml-root-element name="vces"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vce" name="vce" type="inventory.aai.onap.org.v25.Vce"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Vce">
+            <xml-root-element name="vce"/>
+            <java-attributes>
+                <xml-element java-attribute="vnfId" name="vnf-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="the ASDC model id for this resource or service model."/>
-                        <xml-property name="visibility" value="deployment"/>
-                        <xml-property name="requires" value="model-version-id"/>
-                        <xml-property name="dbAlias" value="model-invariant-id-local"/>
+                        <xml-property name="description" value="Unique id of VNF.  This is unique across the graph."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
+                <xml-element java-attribute="vnfName" name="vnf-name" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="the ASDC model version for this resource or service model."/>
-                        <xml-property name="visibility" value="deployment"/>
-                        <xml-property name="requires" value="model-invariant-id"/>
-                        <xml-property name="dbAlias" value="model-version-id-local"/>
-                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
+                        <xml-property name="description" value="Name of VNF."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String">
+                <xml-element java-attribute="vnfName2" name="vnf-name2" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="the ASDC model version for this resource or service model."/>
-                        <xml-property name="visibility" value="internal"/>
-                        <xml-property name="dataCopy" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version"/>
+                        <xml-property name="description" value="Alternate name of VNF."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String">
+                <xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="captures the id of all the configuration used to customize the resource for the service."/>
+                        <xml-property name="description" value="String capturing type of vnf, that was intended to identify the SDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ONAP matures."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String">
+                <xml-element java-attribute="serviceId" name="service-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget."/>
+                        <xml-property name="description" value="Unique identifier of service, does not strictly map to ASDC services, SOON TO BE DEPRECATED."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="widgetModelVersion" name="widget-model-version" type="java.lang.String">
+                <xml-element java-attribute="regionalResourceZone" name="regional-resource-zone" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget."/>
+                        <xml-property name="description" value="Regional way of organizing pservers, source of truth should define values"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="physicalNetworkName" name="physical-network-name" type="java.lang.String">
+                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Name associated with the physical network."/>
+                        <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="isProviderNetwork" name="is-provider-network" required="true" type="java.lang.Boolean">
+                <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="defaultValue" value="false"/>
-                        <xml-property name="description" value="boolean indicatating whether or not network is a provider network."/>
+                        <xml-property name="description" value="Indicator for whether the resource is considered operational"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="isSharedNetwork" name="is-shared-network" required="true" type="java.lang.Boolean">
+                <xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="defaultValue" value="false"/>
-                        <xml-property name="description" value="boolean indicatating whether or not network is a shared network."/>
+                        <xml-property name="description" value="OBSOLETE -  do not use"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="isExternalNetwork" name="is-external-network" required="true" type="java.lang.Boolean">
+                <xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="defaultValue" value="false"/>
-                        <xml-property name="description" value="boolean indicatating whether or not network is an external network."/>
+                        <xml-property name="description" value="Network role being played by this VNF"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Path to the controller object."/>
+                        <xml-property name="description" value="Orchestration status of this VNF, mastered by MSO"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
+                <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Indicator for whether the resource is considered operational."/>
+                        <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="isTrunked" name="is-trunked" type="java.lang.Boolean">
+                <xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="defaultValue" value="false"/>
-                        <xml-property name="description" value="Trunked network indication."/>
+                        <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="opsNote" name="ops-note" type="java.lang.String">
+                <xml-element java-attribute="vpeId" name="vpe-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Notes to aid OPs in troubleshooting, such as attribute aliases or additional descriptions/instructions about an object."/>
+                        <xml-property name="description" value="Unique ID of VPE connected to this VCE."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="networkFunction" name="network-function" type="java.lang.String">
+                <xml-element java-attribute="v6VceWanAddress" name="v6-vce-wan-address" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The function performed by this l3 network"/>
+                        <xml-property name="description" value="Valid v6 IP address for the WAN Link on this router.  Implied length of /64."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Address tail-f uses to configure vce, also used for troubleshooting and is IP used for traps generated by VCE."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipv4Loopback0Address" name="ipv4-loopback0-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Loopback0 address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="entitlementResourceUuid" name="entitlement-resource-uuid" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="OBSOLETE -  see child relationships"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="subnets" name="subnets" type="inventory.aai.onap.org.v25.Subnets"/>
-                <xml-element java-attribute="ctagAssignments" name="ctag-assignments" type="inventory.aai.onap.org.v25.CtagAssignments"/>
-                <xml-element java-attribute="segmentationAssignments" name="segmentation-assignments" type="inventory.aai.onap.org.v25.SegmentationAssignments"/>
-                <xml-element java-attribute="aggregateRoutes" name="aggregate-routes" type="inventory.aai.onap.org.v25.AggregateRoutes"/>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList">
-                    <xml-properties>
-                        <xml-property name="description" value="Relates to tenant (or is it a child of tenant), complex, service, vpn-binding"/>
-                    </xml-properties>
-                </xml-element>
+                <xml-element java-attribute="portGroups" name="port-groups" type="inventory.aai.onap.org.v25.PortGroups"/>
+                <xml-element java-attribute="licenses" name="licenses" type="inventory.aai.onap.org.v25.Licenses"/>
+                <xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.onap.org.v25.Entitlements"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Generic network definition"/>
-                <xml-property name="nameProps" value="network-name"/>
-                <xml-property name="indexedProps" value="heat-stack-id,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role,network-function,orchestration-status,data-owner,data-source,data-source-version,neutron-network-id"/>
-                <xml-property name="searchable" value="network-id,network-name"/>
-                <xml-property name="uniqueProps" value="network-id"/>
-                <xml-property name="container" value="l3-networks"/>
+                <xml-property name="description" value="Virtual Customer Edge Router, used specifically for Gamma.  This object is deprecated."/>
+                <xml-property name="nameProps" value="vnf-name"/>
+                <xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,regional-resource-zone,vpe-id,prov-status,service-id,orchestration-status,data-owner,data-source,data-source-version"/>
+                <xml-property name="searchable" value="vnf-id,vnf-name,vnf-name2"/>
+                <xml-property name="uniqueProps" value="vnf-id"/>
+                <xml-property name="container" value="vces"/>
                 <xml-property name="namespace" value="network"/>
-                <xml-property name="uriTemplate" value="/network/l3-networks/l3-network/{network-id}"/>
-                <xml-property name="requiredProps" value="network-id,is-bound-to-vpn,is-provider-network,is-shared-network,is-external-network"/>
-             </xml-properties>
+                <xml-property name="extends" value="vnf"/>
+                <xml-property name="uriTemplate" value="/network/vces/vce/{vnf-id}"/>
+                <xml-property name="requiredProps" value="vnf-id,vnf-name,vnf-type"/>
+            </xml-properties>
         </java-type>
-        <java-type name="NetworkPolicies">
-            <xml-root-element name="network-policies"/>
+
+        <java-type name="PortGroups">
+            <xml-root-element name="port-groups"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="networkPolicy" name="network-policy" type="inventory.aai.onap.org.v25.NetworkPolicy"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="portGroup" name="port-group" type="inventory.aai.onap.org.v25.PortGroup"/>
             </java-attributes>
         </java-type>
-        <java-type name="NetworkPolicy">
-            <xml-root-element name="network-policy"/>
+
+        <java-type name="PortGroup">
+            <xml-root-element name="port-group"/>
             <java-attributes>
-                <xml-element java-attribute="networkPolicyId" name="network-policy-id" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="interfaceId" name="interface-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="UUID representing unique key to this instance"/>
+                        <xml-property name="description" value="Unique ID of the interface"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="networkPolicyFqdn" name="network-policy-fqdn" type="java.lang.String">
+                <xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Contrail FQDN for the policy"/>
+                        <xml-property name="description" value="Neutron network id of this Interface"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
+                <xml-element java-attribute="neutronNetworkName" name="neutron-network-name" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="ID for the openStack Heat instance"/>
+                        <xml-property name="description" value="Neutron network name of this Interface"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                <xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
-                                               <xml-property name="ownerCheck" value="N/A"/>
+                        <xml-property name="description" value="Role assigned to this Interface, should use values as defined in ECOMP Yang models."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="portGroupId" name="port-group-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                        <xml-property name="description" value="Unique ID for port group in vmware"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                <xml-element java-attribute="portGroupName" name="port-group-name" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                        <xml-property name="description" value="Likely to duplicate value of neutron network name"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="name" name="name" type="java.lang.String">
+                <xml-element java-attribute="switchName" name="switch-name" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Name of the policy"/>
+                        <xml-property name="description" value="DVS or standard switch name (should be non-null for port groups associated with DVS)"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="type" name="type" type="java.lang.String">
+                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Type of the policy"/>
+                        <xml-property name="description" value="Orchestration status of this VNF, mastered by MSO"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="latency" name="latency" type="java.lang.Integer">
+                <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The packet transmission latency (millisecond) through the Transport slice connections and is used to evaluate utilization performance of the end-to-end network slice instance."/>
+                        <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="jitter" name="jitter" type="java.lang.Integer">
+                <xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="jitter"/>
+                        <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="maxBandwidth" name="max-bandwidth" type="java.lang.Integer">
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The maximum bandwidth (mb) of the connection links in a transport slice instance."/>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                                               <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="reliability" name="reliability" type="java.lang.Float">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The reliability requirement for an network slice subnet instance, expressed as a percentage."/>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
+                <xml-element java-attribute="cvlanTags" name="cvlan-tags" type="inventory.aai.onap.org.v25.CvlanTags"/>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-               <xml-property name="description" value="Captures set of conditions, constraints, and settings that allow designation of who is authorized to connect to the network and the circumstances under which they can or cannot connect. Provides Contrail FQDN for policy."/>
-                <xml-property name="nameProps" value="network-policy-fqdn"/>
-                <xml-property name="indexedProps" value="network-policy-id,network-policy-fqdn,data-owner,data-source,data-source-version,heat-stack-id"/>
-                <xml-property name="searchable" value="network-policy-id,network-policy-fqdn"/>
-                <xml-property name="uniqueProps" value="network-policy-id"/>
-                <xml-property name="container" value="network-policies"/>
-                <xml-property name="namespace" value="network"/>
-                <xml-property name="uriTemplate" value="/network/network-policies/network-policy/{network-policy-id}"/>
-             </xml-properties>
+                <xml-property name="description" value="Used to capture the network interfaces of this VCE"/>
+                <xml-property name="nameProps" value="port-group-name"/>
+                <xml-property name="indexedProps" value="port-group-id,heat-stack-id,interface-id,switch-name,interface-role,orchestration-status,data-owner,data-source,data-source-version,neutron-network-id"/>
+                <xml-property name="dependentOn" value="vce"/>
+                <xml-property name="container" value="port-groups"/>
+                <xml-property name="uriTemplate" value="/port-groups/port-group/{interface-id}"/>
+                <xml-property name="requiredProps" value="interface-id,orchestration-status"/>
+            </xml-properties>
         </java-type>
-        <java-type name="CtagAssignments">
-            <xml-root-element name="ctag-assignments"/>
+
+        <java-type name="CvlanTags">
+            <xml-root-element name="cvlan-tags"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="ctagAssignment" name="ctag-assignment" type="inventory.aai.onap.org.v25.CtagAssignment"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="cvlanTagEntry" name="cvlan-tag-entry" type="inventory.aai.onap.org.v25.CvlanTagEntry"/>
             </java-attributes>
         </java-type>
 
-        <java-type name="CtagAssignment">
-            <xml-root-element name="ctag-assignment"/>
+        <java-type name="CvlanTagEntry">
+            <xml-root-element name="cvlan-tag-entry"/>
             <java-attributes>
-                <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" required="true" type="java.lang.Long" xml-key="true">
+                <xml-element java-attribute="cvlanTag" name="cvlan-tag" required="true" type="java.lang.Long" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="id."/>
+                        <xml-property name="description" value="See mis-na-virtualization-platform.yang"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="indexedProps" value="vlan-id-inner,data-owner,data-source,data-source-version"/>
-                <xml-property name="dependentOn" value="l3-network"/>
-                <xml-property name="container" value="ctag-assignments"/>
-                <xml-property name="uriTemplate" value="/ctag-assignments/ctag-assignment/{vlan-id-inner}"/>
+                <xml-property name="dependentOn" value="port-group"/>
+                <xml-property name="indexedProps" value="cvlan-tag,data-owner,data-source,data-source-version"/>
+                <xml-property name="container" value="cvlan-tags"/>
+                <xml-property name="uriTemplate" value="/cvlan-tags/cvlan-tag/{cvlan-tag}"/>
             </xml-properties>
         </java-type>
 
-        <java-type name="Subnets">
-            <xml-root-element name="subnets"/>
+
+        <java-type name="Vnfcs">
+            <xml-properties>
+                <xml-property name="description" value="virtual network components associated with a vserver from application controller."/>
+            </xml-properties>
+            <xml-root-element name="vnfcs"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="subnet" name="subnet" type="inventory.aai.onap.org.v25.Subnet"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vnfc" name="vnfc" type="inventory.aai.onap.org.v25.Vnfc"/>
             </java-attributes>
         </java-type>
 
-        <java-type name="Subnet">
-            <xml-root-element name="subnet"/>
+        <java-type name="Vnfc">
+            <xml-root-element name="vnfc"/>
             <java-attributes>
-                <xml-element java-attribute="subnetId" name="subnet-id" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="vnfcName" name="vnfc-name" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Subnet ID, should be UUID."/>
+                        <xml-property name="description" value="Unique ID of vnfc."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="subnetName" name="subnet-name" type="java.lang.String">
+                <xml-element java-attribute="nfcNamingCode" name="nfc-naming-code" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Name associated with the subnet."/>
+                        <xml-property name="description" value="Short code that is used in naming instances of the item being modeled"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String">
+                <xml-element java-attribute="nfcFunction" name="nfc-function" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Neutron id of this subnet"/>
+                        <xml-property name="description" value="English description of function that the specific resource deployment is providing. Assigned as part of the customization of a resource in a service"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="gatewayAddress" name="gateway-address" type="java.lang.String">
+                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="gateway ip address"/>
+                        <xml-property name="description" value="prov status of this vnfc"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="networkStartAddress" name="network-start-address" type="java.lang.String">
+                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="network start address"/>
+                        <xml-property name="description" value="Orchestration status of this VNF, mastered by APP-C"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="cidrMask" name="cidr-mask" type="java.lang.String">
+                <xml-element java-attribute="ipaddressV4OamVip" name="ipaddress-v4-oam-vip" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="cidr mask"/>
+                        <xml-property name="description" value="Oam V4 vip address of this vnfc"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="ipVersion" name="ip-version" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="ip version"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="Orchestration status of this VNF, mastered by MSO"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="description" name="description" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="text used for documentation"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element default-value="false" java-attribute="dhcpEnabled" name="dhcp-enabled" required="true" type="java.lang.Boolean">
+                <xml-element default-value="false" java-attribute="inMaint" name="in-maint" required="true" type="java.lang.Boolean">
                     <xml-properties>
                         <xml-property name="defaultValue" value="false"/>
-                        <xml-property name="description" value="dhcp enabled"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="dhcpStart" name="dhcp-start" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="the start address reserved for use by dhcp"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="dhcpEnd" name="dhcp-end" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="the last address reserved for use by dhcp"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="subnetRole" name="subnet-role" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="role of the subnet, referenced when assigning IPs"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="subnetModel" name="subnet-model" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="subnet model BGP, VRPP"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="opsNote" name="ops-note" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="Notes to aid OPs in troubleshooting, such as attribute aliases or additional descriptions/instructions about an object."/>
+                        <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="subnetType" name="subnet-type" type="java.lang.String">
+                <xml-element default-value="false" java-attribute="isClosedLoopDisabled" name="is-closed-loop-disabled" required="true" type="java.lang.Boolean">
                     <xml-properties>
-                        <xml-property name="description" value="Subtype used to categorize this physical link"/>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="used to indicate whether closed loop function is enabled on this node"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="subnetFunction" name="subnet-function" type="java.lang.String">
+                <xml-element java-attribute="groupNotation" name="group-notation" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The function performed by this Linterface"/>
+                        <xml-property name="description" value="Group notation of VNFC"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="ipAssignmentDirection" name="ip-assignment-direction" type="java.lang.String">
+                <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="ip address assignment direction of the subnet"/>
+                        <xml-property name="description" value="the ASDC model id for this resource or service model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-version-id"/>
+                        <xml-property name="dbAlias" value="model-invariant-id-local"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                        <xml-property name="description" value="the ASDC model version for this resource or service model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="subnetSequence" name="subnet-sequence" type="java.lang.Integer">
+                <xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="sequence of the subnet"/>
+                        <xml-property name="description" value="captures the id of all the configuration used to customize the resource for the service."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="configurationStatus" name="configuration-status" type="java.lang.String">
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Configuration status of the subnet."/>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="hostRoutes" name="host-routes" type="inventory.aai.onap.org.v25.HostRoutes"/>
-                <xml-element container-type="java.util.ArrayList" java-attribute="ipAddressList" name="ip-address-list" type="inventory.aai.onap.org.v25.IpAddressList"/>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-                <xml-element java-attribute="bgpNeighbors" name="bgp-neighbors" type="inventory.aai.onap.org.v25.BgpNeighbors"/>
+                <xml-element java-attribute="cps" name="cps" type="inventory.aai.onap.org.v25.Cps"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v25.L3InterfaceIpv4AddressList"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v25.L3InterfaceIpv6AddressList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="indexedProps" value="subnet-id,subnet-name,subnet-type,subnet-function,orchestration-status,data-owner,data-source,data-source-version,neutron-subnet-id"/>
-                <xml-property name="nameProps" value="subnet-name"/>
-                <xml-property name="uniqueProps" value="subnet-id"/>
-                <xml-property name="dependentOn" value="l3-network,zone"/>
-                <xml-property name="container" value="subnets"/>
-                <xml-property name="uriTemplate" value="/subnets/subnet/{subnet-id}"/>
-                <xml-property name="requiredProps" value="subnet-id,dhcp-enabled"/>
-             </xml-properties>
+                <xml-property name="indexedProps" value="vnfc-name,prov-status,nfc-function,nfc-naming-code,ipaddress-v4-oam-vip,is-closed-loop-disabled,group-notation,model-invariant-id,model-version-id,orchestration-status,data-owner,data-source,data-source-version"/>
+                <xml-property name="searchable" value="vnfc-name"/>
+                <xml-property name="container" value="vnfcs"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/vnfcs/vnfc/{vnfc-name}"/>
+            </xml-properties>
         </java-type>
 
-        <java-type name="GenericVnfs">
-            <xml-properties>
-                <xml-property name="description" value="Collection of VNFs"/>
-            </xml-properties>
-            <xml-root-element name="generic-vnfs"/>
+        <java-type name="L3Networks">
+            <xml-root-element name="l3-networks"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="genericVnf" name="generic-vnf" type="inventory.aai.onap.org.v25.GenericVnf"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3Network" name="l3-network" type="inventory.aai.onap.org.v25.L3Network"/>
             </java-attributes>
-            <xml-properties>
-                <xml-property name="maximumDepth" value="0"/>
-            </xml-properties>
         </java-type>
 
-        <java-type name="GenericVnf">
-            <xml-root-element name="generic-vnf"/>
+        <java-type name="L3Network">
+            <xml-root-element name="l3-network"/>
             <java-attributes>
-                <xml-element java-attribute="vnfId" name="vnf-id" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="networkId" name="network-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Unique id of VNF.  This is unique across the graph."/>
+                        <xml-property name="description" value="Network ID, should be uuid. Unique across A&amp;AI."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="vnfInstanceId" name="vnf-instance-id" required="false" type="java.lang.String">
+                <xml-element java-attribute="networkName" name="network-name" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="vnf instance id."/>
+                        <xml-property name="description" value="Name of the network, governed by some naming convention.."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="vnfName" name="vnf-name" type="java.lang.String">
+                <xml-element java-attribute="networkType" name="network-type" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Name of VNF."/>
+                        <xml-property name="description" value="Type of the network - who defines these values?"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="vnfName2" name="vnf-name2" type="java.lang.String">
+                <xml-element java-attribute="networkRole" name="network-role" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Alternate name of VNF."/>
+                        <xml-property name="description" value="Role the network plans - who defines these values?"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String">
+                <xml-element java-attribute="networkTechnology" name="network-technology" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures."/>
+                        <xml-property name="description" value="Network technology - who defines these values?"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="serviceId" name="service-id" type="java.lang.String">
+                <xml-element java-attribute="description" name="description" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Unique identifier of service, does not necessarily map to ASDC service models.  SOON TO BE DEPRECATED"/>
+                        <xml-property name="description" value="text used for documentation"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="regionalResourceZone" name="regional-resource-zone" type="java.lang.String">
+                <xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Regional way of organizing pservers, source of truth should define values"/>
+                        <xml-property name="description" value="Neutron network id of this Interface"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+                <xml-element default-value="false" java-attribute="isBoundToVpn" name="is-bound-to-vpn" required="true" type="java.lang.Boolean">
                     <xml-properties>
-                        <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems."/>
-                        <xml-property name="suggestibleOnSearch" value="true"/>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="Set to true if bound to VPN"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
+                <xml-element java-attribute="serviceId" name="service-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Indicator for whether the resource is considered operational.  Valid values are in-service-path and out-of-service-path."/>
-                        <xml-property name="suggestibleOnSearch" value="true"/>
+                        <xml-property name="description" value="Unique identifier of service from ASDC.  Does not strictly map to ASDC services.  SOON TO BE DEPRECATED"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String">
+                <xml-element java-attribute="networkRoleInstance" name="network-role-instance" type="java.lang.Long">
                     <xml-properties>
-                        <xml-property name="description" value="OBSOLETE -  do not use"/>
+                        <xml-property name="description" value="network role instance"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String">
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Client should send valid enumerated value"/>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Orchestration status of this VNF, used by MSO."/>
-                        <xml-property name="suggestibleOnSearch" value="true"/>
-                                       </xml-properties>
-                               </xml-element>
-                <xml-element java-attribute="vnfPackageName" name="vnf-package-name" required="false" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value=""/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="vnfDiscriptorName" name="vnf-discriptor-name" required="false" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="vnf discriptor name"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="jobId" name="job-id" required="false" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="job id corresponding to vnf"/>
+                        <xml-property name="description" value="Orchestration status of this VNF, mastered by MSO"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
                         <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
+                <xml-element java-attribute="contrailNetworkFqdn" name="contrail-network-fqdn" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="identifier of managed customer"/>
+                        <xml-property name="description" value="Contrail FQDN for the network"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
+                <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by generic-vnf."/>
+                        <xml-property name="description" value="the ASDC model id for this resource or service model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-version-id"/>
+                        <xml-property name="dbAlias" value="model-invariant-id-local"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="ipv4Loopback0Address" name="ipv4-loopback0-address" type="java.lang.String">
+                <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="v4 Loopback0 address"/>
+                        <xml-property name="description" value="the ASDC model version for this resource or service model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="nmLanV6Address" name="nm-lan-v6-address" type="java.lang.String">
+                <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="v6 Loopback address"/>
+                        <xml-property name="description" value="the ASDC model version for this resource or service model."/>
+                        <xml-property name="visibility" value="internal"/>
+                        <xml-property name="dataCopy" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="managementV6Address" name="management-v6-address" type="java.lang.String">
+                <xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="v6 management address"/>
+                        <xml-property name="description" value="captures the id of all the configuration used to customize the resource for the service."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="vcpu" name="vcpu" type="java.lang.Long">
+                <xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="number of vcpus ordered for this instance of VNF, used for VNFs with no vservers/flavors, to be used only by uCPE"/>
+                        <xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="vcpuUnits" name="vcpu-units" type="java.lang.String">
+                <xml-element java-attribute="widgetModelVersion" name="widget-model-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="units associated with vcpu, used for VNFs with no vservers/flavors, to be used only by uCPE"/>
+                        <xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="vmemory" name="vmemory" type="java.lang.Long">
+                <xml-element java-attribute="physicalNetworkName" name="physical-network-name" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="number of GB of memory ordered for this instance of VNF, used for VNFs with no vservers/flavors, to be used only by uCPE"/>
+                        <xml-property name="description" value="Name associated with the physical network."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="vmemoryUnits" name="vmemory-units" type="java.lang.String">
+                <xml-element java-attribute="isProviderNetwork" name="is-provider-network" required="true" type="java.lang.Boolean">
                     <xml-properties>
-                        <xml-property name="description" value="units associated with vmemory, used for VNFs with no vservers/flavors, to be used only by uCPE"/>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="boolean indicatating whether or not network is a provider network."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="vdisk" name="vdisk" type="java.lang.Long">
+                <xml-element java-attribute="isSharedNetwork" name="is-shared-network" required="true" type="java.lang.Boolean">
                     <xml-properties>
-                        <xml-property name="description" value="number of vdisks ordered for this instance of VNF, used for VNFs with no vservers/flavors, to be used only uCPE"/>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="boolean indicatating whether or not network is a shared network."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="vdiskUnits" name="vdisk-units" type="java.lang.String">
+                <xml-element java-attribute="isExternalNetwork" name="is-external-network" required="true" type="java.lang.Boolean">
                     <xml-properties>
-                        <xml-property name="description" value="units associated with vdisk, used for VNFs with no vservers/flavors, to be used only by uCPE"/>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="boolean indicatating whether or not network is an external network."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="nshd" name="nshd" type="java.lang.Long">
+                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="number of associated SHD in vnf."/>
+                        <xml-property name="description" value="Path to the controller object."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="nvm" name="nvm" type="java.lang.Long">
+                <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="number of vms in vnf."/>
+                        <xml-property name="description" value="Indicator for whether the resource is considered operational."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="nnet" name="nnet" type="java.lang.Long">
+                <xml-element java-attribute="isTrunked" name="is-trunked" type="java.lang.Boolean">
                     <xml-properties>
-                        <xml-property name="description" value="number of network in vnf."/>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="Trunked network indication."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element default-value="false" java-attribute="inMaint" name="in-maint" required="true" type="java.lang.Boolean">
+                <xml-element java-attribute="opsNote" name="ops-note" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="defaultValue" value="false"/>
-                        <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs."/>
+                        <xml-property name="description" value="Notes to aid OPs in troubleshooting, such as attribute aliases or additional descriptions/instructions about an object."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element default-value="false" java-attribute="isClosedLoopDisabled" name="is-closed-loop-disabled" required="true" type="java.lang.Boolean">
+                <xml-element java-attribute="networkFunction" name="network-function" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="defaultValue" value="false"/>
-                        <xml-property name="description" value="used to indicate whether closed loop function is enabled on this node"/>
+                        <xml-property name="description" value="The function performed by this l3 network"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="summaryStatus" name="summary-status" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="details regarding the generic-vnf operation, PLEASE DISCONTINUE USE OF THIS FIELD."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="encryptedAccessFlag" name="encrypted-access-flag" type="java.lang.Boolean">
-                    <xml-properties>
-                        <xml-property name="description" value="indicates whether generic-vnf access uses SSH"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="entitlementAssignmentGroupUuid" name="entitlement-assignment-group-uuid" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="UUID of the Entitlement group used for licensing VNFs, OBSOLETE -  See child relationships."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="entitlementResourceUuid" name="entitlement-resource-uuid" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="UUID of the specific entitlement resource.  OBSOLETE -  See child relationships."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="licenseAssignmentGroupUuid" name="license-assignment-group-uuid" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="UUID of the license assignment group.  OBSOLETE -  See child relationships."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="licenseKeyUuid" name="license-key-uuid" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="UUID of the actual license resource.  OBSOLETE -  See child relationships."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="the ASDC model id for this resource or service model."/>
-                        <xml-property name="visibility" value="deployment"/>
-                        <xml-property name="requires" value="model-version-id"/>
-                        <xml-property name="dbAlias" value="model-invariant-id-local"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="the ASDC model version for this resource or service model."/>
-                        <xml-property name="visibility" value="deployment"/>
-                        <xml-property name="requires" value="model-invariant-id"/>
-                        <xml-property name="dbAlias" value="model-version-id-local"/>
-                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                                               <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="the ASDC model version for this resource or service model."/>
-                        <xml-property name="visibility" value="internal"/>
-                        <xml-property name="dataCopy" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version"/>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="captures the id of all the configuration used to customize the resource for the service."/>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String">
+                <xml-element java-attribute="subnets" name="subnets" type="inventory.aai.onap.org.v25.Subnets"/>
+                <xml-element java-attribute="ctagAssignments" name="ctag-assignments" type="inventory.aai.onap.org.v25.CtagAssignments"/>
+                <xml-element java-attribute="segmentationAssignments" name="segmentation-assignments" type="inventory.aai.onap.org.v25.SegmentationAssignments"/>
+                <xml-element java-attribute="aggregateRoutes" name="aggregate-routes" type="inventory.aai.onap.org.v25.AggregateRoutes"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList">
                     <xml-properties>
-                        <xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget."/>
+                        <xml-property name="description" value="Relates to tenant (or is it a child of tenant), complex, service, vpn-binding"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="widgetModelVersion" name="widget-model-version" type="java.lang.String">
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Generic network definition"/>
+                <xml-property name="nameProps" value="network-name"/>
+                <xml-property name="indexedProps" value="heat-stack-id,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role,network-function,orchestration-status,data-owner,data-source,data-source-version,neutron-network-id"/>
+                <xml-property name="searchable" value="network-id,network-name"/>
+                <xml-property name="uniqueProps" value="network-id"/>
+                <xml-property name="container" value="l3-networks"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/l3-networks/l3-network/{network-id}"/>
+                <xml-property name="requiredProps" value="network-id,is-bound-to-vpn,is-provider-network,is-shared-network,is-external-network"/>
+            </xml-properties>
+        </java-type>
+        <java-type name="NetworkPolicies">
+            <xml-root-element name="network-policies"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="networkPolicy" name="network-policy" type="inventory.aai.onap.org.v25.NetworkPolicy"/>
+            </java-attributes>
+        </java-type>
+        <java-type name="NetworkPolicy">
+            <xml-root-element name="network-policy"/>
+            <java-attributes>
+                <xml-element java-attribute="networkPolicyId" name="network-policy-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget."/>
+                        <xml-property name="description" value="UUID representing unique key to this instance"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="asNumber" name="as-number" type="java.lang.String">
+                <xml-element java-attribute="networkPolicyFqdn" name="network-policy-fqdn" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="as-number of the VNF"/>
+                        <xml-property name="description" value="Contrail FQDN for the policy"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="regionalResourceSubzone" name="regional-resource-subzone" type="java.lang.String">
+                <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="represents sub zone of the rr plane"/>
+                        <xml-property name="description" value="ID for the openStack Heat instance"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="nfType" name="nf-type" type="java.lang.String">
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Generic description of the type of NF"/>
-                        <xml-property name="suggestibleOnSearch" value="true"/>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                                               <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="nfFunction" name="nf-function" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="English description of Network function that the specific VNF deployment is providing"/>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="nfRole" name="nf-role" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="role in the network that this model will be providing"/>
-                        <xml-property name="suggestibleOnSearch" value="true"/>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="nfNamingCode" name="nf-naming-code" type="java.lang.String">
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="string assigned to this model used for naming purposes"/>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+                <xml-element java-attribute="name" name="name" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Path to the controller object."/>
+                        <xml-property name="description" value="Name of the policy"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="ipv4OamGatewayAddress" name="ipv4-oam-gateway-address" type="java.lang.String">
+                <xml-element java-attribute="type" name="type" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Gateway address"/>
+                        <xml-property name="description" value="Type of the policy"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="ipv4OamGatewayAddressPrefixLength" name="ipv4-oam-gateway-address-prefix-length" type="java.lang.Integer">
+                <xml-element java-attribute="latency" name="latency" type="java.lang.Integer">
                     <xml-properties>
-                        <xml-property name="description" value="Prefix length for oam-address"/>
+                        <xml-property name="description" value="The packet transmission latency (millisecond) through the Transport slice connections and is used to evaluate utilization performance of the end-to-end network slice instance."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
+                <xml-element java-attribute="jitter" name="jitter" type="java.lang.Integer">
                     <xml-properties>
-                        <xml-property name="description" value="Temporary location for S-TAG to get to VCE"/>
+                        <xml-property name="description" value="jitter"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="nmProfileName" name="nm-profile-name" type="java.lang.String">
+                <xml-element java-attribute="maxBandwidth" name="max-bandwidth" type="java.lang.Integer">
                     <xml-properties>
-                        <xml-property name="description" value="Network Management profile of this VNF"/>
+                        <xml-property name="description" value="The maximum bandwidth (mb) of the connection links in a transport slice instance."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="softwareVersion" name="software-version" type="java.lang.String">
+                <xml-element java-attribute="reliability" name="reliability" type="java.lang.Float">
                     <xml-properties>
-                        <xml-property name="description" value="VNF instance specific software version"/>
+                        <xml-property name="description" value="The reliability requirement for an network slice subnet instance, expressed as a percentage."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="applicationId" name="application-id" type="java.lang.String">
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Captures set of conditions, constraints, and settings that allow designation of who is authorized to connect to the network and the circumstances under which they can or cannot connect. Provides Contrail FQDN for policy."/>
+                <xml-property name="nameProps" value="network-policy-fqdn"/>
+                <xml-property name="indexedProps" value="network-policy-id,network-policy-fqdn,data-owner,data-source,data-source-version,heat-stack-id"/>
+                <xml-property name="searchable" value="network-policy-id,network-policy-fqdn"/>
+                <xml-property name="uniqueProps" value="network-policy-id"/>
+                <xml-property name="container" value="network-policies"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/network-policies/network-policy/{network-policy-id}"/>
+            </xml-properties>
+        </java-type>
+        <java-type name="CtagAssignments">
+            <xml-root-element name="ctag-assignments"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="ctagAssignment" name="ctag-assignment" type="inventory.aai.onap.org.v25.CtagAssignment"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="CtagAssignment">
+            <xml-root-element name="ctag-assignment"/>
+            <java-attributes>
+                <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" required="true" type="java.lang.Long" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="vnf application-id"/>
+                        <xml-property name="description" value="id."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v25.LInterfaces"/>
-                <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v25.LagInterfaces"/>
-                <xml-element java-attribute="vfModules" name="vf-modules" type="inventory.aai.onap.org.v25.VfModules"/>
-                <xml-element java-attribute="licenses" name="licenses" type="inventory.aai.onap.org.v25.Licenses"/>
-                <xml-element java-attribute="bgpGroups" name="bgp-groups" type="inventory.aai.onap.org.v25.BgpGroups"/>
-                <xml-element java-attribute="bgpNeighbors" name="bgp-neighbors" type="inventory.aai.onap.org.v25.BgpNeighbors"/>
-                <xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.onap.org.v25.Entitlements"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="General purpose VNF"/>
-                <xml-property name="nameProps" value="vnf-name"/>
-                <xml-property name="indexedProps" value="is-closed-loop-disabled,vnf-name2,vnf-type,heat-stack-id,vnf-name,vnf-id,regional-resource-zone,prov-status,service-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,nf-type,nf-function,nf-naming-code,nf-role,nm-profile-name,orchestration-status,vlan-id-outer,data-owner,data-source,data-source-version"/>
-                <xml-property name="searchable" value="vnf-id,vnf-name,vnf-name2,operational-status"/>
-                <xml-property name="uniqueProps" value="vnf-id"/>
-                <xml-property name="container" value="generic-vnfs"/>
-                <xml-property name="namespace" value="network"/>
-                <xml-property name="extends" value="vnf"/>
-                <xml-property name="containsSuggestibleProps" value="true"/>
-                <xml-property name="suggestionAliases" value="VNFs"/>
-                <xml-property name="uriTemplate" value="/network/generic-vnfs/generic-vnf/{vnf-id}"/>
-                <xml-property name="requiredProps" value="vnf-id,vnf-type,in-maint,is-closed-loop-disabled"/>
-             </xml-properties>
+                <xml-property name="indexedProps" value="vlan-id-inner,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="l3-network"/>
+                <xml-property name="container" value="ctag-assignments"/>
+                <xml-property name="uriTemplate" value="/ctag-assignments/ctag-assignment/{vlan-id-inner}"/>
+            </xml-properties>
         </java-type>
 
-        <java-type name="VfModules">
-            <xml-properties>
-                <xml-property name="description" value="Collection of vf-modules, a deployment unit of VNFCs"/>
-            </xml-properties>
-            <xml-root-element name="vf-modules"/>
+        <java-type name="Subnets">
+            <xml-root-element name="subnets"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="vfModule" name="vf-module" type="inventory.aai.onap.org.v25.VfModule"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="subnet" name="subnet" type="inventory.aai.onap.org.v25.Subnet"/>
             </java-attributes>
         </java-type>
 
-        <java-type name="VfModule">
-            <xml-root-element name="vf-module"/>
+        <java-type name="Subnet">
+            <xml-root-element name="subnet"/>
             <java-attributes>
-                <xml-element java-attribute="vfModuleId" name="vf-module-id" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="subnetId" name="subnet-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Unique ID of vf-module."/>
+                        <xml-property name="description" value="Subnet ID, should be UUID."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="vfModuleName" name="vf-module-name" type="java.lang.String">
+                <xml-element java-attribute="subnetName" name="subnet-name" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Name of vf-module"/>
+                        <xml-property name="description" value="Name associated with the subnet."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
+                <xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Heat stack id corresponding to this instance."/>
+                        <xml-property name="description" value="Neutron id of this subnet"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                <xml-element java-attribute="gatewayAddress" name="gateway-address" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="orchestration status of this vf-module, mastered by MSO"/>
+                        <xml-property name="description" value="gateway ip address"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element default-value="false" java-attribute="isBaseVfModule" name="is-base-vf-module" required="true" type="java.lang.Boolean">
+                <xml-element java-attribute="networkStartAddress" name="network-start-address" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="defaultValue" value="false"/>
-                        <xml-property name="description" value="used to indicate whether or not this object is base vf module"/>
+                        <xml-property name="description" value="network start address"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element default-value="false" java-attribute="automatedAssignment" name="automated-assignment" required="true" type="java.lang.Boolean">
+                <xml-element java-attribute="cidrMask" name="cidr-mask" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="defaultValue" value="false"/>
-                        <xml-property name="description" value="Indicates whether vf-module assignment was done via automation or manually"/>
+                        <xml-property name="description" value="cidr mask"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                <xml-element java-attribute="ipVersion" name="ip-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                        <xml-property name="description" value="ip version"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
+                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="the ASDC model id for this resource or service model."/>
-                        <xml-property name="visibility" value="deployment"/>
-                        <xml-property name="requires" value="model-version-id"/>
-                        <xml-property name="dbAlias" value="model-invariant-id-local"/>
+                        <xml-property name="description" value="Orchestration status of this VNF, mastered by MSO"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="the ASDC model version for this resource or service model."/>
-                        <xml-property name="visibility" value="deployment"/>
-                        <xml-property name="requires" value="model-invariant-id"/>
-                        <xml-property name="dbAlias" value="model-version-id-local"/>
-                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String">
+                <xml-element java-attribute="description" name="description" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="the ASDC model version for this resource or service model."/>
-                        <xml-property name="visibility" value="internal"/>
-                        <xml-property name="dataCopy" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version"/>
+                        <xml-property name="description" value="text used for documentation"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String">
+                <xml-element default-value="false" java-attribute="dhcpEnabled" name="dhcp-enabled" required="true" type="java.lang.Boolean">
                     <xml-properties>
-                        <xml-property name="description" value="captures the id of all the configuration used to customize the resource for the service."/>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="dhcp enabled"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String">
+                <xml-element java-attribute="dhcpStart" name="dhcp-start" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget."/>
+                        <xml-property name="description" value="the start address reserved for use by dhcp"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="widgetModelVersion" name="widget-model-version" type="java.lang.String">
+                <xml-element java-attribute="dhcpEnd" name="dhcp-end" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget."/>
+                        <xml-property name="description" value="the last address reserved for use by dhcp"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="contrailServiceInstanceFqdn" name="contrail-service-instance-fqdn" type="java.lang.String">
+                <xml-element java-attribute="subnetRole" name="subnet-role" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="the Contrail unique ID for a service-instance"/>
+                        <xml-property name="description" value="role of the subnet, referenced when assigning IPs"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="moduleIndex" name="module-index" type="java.lang.Integer">
+                <xml-element java-attribute="subnetModel" name="subnet-model" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="the index will track the number of modules of a given type that have been deployed in a VNF, starting with 0, and always choosing the lowest available digit"/>
+                        <xml-property name="description" value="subnet model BGP, VRPP"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+                <xml-element java-attribute="opsNote" name="ops-note" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Path to the controller object."/>
+                        <xml-property name="description" value="Notes to aid OPs in troubleshooting, such as attribute aliases or additional descriptions/instructions about an object."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                <xml-element java-attribute="subnetType" name="subnet-type" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
-                                               <xml-property name="ownerCheck" value="N/A"/>
+                        <xml-property name="description" value="Subtype used to categorize this physical link"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="subnetFunction" name="subnet-function" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                        <xml-property name="description" value="The function performed by this Linterface"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="ipAssignmentDirection" name="ip-assignment-direction" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                        <xml-property name="description" value="ip address assignment direction of the subnet"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-                <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Indicator for whether the resource is considered operational.  Valid values are in-service-path and out-of-service-path."/>
-                        <xml-property name="suggestibleOnSearch" value="true"/>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-            </java-attributes>
-            <xml-properties>
-                <xml-property name="description" value="a deployment unit of VNFCs"/>
-                <xml-property name="indexedProps" value="vf-module-id,vf-module-name,heat-stack-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-service-instance-fqdn,orchestration-status,data-owner,data-source,data-source-version"/>
-                <xml-property name="searchable" value="vf-module-id,vf-module-name,operational-status"/>
-                <xml-property name="dependentOn" value="generic-vnf"/>
-                <xml-property name="container" value="vf-modules"/>
-                <xml-property name="uriTemplate" value="/vf-modules/vf-module/{vf-module-id}"/>
-                <xml-property name="requiredProps" value="vf-module-id,is-base-vf-module,automated-assignment"/>
-             </xml-properties>
-        </java-type>
-
-
-        <java-type name="LagLinks">
-            <xml-properties>
-                <xml-property name="description" value="Collection of link aggregation connections"/>
-            </xml-properties>
-            <xml-root-element name="lag-links"/>
-            <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="lagLink" name="lag-link" type="inventory.aai.onap.org.v25.LagLink"/>
-            </java-attributes>
-        </java-type>
-
-        <java-type name="LagLink">
-            <xml-root-element name="lag-link"/>
-            <java-attributes>
-                <xml-element java-attribute="linkName" name="link-name" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="subnetSequence" name="subnet-sequence" type="java.lang.Integer">
                     <xml-properties>
-                        <xml-property name="description" value="Alphabetical concatenation of lag-interface names"/>
+                        <xml-property name="description" value="sequence of the subnet"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                <xml-element java-attribute="configurationStatus" name="configuration-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                        <xml-property name="description" value="Configuration status of the subnet."/>
                     </xml-properties>
                 </xml-element>
+                <xml-element java-attribute="hostRoutes" name="host-routes" type="inventory.aai.onap.org.v25.HostRoutes"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="ipAddressList" name="ip-address-list" type="inventory.aai.onap.org.v25.IpAddressList"/>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
+                <xml-element java-attribute="bgpNeighbors" name="bgp-neighbors" type="inventory.aai.onap.org.v25.BgpNeighbors"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="LAG links can connect lag-interfaces"/>
-                <xml-property name="indexedProps" value="link-name,data-owner,data-source,data-source-version"/>
-                <xml-property name="container" value="lag-links"/>
-                <xml-property name="namespace" value="network"/>
-                <xml-property name="uriTemplate" value="/network/lag-links/lag-link/{link-name}"/>
-                <xml-property name="requiredProps" value="link-name"/>
-             </xml-properties>
+                <xml-property name="indexedProps" value="subnet-id,subnet-name,subnet-type,subnet-function,orchestration-status,data-owner,data-source,data-source-version,neutron-subnet-id"/>
+                <xml-property name="nameProps" value="subnet-name"/>
+                <xml-property name="uniqueProps" value="subnet-id"/>
+                <xml-property name="dependentOn" value="l3-network,zone"/>
+                <xml-property name="container" value="subnets"/>
+                <xml-property name="uriTemplate" value="/subnets/subnet/{subnet-id}"/>
+                <xml-property name="requiredProps" value="subnet-id,dhcp-enabled"/>
+            </xml-properties>
         </java-type>
 
-        <java-type name="Newvces">
+        <java-type name="GenericVnfs">
             <xml-properties>
-                <xml-property name="description" value="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce."/>
+                <xml-property name="description" value="Collection of VNFs"/>
             </xml-properties>
-            <xml-root-element name="newvces"/>
+            <xml-root-element name="generic-vnfs"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="newvce" name="newvce" type="inventory.aai.onap.org.v25.Newvce"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="genericVnf" name="generic-vnf" type="inventory.aai.onap.org.v25.GenericVnf"/>
             </java-attributes>
+            <xml-properties>
+                <xml-property name="maximumDepth" value="0"/>
+            </xml-properties>
         </java-type>
 
-        <java-type name="Newvce">
-            <xml-root-element name="newvce"/>
+        <java-type name="GenericVnf">
+            <xml-root-element name="generic-vnf"/>
             <java-attributes>
-                <xml-element java-attribute="vnfId2" name="vnf-id2" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="vnfId" name="vnf-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Unique id of VNF, can't use same attribute name right now until we promote this new object"/>
+                        <xml-property name="description" value="Unique id of VNF.  This is unique across the graph."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="vnfName" name="vnf-name" required="true" type="java.lang.String">
+                <xml-element java-attribute="vnfInstanceId" name="vnf-instance-id" required="false" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="vnf instance id."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vnfName" name="vnf-name" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Name of VNF."/>
                     </xml-properties>
                         <xml-property name="description" value="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures."/>
                     </xml-properties>
                 </xml-element>
+                <xml-element java-attribute="serviceId" name="service-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique identifier of service, does not necessarily map to ASDC service models.  SOON TO BE DEPRECATED"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="regionalResourceZone" name="regional-resource-zone" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Regional way of organizing pservers, source of truth should define values"/>
+                    </xml-properties>
+                </xml-element>
                 <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Trigger for operational monitoring of this VNF by BAU Service Assurance systems."/>
+                        <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems."/>
+                        <xml-property name="suggestibleOnSearch" value="true"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Indicator for whether the resource is considered operational"/>
+                        <xml-property name="description" value="Indicator for whether the resource is considered operational.  Valid values are in-service-path and out-of-service-path."/>
+                        <xml-property name="suggestibleOnSearch" value="true"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String">
                         <xml-property name="description" value="OBSOLETE -  do not use"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
+                <xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by GenericVnf (v4-loopback0-ip-address)."/>
+                        <xml-property name="description" value="Client should send valid enumerated value"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String">
+                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Client should send valid enumerated value."/>
+                        <xml-property name="description" value="Orchestration status of this VNF, used by MSO."/>
+                        <xml-property name="suggestibleOnSearch" value="true"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                <xml-element java-attribute="vnfPackageName" name="vnf-package-name" required="false" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                        <xml-property name="description" value=""/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="ipv4Loopback0Address" name="ipv4-loopback0-address" type="java.lang.String">
+                <xml-element java-attribute="vnfDiscriptorName" name="vnf-discriptor-name" required="false" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="v4 Loopback0 address"/>
+                        <xml-property name="description" value="vnf discriptor name"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                <xml-element java-attribute="jobId" name="job-id" required="false" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Orchestration status of this VNF, mastered by MSO."/>
+                        <xml-property name="description" value="job id corresponding to vnf"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
                         <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                <xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
-                                               <xml-property name="ownerCheck" value="N/A"/>
+                        <xml-property name="description" value="identifier of managed customer"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                        <xml-property name="description" value="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by generic-vnf."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="ipv4Loopback0Address" name="ipv4-loopback0-address" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                        <xml-property name="description" value="v4 Loopback0 address"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v25.LInterfaces"/>
-            </java-attributes>
-            <xml-properties>
-                <xml-property name="description" value="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce."/>
-                <xml-property name="nameProps" value="vnf-name"/>
-                <xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,prov-status,vnf-id2,orchestration-status,data-owner,data-source,data-source-version"/>
-                <xml-property name="searchable" value="vnf-id2,vnf-name,vnf-name2"/>
-                <xml-property name="uniqueProps" value="vnf-id2"/>
-                <xml-property name="container" value="newvces"/>
-                <xml-property name="namespace" value="network"/>
-                <xml-property name="uriTemplate" value="/network/newvces/newvce/{vnf-id2}"/>
-                <xml-property name="requiredProps" value="vnf-id2,vnf-name,vnf-type"/>
-            </xml-properties>
-        </java-type>
-
-        <java-type name="Pnfs">
-            <xml-properties>
-                <xml-property name="description" value="Collection of Physical Network Functions."/>
-            </xml-properties>
-            <xml-root-element name="pnfs"/>
-            <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="pnf" name="pnf" type="inventory.aai.onap.org.v25.Pnf"/>
-            </java-attributes>
-            <xml-properties>
-                <xml-property name="maximumDepth" value="0"/>
-            </xml-properties>
-        </java-type>
-
-        <java-type name="Pnf">
-            <xml-root-element name="pnf"/>
-            <java-attributes>
-                <xml-element java-attribute="pnfName" name="pnf-name" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="nmLanV6Address" name="nm-lan-v6-address" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="unique name of Physical Network Function."/>
+                        <xml-property name="description" value="v6 Loopback address"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="pnfName2" name="pnf-name2" type="java.lang.String">
+                <xml-element java-attribute="managementV6Address" name="management-v6-address" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="name of Physical Network Function."/>
+                        <xml-property name="description" value="v6 management address"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+                <xml-element java-attribute="vcpu" name="vcpu" type="java.lang.Long">
                     <xml-properties>
-                        <xml-property name="description" value="URL to endpoint where AAI can get more details."/>
+                        <xml-property name="description" value="number of vcpus ordered for this instance of VNF, used for VNFs with no vservers/flavors, to be used only by uCPE"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="pnfName2Source" name="pnf-name2-source" type="java.lang.String">
+                <xml-element java-attribute="vcpuUnits" name="vcpu-units" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="source of name2"/>
+                        <xml-property name="description" value="units associated with vcpu, used for VNFs with no vservers/flavors, to be used only by uCPE"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="pnfId" name="pnf-id" type="java.lang.String">
+                <xml-element java-attribute="vmemory" name="vmemory" type="java.lang.Long">
                     <xml-properties>
-                        <xml-property name="description" value="id of pnf"/>
+                        <xml-property name="description" value="number of GB of memory ordered for this instance of VNF, used for VNFs with no vservers/flavors, to be used only by uCPE"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="nfNamingCode" name="nf-naming-code" type="java.lang.String">
+                <xml-element java-attribute="vmemoryUnits" name="vmemory-units" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Naming code for network function"/>
+                        <xml-property name="description" value="units associated with vmemory, used for VNFs with no vservers/flavors, to be used only by uCPE"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="networkOperatingSystem" name="network-operating-system" type="java.lang.String">
+                <xml-element java-attribute="vdisk" name="vdisk" type="java.lang.Long">
                     <xml-properties>
-                        <xml-property name="description" value="Network operating system used on the device."/>
+                        <xml-property name="description" value="number of vdisks ordered for this instance of VNF, used for VNFs with no vservers/flavors, to be used only uCPE"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="nfFunction" name="nf-function" type="java.lang.String">
+                <xml-element java-attribute="vdiskUnits" name="vdisk-units" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The function performed by the pnf."/>
+                        <xml-property name="description" value="units associated with vdisk, used for VNFs with no vservers/flavors, to be used only by uCPE"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="equipType" name="equip-type" type="java.lang.String">
+                <xml-element java-attribute="nshd" name="nshd" type="java.lang.Long">
                     <xml-properties>
-                        <xml-property name="description" value="Equipment type.  Source of truth should define valid values."/>
+                        <xml-property name="description" value="number of associated SHD in vnf."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="equipVendor" name="equip-vendor" type="java.lang.String">
+                <xml-element java-attribute="nvm" name="nvm" type="java.lang.Long">
                     <xml-properties>
-                        <xml-property name="description" value="Equipment vendor.  Source of truth should define valid values."/>
+                        <xml-property name="description" value="number of vms in vnf."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="equipModel" name="equip-model" type="java.lang.String">
+                <xml-element java-attribute="nnet" name="nnet" type="java.lang.Long">
                     <xml-properties>
-                        <xml-property name="description" value="Equipment model.  Source of truth should define valid values."/>
+                        <xml-property name="description" value="number of network in vnf."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
+                <xml-element default-value="false" java-attribute="inMaint" name="in-maint" required="true" type="java.lang.Boolean">
                     <xml-properties>
-                        <xml-property name="description" value="identifier of managed customer"/>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                <xml-element default-value="false" java-attribute="isClosedLoopDisabled" name="is-closed-loop-disabled" required="true" type="java.lang.Boolean">
                     <xml-properties>
-                        <xml-property name="description" value="Orchestration status of this pnf"/>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="used to indicate whether closed loop function is enabled on this node"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="ipaddressV4Oam" name="ipaddress-v4-oam" type="java.lang.String">
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="ipv4-oam-address with new naming convention for IP addresses"/>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="swVersion" name="sw-version" type="java.lang.String">
+                <xml-element java-attribute="summaryStatus" name="summary-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="sw-version is the version of SW for the hosted application on the PNF."/>
+                        <xml-property name="description" value="details regarding the generic-vnf operation, PLEASE DISCONTINUE USE OF THIS FIELD."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element default-value="false" java-attribute="inMaint" name="in-maint" required="true" type="java.lang.Boolean">
+                <xml-element java-attribute="encryptedAccessFlag" name="encrypted-access-flag" type="java.lang.Boolean">
                     <xml-properties>
-                        <xml-property name="defaultValue" value="false"/>
-                        <xml-property name="description" value="Used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs."/>
+                        <xml-property name="description" value="indicates whether generic-vnf access uses SSH"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="frameId" name="frame-id" type="java.lang.String">
+                <xml-element java-attribute="entitlementAssignmentGroupUuid" name="entitlement-assignment-group-uuid" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="ID of the physical frame (relay rack) where pnf is installed."/>
+                        <xml-property name="description" value="UUID of the Entitlement group used for licensing VNFs, OBSOLETE -  See child relationships."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="serialNumber" name="serial-number" type="java.lang.String">
+                <xml-element java-attribute="entitlementResourceUuid" name="entitlement-resource-uuid" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Serial number of the device"/>
+                        <xml-property name="description" value="UUID of the specific entitlement resource.  OBSOLETE -  See child relationships."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="ipaddressV4Loopback0" name="ipaddress-v4-loopback-0" type="java.lang.String">
+                <xml-element java-attribute="licenseAssignmentGroupUuid" name="license-assignment-group-uuid" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="IPV4 Loopback 0 address"/>
+                        <xml-property name="description" value="UUID of the license assignment group.  OBSOLETE -  See child relationships."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="ipaddressV6Loopback0" name="ipaddress-v6-loopback-0" type="java.lang.String">
+                <xml-element java-attribute="licenseKeyUuid" name="license-key-uuid" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="IPV6 Loopback 0 address"/>
+                        <xml-property name="description" value="UUID of the actual license resource.  OBSOLETE -  See child relationships."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="ipaddressV4Aim" name="ipaddress-v4-aim" type="java.lang.String">
+                <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="IPV4 AIM address"/>
+                        <xml-property name="description" value="the ASDC model id for this resource or service model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-version-id"/>
+                        <xml-property name="dbAlias" value="model-invariant-id-local"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="ipaddressV6Aim" name="ipaddress-v6-aim" type="java.lang.String">
+                <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="IPV6 AIM address"/>
+                        <xml-property name="description" value="the ASDC model version for this resource or service model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="ipaddressV6Oam" name="ipaddress-v6-oam" type="java.lang.String">
+                <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="IPV6 OAM address"/>
+                        <xml-property name="description" value="the ASDC model version for this resource or service model."/>
+                        <xml-property name="visibility" value="internal"/>
+                        <xml-property name="dataCopy" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="invStatus" name="inv-status" type="java.lang.String">
+                <xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="CANOPI's inventory status.  Only set with values exactly as defined by CANOPI."/>
+                        <xml-property name="description" value="captures the id of all the configuration used to customize the resource for the service."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="spareEquipmentIndicator" name="spare-equipment-indicator" required="true" type="java.lang.Boolean">
+                <xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String">
                     <xml-properties>
-                       <xml-property name="defaultValue" value="false"/>
-                        <xml-property name="description" value="Flag for identifying spare equipment"/>
+                        <xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                <xml-element java-attribute="widgetModelVersion" name="widget-model-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                        <xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+                <xml-element java-attribute="asNumber" name="as-number" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Prov Status of this device (not under canopi control) Valid values [PREPROV/NVTPROV/PROV]"/>
+                        <xml-property name="description" value="as-number of the VNF"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="nfRole" name="nf-role" type="java.lang.String">
+                <xml-element java-attribute="regionalResourceSubzone" name="regional-resource-subzone" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Nf Role is the role performed by this instance in the network."/>
+                        <xml-property name="description" value="represents sub zone of the rr plane"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="adminStatus" name="admin-status" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="admin Status of this PNF"/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the operational-status for this object."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the model-customization-id for this object."/>
-                                       </xml-properties>
-                               </xml-element>
-                <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
+                <xml-element java-attribute="nfType" name="nf-type" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The ASDC model id for this resource  model."/>
-                        <xml-property name="visibility" value="deployment"/>
-                        <xml-property name="requires" value="model-version-id"/>
-                        <xml-property name="dbAlias" value="model-invariant-id-local"/>
+                        <xml-property name="description" value="Generic description of the type of NF"/>
+                        <xml-property name="suggestibleOnSearch" value="true"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
+                <xml-element java-attribute="nfFunction" name="nf-function" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The ASDC model version for this resource  model."/>
-                        <xml-property name="visibility" value="deployment"/>
-                        <xml-property name="requires" value="model-invariant-id"/>
-                        <xml-property name="dbAlias" value="model-version-id-local"/>
-                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
+                        <xml-property name="description" value="English description of Network function that the specific VNF deployment is providing"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="opsNote" name="ops-note" type="java.lang.String">
+                <xml-element java-attribute="nfRole" name="nf-role" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Notes to aid OPs in troubleshooting, such as attribute aliases or additional descriptions/instructions about an object."/>
+                        <xml-property name="description" value="role in the network that this model will be providing"/>
+                        <xml-property name="suggestibleOnSearch" value="true"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="configValidationRequestId" name="config-validation-request-id" type="java.lang.String">
+                <xml-element java-attribute="nfNamingCode" name="nf-naming-code" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Contains the value of the request id to the most recent configuration file/validation report for this PNF."/>
+                        <xml-property name="description" value="string assigned to this model used for naming purposes"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="configValidationStatus" name="config-validation-status" type="java.lang.String">
+                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Status of latest configuration attempt represented by the config-url."/>
+                        <xml-property name="description" value="Path to the controller object."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="nfType" name="nf-type" type="java.lang.String">
+                <xml-element java-attribute="ipv4OamGatewayAddress" name="ipv4-oam-gateway-address" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Subtype used to categorize this pnf"/>
+                        <xml-property name="description" value="Gateway address"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="commonBaseIndicator" name="common-base-indicator" type="java.lang.String">
+                <xml-element java-attribute="ipv4OamGatewayAddressPrefixLength" name="ipv4-oam-gateway-address-prefix-length" type="java.lang.Integer">
                     <xml-properties>
-                        <xml-property name="description" value="Indicates the PNF/R-Leaf was built with the VNF agnostic common base"/>
+                        <xml-property name="description" value="Prefix length for oam-address"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="equipmentClli" name="equipment-clli" type="java.lang.String">
+                <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
                     <xml-properties>
-                        <xml-property name="description" value="11-character equipment CLLI."/>
+                        <xml-property name="description" value="Temporary location for S-TAG to get to VCE"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="pnfIpv4Address" name="pnf-ipv4-address" type="java.lang.String">
+                <xml-element java-attribute="nmProfileName" name="nm-profile-name" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="This is the IP address (IPv4) for the PNF itself. This is the IPv4 address that the PNF iself can be accessed at."/>
+                        <xml-property name="description" value="Network Management profile of this VNF"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="pnfIpv6Address" name="pnf-ipv6-address" type="java.lang.String">
+                <xml-element java-attribute="softwareVersion" name="software-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="This is the IP address (IPv6) for the PNF itself. This is the IPv6 address that the PNF iself can be accessed at."/>
+                        <xml-property name="description" value="VNF instance specific software version"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="phoneNumber" name="phone-number" type="java.lang.String">
+                <xml-element java-attribute="applicationId" name="application-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the POTS phone number used to connect to a pnf out-of-band via dial-up."/>
+                        <xml-property name="description" value="vnf application-id"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
-                                       </xml-properties>
+                    </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="softwareVersions" name="software-versions" type="inventory.aai.onap.org.v25.SoftwareVersions"/>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-                <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v25.PInterfaces"/>
                 <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v25.LInterfaces"/>
                 <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v25.LagInterfaces"/>
-                <xml-element java-attribute="activities" name="activities" type="inventory.aai.onap.org.v25.Activities"/>
-                <xml-element java-attribute="vrfs" name="vrfs" type="inventory.aai.onap.org.v25.Vrfs"/>
+                <xml-element java-attribute="vfModules" name="vf-modules" type="inventory.aai.onap.org.v25.VfModules"/>
+                <xml-element java-attribute="licenses" name="licenses" type="inventory.aai.onap.org.v25.Licenses"/>
                 <xml-element java-attribute="bgpGroups" name="bgp-groups" type="inventory.aai.onap.org.v25.BgpGroups"/>
                 <xml-element java-attribute="bgpNeighbors" name="bgp-neighbors" type="inventory.aai.onap.org.v25.BgpNeighbors"/>
+                <xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.onap.org.v25.Entitlements"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="PNF represents a physical network function. typically equipment used in the D1 world. in 1607, this will be populated by SDN-C to represent a premises router that a uCPE connects to. But this can be used to represent any physical device that is not an AIC node or uCPE."/>
-                <xml-property name="indexedProps" value="pnf-name,orchestration-status,inv-status,model-invariant-id,model-version-id,operational-status,nf-type,admin-status,nf-role,prov-status,nf-naming-code,equipment-clli,phone-number,equip-model,equip-vendor,nf-function,data-owner,data-source,data-source-version"/>
-                <xml-property name="searchable" value="pnf-name"/>
-                <xml-property name="uniqueProps" value="pnf-name"/>
-                <xml-property name="container" value="pnfs"/>
+                <xml-property name="description" value="General purpose VNF"/>
+                <xml-property name="nameProps" value="vnf-name"/>
+                <xml-property name="indexedProps" value="is-closed-loop-disabled,vnf-name2,vnf-type,heat-stack-id,vnf-name,vnf-id,regional-resource-zone,prov-status,service-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,nf-type,nf-function,nf-naming-code,nf-role,nm-profile-name,orchestration-status,vlan-id-outer,data-owner,data-source,data-source-version"/>
+                <xml-property name="searchable" value="vnf-id,vnf-name,vnf-name2,operational-status"/>
+                <xml-property name="uniqueProps" value="vnf-id"/>
+                <xml-property name="container" value="generic-vnfs"/>
                 <xml-property name="namespace" value="network"/>
-                <xml-property name="uriTemplate" value="/network/pnfs/pnf/{pnf-name}"/>
-                <xml-property name="requiredProps" value="pnf-name,in-maint,spare-equipment-indicator"/>
-             </xml-properties>
+                <xml-property name="extends" value="vnf"/>
+                <xml-property name="containsSuggestibleProps" value="true"/>
+                <xml-property name="suggestionAliases" value="VNFs"/>
+                <xml-property name="uriTemplate" value="/network/generic-vnfs/generic-vnf/{vnf-id}"/>
+                <xml-property name="requiredProps" value="vnf-id,vnf-type,in-maint,is-closed-loop-disabled"/>
+            </xml-properties>
         </java-type>
 
-        <java-type name="Chassies">
-            <xml-root-element name="chassies"/>
+        <java-type name="VfModules">
+            <xml-properties>
+                <xml-property name="description" value="Collection of vf-modules, a deployment unit of VNFCs"/>
+            </xml-properties>
+            <xml-root-element name="vf-modules"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="chassis" name="chassis" type="inventory.aai.onap.org.v25.Chassis"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vfModule" name="vf-module" type="inventory.aai.onap.org.v25.VfModule"/>
             </java-attributes>
         </java-type>
 
-        <java-type name="Chassis">
-            <xml-root-element name="chassis"/>
+        <java-type name="VfModule">
+            <xml-root-element name="vf-module"/>
             <java-attributes>
-                <xml-element java-attribute="chassisName" name="chassis-name" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="vfModuleId" name="vf-module-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="A globally unique name for the chassis."/>
+                        <xml-property name="description" value="Unique ID of vf-module."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="chassisType" name="chassis-type" required="true" type="java.lang.String">
+                <xml-element java-attribute="vfModuleName" name="vf-module-name" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The type of chassis.."/>
+                        <xml-property name="description" value="Name of vf-module"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="chassisRole" name="chassis-role" required="true" type="java.lang.String">
+                <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The role of the chassis relative to the pnf/pserver.."/>
+                        <xml-property name="description" value="Heat stack id corresponding to this instance."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="operatingSystem" name="operating-system" required="false" type="java.lang.String">
+                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Operating system of the hardware."/>
+                        <xml-property name="description" value="orchestration status of this vf-module, mastered by MSO"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="serialNumber" name="serial-number" type="java.lang.String">
+                <xml-element default-value="false" java-attribute="isBaseVfModule" name="is-base-vf-module" required="true" type="java.lang.Boolean">
                     <xml-properties>
-                        <xml-property name="description" value="The serial number of the chassis.."/>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="used to indicate whether or not this object is base vf module"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="assetTag" name="asset-tag" type="java.lang.String">
+                <xml-element default-value="false" java-attribute="automatedAssignment" name="automated-assignment" required="true" type="java.lang.Boolean">
                     <xml-properties>
-                        <xml-property name="description" value="The asset tag of the chassis."/>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="Indicates whether vf-module assignment was done via automation or manually"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="chassisDescription" name="chassis-description" type="java.lang.String">
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Description of the chassis."/>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="partNumber" name="part-number" type="java.lang.String">
+                <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Part number for this chassis."/>
+                        <xml-property name="description" value="the ASDC model id for this resource or service model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-version-id"/>
+                        <xml-property name="dbAlias" value="model-invariant-id-local"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Orchestration status of this chassis."/>
+                        <xml-property name="description" value="the ASDC model version for this resource or service model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="equipModel" name="equip-model" type="java.lang.String">
+                <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Equipment model."/>
+                        <xml-property name="description" value="the ASDC model version for this resource or service model."/>
+                        <xml-property name="visibility" value="internal"/>
+                        <xml-property name="dataCopy" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="equipVendor" name="equip-vendor" type="java.lang.String">
+                <xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Equipment vendor. Source of truth should define valid values."/>
+                        <xml-property name="description" value="captures the id of all the configuration used to customize the resource for the service."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="equipIdentifier" name="equip-identifier" type="java.lang.String">
+                <xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="CLEI or other specification for chassis hardware."/>
+                        <xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="slotNumber" name="slot-number" type="java.lang.Integer">
+                <xml-element java-attribute="widgetModelVersion" name="widget-model-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Slot number associated with this chassis."/>
+                        <xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="adminState" name="admin-state" type="java.lang.String">
+                <xml-element java-attribute="contrailServiceInstanceFqdn" name="contrail-service-instance-fqdn" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Reflects the admin-state of the device."/>
+                        <xml-property name="description" value="the Contrail unique ID for a service-instance"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="moduleIndex" name="module-index" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="the index will track the number of modules of a given type that have been deployed in a VNF, starting with 0, and always choosing the lowest available digit"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Path to the controller object."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
+                <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                        <xml-property name="description" value="Indicator for whether the resource is considered operational.  Valid values are in-service-path and out-of-service-path."/>
+                        <xml-property name="suggestibleOnSearch" value="true"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="ports" name="ports" type="inventory.aai.onap.org.v25.Ports"/>
-                <xml-element java-attribute="cardSlots" name="card-slots" type="inventory.aai.onap.org.v25.CardSlots"/>
-                <xml-element java-attribute="pluggableSlots" name="pluggable-slots" type="inventory.aai.onap.org.v25.PluggableSlots"/>
-                               <xml-element java-attribute="licenses" name="licenses" type="inventory.aai.onap.org.v25.Licenses"/>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Definition of chassis"/>
-                <xml-property name="uniqueProps" value="chassis-name"/>
-                <xml-property name="indexedProps" value="chassis-name,part-number,orchestration-status,equip-model,equip-vendor,equip-identifier,data-owner,data-source,data-source-version"/>
-                <xml-property name="container" value="chassies"/>
-                <xml-property name="namespace" value="network"/>
-                <xml-property name="uriTemplate" value="/network/chassies/chassis/{chassis-name}"/>
-                <xml-property name="requiredProps" value="chassis-name,chassis-type,chassis-role"/>
-             </xml-properties>
+                <xml-property name="description" value="a deployment unit of VNFCs"/>
+                <xml-property name="indexedProps" value="vf-module-id,vf-module-name,heat-stack-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-service-instance-fqdn,orchestration-status,data-owner,data-source,data-source-version"/>
+                <xml-property name="searchable" value="vf-module-id,vf-module-name,operational-status"/>
+                <xml-property name="dependentOn" value="generic-vnf"/>
+                <xml-property name="container" value="vf-modules"/>
+                <xml-property name="uriTemplate" value="/vf-modules/vf-module/{vf-module-id}"/>
+                <xml-property name="requiredProps" value="vf-module-id,is-base-vf-module,automated-assignment"/>
+            </xml-properties>
         </java-type>
 
-        <java-type name="Ports">
-            <xml-root-element name="ports"/>
+
+        <java-type name="LagLinks">
+            <xml-properties>
+                <xml-property name="description" value="Collection of link aggregation connections"/>
+            </xml-properties>
+            <xml-root-element name="lag-links"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="port" name="port" type="inventory.aai.onap.org.v25.Port"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="lagLink" name="lag-link" type="inventory.aai.onap.org.v25.LagLink"/>
             </java-attributes>
         </java-type>
 
-        <java-type name="Port">
-            <xml-root-element name="port"/>
+        <java-type name="LagLink">
+            <xml-root-element name="lag-link"/>
             <java-attributes>
-                <xml-element java-attribute="portName" name="port-name" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="linkName" name="link-name" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="A unique name for the port relative to the containing hardware."/>
+                        <xml-property name="description" value="Alphabetical concatenation of lag-interface names"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="portType" name="port-type" required="true" type="java.lang.String">
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The type of port."/>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                                               <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="portRole" name="port-role" required="true" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The role of the port."/>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="speedValue" name="speed-value" required="true" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The numeric value for the speed of the port."/>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="speedUnits" name="speed-units" required="true" type="java.lang.String">
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The units for the speed of the port."/>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="xcvrType" name="xcvr-type" type="java.lang.String">
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="LAG links can connect lag-interfaces"/>
+                <xml-property name="indexedProps" value="link-name,data-owner,data-source,data-source-version"/>
+                <xml-property name="container" value="lag-links"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/lag-links/lag-link/{link-name}"/>
+                <xml-property name="requiredProps" value="link-name"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Newvces">
+            <xml-properties>
+                <xml-property name="description" value="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce."/>
+            </xml-properties>
+            <xml-root-element name="newvces"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="newvce" name="newvce" type="inventory.aai.onap.org.v25.Newvce"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Newvce">
+            <xml-root-element name="newvce"/>
+            <java-attributes>
+                <xml-element java-attribute="vnfId2" name="vnf-id2" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Type of transceiver that creates this port."/>
+                        <xml-property name="description" value="Unique id of VNF, can't use same attribute name right now until we promote this new object"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="equipIdentifier" name="equip-identifier" type="java.lang.String">
+                <xml-element java-attribute="vnfName" name="vnf-name" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="clei-code or other similar identifier"/>
+                        <xml-property name="description" value="Name of VNF."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="partNumber" name="part-number" type="java.lang.String">
+                <xml-element java-attribute="vnfName2" name="vnf-name2" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="part number"/>
+                        <xml-property name="description" value="Alternate name of VNF."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="portStart" name="port-start" type="java.lang.String">
+                <xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Port range start"/>
+                        <xml-property name="description" value="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="portEnd" name="port-end" type="java.lang.String">
+                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Port range end"/>
+                        <xml-property name="description" value="Trigger for operational monitoring of this VNF by BAU Service Assurance systems."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
-                                               <xml-property name="ownerCheck" value="N/A"/>
+                        <xml-property name="description" value="Indicator for whether the resource is considered operational"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                        <xml-property name="description" value="OBSOLETE -  do not use"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                        <xml-property name="description" value="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by GenericVnf (v4-loopback0-ip-address)."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Client should send valid enumerated value."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-            </java-attributes>
-            <xml-properties>
-                <xml-property name="description" value="Definition of port"/>
-                <xml-property name="indexedProps" value="port-name,data-owner,data-source,data-source-version,part-number,equip-identifier"/>
-                <xml-property name="dependentOn" value="chassis,pluggable,card"/>
-                <xml-property name="container" value="ports"/>
-                <xml-property name="uriTemplate" value="/ports/port/{port-name}"/>
-                <xml-property name="requiredProps" value="port-name,port-type,port-role,speed-value,speed-units"/>
-             </xml-properties>
-        </java-type>
-
-        <java-type name="CardSlots">
-            <xml-root-element name="card-slots"/>
-            <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="cardSlot" name="card-slot" type="inventory.aai.onap.org.v25.CardSlot"/>
-            </java-attributes>
-            <xml-properties>
-            </xml-properties>
-        </java-type>
-
-        <java-type name="CardSlot">
-            <xml-root-element name="card-slot"/>
-            <java-attributes>
-                <xml-element java-attribute="slotName" name="slot-name" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="ipv4Loopback0Address" name="ipv4-loopback0-address" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The name of the card-slot (unique relative to the chassis)."/>
+                        <xml-property name="description" value="v4 Loopback0 address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Orchestration status of this VNF, mastered by MSO."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="cards" name="cards" type="inventory.aai.onap.org.v25.Cards"/>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
+                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v25.LInterfaces"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Definition of card-slot"/>
-                <xml-property name="indexedProps" value="slot-name,data-owner,data-source,data-source-version"/>
-                <xml-property name="dependentOn" value="chassis"/>
-                <xml-property name="container" value="card-slots"/>
-                <xml-property name="uriTemplate" value="/card-slots/card-slot/{slot-name}"/>
-                <xml-property name="requiredProps" value="slot-name"/>
-             </xml-properties>
+                <xml-property name="description" value="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce."/>
+                <xml-property name="nameProps" value="vnf-name"/>
+                <xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,prov-status,vnf-id2,orchestration-status,data-owner,data-source,data-source-version"/>
+                <xml-property name="searchable" value="vnf-id2,vnf-name,vnf-name2"/>
+                <xml-property name="uniqueProps" value="vnf-id2"/>
+                <xml-property name="container" value="newvces"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/newvces/newvce/{vnf-id2}"/>
+                <xml-property name="requiredProps" value="vnf-id2,vnf-name,vnf-type"/>
+            </xml-properties>
         </java-type>
 
-        <java-type name="Cards">
-            <xml-root-element name="cards"/>
+        <java-type name="Pnfs">
+            <xml-properties>
+                <xml-property name="description" value="Collection of Physical Network Functions."/>
+            </xml-properties>
+            <xml-root-element name="pnfs"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="card" name="card" type="inventory.aai.onap.org.v25.Card"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="pnf" name="pnf" type="inventory.aai.onap.org.v25.Pnf"/>
             </java-attributes>
+            <xml-properties>
+                <xml-property name="maximumDepth" value="0"/>
+            </xml-properties>
         </java-type>
 
-        <java-type name="Card">
-            <xml-root-element name="card"/>
+        <java-type name="Pnf">
+            <xml-root-element name="pnf"/>
             <java-attributes>
-                <xml-element java-attribute="cardType" name="card-type" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="pnfName" name="pnf-name" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="The type of card."/>
+                        <xml-property name="description" value="unique name of Physical Network Function."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                <xml-element java-attribute="pnfName2" name="pnf-name2" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
-                                               <xml-property name="ownerCheck" value="N/A"/>
+                        <xml-property name="description" value="name of Physical Network Function."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                        <xml-property name="description" value="URL to endpoint where AAI can get more details."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="pnfName2Source" name="pnf-name2-source" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                        <xml-property name="description" value="source of name2"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                <xml-element java-attribute="pnfId" name="pnf-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                        <xml-property name="description" value="id of pnf"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-                <xml-element java-attribute="ports" name="ports" type="inventory.aai.onap.org.v25.Ports"/>
-                <xml-element java-attribute="pluggableSlots" name="pluggable-slots" type="inventory.aai.onap.org.v25.PluggableSlots"/>
-            </java-attributes>
-            <xml-properties>
-                <xml-property name="description" value="Definition of card"/>
-                <xml-property name="indexedProps" value="card-type,data-owner,data-source,data-source-version"/>
-                <xml-property name="dependentOn" value="card-slot"/>
-                <xml-property name="container" value="cards"/>
-                <xml-property name="uriTemplate" value="/cards/card/{card-type}"/>
-                <xml-property name="requiredProps" value="card-type"/>
-             </xml-properties>
-        </java-type>
-
-        <java-type name="PluggableSlots">
-            <xml-root-element name="pluggable-slots"/>
-            <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="pluggableSlot" name="pluggable-slot" type="inventory.aai.onap.org.v25.PluggableSlot"/>
-            </java-attributes>
-            <xml-properties>
-            </xml-properties>
-        </java-type>
-
-        <java-type name="PluggableSlot">
-            <xml-root-element name="pluggable-slot"/>
-            <java-attributes>
-                <xml-element java-attribute="slotName" name="slot-name" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="nfNamingCode" name="nf-naming-code" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The name of the pluggable-slot. (unique relative to the chassis or card)."/>
+                        <xml-property name="description" value="Naming code for network function"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                <xml-element java-attribute="networkOperatingSystem" name="network-operating-system" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
-                                               <xml-property name="ownerCheck" value="N/A"/>
+                        <xml-property name="description" value="Network operating system used on the device."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="nfFunction" name="nf-function" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                        <xml-property name="description" value="The function performed by the pnf."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="equipType" name="equip-type" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                        <xml-property name="description" value="Equipment type.  Source of truth should define valid values."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                <xml-element java-attribute="equipVendor" name="equip-vendor" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                        <xml-property name="description" value="Equipment vendor.  Source of truth should define valid values."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="pluggables" name="pluggables" type="inventory.aai.onap.org.v25.Pluggables"/>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-            </java-attributes>
-            <xml-properties>
-                <xml-property name="description" value="Definition of card-slot"/>
-                <xml-property name="indexedProps" value="slot-name,data-owner,data-source,data-source-version"/>
-                <xml-property name="dependentOn" value="chassis,card"/>
-                <xml-property name="container" value="pluggable-slots"/>
-                <xml-property name="uriTemplate" value="/pluggable-slots/pluggable-slot/{slot-name}"/>
-                <xml-property name="requiredProps" value="slot-name"/>
-             </xml-properties>
-        </java-type>
-
-        <java-type name="Pluggables">
-            <xml-root-element name="pluggables"/>
-            <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="pluggable" name="pluggable" type="inventory.aai.onap.org.v25.Pluggable"/>
-            </java-attributes>
-        </java-type>
-
-        <java-type name="Pluggable">
-            <xml-root-element name="pluggable"/>
-            <java-attributes>
-                <xml-element java-attribute="pluggableType" name="pluggable-type" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="equipModel" name="equip-model" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The type of pluggable."/>
+                        <xml-property name="description" value="Equipment model.  Source of truth should define valid values."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="partNumber" name="part-number" type="java.lang.String">
+                <xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Part number for this pluggable."/>
+                        <xml-property name="description" value="identifier of managed customer"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="equipIdentifier" name="equip-identifier" type="java.lang.String">
+                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="CLEI or other specification for pluggable hardware."/>
+                        <xml-property name="description" value="Orchestration status of this pnf"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                <xml-element java-attribute="ipaddressV4Oam" name="ipaddress-v4-oam" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
-                                               <xml-property name="ownerCheck" value="N/A"/>
+                        <xml-property name="description" value="ipv4-oam-address with new naming convention for IP addresses"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="swVersion" name="sw-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                        <xml-property name="description" value="sw-version is the version of SW for the hosted application on the PNF."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element default-value="false" java-attribute="inMaint" name="in-maint" required="true" type="java.lang.Boolean">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="Used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                <xml-element java-attribute="frameId" name="frame-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                        <xml-property name="description" value="ID of the physical frame (relay rack) where pnf is installed."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-                <xml-element java-attribute="ports" name="ports" type="inventory.aai.onap.org.v25.Ports"/>
-            </java-attributes>
-            <xml-properties>
-                <xml-property name="description" value="Definition of pluggable"/>
-                <xml-property name="indexedProps" value="pluggable-type,part-number,equip-identifier,data-owner,data-source,data-source-version"/>
-                <xml-property name="dependentOn" value="pluggable-slot"/>
-                <xml-property name="container" value="pluggables"/>
-                <xml-property name="uriTemplate" value="/pluggables/pluggable/{pluggable-type}"/>
-                <xml-property name="requiredProps" value="pluggable-type"/>
-             </xml-properties>
-        </java-type>
-
-        <java-type name="SoftwareVersions">
-            <xml-properties>
-                <xml-property name="description" value="Collection of software versions."/>
-            </xml-properties>
-            <xml-root-element name="software-versions"/>
-            <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="softwareVersion" name="software-version" type="inventory.aai.onap.org.v25.SoftwareVersion"/>
-            </java-attributes>
-        </java-type>
-
-        <java-type name="SoftwareVersion">
-            <xml-root-element name="software-version"/>
-            <java-attributes>
-                <xml-element java-attribute="softwareVersionId" name="software-version-id" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="serialNumber" name="serial-number" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifier of the software version"/>
+                        <xml-property name="description" value="Serial number of the device"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element default-value="false" java-attribute="isActiveSwVer" name="is-active-sw-ver" required="true" type="java.lang.Boolean">
+                <xml-element java-attribute="ipaddressV4Loopback0" name="ipaddress-v4-loopback-0" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="defaultValue" value="false"/>
-                        <xml-property name="description" value="used to indicate whether or not this software-version is the active one (activeSw = true)"/>
+                        <xml-property name="description" value="IPV4 Loopback 0 address"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                <xml-element java-attribute="ipaddressV6Loopback0" name="ipaddress-v6-loopback-0" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
-                                               <xml-property name="ownerCheck" value="N/A"/>
+                        <xml-property name="description" value="IPV6 Loopback 0 address"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="ipaddressV4Aim" name="ipaddress-v4-aim" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                        <xml-property name="description" value="IPV4 AIM address"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="ipaddressV6Aim" name="ipaddress-v6-aim" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                        <xml-property name="description" value="IPV6 AIM address"/>
                     </xml-properties>
                 </xml-element>
-            </java-attributes>
-            <xml-properties>
-                <xml-property name="description" value="Software Version"/>
-                <xml-property name="indexedProps" value="software-version-id,is-active-sw-ver,data-owner,data-source,data-source-version"/>
-                <xml-property name="dependentOn" value="pnf"/>
-                <xml-property name="container" value="pnf"/>
-                <xml-property name="requiredProps" value="software-version-id,is-active-sw-ver"/>
-                <xml-property name="uriTemplate" value="/pnf/software-version/{software-version-id}"/>
-             </xml-properties>
-        </java-type>
-
-        <java-type name="PhysicalLinks">
-            <xml-properties>
-                <xml-property name="description" value="Collection of physical connections, typically between p-interfaces"/>
-            </xml-properties>
-            <xml-root-element name="physical-links"/>
-            <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="physicalLink" name="physical-link" type="inventory.aai.onap.org.v25.PhysicalLink"/>
-            </java-attributes>
-            <xml-properties>
-                <xml-property name="maximumDepth" value="0"/>
-            </xml-properties>
-        </java-type>
-
-        <java-type name="PhysicalLink">
-            <xml-root-element name="physical-link"/>
-            <java-attributes>
-                <xml-element java-attribute="linkName" name="link-name" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="ipaddressV6Oam" name="ipaddress-v6-oam" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="e.g., hostnameA_p-connection_nameA_hostnameZ+p_connection-nameZ"/>
+                        <xml-property name="description" value="IPV6 OAM address"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String">
+                <xml-element java-attribute="invStatus" name="inv-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Captures the numeric part of the speed"/>
+                        <xml-property name="description" value="CANOPI's inventory status.  Only set with values exactly as defined by CANOPI."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
+                <xml-element java-attribute="spareEquipmentIndicator" name="spare-equipment-indicator" required="true" type="java.lang.Boolean">
                     <xml-properties>
-                        <xml-property name="description" value="Captures the units corresponding to the speed"/>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="Flag for identifying spare equipment"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="circuitId" name="circuit-id" type="java.lang.String">
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Circuit it"/>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="dualMode" name="dual-mode" type="java.lang.String">
+                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Dual access mode (e.g., primary, secondary"/>
+                        <xml-property name="description" value="Prov Status of this device (not under canopi control) Valid values [PREPROV/NVTPROV/PROV]"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
+                <xml-element java-attribute="nfRole" name="nf-role" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="To provide information on who manages this circuit. A&amp;AI or 3rd party transport provider"/>
+                        <xml-property name="description" value="Nf Role is the role performed by this instance in the network."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="serviceProviderName" name="service-provider-name" type="java.lang.String">
+                <xml-element java-attribute="adminStatus" name="admin-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Name of the service Provider on this link."/>
+                        <xml-property name="description" value="admin Status of this PNF"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="serviceProviderBandwidthUpValue" name="service-provider-bandwidth-up-value" type="java.lang.Integer">
+                <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Upstream Bandwidth value agreed with the service provider"/>
+                        <xml-property name="description" value="Store the operational-status for this object."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="serviceProviderBandwidthUpUnits" name="service-provider-bandwidth-up-units" type="java.lang.String">
+                <xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Units for the upstream BW value"/>
+                        <xml-property name="description" value="Store the model-customization-id for this object."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="serviceProviderBandwidthDownValue" name="service-provider-bandwidth-down-value" type="java.lang.Integer">
+                <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Downstream Bandwidth value agreed with the service provider"/>
+                        <xml-property name="description" value="The ASDC model id for this resource  model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-version-id"/>
+                        <xml-property name="dbAlias" value="model-invariant-id-local"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="serviceProviderBandwidthDownUnits" name="service-provider-bandwidth-down-units" type="java.lang.String">
+                <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Units for downstream BW value"/>
+                        <xml-property name="description" value="The ASDC model version for this resource  model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                <xml-element java-attribute="opsNote" name="ops-note" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                        <xml-property name="description" value="Notes to aid OPs in troubleshooting, such as attribute aliases or additional descriptions/instructions about an object."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="linkFunction" name="link-function" type="java.lang.String">
+                <xml-element java-attribute="configValidationRequestId" name="config-validation-request-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The function performed by this physical link"/>
+                        <xml-property name="description" value="Contains the value of the request id to the most recent configuration file/validation report for this PNF."/>
                     </xml-properties>
                 </xml-element>
-                 <xml-element java-attribute="linkRole" name="link-role" type="java.lang.String">
+                <xml-element java-attribute="configValidationStatus" name="config-validation-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Indicator for the use of this physical link"/>
+                        <xml-property name="description" value="Status of latest configuration attempt represented by the config-url."/>
                     </xml-properties>
                 </xml-element>
-                   <xml-element java-attribute="linkType" name="link-type" type="java.lang.String">
+                <xml-element java-attribute="nfType" name="nf-type" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Subtype used to categorize this physical link"/>
+                        <xml-property name="description" value="Subtype used to categorize this pnf"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="linkDescription" name="link-description" type="java.lang.String">
+                <xml-element java-attribute="commonBaseIndicator" name="common-base-indicator" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Descriptor to identify the path of the link. In the format of ptn-ii-a_interface-a|ptn-ii-b_interface-b"/>
+                        <xml-property name="description" value="Indicates the PNF/R-Leaf was built with the VNF agnostic common base"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                <xml-element java-attribute="equipmentClli" name="equipment-clli" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
-                                               <xml-property name="ownerCheck" value="N/A"/>
+                        <xml-property name="description" value="11-character equipment CLLI."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="pnfIpv4Address" name="pnf-ipv4-address" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                        <xml-property name="description" value="This is the IP address (IPv4) for the PNF itself. This is the IPv4 address that the PNF iself can be accessed at."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="pnfIpv6Address" name="pnf-ipv6-address" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                        <xml-property name="description" value="This is the IP address (IPv6) for the PNF itself. This is the IPv6 address that the PNF iself can be accessed at."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
+                <xml-element java-attribute="phoneNumber" name="phone-number" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Indicator for whether the resource is considered operational.  Valid values are in-service-path and out-of-service-path."/>
-                        <xml-property name="suggestibleOnSearch" value="true"/>
+                        <xml-property name="description" value="Identifies the POTS phone number used to connect to a pnf out-of-band via dial-up."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                                               <xml-property name="ownerCheck" value="N/A"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
+                <xml-element java-attribute="softwareVersions" name="software-versions" type="inventory.aai.onap.org.v25.SoftwareVersions"/>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
+                <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v25.PInterfaces"/>
+                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v25.LInterfaces"/>
+                <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v25.LagInterfaces"/>
+                <xml-element java-attribute="activities" name="activities" type="inventory.aai.onap.org.v25.Activities"/>
+                <xml-element java-attribute="vrfs" name="vrfs" type="inventory.aai.onap.org.v25.Vrfs"/>
+                <xml-element java-attribute="bgpGroups" name="bgp-groups" type="inventory.aai.onap.org.v25.BgpGroups"/>
+                <xml-element java-attribute="bgpNeighbors" name="bgp-neighbors" type="inventory.aai.onap.org.v25.BgpNeighbors"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Collection of physical connections, typically between p-interfaces"/>
-                <xml-property name="indexedProps" value="circuit-id,link-name,link-function,link-role,link-type,link-description,data-owner,data-source,data-source-version"/>
-                <xml-property name="nameProps" value="link-description"/>
-                <xml-property name="alternateKeys1" value="circuit-id"/>
-                <xml-property name="container" value="physical-links"/>
+                <xml-property name="description" value="PNF represents a physical network function. typically equipment used in the D1 world. in 1607, this will be populated by SDN-C to represent a premises router that a uCPE connects to. But this can be used to represent any physical device that is not an AIC node or uCPE."/>
+                <xml-property name="indexedProps" value="pnf-name,orchestration-status,inv-status,model-invariant-id,model-version-id,operational-status,nf-type,admin-status,nf-role,prov-status,nf-naming-code,equipment-clli,phone-number,equip-model,equip-vendor,nf-function,data-owner,data-source,data-source-version"/>
+                <xml-property name="searchable" value="pnf-name"/>
+                <xml-property name="uniqueProps" value="pnf-name"/>
+                <xml-property name="container" value="pnfs"/>
                 <xml-property name="namespace" value="network"/>
-                <xml-property name="searchable" value="link-name,circuit-id,operational-status"/>
-                <xml-property name="uriTemplate" value="/network/physical-links/physical-link/{link-name}"/>
-            <xml-property name="requiredProps" value="link-name"/>
+                <xml-property name="uriTemplate" value="/network/pnfs/pnf/{pnf-name}"/>
+                <xml-property name="requiredProps" value="pnf-name,in-maint,spare-equipment-indicator"/>
             </xml-properties>
         </java-type>
 
-        <java-type name="VigServers">
-            <xml-root-element name="vig-servers"/>
+        <java-type name="Chassies">
+            <xml-root-element name="chassies"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="vigServer" name="vig-server" type="inventory.aai.onap.org.v25.VigServer"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="chassis" name="chassis" type="inventory.aai.onap.org.v25.Chassis"/>
             </java-attributes>
         </java-type>
 
-        <java-type name="VigServer">
-            <xml-root-element name="vig-server"/>
+        <java-type name="Chassis">
+            <xml-root-element name="chassis"/>
             <java-attributes>
-                <xml-element java-attribute="vigAddressType" name="vig-address-type" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="chassisName" name="chassis-name" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="indicates whether the VIG is for AVPN or INTERNET"/>
+                        <xml-property name="description" value="A globally unique name for the chassis."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element container-type="java.util.ArrayList" java-attribute="ipaddressV4Vig" name="ipaddress-v4-vig" type="java.lang.String">
+                <xml-element java-attribute="chassisType" name="chassis-type" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="v4 IP of the vig server"/>
+                        <xml-property name="description" value="The type of chassis.."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element container-type="java.util.ArrayList" java-attribute="ipaddressV6Vig" name="ipaddress-v6-vig" type="java.lang.String">
+                <xml-element java-attribute="chassisRole" name="chassis-role" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="v6 IP of the vig server"/>
+                        <xml-property name="description" value="The role of the chassis relative to the pnf/pserver.."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                <xml-element java-attribute="operatingSystem" name="operating-system" required="false" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
-                                               <xml-property name="ownerCheck" value="N/A"/>
+                        <xml-property name="description" value="Operating system of the hardware."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="serialNumber" name="serial-number" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                        <xml-property name="description" value="The serial number of the chassis.."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="assetTag" name="asset-tag" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                        <xml-property name="description" value="The asset tag of the chassis."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                <xml-element java-attribute="chassisDescription" name="chassis-description" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                        <xml-property name="description" value="Description of the chassis."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-            </java-attributes>
-            <xml-properties>
-                <xml-property name="description" value="vig-server contains information about a vig server used for IPSec-configuration. Populated by SDN-C from 1607"/>
-                <xml-property name="indexedProps" value="vig-address-type,data-owner,data-source,data-source-version"/>
-                <xml-property name="dependentOn" value="ipsec-configuration"/>
-                <xml-property name="container" value="vig-servers"/>
-                <xml-property name="uriTemplate" value="/vig-servers/vig-server/{vig-address-type}"/>
-            <xml-property name="requiredProps" value="vig-address-type"/>
-            </xml-properties>
-        </java-type>
-
-        <java-type name="IpsecConfigurations">
-            <xml-root-element name="ipsec-configurations"/>
-            <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="ipsecConfiguration" name="ipsec-configuration" type="inventory.aai.onap.org.v25.IpsecConfiguration"/>
-            </java-attributes>
-        </java-type>
-
-        <java-type name="IpsecConfiguration">
-            <xml-root-element name="ipsec-configuration"/>
-            <java-attributes>
-                <xml-element java-attribute="ipsecConfigurationId" name="ipsec-configuration-id" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="partNumber" name="part-number" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="UUID of this configuration"/>
+                        <xml-property name="description" value="Part number for this chassis."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="requestedVigAddressType" name="requested-vig-address-type" type="java.lang.String">
+                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Indicate the type of VIG server like AVPN, INTERNET, BOTH"/>
+                        <xml-property name="description" value="Orchestration status of this chassis."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="requestedEncryptionStrength" name="requested-encryption-strength" type="java.lang.String">
+                <xml-element java-attribute="equipModel" name="equip-model" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Encryption values like 3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc"/>
+                        <xml-property name="description" value="Equipment model."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="requestedDmzType" name="requested-dmz-type" type="java.lang.String">
+                <xml-element java-attribute="equipVendor" name="equip-vendor" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Shared DMZ or a DMZ specific to a customer"/>
+                        <xml-property name="description" value="Equipment vendor. Source of truth should define valid values."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="sharedDmzNetworkAddress" name="shared-dmz-network-address" type="java.lang.String">
+                <xml-element java-attribute="equipIdentifier" name="equip-identifier" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Network address of shared DMZ"/>
+                        <xml-property name="description" value="CLEI or other specification for chassis hardware."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="requestedCustomerName" name="requested-customer-name" type="java.lang.String">
+                <xml-element java-attribute="slotNumber" name="slot-number" type="java.lang.Integer">
                     <xml-properties>
-                        <xml-property name="description" value="If the DMZ is a custom DMZ, this field will indicate the customer information"/>
+                        <xml-property name="description" value="Slot number associated with this chassis."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="ikeVersion" name="ike-version" type="java.lang.String">
+                <xml-element java-attribute="adminState" name="admin-state" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="can be 1 or 2"/>
+                        <xml-property name="description" value="Reflects the admin-state of the device."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="ikev1Authentication" name="ikev1-authentication" type="java.lang.String">
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Contains values like md5, sha1, sha256, sha384"/>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                                               <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="ikev1Encryption" name="ikev1-encryption" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Encyption values like 3des-cbc, des-cbc, aes-128-cbc,&#xC2;&#xA0;aes-192-cbc, aes-265-cbc"/>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="ikev1DhGroup" name="ikev1-dh-group" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Diffie-Hellman group like DH-GROUP2, DH-GROUP5, DH-GROUP14"/>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="ikev1AmGroupId" name="ikev1-am-group-id" type="java.lang.String">
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Group name defined in VIG for clients using aggressive mode"/>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="ikev1AmPassword" name="ikev1-am-password" type="java.lang.String">
+                <xml-element java-attribute="ports" name="ports" type="inventory.aai.onap.org.v25.Ports"/>
+                <xml-element java-attribute="cardSlots" name="card-slots" type="inventory.aai.onap.org.v25.CardSlots"/>
+                <xml-element java-attribute="pluggableSlots" name="pluggable-slots" type="inventory.aai.onap.org.v25.PluggableSlots"/>
+                <xml-element java-attribute="licenses" name="licenses" type="inventory.aai.onap.org.v25.Licenses"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Definition of chassis"/>
+                <xml-property name="uniqueProps" value="chassis-name"/>
+                <xml-property name="indexedProps" value="chassis-name,part-number,orchestration-status,equip-model,equip-vendor,equip-identifier,data-owner,data-source,data-source-version"/>
+                <xml-property name="container" value="chassies"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/chassies/chassis/{chassis-name}"/>
+                <xml-property name="requiredProps" value="chassis-name,chassis-type,chassis-role"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Ports">
+            <xml-root-element name="ports"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="port" name="port" type="inventory.aai.onap.org.v25.Port"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Port">
+            <xml-root-element name="port"/>
+            <java-attributes>
+                <xml-element java-attribute="portName" name="port-name" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="pre-shared key for the above group name "/>
+                        <xml-property name="description" value="A unique name for the port relative to the containing hardware."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="ikev1SaLifetime" name="ikev1-sa-lifetime" type="java.lang.String">
+                <xml-element java-attribute="portType" name="port-type" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Lifetime for IKEv1 SA"/>
+                        <xml-property name="description" value="The type of port."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="ipsecAuthentication" name="ipsec-authentication" type="java.lang.String">
+                <xml-element java-attribute="portRole" name="port-role" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="md5, sha1, sha256, sha384"/>
+                        <xml-property name="description" value="The role of the port."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="ipsecEncryption" name="ipsec-encryption" type="java.lang.String">
+                <xml-element java-attribute="speedValue" name="speed-value" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="3des-cbc, des-cbc, aes-128-cbc,&#xC2;&#xA0;aes-192-cbc, aes-265-cbc"/>
+                        <xml-property name="description" value="The numeric value for the speed of the port."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="ipsecSaLifetime" name="ipsec-sa-lifetime" type="java.lang.String">
+                <xml-element java-attribute="speedUnits" name="speed-units" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Life time for IPSec SA"/>
+                        <xml-property name="description" value="The units for the speed of the port."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="ipsecPfs" name="ipsec-pfs" type="java.lang.String">
+                <xml-element java-attribute="xcvrType" name="xcvr-type" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="enable PFS or not"/>
+                        <xml-property name="description" value="Type of transceiver that creates this port."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="xauthUserId" name="xauth-userid" type="java.lang.String">
+                <xml-element java-attribute="equipIdentifier" name="equip-identifier" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="user ID for xAuth, sm-user,ucpeHostName,nmteHostName"/>
+                        <xml-property name="description" value="clei-code or other similar identifier"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="xauthUserPassword" name="xauth-user-password" type="java.lang.String">
+                <xml-element java-attribute="partNumber" name="part-number" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Encrypted using the Juniper $9$ algorithm"/>
+                        <xml-property name="description" value="part number"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="dpdInterval" name="dpd-interval" type="java.lang.String">
+                <xml-element java-attribute="portStart" name="port-start" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The time between DPD probe"/>
+                        <xml-property name="description" value="Port range start"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="dpdFrequency" name="dpd-frequency" type="java.lang.String">
+                <xml-element java-attribute="portEnd" name="port-end" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Maximum number of DPD before claiming the tunnel is down"/>
+                        <xml-property name="description" value="Port range end"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-                <xml-element java-attribute="vigServers" name="vig-servers" type="inventory.aai.onap.org.v25.VigServers"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="IPSec configuration node will contain various configuration data for the NMTE VNF. This node will have an edge to the generic-vnf (vnf type = TE). Starting 1607, this data will be populated by SDN-C"/>
-                <xml-property name="indexedProps" value="ipsec-configuration-id,data-owner,data-source,data-source-version"/>
-                <xml-property name="uniqueProps" value="ipsec-configuration-id"/>
-                <xml-property name="container" value="ipsec-configurations"/>
-                <xml-property name="namespace" value="network"/>
-                <xml-property name="uriTemplate" value="/network/ipsec-configurations/ipsec-configuration/{ipsec-configuration-id}"/>
-                       <xml-property name="requiredProps" value="ipsec-configuration-id"/>
-            </xml-properties>
-               </java-type>
-
-
-               <java-type name="NotificationEvent">
-                       <xml-root-element name="notification-event"/>
-                       <java-attributes>
-                               <xml-element java-attribute="cambriaPartition" name="cambria.partition" type="java.lang.String"/>
-                               <xml-element java-attribute="eventHeader" name="event-header" type="inventory.aai.onap.org.v25.NotificationEventHeader"/>
-                               <xml-any-element java-attribute="entity"/>
-                       </java-attributes>
-               </java-type>
-               <java-type name="NotificationEventHeader">
-                       <xml-root-element name="notification-event-header"/>
-                       <java-attributes>
-                               <xml-element java-attribute="id" name="id" type="java.lang.String"/>
-                               <xml-element java-attribute="timestamp" name="timestamp" type="java.lang.String"/>
-                               <xml-element java-attribute="sourceName" name="source-name" type="java.lang.String"/>
-                               <xml-element java-attribute="domain" name="domain" type="java.lang.String"/>
-                               <xml-element java-attribute="sequenceNumber" name="sequence-number" type="java.lang.String"/>
-                               <xml-element java-attribute="severity" name="severity" type="java.lang.String"/>
-                               <xml-element java-attribute="eventType" name="event-type" type="java.lang.String"/>
-                               <xml-element java-attribute="version" name="version" type="java.lang.String"/>
-                               <xml-element java-attribute="action" name="action" type="java.lang.String"/>
-                               <xml-element java-attribute="entityType" name="entity-type" type="java.lang.String"/>
-                               <xml-element java-attribute="topEntityType" name="top-entity-type" type="java.lang.String"/>
-                               <xml-element java-attribute="entityLink" name="entity-link" type="java.lang.String"/>
-                               <xml-element java-attribute="status" name="status" type="java.lang.String"/>
-                       </java-attributes>
-               </java-type>
-               <java-type name="AaiInternal">
-                       <xml-root-element name="aai-internal"/>
-                       <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="reservedPropNames" name="reserved-prop-names" type="inventory.aai.onap.org.v25.ReservedPropNames"/>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="edgePropNames" name="edge-prop-names" type="inventory.aai.onap.org.v25.EdgePropNames"/>
-                       </java-attributes>
-               </java-type>
-               <java-type name="ReservedPropNames">
-                       <xml-properties>
-                               <xml-property name="description" value="Internal map to define some reserved properties of a vertex"/>
-                               <xml-property name="uniqueProps" value="aai-unique-key,aai-uri"/>
-                               <xml-property name="indexedProps" value="aai-unique-key,source-of-truth,aai-node-type,aai-uri"/>
-                       </xml-properties>
-                       <xml-root-element name="reserved-prop-names"/>
-                       <java-attributes>
-                               <xml-element java-attribute="lastModSourceOfTruth" name="last-mod-source-of-truth" type="java.lang.String"/>
-                               <xml-element java-attribute="aaiNodeType" name="aai-node-type" type="java.lang.String"/>
-                               <xml-element java-attribute="aaiCreatedTs" name="aai-created-ts" type="java.lang.Long"/>
-                               <xml-element java-attribute="aaiUniqueKey" name="aai-unique-key" type="java.lang.String"/>
-                               <xml-element java-attribute="aaiLastModTs" name="aai-last-mod-ts" type="java.lang.Long"/>
-                               <xml-element java-attribute="sourceOfTruth" name="source-of-truth" type="java.lang.String"/>
-                               <xml-element java-attribute="aaiUri" name="aai-uri" type="java.lang.String"/>
-                       </java-attributes>
-               </java-type>
-               <java-type name="EdgePropNames">
-                       <!-- NOTE that the names of these properties are not consistent and are in mixed case and hyphen case for now -->
-                       <xml-properties>
-                               <xml-property name="description" value="Internal map to define the properties of an edge and interpret the map EdgeRules"/>
-                               <xml-property name="edgeInfo" value="aaiUuid,edgeLabel,direction,multiplicityRule,isParent,usesResource,hasDelTarget,SVC-INFRA,SVC-INFRA-REV"/>
-                <xml-property name="uniqueProps" value="aai-uuid"/>
-                <xml-property name="indexedProps" value="aai-uuid"/>
+                <xml-property name="description" value="Definition of port"/>
+                <xml-property name="indexedProps" value="port-name,data-owner,data-source,data-source-version,part-number,equip-identifier"/>
+                <xml-property name="dependentOn" value="chassis,pluggable,card"/>
+                <xml-property name="container" value="ports"/>
+                <xml-property name="uriTemplate" value="/ports/port/{port-name}"/>
+                <xml-property name="requiredProps" value="port-name,port-type,port-role,speed-value,speed-units"/>
             </xml-properties>
-                       <xml-root-element name="edge-prop-names"/>
-                       <java-attributes>
-                               <xml-element java-attribute="edgeLabel" name="edgeLabel" type="java.lang.String"/>
-                               <xml-element java-attribute="direction" name="direction" type="java.lang.String"/>
-                               <xml-element java-attribute="multiplicityRule" name="multiplicityRule" type="java.lang.String"/>
-                               <xml-element java-attribute="containsOtherV" name="contains-other-v" type="java.lang.String"/>
-                               <xml-element java-attribute="deleteOtherV" name="delete-other-v" type="java.lang.String"/>
-                               <xml-element java-attribute="svcinfra" name="SVC-INFRA" type="java.lang.String"/>
-                               <xml-element java-attribute="preventDelete" name="prevent-delete" type="java.lang.String"/>
-                               <xml-element java-attribute="aaiUuid" name="aai-uuid" type="java.lang.String"/>
-                       </java-attributes>
         </java-type>
 
-        <java-type name="Models">
-            <xml-properties>
-                <xml-property name="description" value="Collection of subgraph definitions provided by ASDC to describe the inventory assets and their connections related to ASDC models"/>
-            </xml-properties>
-            <xml-root-element name="models"/>
+        <java-type name="CardSlots">
+            <xml-root-element name="card-slots"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="model" name="model" type="inventory.aai.onap.org.v25.Model"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="cardSlot" name="card-slot" type="inventory.aai.onap.org.v25.CardSlot"/>
             </java-attributes>
-        </java-type>
-
-        <java-type name="Model">
-            <xml-root-element name="model"/>
             <xml-properties>
-                <xml-property name="description" value="Subgraph definition provided by ASDC to describe an inventory asset and its connections related to ASDC models, independent of version"/>
-                <xml-property name="nameProps" value="model-type"/>
-                <xml-property name="indexedProps" value="model-invariant-id,model-type,data-owner,data-source,data-source-version"/>
-                <xml-property name="uniqueProps" value="model-invariant-id"/>
-                <xml-property name="container" value="models"/>
-                <xml-property name="namespace" value="service-design-and-creation"/>
-                <xml-property name="uriTemplate" value="/service-design-and-creation/models/model/{model-invariant-id}"/>
-            <xml-property name="requiredProps" value="model-invariant-id,model-type"/>
             </xml-properties>
+        </java-type>
+
+        <java-type name="CardSlot">
+            <xml-root-element name="card-slot"/>
             <java-attributes>
-                <xml-element java-attribute="modelInvariantId" name="model-invariant-id" required="true" type="java.lang.String" xml-key="true">
-                    <xml-properties>
-                        <xml-property name="description" value="Unique identifier corresponding to the main definition of a model in ASDC"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="modelType" name="model-type" required="true" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="Type of the model, e.g., service, resource, widget, etc."/>
-                    </xml-properties>
-                </xml-element>
-                               <xml-element java-attribute="modelRole" name="model-role"  type="java.lang.String">
+                <xml-element java-attribute="slotName" name="slot-name" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Role of the model,e.g.,NST,NSST,CST,etc"/>
+                        <xml-property name="description" value="The name of the card-slot (unique relative to the chassis)."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="modelVers" name="model-vers" type="inventory.aai.onap.org.v25.ModelVers"/>
+                <xml-element java-attribute="cards" name="cards" type="inventory.aai.onap.org.v25.Cards"/>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
             </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Definition of card-slot"/>
+                <xml-property name="indexedProps" value="slot-name,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="chassis"/>
+                <xml-property name="container" value="card-slots"/>
+                <xml-property name="uriTemplate" value="/card-slots/card-slot/{slot-name}"/>
+                <xml-property name="requiredProps" value="slot-name"/>
+            </xml-properties>
         </java-type>
 
-
-        <java-type name="ModelVers">
-            <xml-root-element name="model-vers"/>
+        <java-type name="Cards">
+            <xml-root-element name="cards"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="modelVer" name="model-ver" type="inventory.aai.onap.org.v25.ModelVer"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="card" name="card" type="inventory.aai.onap.org.v25.Card"/>
             </java-attributes>
         </java-type>
 
-        <java-type name="ModelVer">
-            <xml-root-element name="model-ver"/>
-            <xml-properties>
-                <xml-property name="description" value="Subgraph definition provided by ASDC to describe a specific version of an inventory asset and its connections related to ASDC models"/>
-                <xml-property name="nameProps" value="model-name"/>
-                <xml-property name="indexedProps" value="model-version-id,model-name,model-version,distribution-status,data-owner,data-source,data-source-version"/>
-                <xml-property name="uniqueProps" value="model-version-id"/>
-                <xml-property name="dependentOn" value="model"/>
-                <xml-property name="container" value="model-vers"/>
-                <xml-property name="uriTemplate" value="/model-vers/model-ver/{model-version-id}"/>
-            <xml-property name="requiredProps" value="model-version-id,model-name,model-version"/>
-            </xml-properties>
+        <java-type name="Card">
+            <xml-root-element name="card"/>
             <java-attributes>
-                <xml-element java-attribute="modelVersionId" name="model-version-id" required="true" type="java.lang.String" xml-key="true">
-                    <xml-properties>
-                        <xml-property name="description" value="Unique identifier corresponding to one version of a model in ASDC"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="modelName" name="model-name" required="true" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="Name of the model, which can change from version to version."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="modelVersion" name="model-version" required="true" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="Version"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="distributionStatus" name="distribution-status" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="Distribution Status"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="modelDescription" name="model-description" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="Description"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="sdncModelName" name="sdnc-model-name" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="The CDS blue print name associated with the resource."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="sdncModelVersion" name="sdnc-model-version" type="java.lang.String">
+                <xml-element java-attribute="cardType" name="card-type" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="The version of the CDS blue print."/>
+                        <xml-property name="description" value="The type of card."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.onap.org.v25.ModelElements"/>
-                <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v25.Metadata"/>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
+                <xml-element java-attribute="ports" name="ports" type="inventory.aai.onap.org.v25.Ports"/>
+                <xml-element java-attribute="pluggableSlots" name="pluggable-slots" type="inventory.aai.onap.org.v25.PluggableSlots"/>
             </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Definition of card"/>
+                <xml-property name="indexedProps" value="card-type,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="card-slot"/>
+                <xml-property name="container" value="cards"/>
+                <xml-property name="uriTemplate" value="/cards/card/{card-type}"/>
+                <xml-property name="requiredProps" value="card-type"/>
+            </xml-properties>
         </java-type>
 
-        <java-type name="ModelElements">
-            <xml-root-element name="model-elements"/>
+        <java-type name="PluggableSlots">
+            <xml-root-element name="pluggable-slots"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="modelElement" name="model-element" type="inventory.aai.onap.org.v25.ModelElement"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="pluggableSlot" name="pluggable-slot" type="inventory.aai.onap.org.v25.PluggableSlot"/>
             </java-attributes>
-        </java-type>
-
-        <java-type name="ModelElement">
             <xml-properties>
-                <xml-property name="description" value="Defines how other models combine to make up a higher-level model."/>
-                <xml-property name="uniqueProps" value="model-element-uuid"/>
-                <xml-property name="indexedProps" value="model-element-uuid,data-owner,data-source,data-source-version"/>
-                <xml-property name="allowDirectRead" value="true"/>
-                <xml-property name="dependentOn" value="element-choice-set,model-element,model-ver"/>
-                <xml-property name="allowDirectWrite" value="false"/>
-                <xml-property name="container" value="model-elements"/>
-                <xml-property name="uriTemplate" value="/model-elements/model-element/{model-element-uuid}"/>
-            <xml-property name="requiredProps" value="model-element-uuid,new-data-del-flag,cardinality"/>
             </xml-properties>
-            <xml-root-element name="model-element"/>
+        </java-type>
+
+        <java-type name="PluggableSlot">
+            <xml-root-element name="pluggable-slot"/>
             <java-attributes>
-                <xml-element java-attribute="modelElementUuid" name="model-element-uuid" required="true" type="java.lang.String" xml-key="true">
-                    <xml-properties>
-                        <xml-property name="autoGenerateUuid" value="true"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="newDataDelFlag" name="new-data-del-flag" required="true" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="Indicates whether this element was created as part of instantiation from this model"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="cardinality" name="cardinality" required="true" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="How many of this type of element are required/allowed"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element container-type="java.util.ArrayList" java-attribute="linkagePoints" name="linkage-points" type="java.lang.String">
-                </xml-element>
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.onap.org.v25.ModelElements">
-                    <xml-properties>
-                        <xml-property name="description" value="Defines how other models combine to make up a higher-level model"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="modelConstraints" name="model-constraints" type="inventory.aai.onap.org.v25.ModelConstraints">
+                <xml-element java-attribute="slotName" name="slot-name" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Describes new constraints on this model element that are not part of that model's definition"/>
+                        <xml-property name="description" value="The name of the pluggable-slot. (unique relative to the chassis or card)."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="pluggables" name="pluggables" type="inventory.aai.onap.org.v25.Pluggables"/>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
             </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Definition of card-slot"/>
+                <xml-property name="indexedProps" value="slot-name,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="chassis,card"/>
+                <xml-property name="container" value="pluggable-slots"/>
+                <xml-property name="uriTemplate" value="/pluggable-slots/pluggable-slot/{slot-name}"/>
+                <xml-property name="requiredProps" value="slot-name"/>
+            </xml-properties>
         </java-type>
 
-        <java-type name="ModelConstraints">
-            <xml-root-element name="model-constraints"/>
+        <java-type name="Pluggables">
+            <xml-root-element name="pluggables"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="modelConstraint" name="model-constraint" type="inventory.aai.onap.org.v25.ModelConstraint"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="pluggable" name="pluggable" type="inventory.aai.onap.org.v25.Pluggable"/>
             </java-attributes>
         </java-type>
 
-        <java-type name="ModelConstraint">
-            <xml-properties>
-                <xml-property name="description" value="This is how we would capture constraints defining allowed sets of elements."/>
-                <xml-property name="uniqueProps" value="model-constraint-uuid"/>
-                <xml-property name="indexedProps" value="model-constraint-uuid,data-owner,data-source,data-source-version"/>
-                <xml-property name="allowDirectRead" value="true"/>
-                <xml-property name="allowDirectWrite" value="false"/>
-                <xml-property name="dependentOn" value="model-element"/>
-                <xml-property name="container" value="model-constraints"/>
-                <xml-property name="uriTemplate" value="/model-constraints/model-constraint/{model-constraint-uuid}"/>
-            <xml-property name="requiredProps" value="model-constraint-uuid,constrained-element-set-uuid-to-replace"/>
-            </xml-properties>
-            <xml-root-element name="model-constraint"/>
+        <java-type name="Pluggable">
+            <xml-root-element name="pluggable"/>
             <java-attributes>
-                <xml-element java-attribute="modelConstraintUuid" name="model-constraint-uuid" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="pluggableType" name="pluggable-type" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="autoGenerateUuid" value="true"/>
+                        <xml-property name="description" value="The type of pluggable."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="partNumber" name="part-number" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Part number for this pluggable."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="equipIdentifier" name="equip-identifier" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="CLEI or other specification for pluggable hardware."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="constrainedElementSetUuidToReplace" name="constrained-element-set-uuid-to-replace" required="true" type="java.lang.String"/>
-                <xml-element java-attribute="constrainedElementSets" name="constrained-element-sets" type="inventory.aai.onap.org.v25.ConstrainedElementSets"/>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
+                <xml-element java-attribute="ports" name="ports" type="inventory.aai.onap.org.v25.Ports"/>
             </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Definition of pluggable"/>
+                <xml-property name="indexedProps" value="pluggable-type,part-number,equip-identifier,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="pluggable-slot"/>
+                <xml-property name="container" value="pluggables"/>
+                <xml-property name="uriTemplate" value="/pluggables/pluggable/{pluggable-type}"/>
+                <xml-property name="requiredProps" value="pluggable-type"/>
+            </xml-properties>
         </java-type>
 
-        <java-type name="ConstrainedElementSets">
-            <xml-root-element name="constrained-element-sets"/>
+        <java-type name="SoftwareVersions">
+            <xml-properties>
+                <xml-property name="description" value="Collection of software versions."/>
+            </xml-properties>
+            <xml-root-element name="software-versions"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="constrainedElementSet" name="constrained-element-set" type="inventory.aai.onap.org.v25.ConstrainedElementSet"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="softwareVersion" name="software-version" type="inventory.aai.onap.org.v25.SoftwareVersion"/>
             </java-attributes>
         </java-type>
 
-        <java-type name="ConstrainedElementSet">
-            <xml-properties>
-                <xml-property name="description" value="This is how we would capture constraints defining allowed sets of elements."/>
-                <xml-property name="uniqueProps" value="constrained-element-set-uuid"/>
-                <xml-property name="indexedProps" value="constrained-element-set-uuid,data-owner,data-source,data-source-version"/>
-                <xml-property name="allowDirectRead" value="true"/>
-                <xml-property name="allowDirectWrite" value="false"/>
-                <xml-property name="dependentOn" value="model-constraint,model-element"/>
-                <xml-property name="container" value="constrained-element-sets"/>
-                <xml-property name="uriTemplate" value="/constrained-element-sets/constrained-element-set/{constrained-element-set-uuid}"/>
-            <xml-property name="requiredProps" value="constrained-element-set-uuid,constraint-type,check-type"/>
-            </xml-properties>
-            <xml-root-element name="constrained-element-set"/>
+        <java-type name="SoftwareVersion">
+            <xml-root-element name="software-version"/>
             <java-attributes>
-                <xml-element java-attribute="constrainedElementSetUuid" name="constrained-element-set-uuid" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="softwareVersionId" name="software-version-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="autoGenerateUuid" value="true"/>
+                        <xml-property name="description" value="Identifier of the software version"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element default-value="false" java-attribute="isActiveSwVer" name="is-active-sw-ver" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="used to indicate whether or not this software-version is the active one (activeSw = true)"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="constraintType" name="constraint-type" required="true" type="java.lang.String"/>
-                <xml-element java-attribute="checkType" name="check-type" required="true" type="java.lang.String"/>
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"/>
-                <xml-element java-attribute="elementChoiceSets" name="element-choice-sets" type="inventory.aai.onap.org.v25.ElementChoiceSets"/>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
             </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Software Version"/>
+                <xml-property name="indexedProps" value="software-version-id,is-active-sw-ver,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="pnf"/>
+                <xml-property name="container" value="pnf"/>
+                <xml-property name="requiredProps" value="software-version-id,is-active-sw-ver"/>
+                <xml-property name="uriTemplate" value="/pnf/software-version/{software-version-id}"/>
+            </xml-properties>
         </java-type>
 
-        <java-type name="ElementChoiceSets">
-            <xml-root-element name="element-choice-sets"/>
+        <java-type name="PhysicalLinks">
+            <xml-properties>
+                <xml-property name="description" value="Collection of physical connections, typically between p-interfaces"/>
+            </xml-properties>
+            <xml-root-element name="physical-links"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="elementChoiceSet" name="element-choice-set" type="inventory.aai.onap.org.v25.ElementChoiceSet"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="physicalLink" name="physical-link" type="inventory.aai.onap.org.v25.PhysicalLink"/>
             </java-attributes>
-        </java-type>
-
-        <java-type name="ElementChoiceSet">
             <xml-properties>
-                <xml-property name="description" value="This is how we would capture constraints defining allowed sets of elements."/>
-                <xml-property name="uniqueProps" value="element-choice-set-uuid"/>
-                <xml-property name="indexedProps" value="element-choice-set-uuid,data-owner,data-source,data-source-version"/>
-                <xml-property name="allowDirectRead" value="true"/>
-                <xml-property name="allowDirectWrite" value="false"/>
-                <xml-property name="dependentOn" value="constrained-element-set"/>
-                <xml-property name="container" value="element-choice-sets"/>
-                <xml-property name="uriTemplate" value="/element-choice-sets/element-choice-set/{element-choice-set-uuid}"/>
-            <xml-property name="requiredProps" value="element-choice-set-uuid,element-choice-set-name"/>
+                <xml-property name="maximumDepth" value="0"/>
             </xml-properties>
-            <xml-root-element name="element-choice-set"/>
+        </java-type>
+
+        <java-type name="PhysicalLink">
+            <xml-root-element name="physical-link"/>
             <java-attributes>
-                <xml-element java-attribute="elementChoiceSetUuid" name="element-choice-set-uuid" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="linkName" name="link-name" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="autoGenerateUuid" value="true"/>
+                        <xml-property name="description" value="e.g., hostnameA_p-connection_nameA_hostnameZ+p_connection-nameZ"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                <xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
-                                               <xml-property name="ownerCheck" value="N/A"/>
+                        <xml-property name="description" value="Captures the numeric part of the speed"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                        <xml-property name="description" value="Captures the units corresponding to the speed"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="circuitId" name="circuit-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                        <xml-property name="description" value="Circuit it"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="elementChoiceSetName" name="element-choice-set-name" required="true" type="java.lang.String"/>
-                <xml-element java-attribute="cardinality" name="cardinality" type="java.lang.String"/>
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"/>
-                <xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.onap.org.v25.ModelElements"/>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-            </java-attributes>
-        </java-type>
-
-               <java-type name="NamedQueries">
-                       <xml-root-element name="named-queries"/>
-                       <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="namedQuery" name="named-query" type="inventory.aai.onap.org.v25.NamedQuery"/>
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="NamedQuery">
-                       <xml-properties>
-                               <xml-property name="description" value="TBD"/>
-                               <xml-property name="nameProps" value="named-query-name"/>
-                               <xml-property name="uniqueProps" value="named-query-uuid"/>
-                               <xml-property name="indexedProps" value="named-query-uuid,named-query-name"/>
-                               <xml-property name="container" value="named-queries"/>
-                               <xml-property name="namespace" value="service-design-and-creation"/>
-                       <xml-property name="requiredProps" value="named-query-uuid,named-query-name,named-query-version"/>
-            <xml-property name="uriTemplate" value="/service-design-and-creation/named-queries/named-query/{named-query-uuid}"/>
-            </xml-properties>
-                       <xml-root-element name="named-query"/>
-                       <java-attributes>
-                               <xml-element java-attribute="namedQueryUuid" name="named-query-uuid" required="true" type="java.lang.String" xml-key="true"/>
-                               <xml-element java-attribute="namedQueryName" name="named-query-name" required="true" type="java.lang.String"/>
-                               <xml-element java-attribute="namedQueryVersion" name="named-query-version" required="true" type="java.lang.String"/>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="requiredInputParams" name="required-input-param" type="java.lang.String">
-                                       <xml-element-wrapper name="required-input-params"/>
-                               </xml-element>
-                               <xml-element java-attribute="description" name="description" type="java.lang.String"/>
-                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"/>
-                               <xml-element java-attribute="namedQueryElements" name="named-query-elements" type="inventory.aai.onap.org.v25.NamedQueryElements"/>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="NamedQueryElements">
-                       <xml-root-element name="named-query-elements"/>
-                       <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="namedQueryElement" name="named-query-element" type="inventory.aai.onap.org.v25.NamedQueryElement"/>
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="NamedQueryElement">
-                       <xml-properties>
-                               <xml-property name="description" value="TBD"/>
-                               <xml-property name="uniqueProps" value="named-query-element-uuid"/>
-                               <xml-property name="indexedProps" value="named-query-element-uuid"/>
-                               <xml-property name="allowDirectRead" value="true"/>
-                               <xml-property name="allowDirectWrite" value="false"/>
-                <xml-property name="dependentOn" value="named-query,named-query-element"/>
-                               <xml-property name="container" value="named-query-elements"/>
-                       <xml-property name="requiredProps" value="named-query-element-uuid"/>
-            <xml-property name="uriTemplate" value="/named-query-elements/named-query-element/{named-query-element-uuid}"/>
-            </xml-properties>
-                       <xml-root-element name="named-query-element"/>
-                       <java-attributes>
-                               <xml-element java-attribute="namedQueryElementUuid" name="named-query-element-uuid" required="true" type="java.lang.String" xml-key="true">
-                                       <xml-properties>
-                                               <xml-property name="autoGenerateUuid" value="true"/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="propertyCollectList" name="property-collect-list" type="java.lang.String"/>
-                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"/>
-                               <xml-element java-attribute="propertyLimitDesc" name="property-limit-desc" type="java.lang.String"/>
-                               <xml-element java-attribute="doNotOutput" name="do-not-output" type="java.lang.String"/>
-                               <xml-element java-attribute="namedQueryElements" name="named-query-elements" type="inventory.aai.onap.org.v25.NamedQueryElements"/>
-                               <xml-element java-attribute="relatedLookups" name="related-lookups" type="inventory.aai.onap.org.v25.RelatedLookups"/>
-                               <xml-element java-attribute="propertyConstraints" name="property-constraints" type="inventory.aai.onap.org.v25.PropertyConstraints"/>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="RelatedLookups">
-                       <xml-root-element name="related-lookups"/>
-                       <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="relatedLookup" name="related-lookup" type="inventory.aai.onap.org.v25.RelatedLookup"/>
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="RelatedLookup">
-                       <xml-properties>
-                               <xml-property name="description" value="TBD"/>
-                               <xml-property name="uniqueProps" value="related-lookup-uuid"/>
-                               <xml-property name="indexedProps" value="related-lookup-uuid"/>
-                               <xml-property name="allowDirectRead" value="true"/>
-                               <xml-property name="allowDirectWrite" value="false"/>
-                <xml-property name="dependentOn" value="named-query-element"/>
-                               <xml-property name="container" value="related-lookups"/>
-                       <xml-property name="requiredProps" value="related-lookup-uuid,source-node-type,source-node-property,target-node-type,target-node-property"/>
-            <xml-property name="uriTemplate" value="/related-lookups/related-lookup/{related-lookup-uuid}"/>
-            </xml-properties>
-                       <xml-root-element name="related-lookup"/>
-                       <java-attributes>
-                               <xml-element java-attribute="relatedLookupUuid" name="related-lookup-uuid" required="true" type="java.lang.String" xml-key="true">
-                                       <xml-properties>
-                                               <xml-property name="autoGenerateUuid" value="true"/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="sourceNodeType" name="source-node-type" required="true" type="java.lang.String"/>
-                               <xml-element java-attribute="sourceNodeProperty" name="source-node-property" required="true" type="java.lang.String"/>
-                               <xml-element java-attribute="targetNodeType" name="target-node-type" required="true" type="java.lang.String"/>
-                               <xml-element java-attribute="targetNodeProperty" name="target-node-property" required="true" type="java.lang.String"/>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="propertyCollectList" name="property-collect-list" type="java.lang.String"/>
-                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"/>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="PropertyConstraints">
-                       <xml-root-element name="property-constraints"/>
-                       <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="propertyConstraint" name="property-constraint" type="inventory.aai.onap.org.v25.PropertyConstraint"/>
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="PropertyConstraint">
-                       <xml-properties>
-                               <xml-property name="description" value="TBD"/>
-                               <xml-property name="uniqueProps" value="property-constraint-uuid"/>
-                               <xml-property name="indexedProps" value="property-constraint-uuid"/>
-                               <xml-property name="allowDirectRead" value="true"/>
-                               <xml-property name="allowDirectWrite" value="false"/>
-                <xml-property name="dependentOn" value="named-query-element"/>
-                               <xml-property name="container" value="property-constraints"/>
-                       <xml-property name="requiredProps" value="property-constraint-uuid,constraint-type,property-name,property-value"/>
-            <xml-property name="uriTemplate" value="/property-constraints/property-constraint/{property-constraint-uuid}"/>
-            </xml-properties>
-                       <xml-root-element name="property-constraint"/>
-                       <java-attributes>
-                               <xml-element java-attribute="propertyConstraintUuid" name="property-constraint-uuid" required="true" type="java.lang.String" xml-key="true">
-                                       <xml-properties>
-                                               <xml-property name="autoGenerateUuid" value="true"/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="constraintType" name="constraint-type" required="true" type="java.lang.String"/>
-                               <xml-element java-attribute="propertyName" name="property-name" required="true" type="java.lang.String"/>
-                               <xml-element java-attribute="propertyValue" name="property-value" required="true" type="java.lang.String"/>
-                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"/>
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="ModelAndNamedQuerySearch">
-                       <xml-properties>
-                               <xml-property name="description" value="ModelAndNamedQuerySearch holds query-parameters and instance-properties for performing a named-query or model query"/>
-                       </xml-properties>
-                       <xml-root-element name="model-and-named-query-search"/>
-                       <java-attributes>
-                               <xml-element java-attribute="queryParameters" name="query-parameters" type="inventory.aai.onap.org.v25.QueryParameters"/>
-                               <xml-element java-attribute="instanceFilters" name="instance-filters" type="inventory.aai.onap.org.v25.InstanceFilters"/>
-                               <xml-element java-attribute="secondaryFilts" name="secondary-filts" type="inventory.aai.onap.org.v25.SecondaryFilts"/>
-                               <xml-element java-attribute="topNodeType" name="top-node-type" type="java.lang.String"/>
-                               <xml-element java-attribute="secondaryFilterCutPoint" name="secondary-filter-cut-point" type="java.lang.String"/>
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="QueryParameters">
-                       <xml-properties>
-                               <xml-property name="description" value="QueryParameters for performing a named-query or model query"/>
-                       </xml-properties>
-                       <xml-root-element name="query-parameters"/>
-                       <java-attributes>
-                               <xml-element java-attribute="namedQuery" name="named-query" type="inventory.aai.onap.org.v25.NamedQuery"/>
-                               <xml-element java-attribute="model" name="model" type="inventory.aai.onap.org.v25.OverloadedModel"/>
-                       </java-attributes>
-               </java-type>
-
-        <java-type name="OverloadedModel">
-            <xml-root-element name="overloaded-model"/>
-            <xml-properties>
-                <xml-property name="description" value="Allows for legacy POST of old-style and new-style models"/>
-                <xml-property name="indexedProps" value="model-name"/>
-            <xml-property name="requiredProps" value="model-invariant-id,model-name-version-id,model-type,model-name,model-id,model-version"/>
-            </xml-properties>
-            <java-attributes>
-                <xml-element java-attribute="modelInvariantId" name="model-invariant-id" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="dualMode" name="dual-mode" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Unique identifier corresponding to the main definition of a model in ASDC"/>
+                        <xml-property name="description" value="Dual access mode (e.g., primary, secondary"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="modelNameVersionId" name="model-name-version-id" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Unique identifier corresponding to one version of a model in ASDC"/>
+                        <xml-property name="description" value="To provide information on who manages this circuit. A&amp;AI or 3rd party transport provider"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="modelType" name="model-type" required="true" type="java.lang.String">
+                <xml-element java-attribute="serviceProviderName" name="service-provider-name" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Type of the model, e.g., service, resource, widget, etc."/>
+                        <xml-property name="description" value="Name of the service Provider on this link."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="modelName" name="model-name" required="true" type="java.lang.String">
+                <xml-element java-attribute="serviceProviderBandwidthUpValue" name="service-provider-bandwidth-up-value" type="java.lang.Integer">
                     <xml-properties>
-                        <xml-property name="description" value="Name of the model, which can change from version to version."/>
+                        <xml-property name="description" value="Upstream Bandwidth value agreed with the service provider"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="modelId" name="model-id" required="true" type="java.lang.String">
+                <xml-element java-attribute="serviceProviderBandwidthUpUnits" name="service-provider-bandwidth-up-units" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Invariant unique ID which does not change from version to version"/>
+                        <xml-property name="description" value="Units for the upstream BW value"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="modelVersion" name="model-version" required="true" type="java.lang.String">
+                <xml-element java-attribute="serviceProviderBandwidthDownValue" name="service-provider-bandwidth-down-value" type="java.lang.Integer">
                     <xml-properties>
-                        <xml-property name="description" value="Version"/>
+                        <xml-property name="description" value="Downstream Bandwidth value agreed with the service provider"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="modelDescription" name="model-description" type="java.lang.String">
+                <xml-element java-attribute="serviceProviderBandwidthDownUnits" name="service-provider-bandwidth-down-units" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Description"/>
+                        <xml-property name="description" value="Units for downstream BW value"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="modelVers" name="model-vers" type="inventory.aai.onap.org.v25.ModelVers"/>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-            </java-attributes>
-        </java-type>
-
-               <java-type name="InstanceFilters">
-                       <xml-properties>
-                               <xml-property name="description" value="InstanceFilters for performing a named-query or model query"/>
-                       </xml-properties>
-                       <xml-root-element name="instance-filters"/>
-                       <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="instanceFilter" name="instance-filter" type="inventory.aai.onap.org.v25.InstanceFilter"/>
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="InstanceFilter">
-                       <xml-properties>
-                               <xml-property name="description" value="InstanceFilter for performing a named-query or model query"/>
-                               <xml-property name="container" value="instance-filters"/>
-                       </xml-properties>
-                       <xml-root-element name="instance-filter"/>
-                       <java-attributes>
-                               <xml-any-element container-type="java.util.ArrayList" java-attribute="any" lax="true" name="any"/>
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="SecondaryFilts">
-                       <xml-properties>
-                               <xml-property name="description" value="SecondaryFilts for performing a named-query or model query"/>
-                       </xml-properties>
-                       <xml-root-element name="secondary-filts"/>
-                       <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilt" name="secondary-filt" type="inventory.aai.onap.org.v25.SecondaryFilt"/>
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="SecondaryFilt">
-                       <xml-properties>
-                               <xml-property name="description" value="SecondaryFilt for performing a named-query or model query"/>
-                       </xml-properties>
-                       <xml-root-element name="secondary-filt"/>
-                       <java-attributes>
-                               <xml-any-element container-type="java.util.ArrayList" java-attribute="any" lax="true" name="any"/>
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="Properties">
-                       <xml-properties>
-                               <xml-property name="description" value="Property holder for query properties or instance properties"/>
-                       </xml-properties>
-                       <xml-root-element name="properties"/>
-                       <java-attributes>
-                               <xml-element java-attribute="propertyName" name="property-name" type="java.lang.String"/>
-                               <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String"/>
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="ResponseList">
-                       <xml-properties>
-                               <xml-property name="description" value="Response container for the results of a named-query or model query"/>
-                       </xml-properties>
-                       <xml-root-element name="response-list"/>
-                       <java-attributes>
-                               <xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.onap.org.v25.InventoryResponseItems"/>
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="InventoryResponseItems">
-                       <xml-properties>
-                               <xml-property name="description" value="Container for inventory items in response list"/>
-                               <xml-property name="container" value="response-list"/>
-                       </xml-properties>
-                       <xml-root-element name="inventory-response-items"/>
-                       <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="inventoryResponseItem" name="inventory-response-item" type="inventory.aai.onap.org.v25.InventoryResponseItem"/>
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="InventoryResponseItem">
-                       <xml-properties>
-                               <xml-property name="description" value="Inventory item for response list"/>
-                               <xml-property name="container" value="inventory-response-items"/>
-                       </xml-properties>
-                       <xml-root-element name="inventory-response-item"/>
-                       <java-attributes>
-                               <xml-element java-attribute="modelName" name="model-name" type="java.lang.String"/>
-                               <xml-any-element java-attribute="item"/>
-                               <xml-element java-attribute="extraProperties" name="extra-properties" type="inventory.aai.onap.org.v25.ExtraProperties"/>
-                               <xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.onap.org.v25.InventoryResponseItems"/>
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="ExtraProperties">
-                       <xml-properties>
-                               <xml-property name="description" value="Extra properties for inventory item for response list"/>
-                       </xml-properties>
-                       <xml-root-element name="extra-properties"/>
-                       <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="extraProperty" name="extra-property" type="inventory.aai.onap.org.v25.ExtraProperty"/>
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="ExtraProperty">
-                       <xml-root-element name="extra-property"/>
-                       <java-attributes>
-                               <xml-element java-attribute="propertyName" name="property-name" type="java.lang.String"/>
-                               <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String"/>
-                       </java-attributes>
-               </java-type>
-
-        <java-type name="RouteTableReferences">
-            <xml-properties>
-                <xml-property name="description" value="Collection of openstack route table references"/>
-            </xml-properties>
-            <xml-root-element name="route-table-references"/>
-            <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="routeTableReference" name="route-table-reference" type="inventory.aai.onap.org.v25.RouteTableReference"/>
-            </java-attributes>
-        </java-type>
-
-        <java-type name="RouteTableReference">
-            <xml-root-element name="route-table-reference"/>
-            <java-attributes>
-                <xml-element java-attribute="routeTableReferenceId" name="route-table-reference-id" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="linkFunction" name="link-function" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Route Table Reference id, UUID assigned to this instance."/>
+                        <xml-property name="description" value="The function performed by this physical link"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="routeTableReferenceFqdn" name="route-table-reference-fqdn" required="true" type="java.lang.String">
+                <xml-element java-attribute="linkRole" name="link-role" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="FQDN entry in the route table."/>
+                        <xml-property name="description" value="Indicator for the use of this physical link"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="linkType" name="link-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Subtype used to categorize this physical link"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="linkDescription" name="link-description" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Descriptor to identify the path of the link. In the format of ptn-ii-a_interface-a|ptn-ii-b_interface-b"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Concurrency value"/>
+                        <xml-property name="description" value="Indicator for whether the resource is considered operational.  Valid values are in-service-path and out-of-service-path."/>
+                        <xml-property name="suggestibleOnSearch" value="true"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
             </java-attributes>
-
             <xml-properties>
-                <xml-property name="description" value="Openstack route table reference."/>
-                <xml-property name="nameProps" value="route-table-reference-fqdn"/>
-                <xml-property name="uniqueProps" value="route-table-reference-id"/>
-                <xml-property name="indexedProps" value="route-table-reference-id,route-table-reference-fqdn,data-owner,data-source,data-source-version"/>
-                <xml-property name="container" value="route-table-references"/>
+                <xml-property name="description" value="Collection of physical connections, typically between p-interfaces"/>
+                <xml-property name="indexedProps" value="circuit-id,link-name,link-function,link-role,link-type,link-description,data-owner,data-source,data-source-version"/>
+                <xml-property name="nameProps" value="link-description"/>
+                <xml-property name="alternateKeys1" value="circuit-id"/>
+                <xml-property name="container" value="physical-links"/>
                 <xml-property name="namespace" value="network"/>
-                <xml-property name="uriTemplate" value="/network/route-table-references/route-table-reference/{route-table-reference-id}"/>
-            <xml-property name="requiredProps" value="route-table-reference-id,route-table-reference-fqdn"/>
+                <xml-property name="searchable" value="link-name,circuit-id,operational-status"/>
+                <xml-property name="uriTemplate" value="/network/physical-links/physical-link/{link-name}"/>
+                <xml-property name="requiredProps" value="link-name"/>
             </xml-properties>
         </java-type>
 
-        <java-type name="InstanceGroups">
-            <xml-properties>
-                <xml-property name="description" value="Collection of openstack route table references"/>
-            </xml-properties>
-            <xml-root-element name="instance-groups"/>
+        <java-type name="VigServers">
+            <xml-root-element name="vig-servers"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="instanceGroup" name="instance-group" type="inventory.aai.onap.org.v25.InstanceGroup"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vigServer" name="vig-server" type="inventory.aai.onap.org.v25.VigServer"/>
             </java-attributes>
         </java-type>
 
-        <java-type name="InstanceGroup">
-            <xml-root-element name="instance-group"/>
+        <java-type name="VigServer">
+            <xml-root-element name="vig-server"/>
             <java-attributes>
-
-                <xml-element java-attribute="id" name="id" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="vigAddressType" name="vig-address-type" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Instance Group ID, UUID assigned to this instance."/>
+                        <xml-property name="description" value="indicates whether the VIG is for AVPN or INTERNET"/>
                     </xml-properties>
                 </xml-element>
-
-                <xml-element java-attribute="instanceGroupRole" name="instance-group-role" required="false" type="java.lang.String">
+                <xml-element container-type="java.util.ArrayList" java-attribute="ipaddressV4Vig" name="ipaddress-v4-vig" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="role of the instance group."/>
+                        <xml-property name="description" value="v4 IP of the vig server"/>
                     </xml-properties>
                 </xml-element>
-
-                <xml-element java-attribute="modelInvariantId" name="model-invariant-id" required="false" type="java.lang.String">
+                <xml-element container-type="java.util.ArrayList" java-attribute="ipaddressV6Vig" name="ipaddress-v6-vig" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="ASDC model id for this resource or service model."/>
-                        <xml-property name="visibility" value="deployment"/>
-                        <xml-property name="requires" value="model-version-id"/>
-                        <xml-property name="dbAlias" value="model-invariant-id-local"/>
+                        <xml-property name="description" value="v6 IP of the vig server"/>
                     </xml-properties>
                 </xml-element>
-
-                <xml-element java-attribute="modelVersionId" name="model-version-id" required="false" type="java.lang.String">
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="ASDC model version uid for this resource model."/>
-                        <xml-property name="visibility" value="deployment"/>
-                        <xml-property name="requires" value="model-invariant-id"/>
-                        <xml-property name="dbAlias" value="model-version-id-local"/>
-                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                                               <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="description" name="description" required="false" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Descriptive text to help identify the usage of this instance-group"/>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="instanceGroupType" name="instance-group-type" required="true" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Only valid value today is lower case ha for high availability"/>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Concurrency value"/>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="vig-server contains information about a vig server used for IPSec-configuration. Populated by SDN-C from 1607"/>
+                <xml-property name="indexedProps" value="vig-address-type,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="ipsec-configuration"/>
+                <xml-property name="container" value="vig-servers"/>
+                <xml-property name="uriTemplate" value="/vig-servers/vig-server/{vig-address-type}"/>
+                <xml-property name="requiredProps" value="vig-address-type"/>
+            </xml-properties>
+        </java-type>
 
-                <xml-element java-attribute="instanceGroupName" name="instance-group-name" required="false" type="java.lang.String">
+        <java-type name="IpsecConfigurations">
+            <xml-root-element name="ipsec-configurations"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="ipsecConfiguration" name="ipsec-configuration" type="inventory.aai.onap.org.v25.IpsecConfiguration"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="IpsecConfiguration">
+            <xml-root-element name="ipsec-configuration"/>
+            <java-attributes>
+                <xml-element java-attribute="ipsecConfigurationId" name="ipsec-configuration-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Instance-Group Name."/>
+                        <xml-property name="description" value="UUID of this configuration"/>
                     </xml-properties>
                 </xml-element>
-
-                <xml-element java-attribute="instanceGroupFunction" name="instance-group-function" required="false" type="java.lang.String">
+                <xml-element java-attribute="requestedVigAddressType" name="requested-vig-address-type" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Instance-Group Function"/>
+                        <xml-property name="description" value="Indicate the type of VIG server like AVPN, INTERNET, BOTH"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="instanceGroupNumber" name="instance-group-number" type="java.lang.Integer">
+                <xml-element java-attribute="requestedEncryptionStrength" name="requested-encryption-strength" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Number used to identify an instance-group"/>
+                        <xml-property name="description" value="Encryption values like 3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="priorityNumber" name="priority-number" type="java.lang.String">
+                <xml-element java-attribute="requestedDmzType" name="requested-dmz-type" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used to identify the primary and secondary priority"/>
+                        <xml-property name="description" value="Shared DMZ or a DMZ specific to a customer"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                <xml-element java-attribute="sharedDmzNetworkAddress" name="shared-dmz-network-address" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
-                                               <xml-property name="ownerCheck" value="N/A"/>
+                        <xml-property name="description" value="Network address of shared DMZ"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="requestedCustomerName" name="requested-customer-name" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                        <xml-property name="description" value="If the DMZ is a custom DMZ, this field will indicate the customer information"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="ikeVersion" name="ike-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                        <xml-property name="description" value="can be 1 or 2"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-            </java-attributes>
-
-            <xml-properties>
-                <xml-property name="description" value="General mechanism for grouping instances"/>
-                <xml-property name="nameProps" value="description,instance-group-name"/>
-                <xml-property name="uniqueProps" value="id"/>
-                <xml-property name="searchable" value="id,description"/>
-                <xml-property name="indexedProps" value="id,model-invariant-id,model-version-id,data-owner,data-source,data-source-version"/>
-                <xml-property name="container" value="instance-groups"/>
-                <xml-property name="namespace" value="network"/>
-                <xml-property name="uriTemplate" value="/network/instance-groups/instance-group/{id}"/>
-            <xml-property name="requiredProps" value="id,instance-group-type"/>
-            </xml-properties>
-        </java-type>
-
-
-        <java-type name="SegmentationAssignments">
-            <xml-properties>
-                <xml-property name="description" value="Collection of openstack segmentation assignments"/>
-            </xml-properties>
-            <xml-root-element name="segmentation-assignments"/>
-            <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="segmentationAssignment" name="segmentation-assignment" type="inventory.aai.onap.org.v25.SegmentationAssignment"/>
-            </java-attributes>
-        </java-type>
-
-        <java-type name="SegmentationAssignment">
-            <xml-root-element name="segmentation-assignment"/>
-            <java-attributes>
-                <xml-element java-attribute="segmentationId" name="segmentation-id" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="ikev1Authentication" name="ikev1-authentication" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Route Table Reference id, UUID assigned to this instance."/>
+                        <xml-property name="description" value="Contains values like md5, sha1, sha256, sha384"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                <xml-element java-attribute="ikev1Encryption" name="ikev1-encryption" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
-                                               <xml-property name="ownerCheck" value="N/A"/>
+                        <xml-property name="description" value="Encyption values like 3des-cbc, des-cbc, aes-128-cbc,&#xC2;&#xA0;aes-192-cbc, aes-265-cbc"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="ikev1DhGroup" name="ikev1-dh-group" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                        <xml-property name="description" value="Diffie-Hellman group like DH-GROUP2, DH-GROUP5, DH-GROUP14"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="ikev1AmGroupId" name="ikev1-am-group-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                        <xml-property name="description" value="Group name defined in VIG for clients using aggressive mode"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                <xml-element java-attribute="ikev1AmPassword" name="ikev1-am-password" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Concurrency value"/>
+                        <xml-property name="description" value="pre-shared key for the above group name "/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-            </java-attributes>
-            <xml-properties>
-                <xml-property name="description" value="Openstack segmentation assignment."/>
-                <xml-property name="indexedProps" value="segmentation-id,data-owner,data-source,data-source-version"/>
-                <xml-property name="dependentOn" value="l3-network"/>
-                <xml-property name="container" value="segmentation-assignments"/>
-                <xml-property name="uriTemplate" value="/segmentation-assignments/segmentation-assignment/{segmentation-id}"/>
-            <xml-property name="requiredProps" value="segmentation-id"/>
-            </xml-properties>
-        </java-type>
-        <java-type name="ComposedResources">
-            <xml-properties>
-                <xml-property name="description" value="This object is used to store slices of services being offered"/>
-            </xml-properties>
-            <xml-root-element name="composed-resources"/>
-            <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="composedResource" name="composed-resource" type="inventory.aai.onap.org.v25.ComposedResource"/>
-            </java-attributes>
-        </java-type>
-
-        <java-type name="ComposedResource">
-            <xml-root-element name="composed-resource"/>
-            <java-attributes>
-                <xml-element java-attribute="id" name="id" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="ikev1SaLifetime" name="ikev1-sa-lifetime" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Composed Resource id UUID assigned to this instance."/>
+                        <xml-property name="description" value="Lifetime for IKEv1 SA"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="description" name="description" type="java.lang.String">
+                <xml-element java-attribute="ipsecAuthentication" name="ipsec-authentication" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The descriptive information assigned to this composed resource instance"/>
+                        <xml-property name="description" value="md5, sha1, sha256, sha384"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+                <xml-element java-attribute="ipsecEncryption" name="ipsec-encryption" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Link back to more information in the controller"/>
+                        <xml-property name="description" value="3des-cbc, des-cbc, aes-128-cbc,&#xC2;&#xA0;aes-192-cbc, aes-265-cbc"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                <xml-element java-attribute="ipsecSaLifetime" name="ipsec-sa-lifetime" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Concurrency value"/>
+                        <xml-property name="description" value="Life time for IPSec SA"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                <xml-element java-attribute="ipsecPfs" name="ipsec-pfs" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Orchestration status"/>
+                        <xml-property name="description" value="enable PFS or not"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
+                <xml-element java-attribute="xauthUserId" name="xauth-userid" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Indicator for whether the resource is considered operational"/>
+                        <xml-property name="description" value="user ID for xAuth, sm-user,ucpeHostName,nmteHostName"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="type" name="type" type="java.lang.String">
+                <xml-element java-attribute="xauthUserPassword" name="xauth-user-password" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Generic description of the type of composed resource."/>
+                        <xml-property name="description" value="Encrypted using the Juniper $9$ algorithm"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="role" name="role" type="java.lang.String">
+                <xml-element java-attribute="dpdInterval" name="dpd-interval" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="role in the network that this resource will be providing."/>
+                        <xml-property name="description" value="The time between DPD probe"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dpdFrequency" name="dpd-frequency" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Maximum number of DPD before claiming the tunnel is down"/>
                     </xml-properties>
                 </xml-element>
-        <xml-element java-attribute="composedResourceName" name="composed-resource-name" type="java.lang.String">
-          <xml-properties>
-            <xml-property name="description" value="Store the name of this composed-resource."/>
-          </xml-properties>
-        </xml-element>
-        <xml-element java-attribute="accessProviderId" name="access-provider-id" type="java.lang.String">
-          <xml-properties>
-            <xml-property name="description" value="Store the id of the access provider of this composed-resource."/>
-          </xml-properties>
-        </xml-element>
-        <xml-element java-attribute="accessClientId" name="access-client-id" type="java.lang.String">
-          <xml-properties>
-            <xml-property name="description" value="Store the id of the access client of this composed-resource."/>
-          </xml-properties>
-        </xml-element>
-        <xml-element java-attribute="accessTopologyId" name="access-topology-id" type="java.lang.String">
-          <xml-properties>
-            <xml-property name="description" value="Store the id of the access topology of this composed-resource."/>
-          </xml-properties>
-        </xml-element>
-        <xml-element java-attribute="accessNodeId" name="access-node-id" type="java.lang.String">
-          <xml-properties>
-            <xml-property name="description" value="Store the id of the access node of this composed-resource."/>
-          </xml-properties>
-        </xml-element>
-        <xml-element java-attribute="accessLtpId" name="access-ltp-id" type="java.lang.String">
-          <xml-properties>
-            <xml-property name="description" value="Store the id of the access ltp of this composed-resource."/>
-          </xml-properties>
-        </xml-element>
-        <xml-element java-attribute="cvlan" name="cvlan" type="java.lang.String">
-          <xml-properties>
-            <xml-property name="description" value="Store the cvlan of this composed-resource."/>
-          </xml-properties>
-        </xml-element>
-        <xml-element java-attribute="vpnName" name="vpn-name" type="java.lang.String">
-          <xml-properties>
-            <xml-property name="description" value="Store the vpn-name of this composed-resource."/>
-          </xml-properties>
-        </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
-            <xml-property name="ownerCheck" value="N/A"/>
+                                               <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-        <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-        <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
+                <xml-element java-attribute="vigServers" name="vig-servers" type="inventory.aai.onap.org.v25.VigServers"/>
             </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="IPSec configuration node will contain various configuration data for the NMTE VNF. This node will have an edge to the generic-vnf (vnf type = TE). Starting 1607, this data will be populated by SDN-C"/>
+                <xml-property name="indexedProps" value="ipsec-configuration-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="uniqueProps" value="ipsec-configuration-id"/>
+                <xml-property name="container" value="ipsec-configurations"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/ipsec-configurations/ipsec-configuration/{ipsec-configuration-id}"/>
+                <xml-property name="requiredProps" value="ipsec-configuration-id"/>
+            </xml-properties>
+        </java-type>
+
 
+        <java-type name="NotificationEvent">
+            <xml-root-element name="notification-event"/>
+            <java-attributes>
+                <xml-element java-attribute="cambriaPartition" name="cambria.partition" type="java.lang.String"/>
+                <xml-element java-attribute="eventHeader" name="event-header" type="inventory.aai.onap.org.v25.NotificationEventHeader"/>
+                <xml-any-element java-attribute="entity"/>
+            </java-attributes>
+        </java-type>
+        <java-type name="NotificationEventHeader">
+            <xml-root-element name="notification-event-header"/>
+            <java-attributes>
+                <xml-element java-attribute="id" name="id" type="java.lang.String"/>
+                <xml-element java-attribute="timestamp" name="timestamp" type="java.lang.String"/>
+                <xml-element java-attribute="sourceName" name="source-name" type="java.lang.String"/>
+                <xml-element java-attribute="domain" name="domain" type="java.lang.String"/>
+                <xml-element java-attribute="sequenceNumber" name="sequence-number" type="java.lang.String"/>
+                <xml-element java-attribute="severity" name="severity" type="java.lang.String"/>
+                <xml-element java-attribute="eventType" name="event-type" type="java.lang.String"/>
+                <xml-element java-attribute="version" name="version" type="java.lang.String"/>
+                <xml-element java-attribute="action" name="action" type="java.lang.String"/>
+                <xml-element java-attribute="entityType" name="entity-type" type="java.lang.String"/>
+                <xml-element java-attribute="topEntityType" name="top-entity-type" type="java.lang.String"/>
+                <xml-element java-attribute="entityLink" name="entity-link" type="java.lang.String"/>
+                <xml-element java-attribute="status" name="status" type="java.lang.String"/>
+            </java-attributes>
+        </java-type>
+        <java-type name="AaiInternal">
+            <xml-root-element name="aai-internal"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="reservedPropNames" name="reserved-prop-names" type="inventory.aai.onap.org.v25.ReservedPropNames"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="edgePropNames" name="edge-prop-names" type="inventory.aai.onap.org.v25.EdgePropNames"/>
+            </java-attributes>
+        </java-type>
+        <java-type name="ReservedPropNames">
             <xml-properties>
-                <xml-property name="description" value="Represents a resource that acts as a bridge between service-instance to define parent-child relationship"/>
-        <xml-property name="nameProps" value="description,composed-resource-name"/>
-        <xml-property name="indexedProps" value="id,type,role,composed-resource-name,access-provider-id,access-client-id,access-topology-id,access-node-id,access-ltp-id,vpn-name,orchestration-status,data-owner,data-source,data-source-version"/>
-                <xml-property name="dependentOn" value="service-instance"/>
-                <xml-property name="container" value="composed-resources"/>
-                <!--  <xml-property name="namespace" value="network" /> -->
-                <xml-property name="uriTemplate" value="/composed-resources/composed-resource/{id}"/>
-            <xml-property name="requiredProps" value="id"/>
+                <xml-property name="description" value="Internal map to define some reserved properties of a vertex"/>
+                <xml-property name="uniqueProps" value="aai-unique-key,aai-uri"/>
+                <xml-property name="indexedProps" value="aai-unique-key,source-of-truth,aai-node-type,aai-uri"/>
             </xml-properties>
+            <xml-root-element name="reserved-prop-names"/>
+            <java-attributes>
+                <xml-element java-attribute="lastModSourceOfTruth" name="last-mod-source-of-truth" type="java.lang.String"/>
+                <xml-element java-attribute="aaiNodeType" name="aai-node-type" type="java.lang.String"/>
+                <xml-element java-attribute="aaiCreatedTs" name="aai-created-ts" type="java.lang.Long"/>
+                <xml-element java-attribute="aaiUniqueKey" name="aai-unique-key" type="java.lang.String"/>
+                <xml-element java-attribute="aaiLastModTs" name="aai-last-mod-ts" type="java.lang.Long"/>
+                <xml-element java-attribute="sourceOfTruth" name="source-of-truth" type="java.lang.String"/>
+                <xml-element java-attribute="aaiUri" name="aai-uri" type="java.lang.String"/>
+            </java-attributes>
         </java-type>
-        <java-type name="AllottedResources">
+        <java-type name="EdgePropNames">
+            <!-- NOTE that the names of these properties are not consistent and are in mixed case and hyphen case for now -->
             <xml-properties>
-                <xml-property name="description" value="This object is used to store slices of services being offered"/>
+                <xml-property name="description" value="Internal map to define the properties of an edge and interpret the map EdgeRules"/>
+                <xml-property name="edgeInfo" value="aaiUuid,edgeLabel,direction,multiplicityRule,isParent,usesResource,hasDelTarget,SVC-INFRA,SVC-INFRA-REV"/>
+                <xml-property name="uniqueProps" value="aai-uuid"/>
+                <xml-property name="indexedProps" value="aai-uuid"/>
             </xml-properties>
-            <xml-root-element name="allotted-resources"/>
+            <xml-root-element name="edge-prop-names"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="allottedResource" name="allotted-resource" type="inventory.aai.onap.org.v25.AllottedResource"/>
+                <xml-element java-attribute="edgeLabel" name="edgeLabel" type="java.lang.String"/>
+                <xml-element java-attribute="direction" name="direction" type="java.lang.String"/>
+                <xml-element java-attribute="multiplicityRule" name="multiplicityRule" type="java.lang.String"/>
+                <xml-element java-attribute="containsOtherV" name="contains-other-v" type="java.lang.String"/>
+                <xml-element java-attribute="deleteOtherV" name="delete-other-v" type="java.lang.String"/>
+                <xml-element java-attribute="svcinfra" name="SVC-INFRA" type="java.lang.String"/>
+                <xml-element java-attribute="preventDelete" name="prevent-delete" type="java.lang.String"/>
+                <xml-element java-attribute="aaiUuid" name="aai-uuid" type="java.lang.String"/>
             </java-attributes>
         </java-type>
 
-        <java-type name="AllottedResource">
-            <xml-root-element name="allotted-resource"/>
+        <java-type name="Models">
+            <xml-properties>
+                <xml-property name="description" value="Collection of subgraph definitions provided by ASDC to describe the inventory assets and their connections related to ASDC models"/>
+            </xml-properties>
+            <xml-root-element name="models"/>
             <java-attributes>
-                <xml-element java-attribute="id" name="id" required="true" type="java.lang.String" xml-key="true">
+                <xml-element container-type="java.util.ArrayList" java-attribute="model" name="model" type="inventory.aai.onap.org.v25.Model"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Model">
+            <xml-root-element name="model"/>
+            <xml-properties>
+                <xml-property name="description" value="Subgraph definition provided by ASDC to describe an inventory asset and its connections related to ASDC models, independent of version"/>
+                <xml-property name="nameProps" value="model-type"/>
+                <xml-property name="indexedProps" value="model-invariant-id,model-type,data-owner,data-source,data-source-version"/>
+                <xml-property name="uniqueProps" value="model-invariant-id"/>
+                <xml-property name="container" value="models"/>
+                <xml-property name="namespace" value="service-design-and-creation"/>
+                <xml-property name="uriTemplate" value="/service-design-and-creation/models/model/{model-invariant-id}"/>
+                <xml-property name="requiredProps" value="model-invariant-id,model-type"/>
+            </xml-properties>
+            <java-attributes>
+                <xml-element java-attribute="modelInvariantId" name="model-invariant-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Allotted Resource id UUID assigned to this instance."/>
+                        <xml-property name="description" value="Unique identifier corresponding to the main definition of a model in ASDC"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="description" name="description" type="java.lang.String">
+                <xml-element java-attribute="modelType" name="model-type" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The descriptive information assigned to this allotted resource instance"/>
+                        <xml-property name="description" value="Type of the model, e.g., service, resource, widget, etc."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+                <xml-element java-attribute="modelRole" name="model-role"  type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Link back to more information in the controller"/>
+                        <xml-property name="description" value="Role of the model,e.g.,NST,NSST,CST,etc"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="the ASDC model id for this resource or service model."/>
-                        <xml-property name="visibility" value="deployment"/>
-                        <xml-property name="requires" value="model-version-id"/>
-                        <xml-property name="dbAlias" value="model-invariant-id-local"/>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                                               <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="the ASDC model version for this resource or service model."/>
-                        <xml-property name="visibility" value="deployment"/>
-                        <xml-property name="requires" value="model-invariant-id"/>
-                        <xml-property name="dbAlias" value="model-version-id-local"/>
-                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Concurrency value"/>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Orchestration status"/>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
+                <xml-element java-attribute="modelVers" name="model-vers" type="inventory.aai.onap.org.v25.ModelVers"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
+            </java-attributes>
+        </java-type>
+
+
+        <java-type name="ModelVers">
+            <xml-root-element name="model-vers"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="modelVer" name="model-ver" type="inventory.aai.onap.org.v25.ModelVer"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ModelVer">
+            <xml-root-element name="model-ver"/>
+            <xml-properties>
+                <xml-property name="description" value="Subgraph definition provided by ASDC to describe a specific version of an inventory asset and its connections related to ASDC models"/>
+                <xml-property name="nameProps" value="model-name"/>
+                <xml-property name="indexedProps" value="model-version-id,model-name,model-version,distribution-status,data-owner,data-source,data-source-version"/>
+                <xml-property name="uniqueProps" value="model-version-id"/>
+                <xml-property name="dependentOn" value="model"/>
+                <xml-property name="container" value="model-vers"/>
+                <xml-property name="uriTemplate" value="/model-vers/model-ver/{model-version-id}"/>
+                <xml-property name="requiredProps" value="model-version-id,model-name,model-version"/>
+            </xml-properties>
+            <java-attributes>
+                <xml-element java-attribute="modelVersionId" name="model-version-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Indicator for whether the resource is considered operational"/>
+                        <xml-property name="description" value="Unique identifier corresponding to one version of a model in ASDC"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="type" name="type" type="java.lang.String">
+                <xml-element java-attribute="modelName" name="model-name" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Generic description of the type of allotted resource."/>
+                        <xml-property name="description" value="Name of the model, which can change from version to version."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="role" name="role" type="java.lang.String">
+                <xml-element java-attribute="modelVersion" name="model-version" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="role in the network that this resource will be providing."/>
+                        <xml-property name="description" value="Version"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="allottedResourceName" name="allotted-resource-name" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the name of this allotted-resource."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="accessProviderId" name="access-provider-id" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the id of the access provider of this allotted-resource."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="accessClientId" name="access-client-id" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the id of the access client of this allotted-resource."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="accessTopologyId" name="access-topology-id" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the id of the access topology of this allotted-resource."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="accessNodeId" name="access-node-id" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the id of the access node of this allotted-resource."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="accessLtpId" name="access-ltp-id" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the id of the access ltp of this allotted-resource."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="cvlan" name="cvlan" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the cvlan of this allotted-resource."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="vpnName" name="vpn-name" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the vpn-name of this allotted-resource."/>
-                                       </xml-properties>
-                               </xml-element>
-                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                <xml-element java-attribute="distributionStatus" name="distribution-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
-                                               <xml-property name="ownerCheck" value="N/A"/>
+                        <xml-property name="description" value="Distribution Status"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="modelDescription" name="model-description" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                        <xml-property name="description" value="Description"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="sdncModelName" name="sdnc-model-name" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                        <xml-property name="description" value="The CDS blue print name associated with the resource."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="tunnelXconnects" name="tunnel-xconnects" type="inventory.aai.onap.org.v25.TunnelXconnects"/>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-            </java-attributes>
-
-            <xml-properties>
-                <xml-property name="description" value="Represents a slice or partial piece of a resource that gets separately allotted"/>
-                               <xml-property name="nameProps" value="description,allotted-resource-name"/>
-                               <xml-property name="indexedProps" value="id,model-invariant-id,model-version-id,type,role,allotted-resource-name,access-provider-id,access-client-id,access-topology-id,access-node-id,access-ltp-id,vpn-name,orchestration-status,data-owner,data-source,data-source-version"/>
-                <xml-property name="dependentOn" value="service-instance"/>
-                <xml-property name="container" value="allotted-resources"/>
-                <!--  <xml-property name="namespace" value="network" /> -->
-                <xml-property name="uriTemplate" value="/allotted-resources/allotted-resource/{id}"/>
-            <xml-property name="requiredProps" value="id"/>
-            </xml-properties>
-        </java-type>
-
-        <java-type name="TunnelXconnects">
-            <xml-properties>
-                <xml-property name="description" value="This object is used to store the specific tunnel cross connect aspects of an allotted resource"/>
-            </xml-properties>
-            <xml-root-element name="tunnel-xconnects"/>
-            <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="tunnelXconnect" name="tunnel-xconnect" type="inventory.aai.onap.org.v25.TunnelXconnect"/>
-            </java-attributes>
-        </java-type>
-
-        <java-type name="TunnelXconnect">
-            <xml-root-element name="tunnel-xconnect"/>
-            <java-attributes>
-                <xml-element java-attribute="id" name="id" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="sdncModelVersion" name="sdnc-model-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Allotted Resource id UUID assigned to this instance."/>
+                        <xml-property name="description" value="The version of the CDS blue print."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Concurrency value"/>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
+                <xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.onap.org.v25.ModelElements"/>
+                <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v25.Metadata"/>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
             </java-attributes>
-
-            <xml-properties>
-                <xml-property name="description" value="Represents the specifics of a tunnel cross connect piece of a resource that gets separately allotted"/>
-                <xml-property name="indexedProps" value="id,data-owner,data-source,data-source-version"/>
-                <xml-property name="dependentOn" value="allotted-resource"/>
-                <xml-property name="container" value="tunnel-xconnects"/>
-                <!--  <xml-property name="namespace" value="network" /> -->
-                <xml-property name="uriTemplate" value="/tunnel-xconnects/tunnel-xconnect/{id}"/>
-            <xml-property name="requiredProps" value="id"/>
-            </xml-properties>
         </java-type>
 
-        <java-type name="BgpGroups">
-            <xml-root-element name="bgp-groups"/>
+        <java-type name="ModelElements">
+            <xml-root-element name="model-elements"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="bgpGroup" name="bgp-group" type="inventory.aai.onap.org.v25.BgpGroup"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="modelElement" name="model-element" type="inventory.aai.onap.org.v25.ModelElement"/>
             </java-attributes>
-            <xml-properties>
-            </xml-properties>
         </java-type>
 
-        <java-type name="BgpGroup">
-            <xml-root-element name="bgp-group"/>
+        <java-type name="ModelElement">
+            <xml-properties>
+                <xml-property name="description" value="Defines how other models combine to make up a higher-level model."/>
+                <xml-property name="uniqueProps" value="model-element-uuid"/>
+                <xml-property name="indexedProps" value="model-element-uuid,data-owner,data-source,data-source-version"/>
+                <xml-property name="allowDirectRead" value="true"/>
+                <xml-property name="dependentOn" value="element-choice-set,model-element,model-ver"/>
+                <xml-property name="allowDirectWrite" value="false"/>
+                <xml-property name="container" value="model-elements"/>
+                <xml-property name="uriTemplate" value="/model-elements/model-element/{model-element-uuid}"/>
+                <xml-property name="requiredProps" value="model-element-uuid,new-data-del-flag,cardinality"/>
+            </xml-properties>
+            <xml-root-element name="model-element"/>
             <java-attributes>
-                <xml-element java-attribute="bgpGroupId" name="bgp-group-id" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="modelElementUuid" name="model-element-uuid" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="UUID."/>
+                        <xml-property name="autoGenerateUuid" value="true"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="bgpGroupName" name="bgp-group-name" required="true" type="java.lang.String">
+                <xml-element java-attribute="newDataDelFlag" name="new-data-del-flag" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="name of bgp-group"/>
+                        <xml-property name="description" value="Indicates whether this element was created as part of instantiation from this model"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="bgpGroupType" name="bgp-group-type" type="java.lang.String">
+                <xml-element java-attribute="cardinality" name="cardinality" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="type of bgp-group"/>
+                        <xml-property name="description" value="How many of this type of element are required/allowed"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="bgpGroupRole" name="bgp-group-role" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="role of bgp-group"/>
-                    </xml-properties>
+                <xml-element container-type="java.util.ArrayList" java-attribute="linkagePoints" name="linkage-points" type="java.lang.String">
                 </xml-element>
-                                <xml-element java-attribute="bgpGroupFunction" name="bgp-group-function" type="java.lang.String">
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="function of bgp-group"/>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="localAs" name="local-as" type="java.lang.Integer">
+                <xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.onap.org.v25.ModelElements">
                     <xml-properties>
-                        <xml-property name="description" value="local a-s number type of vrf (bridge-domain as an example)"/>
+                        <xml-property name="description" value="Defines how other models combine to make up a higher-level model"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="localAddress" name="local-address" type="java.lang.String">
+                <xml-element java-attribute="modelConstraints" name="model-constraints" type="inventory.aai.onap.org.v25.ModelConstraints">
                     <xml-properties>
-                        <xml-property name="description" value="local address"/>
+                        <xml-property name="description" value="Describes new constraints on this model element that are not part of that model's definition"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="peerAs" name="peer-as" type="java.lang.Integer">
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="peer a-s number"/>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                                               <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="peerAddress" name="peer-address" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="peer address"/>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="description" name="description" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="description of bgp-group"/>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="opsNote" name="ops-note" type="java.lang.String">
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ModelConstraints">
+            <xml-root-element name="model-constraints"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="modelConstraint" name="model-constraint" type="inventory.aai.onap.org.v25.ModelConstraint"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ModelConstraint">
+            <xml-properties>
+                <xml-property name="description" value="This is how we would capture constraints defining allowed sets of elements."/>
+                <xml-property name="uniqueProps" value="model-constraint-uuid"/>
+                <xml-property name="indexedProps" value="model-constraint-uuid,data-owner,data-source,data-source-version"/>
+                <xml-property name="allowDirectRead" value="true"/>
+                <xml-property name="allowDirectWrite" value="false"/>
+                <xml-property name="dependentOn" value="model-element"/>
+                <xml-property name="container" value="model-constraints"/>
+                <xml-property name="uriTemplate" value="/model-constraints/model-constraint/{model-constraint-uuid}"/>
+                <xml-property name="requiredProps" value="model-constraint-uuid,constrained-element-set-uuid-to-replace"/>
+            </xml-properties>
+            <xml-root-element name="model-constraint"/>
+            <java-attributes>
+                <xml-element java-attribute="modelConstraintUuid" name="model-constraint-uuid" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Notes to aid OPs in troubleshooting, such as attribute aliases or additional descriptions/instructions about an object."/>
+                        <xml-property name="autoGenerateUuid" value="true"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
+                <xml-element java-attribute="constrainedElementSetUuidToReplace" name="constrained-element-set-uuid-to-replace" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="constrainedElementSets" name="constrained-element-sets" type="inventory.aai.onap.org.v25.ConstrainedElementSets"/>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="addressFamilies" name="address-families" type="inventory.aai.onap.org.v25.AddressFamilies"/>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
             </java-attributes>
-            <xml-properties>
-                <xml-property name="description" value="Definition of bgp-group"/>
-                <xml-property name="indexedProps" value="bgp-group-id,data-owner,data-source,data-source-version"/>
-                <xml-property name="dependentOn" value="pnf,vrf,generic-vnf"/>
-                <xml-property name="nameProps" value="bgp-group-id,bgp-group-name"/>
-                <xml-property name="container" value="bgp-groups"/>
-                <xml-property name="uriTemplate" value="/bgp-groups/bgp-group/{bgp-group-id}"/>
-                <xml-property name="requiredProps" value="bgp-group-id,bgp-group-name"/>
-            </xml-properties>
         </java-type>
 
-        <java-type name="BgpNeighbors">
-            <xml-root-element name="bgp-neighbors"/>
+        <java-type name="ConstrainedElementSets">
+            <xml-root-element name="constrained-element-sets"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="bgpNeighbor" name="bgp-neighbor" type="inventory.aai.onap.org.v25.BgpNeighbor"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="constrainedElementSet" name="constrained-element-set" type="inventory.aai.onap.org.v25.ConstrainedElementSet"/>
             </java-attributes>
-            <xml-properties>
-            </xml-properties>
         </java-type>
 
-        <java-type name="BgpNeighbor">
-            <xml-root-element name="bgp-neighbor"/>
+        <java-type name="ConstrainedElementSet">
+            <xml-properties>
+                <xml-property name="description" value="This is how we would capture constraints defining allowed sets of elements."/>
+                <xml-property name="uniqueProps" value="constrained-element-set-uuid"/>
+                <xml-property name="indexedProps" value="constrained-element-set-uuid,data-owner,data-source,data-source-version"/>
+                <xml-property name="allowDirectRead" value="true"/>
+                <xml-property name="allowDirectWrite" value="false"/>
+                <xml-property name="dependentOn" value="model-constraint,model-element"/>
+                <xml-property name="container" value="constrained-element-sets"/>
+                <xml-property name="uriTemplate" value="/constrained-element-sets/constrained-element-set/{constrained-element-set-uuid}"/>
+                <xml-property name="requiredProps" value="constrained-element-set-uuid,constraint-type,check-type"/>
+            </xml-properties>
+            <xml-root-element name="constrained-element-set"/>
             <java-attributes>
-                <xml-element java-attribute="bgpNeighborId" name="bgp-neighbor-id" required="true" type="java.lang.String" xml-key="true">
-                    <xml-properties>
-                        <xml-property name="description" value="UUID."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="bgpNeighborType" name="bgp-neighbor-type" required="true" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="name of bgp-group"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="bgpNeighborRole" name="bgp-neighbor-role" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="type of bgp-group"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="bgpNeighborFunction" name="bgp-neighbor-function" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="role of bgp-group"/>
-                    </xml-properties>
-                </xml-element>
-                               <xml-element java-attribute="localAs" name="local-as" type="java.lang.Integer">
-                    <xml-properties>
-                        <xml-property name="description" value="local a-s number type of vrf (bridge-domain as an example)"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="localAddress" name="local-address" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="local address"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="peerAs" name="peer-as" type="java.lang.Integer">
-                    <xml-properties>
-                        <xml-property name="description" value="peer a-s number"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="peerAddress" name="peer-address" type="java.lang.String">
+                <xml-element java-attribute="constrainedElementSetUuid" name="constrained-element-set-uuid" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="peer address"/>
+                        <xml-property name="autoGenerateUuid" value="true"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="description" name="description" type="java.lang.String">
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="description of bgp-group"/>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                                               <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="opsNote" name="ops-note" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Notes to aid OPs in troubleshooting, such as attribute aliases or additional descriptions/instructions about an object."/>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="provisioning status. Valid values [PREPROV/NVTPROV/PROV]."/>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="peerHostname" name="peer-hostname" type="java.lang.String">
+                <xml-element java-attribute="constraintType" name="constraint-type" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="checkType" name="check-type" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"/>
+                <xml-element java-attribute="elementChoiceSets" name="element-choice-sets" type="inventory.aai.onap.org.v25.ElementChoiceSets"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ElementChoiceSets">
+            <xml-root-element name="element-choice-sets"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="elementChoiceSet" name="element-choice-set" type="inventory.aai.onap.org.v25.ElementChoiceSet"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ElementChoiceSet">
+            <xml-properties>
+                <xml-property name="description" value="This is how we would capture constraints defining allowed sets of elements."/>
+                <xml-property name="uniqueProps" value="element-choice-set-uuid"/>
+                <xml-property name="indexedProps" value="element-choice-set-uuid,data-owner,data-source,data-source-version"/>
+                <xml-property name="allowDirectRead" value="true"/>
+                <xml-property name="allowDirectWrite" value="false"/>
+                <xml-property name="dependentOn" value="constrained-element-set"/>
+                <xml-property name="container" value="element-choice-sets"/>
+                <xml-property name="uriTemplate" value="/element-choice-sets/element-choice-set/{element-choice-set-uuid}"/>
+                <xml-property name="requiredProps" value="element-choice-set-uuid,element-choice-set-name"/>
+            </xml-properties>
+            <xml-root-element name="element-choice-set"/>
+            <java-attributes>
+                <xml-element java-attribute="elementChoiceSetUuid" name="element-choice-set-uuid" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="hostname of the peer"/>
+                        <xml-property name="autoGenerateUuid" value="true"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
-                    </xml-properties>
-                </xml-element>
+                <xml-element java-attribute="elementChoiceSetName" name="element-choice-set-name" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="cardinality" name="cardinality" type="java.lang.String"/>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"/>
+                <xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.onap.org.v25.ModelElements"/>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-                <xml-element java-attribute="addressFamilies" name="address-families" type="inventory.aai.onap.org.v25.AddressFamilies"/>
             </java-attributes>
-            <xml-properties>
-                <xml-property name="description" value="Definition of bgp-neighbor"/>
-                <xml-property name="indexedProps" value="bgp-neighbor-id,data-owner,data-source,data-source-version,prov-status"/>
-                <xml-property name="dependentOn" value="pnf,vrf,subnet,generic-vnf"/>
-                <xml-property name="nameProps" value="bgp-neighbor-id"/>
-                <xml-property name="container" value="bgp-neighbors"/>
-                <xml-property name="uriTemplate" value="/bgp-neighbors/bgp-neighbor/{bgp-neighbor-id}"/>
-                <xml-property name="requiredProps" value="bgp-neighbor-id,bgp-neighbor-type"/>
-            </xml-properties>
         </java-type>
 
-        <java-type name="AddressFamilies">
-            <xml-root-element name="address-families"/>
+        <java-type name="NamedQueries">
+            <xml-root-element name="named-queries"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="addressFamily" name="address-family" type="inventory.aai.onap.org.v25.AddressFamily"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="namedQuery" name="named-query" type="inventory.aai.onap.org.v25.NamedQuery"/>
             </java-attributes>
+        </java-type>
+
+        <java-type name="NamedQuery">
             <xml-properties>
+                <xml-property name="description" value="TBD"/>
+                <xml-property name="nameProps" value="named-query-name"/>
+                <xml-property name="uniqueProps" value="named-query-uuid"/>
+                <xml-property name="indexedProps" value="named-query-uuid,named-query-name"/>
+                <xml-property name="container" value="named-queries"/>
+                <xml-property name="namespace" value="service-design-and-creation"/>
+                <xml-property name="requiredProps" value="named-query-uuid,named-query-name,named-query-version"/>
+                <xml-property name="uriTemplate" value="/service-design-and-creation/named-queries/named-query/{named-query-uuid}"/>
             </xml-properties>
+            <xml-root-element name="named-query"/>
+            <java-attributes>
+                <xml-element java-attribute="namedQueryUuid" name="named-query-uuid" required="true" type="java.lang.String" xml-key="true"/>
+                <xml-element java-attribute="namedQueryName" name="named-query-name" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="namedQueryVersion" name="named-query-version" required="true" type="java.lang.String"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="requiredInputParams" name="required-input-param" type="java.lang.String">
+                    <xml-element-wrapper name="required-input-params"/>
+                </xml-element>
+                <xml-element java-attribute="description" name="description" type="java.lang.String"/>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"/>
+                <xml-element java-attribute="namedQueryElements" name="named-query-elements" type="inventory.aai.onap.org.v25.NamedQueryElements"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
+            </java-attributes>
         </java-type>
 
-        <java-type name="AddressFamily">
-            <xml-root-element name="address-family"/>
+        <java-type name="NamedQueryElements">
+            <xml-root-element name="named-query-elements"/>
             <java-attributes>
-                <xml-element java-attribute="addressFamilyId" name="address-family-id" required="true" type="java.lang.String" xml-key="true">
-                    <xml-properties>
-                        <xml-property name="description" value="address family UUID."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="afType" name="af-type" required="true" type="java.lang.String">
+                <xml-element container-type="java.util.ArrayList" java-attribute="namedQueryElement" name="named-query-element" type="inventory.aai.onap.org.v25.NamedQueryElement"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="NamedQueryElement">
+            <xml-properties>
+                <xml-property name="description" value="TBD"/>
+                <xml-property name="uniqueProps" value="named-query-element-uuid"/>
+                <xml-property name="indexedProps" value="named-query-element-uuid"/>
+                <xml-property name="allowDirectRead" value="true"/>
+                <xml-property name="allowDirectWrite" value="false"/>
+                <xml-property name="dependentOn" value="named-query,named-query-element"/>
+                <xml-property name="container" value="named-query-elements"/>
+                <xml-property name="requiredProps" value="named-query-element-uuid"/>
+                <xml-property name="uriTemplate" value="/named-query-elements/named-query-element/{named-query-element-uuid}"/>
+            </xml-properties>
+            <xml-root-element name="named-query-element"/>
+            <java-attributes>
+                <xml-element java-attribute="namedQueryElementUuid" name="named-query-element-uuid" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="address family type (aka afi)"/>
+                        <xml-property name="autoGenerateUuid" value="true"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="afSubtype" name="af-subtype" type="java.lang.String">
+                <xml-element container-type="java.util.ArrayList" java-attribute="propertyCollectList" name="property-collect-list" type="java.lang.String"/>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"/>
+                <xml-element java-attribute="propertyLimitDesc" name="property-limit-desc" type="java.lang.String"/>
+                <xml-element java-attribute="doNotOutput" name="do-not-output" type="java.lang.String"/>
+                <xml-element java-attribute="namedQueryElements" name="named-query-elements" type="inventory.aai.onap.org.v25.NamedQueryElements"/>
+                <xml-element java-attribute="relatedLookups" name="related-lookups" type="inventory.aai.onap.org.v25.RelatedLookups"/>
+                <xml-element java-attribute="propertyConstraints" name="property-constraints" type="inventory.aai.onap.org.v25.PropertyConstraints"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="RelatedLookups">
+            <xml-root-element name="related-lookups"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="relatedLookup" name="related-lookup" type="inventory.aai.onap.org.v25.RelatedLookup"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="RelatedLookup">
+            <xml-properties>
+                <xml-property name="description" value="TBD"/>
+                <xml-property name="uniqueProps" value="related-lookup-uuid"/>
+                <xml-property name="indexedProps" value="related-lookup-uuid"/>
+                <xml-property name="allowDirectRead" value="true"/>
+                <xml-property name="allowDirectWrite" value="false"/>
+                <xml-property name="dependentOn" value="named-query-element"/>
+                <xml-property name="container" value="related-lookups"/>
+                <xml-property name="requiredProps" value="related-lookup-uuid,source-node-type,source-node-property,target-node-type,target-node-property"/>
+                <xml-property name="uriTemplate" value="/related-lookups/related-lookup/{related-lookup-uuid}"/>
+            </xml-properties>
+            <xml-root-element name="related-lookup"/>
+            <java-attributes>
+                <xml-element java-attribute="relatedLookupUuid" name="related-lookup-uuid" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="address family subtype (aka safi)"/>
+                        <xml-property name="autoGenerateUuid" value="true"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="afRole" name="af-role" type="java.lang.String">
+                <xml-element java-attribute="sourceNodeType" name="source-node-type" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="sourceNodeProperty" name="source-node-property" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="targetNodeType" name="target-node-type" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="targetNodeProperty" name="target-node-property" required="true" type="java.lang.String"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="propertyCollectList" name="property-collect-list" type="java.lang.String"/>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="PropertyConstraints">
+            <xml-root-element name="property-constraints"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="propertyConstraint" name="property-constraint" type="inventory.aai.onap.org.v25.PropertyConstraint"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="PropertyConstraint">
+            <xml-properties>
+                <xml-property name="description" value="TBD"/>
+                <xml-property name="uniqueProps" value="property-constraint-uuid"/>
+                <xml-property name="indexedProps" value="property-constraint-uuid"/>
+                <xml-property name="allowDirectRead" value="true"/>
+                <xml-property name="allowDirectWrite" value="false"/>
+                <xml-property name="dependentOn" value="named-query-element"/>
+                <xml-property name="container" value="property-constraints"/>
+                <xml-property name="requiredProps" value="property-constraint-uuid,constraint-type,property-name,property-value"/>
+                <xml-property name="uriTemplate" value="/property-constraints/property-constraint/{property-constraint-uuid}"/>
+            </xml-properties>
+            <xml-root-element name="property-constraint"/>
+            <java-attributes>
+                <xml-element java-attribute="propertyConstraintUuid" name="property-constraint-uuid" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="role of address-family"/>
+                        <xml-property name="autoGenerateUuid" value="true"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="afFunction" name="af-function" type="java.lang.String">
+                <xml-element java-attribute="constraintType" name="constraint-type" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="propertyName" name="property-name" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="propertyValue" name="property-value" required="true" type="java.lang.String"/>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ModelAndNamedQuerySearch">
+            <xml-properties>
+                <xml-property name="description" value="ModelAndNamedQuerySearch holds query-parameters and instance-properties for performing a named-query or model query"/>
+            </xml-properties>
+            <xml-root-element name="model-and-named-query-search"/>
+            <java-attributes>
+                <xml-element java-attribute="queryParameters" name="query-parameters" type="inventory.aai.onap.org.v25.QueryParameters"/>
+                <xml-element java-attribute="instanceFilters" name="instance-filters" type="inventory.aai.onap.org.v25.InstanceFilters"/>
+                <xml-element java-attribute="secondaryFilts" name="secondary-filts" type="inventory.aai.onap.org.v25.SecondaryFilts"/>
+                <xml-element java-attribute="topNodeType" name="top-node-type" type="java.lang.String"/>
+                <xml-element java-attribute="secondaryFilterCutPoint" name="secondary-filter-cut-point" type="java.lang.String"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="QueryParameters">
+            <xml-properties>
+                <xml-property name="description" value="QueryParameters for performing a named-query or model query"/>
+            </xml-properties>
+            <xml-root-element name="query-parameters"/>
+            <java-attributes>
+                <xml-element java-attribute="namedQuery" name="named-query" type="inventory.aai.onap.org.v25.NamedQuery"/>
+                <xml-element java-attribute="model" name="model" type="inventory.aai.onap.org.v25.OverloadedModel"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="OverloadedModel">
+            <xml-root-element name="overloaded-model"/>
+            <xml-properties>
+                <xml-property name="description" value="Allows for legacy POST of old-style and new-style models"/>
+                <xml-property name="indexedProps" value="model-name"/>
+                <xml-property name="requiredProps" value="model-invariant-id,model-name-version-id,model-type,model-name,model-id,model-version"/>
+            </xml-properties>
+            <java-attributes>
+                <xml-element java-attribute="modelInvariantId" name="model-invariant-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="function of address-family"/>
+                        <xml-property name="description" value="Unique identifier corresponding to the main definition of a model in ASDC"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="maxPrefixV4" name="max-prefix-v4" type="java.lang.Integer">
+                <xml-element java-attribute="modelNameVersionId" name="model-name-version-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Max prefix for IPv4"/>
+                        <xml-property name="description" value="Unique identifier corresponding to one version of a model in ASDC"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="maxPrefixV6" name="max-prefix-v6" type="java.lang.Integer">
+                <xml-element java-attribute="modelType" name="model-type" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Max prefix for IPv6"/>
+                        <xml-property name="description" value="Type of the model, e.g., service, resource, widget, etc."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="maxPrefixThreshold" name="max-prefix-threshold" type="java.lang.Integer">
+                <xml-element java-attribute="modelName" name="model-name" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Max prefix threshold"/>
+                        <xml-property name="description" value="Name of the model, which can change from version to version."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                <xml-element java-attribute="modelId" name="model-id" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
-                                               <xml-property name="ownerCheck" value="N/A"/>
+                        <xml-property name="description" value="Invariant unique ID which does not change from version to version"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="modelVersion" name="model-version" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                        <xml-property name="description" value="Version"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="modelDescription" name="model-description" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                        <xml-property name="description" value="Description"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
+                <xml-element java-attribute="modelVers" name="model-vers" type="inventory.aai.onap.org.v25.ModelVers"/>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
             </java-attributes>
+        </java-type>
+
+        <java-type name="InstanceFilters">
             <xml-properties>
-                <xml-property name="description" value="Definition of address family"/>
-                <xml-property name="indexedProps" value="address-family-id,af-type,data-owner,data-source,data-source-version"/>
-                <xml-property name="nameProps" value="address-family-id,af-type"/>
-                <xml-property name="dependentOn" value="bgp-group,bgp-neighbor"/>
-                <xml-property name="container" value="address-families"/>
-                <xml-property name="uriTemplate" value="/address-families/address-family/{address-family-id}"/>
-                <xml-property name="requiredProps" value="address-family-id,af-type"/>
+                <xml-property name="description" value="InstanceFilters for performing a named-query or model query"/>
             </xml-properties>
+            <xml-root-element name="instance-filters"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="instanceFilter" name="instance-filter" type="inventory.aai.onap.org.v25.InstanceFilter"/>
+            </java-attributes>
         </java-type>
 
-        <java-type name="Entitlements">
+        <java-type name="InstanceFilter">
             <xml-properties>
-                <xml-property name="description" value="Entitlements, keyed by group-uuid and resource-uuid, related to license management"/>
+                <xml-property name="description" value="InstanceFilter for performing a named-query or model query"/>
+                <xml-property name="container" value="instance-filters"/>
             </xml-properties>
-            <xml-root-element name="entitlements"/>
+            <xml-root-element name="instance-filter"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="entitlement" name="entitlement" type="inventory.aai.onap.org.v25.Entitlement"/>
+                <xml-any-element container-type="java.util.ArrayList" java-attribute="any" lax="true" name="any"/>
             </java-attributes>
         </java-type>
 
-        <java-type name="Entitlement">
-            <xml-root-element name="entitlement"/>
+        <java-type name="SecondaryFilts">
+            <xml-properties>
+                <xml-property name="description" value="SecondaryFilts for performing a named-query or model query"/>
+            </xml-properties>
+            <xml-root-element name="secondary-filts"/>
             <java-attributes>
-                <xml-element java-attribute="groupUuid" name="group-uuid" required="true" type="java.lang.String" xml-key="true">
-                    <xml-properties>
-                        <xml-property name="description" value="Unique ID for the entitlement group the resource comes from, should be uuid."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="resourceUuid" name="resource-uuid" required="true" type="java.lang.String" xml-key="true">
-                    <xml-properties>
-                        <xml-property name="description" value="Unique ID of an entitlement resource. "/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
-                                               <xml-property name="ownerCheck" value="N/A"/>
-                    </xml-properties>
-                </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="Identifies the upstream source of the data."/>
-                    </xml-properties>
-                </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="Identifies the version of the upstream source."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="Concurrency value"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilt" name="secondary-filt" type="inventory.aai.onap.org.v25.SecondaryFilt"/>
             </java-attributes>
+        </java-type>
+
+        <java-type name="SecondaryFilt">
             <xml-properties>
-                <xml-property name="description" value="Metadata for entitlement group."/>
-                <xml-property name="indexedProps" value="group-uuid,resource-uuid,data-owner,data-source,data-source-version"/>
-                <xml-property name="dependentOn" value="generic-vnf,vce"/>
-                <xml-property name="container" value="entitlements"/>
-                <xml-property name="uriTemplate" value="/entitlements/entitlement/{group-uuid}/{resource-uuid}"/>
-            <xml-property name="requiredProps" value="group-uuid,resource-uuid"/>
+                <xml-property name="description" value="SecondaryFilt for performing a named-query or model query"/>
             </xml-properties>
+            <xml-root-element name="secondary-filt"/>
+            <java-attributes>
+                <xml-any-element container-type="java.util.ArrayList" java-attribute="any" lax="true" name="any"/>
+            </java-attributes>
         </java-type>
 
+        <java-type name="Properties">
+            <xml-properties>
+                <xml-property name="description" value="Property holder for query properties or instance properties"/>
+            </xml-properties>
+            <xml-root-element name="properties"/>
+            <java-attributes>
+                <xml-element java-attribute="propertyName" name="property-name" type="java.lang.String"/>
+                <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String"/>
+            </java-attributes>
+        </java-type>
 
-        <java-type name="Licenses">
+        <java-type name="ResponseList">
             <xml-properties>
-                <xml-property name="description" value="Licenses to be allocated across resources, keyed by group-uuid and resource-uuid, related to license management"/>
+                <xml-property name="description" value="Response container for the results of a named-query or model query"/>
             </xml-properties>
-            <xml-root-element name="licenses"/>
+            <xml-root-element name="response-list"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="license" name="license" type="inventory.aai.onap.org.v25.License"/>
+                <xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.onap.org.v25.InventoryResponseItems"/>
             </java-attributes>
         </java-type>
 
-        <java-type name="License">
-            <xml-root-element name="license"/>
+        <java-type name="InventoryResponseItems">
+            <xml-properties>
+                <xml-property name="description" value="Container for inventory items in response list"/>
+                <xml-property name="container" value="response-list"/>
+            </xml-properties>
+            <xml-root-element name="inventory-response-items"/>
             <java-attributes>
-                <xml-element java-attribute="groupUuid" name="group-uuid" required="true" type="java.lang.String" xml-key="true">
-                    <xml-properties>
-                        <xml-property name="description" value="Unique ID for the license group the resource belongs to, should be uuid."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="resourceUuid" name="resource-uuid" required="true" type="java.lang.String" xml-key="true">
-                    <xml-properties>
-                        <xml-property name="description" value="Unique ID of a license resource. "/>
-                    </xml-properties>
-                </xml-element>
-                               <xml-element java-attribute="projectNumber" name="project-number" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="Used to store CFAS or other project numbers."/>
-                    </xml-properties>
-                </xml-element>
-                               <xml-element java-attribute="orderNumber" name="order-number" type="java.lang.String">
+                <xml-element container-type="java.util.ArrayList" java-attribute="inventoryResponseItem" name="inventory-response-item" type="inventory.aai.onap.org.v25.InventoryResponseItem"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="InventoryResponseItem">
+            <xml-properties>
+                <xml-property name="description" value="Inventory item for response list"/>
+                <xml-property name="container" value="inventory-response-items"/>
+            </xml-properties>
+            <xml-root-element name="inventory-response-item"/>
+            <java-attributes>
+                <xml-element java-attribute="modelName" name="model-name" type="java.lang.String"/>
+                <xml-any-element java-attribute="item"/>
+                <xml-element java-attribute="extraProperties" name="extra-properties" type="inventory.aai.onap.org.v25.ExtraProperties"/>
+                <xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.onap.org.v25.InventoryResponseItems"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ExtraProperties">
+            <xml-properties>
+                <xml-property name="description" value="Extra properties for inventory item for response list"/>
+            </xml-properties>
+            <xml-root-element name="extra-properties"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="extraProperty" name="extra-property" type="inventory.aai.onap.org.v25.ExtraProperty"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ExtraProperty">
+            <xml-root-element name="extra-property"/>
+            <java-attributes>
+                <xml-element java-attribute="propertyName" name="property-name" type="java.lang.String"/>
+                <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="RouteTableReferences">
+            <xml-properties>
+                <xml-property name="description" value="Collection of openstack route table references"/>
+            </xml-properties>
+            <xml-root-element name="route-table-references"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="routeTableReference" name="route-table-reference" type="inventory.aai.onap.org.v25.RouteTableReference"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="RouteTableReference">
+            <xml-root-element name="route-table-reference"/>
+            <java-attributes>
+                <xml-element java-attribute="routeTableReferenceId" name="route-table-reference-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Order number."/>
+                        <xml-property name="description" value="Route Table Reference id, UUID assigned to this instance."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="receiptDate" name="receipt-date" type="java.lang.String">
+                <xml-element java-attribute="routeTableReferenceFqdn" name="route-table-reference-fqdn" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Date of receipt."/>
+                        <xml-property name="description" value="FQDN entry in the route table."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
             </java-attributes>
-            <xml-properties>
-                <xml-property name="description" value="Metadata for license group."/>
-                <xml-property name="indexedProps" value="group-uuid,resource-uuid,project-number,order-number,receipt-date,data-owner,data-source,data-source-version"/>
-                <xml-property name="dependentOn" value="chassis,generic-vnf,vce"/>
-                <xml-property name="container" value="licenses"/>
-                <xml-property name="uriTemplate" value="/licenses/license/{group-uuid}/{resource-uuid}"/>
-            <xml-property name="requiredProps" value="group-uuid,resource-uuid"/>
-            </xml-properties>
-        </java-type>
 
-        <java-type name="Vnf">
-            <xml-root-element name="vnf"/>
-            <java-attributes>
-                <xml-element java-attribute="vnfId" name="vnf-id" required="true" type="java.lang.String" xml-key="true">
-                    <xml-properties>
-                        <xml-property name="description" value="Unique id of VNF.  This is unique across the graph."/>
-                    </xml-properties>
-                </xml-element>
-            </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Abstract vnf class"/>
-                <xml-property name="indexedProps" value="vnf-id"/>
-                <xml-property name="uniqueProps" value="vnf-id"/>
-                <xml-property name="inheritors" value="vce,generic-vnf"/>
-                <xml-property name="abstract" value="true"/>
-            <xml-property name="requiredProps" value="vnf-id"/>
+                <xml-property name="description" value="Openstack route table reference."/>
+                <xml-property name="nameProps" value="route-table-reference-fqdn"/>
+                <xml-property name="uniqueProps" value="route-table-reference-id"/>
+                <xml-property name="indexedProps" value="route-table-reference-id,route-table-reference-fqdn,data-owner,data-source,data-source-version"/>
+                <xml-property name="container" value="route-table-references"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/route-table-references/route-table-reference/{route-table-reference-id}"/>
+                <xml-property name="requiredProps" value="route-table-reference-id,route-table-reference-fqdn"/>
             </xml-properties>
         </java-type>
 
-        <java-type name="Zones">
+        <java-type name="InstanceGroups">
             <xml-properties>
-                <xml-property name="description" value="Collection of zones"/>
+                <xml-property name="description" value="Collection of openstack route table references"/>
             </xml-properties>
-            <xml-root-element name="zones"/>
+            <xml-root-element name="instance-groups"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="zone" name="zone" type="inventory.aai.onap.org.v25.Zone"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="instanceGroup" name="instance-group" type="inventory.aai.onap.org.v25.InstanceGroup"/>
             </java-attributes>
         </java-type>
 
-        <java-type name="Zone">
-            <xml-root-element name="zone"/>
+        <java-type name="InstanceGroup">
+            <xml-root-element name="instance-group"/>
             <java-attributes>
-                <xml-element java-attribute="zoneId" name="zone-id" required="true" type="java.lang.String" xml-key="true">
+
+                <xml-element java-attribute="id" name="id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Code assigned by AIC to the zone"/>
+                        <xml-property name="description" value="Instance Group ID, UUID assigned to this instance."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="zoneName" name="zone-name" required="true" type="java.lang.String">
+
+                <xml-element java-attribute="instanceGroupRole" name="instance-group-role" required="false" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="English name associated with the zone"/>
+                        <xml-property name="description" value="role of the instance group."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="zoneType" name="zone-type" type="java.lang.String">
+
+                <xml-element java-attribute="modelInvariantId" name="model-invariant-id" required="false" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The type of zone (ex. AIC or NC)."/>
+                        <xml-property name="description" value="ASDC model id for this resource or service model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-version-id"/>
+                        <xml-property name="dbAlias" value="model-invariant-id-local"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="designType" name="design-type" required="true" type="java.lang.String">
+
+                <xml-element java-attribute="modelVersionId" name="model-version-id" required="false" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Design of zone [Medium/Large&#x2026;]"/>
+                        <xml-property name="description" value="ASDC model version uid for this resource model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="zoneContext" name="zone-context" required="true" type="java.lang.String">
+                <xml-element java-attribute="description" name="description" required="false" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Context of zone [production/test]"/>
+                        <xml-property name="description" value="Descriptive text to help identify the usage of this instance-group"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="status" name="status" type="java.lang.String">
+                <xml-element java-attribute="instanceGroupType" name="instance-group-type" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Status of a zone."/>
+                        <xml-property name="description" value="Only valid value today is lower case ha for high availability"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="zoneRole" name="zone-role" type="java.lang.String">
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Role of a zone."/>
+                        <xml-property name="description" value="Concurrency value"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="zoneFunction" name="zone-function" type="java.lang.String">
+
+                <xml-element java-attribute="instanceGroupName" name="instance-group-name" required="false" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Function of a zone."/>
+                        <xml-property name="description" value="Instance-Group Name."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="zoneNumber" name="zone-number" type="java.lang.Integer">
+
+                <xml-element java-attribute="instanceGroupFunction" name="instance-group-function" required="false" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Zone number identifier for multi-zone locations."/>
+                        <xml-property name="description" value="Instance-Group Function"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                <xml-element java-attribute="instanceGroupNumber" name="instance-group-number" type="java.lang.Integer">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
-                                               <xml-property name="ownerCheck" value="N/A"/>
+                        <xml-property name="description" value="Number used to identify an instance-group"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="priorityNumber" name="priority-number" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                        <xml-property name="description" value="Used to identify the primary and secondary priority"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                                               <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Concurrency value"/>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                 <xml-element default-value="false" java-attribute="inMaint" name="in-maint" required="true" type="java.lang.Boolean">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="defaultValue" value="false"/>
-                        <xml-property name="description" value="Used to indicate whether or not zone object is in maintenance mode."/>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-                <xml-element java-attribute="subnets" name="subnets" type="inventory.aai.onap.org.v25.Subnets"/>
-                <xml-element java-attribute="vlanRanges" name="vlan-ranges" type="inventory.aai.onap.org.v25.VlanRanges"/>
             </java-attributes>
+
             <xml-properties>
-                <xml-property name="description" value="A zone is a grouping of assets in a location homing to the same connections into the CBB"/>
-                <xml-property name="nameProps" value="zone-name"/>
-                <xml-property name="indexedProps" value="zone-id,design-type,zone-context,data-owner,data-source,data-source-version,zone-number"/>
-                <xml-property name="uniqueProps" value="zone-id"/>
-                <xml-property name="container" value="zones"/>
+                <xml-property name="description" value="General mechanism for grouping instances"/>
+                <xml-property name="nameProps" value="description,instance-group-name"/>
+                <xml-property name="uniqueProps" value="id"/>
+                <xml-property name="searchable" value="id,description"/>
+                <xml-property name="indexedProps" value="id,model-invariant-id,model-version-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="container" value="instance-groups"/>
                 <xml-property name="namespace" value="network"/>
-                <xml-property name="uriTemplate" value="/network/zones/zone/{zone-id}"/>
-            <xml-property name="requiredProps" value="zone-id,zone-name,design-type,zone-context,in-maint"/>
+                <xml-property name="uriTemplate" value="/network/instance-groups/instance-group/{id}"/>
+                <xml-property name="requiredProps" value="id,instance-group-type"/>
             </xml-properties>
         </java-type>
 
-        <java-type name="AutonomousSystems">
+
+        <java-type name="SegmentationAssignments">
             <xml-properties>
-                <xml-property name="description" value="Collection of Autonomous Systems"/>
+                <xml-property name="description" value="Collection of openstack segmentation assignments"/>
             </xml-properties>
-            <xml-root-element name="autonomous-systems"/>
+            <xml-root-element name="segmentation-assignments"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="autonomousSystem" name="autonomous-system" type="inventory.aai.onap.org.v25.AutonomousSystem"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="segmentationAssignment" name="segmentation-assignment" type="inventory.aai.onap.org.v25.SegmentationAssignment"/>
             </java-attributes>
         </java-type>
 
-        <java-type name="AutonomousSystem">
-            <xml-root-element name="autonomous-system"/>
+        <java-type name="SegmentationAssignment">
+            <xml-root-element name="segmentation-assignment"/>
             <java-attributes>
-                <xml-element java-attribute="autonomousSystemId" name="autonomous-system-id" required="true" type="java.lang.String" xml-key="true">
-                    <xml-properties>
-                        <xml-property name="description" value="UUID"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="autonomousSystemNumber" name="autonomous-system-number" required="true" type="java.lang.Long">
-                    <xml-properties>
-                        <xml-property name="description" value="asn in the range of 0 to 9223372036854775807"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="autonomousSystemType" name="autonomous-system-type" required="true" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="type (global vs. local)."/>
-                    </xml-properties>
-                </xml-element>
-               <xml-element java-attribute="autonomousSystemRegion" name="autonomous-system-region" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="geographic region"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="autonomousSystemRole" name="autonomous-system-role" type="java.lang.String">
+                <xml-element java-attribute="segmentationId" name="segmentation-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="role of autonomous system"/>
+                        <xml-property name="description" value="Route Table Reference id, UUID assigned to this instance."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Description of Autonomous System"/>
-                <xml-property name="nameProps" value="autonomous-system-id,autonomous-system-number"/>
-                <xml-property name="indexedProps" value="autonomous-system-id,autonomous-system-number,autonomous-system-type,data-owner,data-source,data-source-version"/>
-                <xml-property name="uniqueProps" value="autonomous-system-id"/>
-                <xml-property name="container" value="autonomous-systems"/>
-                <xml-property name="namespace" value="network"/>
-                <xml-property name="uriTemplate" value="/network/autonomous-systems/autonomous-system/{autonomous-system-id}"/>
-                <xml-property name="requiredProps" value="autonomous-system-id,autonomous-system-number,autonomous-system-type"/>
-             </xml-properties>
+                <xml-property name="description" value="Openstack segmentation assignment."/>
+                <xml-property name="indexedProps" value="segmentation-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="l3-network"/>
+                <xml-property name="container" value="segmentation-assignments"/>
+                <xml-property name="uriTemplate" value="/segmentation-assignments/segmentation-assignment/{segmentation-id}"/>
+                <xml-property name="requiredProps" value="segmentation-id"/>
+            </xml-properties>
         </java-type>
-
-               <java-type name="NetworkRanges">
+        <java-type name="ComposedResources">
             <xml-properties>
-                <xml-property name="description" value="Collection of Network Ranges"/>
+                <xml-property name="description" value="This object is used to store slices of services being offered"/>
             </xml-properties>
-            <xml-root-element name="network-ranges"/>
+            <xml-root-element name="composed-resources"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="networkRange" name="network-range" type="inventory.aai.onap.org.v25.NetworkRange"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="composedResource" name="composed-resource" type="inventory.aai.onap.org.v25.ComposedResource"/>
             </java-attributes>
         </java-type>
-               <!-- Comments to trigger build -->
-        <java-type name="NetworkRange">
-            <xml-root-element name="network-range"/>
+
+        <java-type name="ComposedResource">
+            <xml-root-element name="composed-resource"/>
             <java-attributes>
-                <xml-element java-attribute="networkRangeId" name="network-range-id" required="true" type="java.lang.String" xml-key="true">
-                    <xml-properties>
-                        <xml-property name="description" value="UUID"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="networkRangeName" name="network-range-name" required="true" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="name"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="networkRangeType" name="network-range-type" required="true" type="java.lang.String">
+                <xml-element java-attribute="id" name="id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="type (ex, esi, vni, vni-rt, lacp-id)."/>
+                        <xml-property name="description" value="Composed Resource id UUID assigned to this instance."/>
                     </xml-properties>
                 </xml-element>
-               <xml-element java-attribute="networkRangeRole" name="network-range-role" type="java.lang.String">
+                <xml-element java-attribute="description" name="description" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="role of network-range"/>
+                        <xml-property name="description" value="The descriptive information assigned to this composed resource instance"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="networkRangeFunction" name="network-range-function" type="java.lang.String">
+                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="descriptive function"/>
+                        <xml-property name="description" value="Link back to more information in the controller"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="startRange" name="start-range" type="java.lang.String">
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="starting range for simple network ranges."/>
+                        <xml-property name="description" value="Concurrency value"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="endRange" name="end-range" type="java.lang.String">
+                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="end range for simple network ranges."/>
+                        <xml-property name="description" value="Orchestration status"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="lastAssigned" name="last-assigned" type="java.lang.String">
+                <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="last assigned value for simple network ranges"/>
+                        <xml-property name="description" value="Indicator for whether the resource is considered operational"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="rangeFormat" name="range-format" type="java.lang.String">
+                <xml-element java-attribute="type" name="type" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Format Decimal, Hexadecimal, etc."/>
+                        <xml-property name="description" value="Generic description of the type of composed resource."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="rangePrefix" name="range-prefix" type="java.lang.String">
+                <xml-element java-attribute="role" name="role" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Prefix of network range."/>
+                        <xml-property name="description" value="role in the network that this resource will be providing."/>
                     </xml-properties>
                 </xml-element>
+        <xml-element java-attribute="composedResourceName" name="composed-resource-name" type="java.lang.String">
+          <xml-properties>
+            <xml-property name="description" value="Store the name of this composed-resource."/>
+          </xml-properties>
+        </xml-element>
+        <xml-element java-attribute="accessProviderId" name="access-provider-id" type="java.lang.String">
+          <xml-properties>
+            <xml-property name="description" value="Store the id of the access provider of this composed-resource."/>
+          </xml-properties>
+        </xml-element>
+        <xml-element java-attribute="accessClientId" name="access-client-id" type="java.lang.String">
+          <xml-properties>
+            <xml-property name="description" value="Store the id of the access client of this composed-resource."/>
+          </xml-properties>
+        </xml-element>
+        <xml-element java-attribute="accessTopologyId" name="access-topology-id" type="java.lang.String">
+          <xml-properties>
+            <xml-property name="description" value="Store the id of the access topology of this composed-resource."/>
+          </xml-properties>
+        </xml-element>
+        <xml-element java-attribute="accessNodeId" name="access-node-id" type="java.lang.String">
+          <xml-properties>
+            <xml-property name="description" value="Store the id of the access node of this composed-resource."/>
+          </xml-properties>
+        </xml-element>
+        <xml-element java-attribute="accessLtpId" name="access-ltp-id" type="java.lang.String">
+          <xml-properties>
+            <xml-property name="description" value="Store the id of the access ltp of this composed-resource."/>
+          </xml-properties>
+        </xml-element>
+        <xml-element java-attribute="cvlan" name="cvlan" type="java.lang.String">
+          <xml-properties>
+            <xml-property name="description" value="Store the cvlan of this composed-resource."/>
+          </xml-properties>
+        </xml-element>
+        <xml-element java-attribute="vpnName" name="vpn-name" type="java.lang.String">
+          <xml-properties>
+            <xml-property name="description" value="Store the vpn-name of this composed-resource."/>
+          </xml-properties>
+        </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
-                                               <xml-property name="ownerCheck" value="N/A"/>
+            <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+        <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+        <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="Concurrency value"/>
-                    </xml-properties>
-                </xml-element>
-                               <xml-element java-attribute="activities" name="activities" type="inventory.aai.onap.org.v25.Activities"/>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
             </java-attributes>
+
             <xml-properties>
-                <xml-property name="description" value="Description of Network Range"/>
-                <xml-property name="nameProps" value="network-range-name,network-range-type"/>
-                <xml-property name="indexedProps" value="network-range-id,network-range-name,data-owner,data-source,data-source-version"/>
-                <xml-property name="container" value="network-ranges"/>
-                <xml-property name="namespace" value="network"/>
-                <xml-property name="uriTemplate" value="/network/network-ranges/network-range/{network-range-id}"/>
-                <xml-property name="requiredProps" value="network-range-id,network-range-name,network-range-type"/>
-             </xml-properties>
+                <xml-property name="description" value="Represents a resource that acts as a bridge between service-instance to define parent-child relationship"/>
+        <xml-property name="nameProps" value="description,composed-resource-name"/>
+        <xml-property name="indexedProps" value="id,type,role,composed-resource-name,access-provider-id,access-client-id,access-topology-id,access-node-id,access-ltp-id,vpn-name,orchestration-status,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="service-instance"/>
+                <xml-property name="container" value="composed-resources"/>
+                <!--  <xml-property name="namespace" value="network" /> -->
+                <xml-property name="uriTemplate" value="/composed-resources/composed-resource/{id}"/>
+            <xml-property name="requiredProps" value="id"/>
+            </xml-properties>
         </java-type>
-
-        <java-type name="Mappings">
+        <java-type name="AllottedResources">
             <xml-properties>
-                <xml-property name="description" value="Collection of mappings."/>
+                <xml-property name="description" value="This object is used to store slices of services being offered"/>
             </xml-properties>
-            <xml-root-element name="mappings"/>
+            <xml-root-element name="allotted-resources"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="mapping" name="mapping" type="inventory.aai.onap.org.v25.Mapping"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="allottedResource" name="allotted-resource" type="inventory.aai.onap.org.v25.AllottedResource"/>
             </java-attributes>
         </java-type>
 
-        <java-type name="Mapping">
-            <xml-root-element name="mapping"/>
+        <java-type name="AllottedResource">
+            <xml-root-element name="allotted-resource"/>
             <java-attributes>
-                <xml-element java-attribute="mappingId" name="mapping-id" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="id" name="id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Key for mapping object."/>
+                        <xml-property name="description" value="Allotted Resource id UUID assigned to this instance."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="mappingName" name="mapping-name" type="java.lang.String">
+                <xml-element java-attribute="description" name="description" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Name of mapping"/>
+                        <xml-property name="description" value="The descriptive information assigned to this allotted resource instance"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="mappingType" name="mapping-type" type="java.lang.String">
+                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Type of mapping."/>
+                        <xml-property name="description" value="Link back to more information in the controller"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="mappingRole" name="mapping-role" type="java.lang.String">
+                <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Role of mapping"/>
+                        <xml-property name="description" value="the ASDC model id for this resource or service model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-version-id"/>
+                        <xml-property name="dbAlias" value="model-invariant-id-local"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="mappingFunction" name="mapping-function" type="java.lang.String">
+                <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Function of mapping"/>
+                        <xml-property name="description" value="the ASDC model version for this resource or service model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="mappingNumber" name="mapping-number" type="java.lang.String">
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Number of mapping"/>
+                        <xml-property name="description" value="Concurrency value"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="location1" name="location-1" type="java.lang.String">
+                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Location 1"/>
+                        <xml-property name="description" value="Orchestration status"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="location2" name="location-2" type="java.lang.String">
+                <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Location 2"/>
+                        <xml-property name="description" value="Indicator for whether the resource is considered operational"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="mappingGroupId" name="mapping-group-id" type="java.lang.String">
+                <xml-element java-attribute="type" name="type" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Non-unique ID for grouping mappings"/>
+                        <xml-property name="description" value="Generic description of the type of allotted resource."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+                <xml-element java-attribute="role" name="role" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Provision status for the mapping object. Valid values [PREPROV/NVTPROV/PROV]."/>
+                        <xml-property name="description" value="role in the network that this resource will be providing."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="homedLocation" name="homed-location" type="java.lang.String">
+                <xml-element java-attribute="allottedResourceName" name="allotted-resource-name" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Location the object is homed to"/>
+                        <xml-property name="description" value="Store the name of this allotted-resource."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="plannedLocation" name="planned-location" type="java.lang.String">
+                <xml-element java-attribute="accessProviderId" name="access-provider-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Location the object is planned for"/>
+                        <xml-property name="description" value="Store the id of the access provider of this allotted-resource."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="accessClientId" name="access-client-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the id of the access client of this allotted-resource."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="accessTopologyId" name="access-topology-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the id of the access topology of this allotted-resource."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="accessNodeId" name="access-node-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the id of the access node of this allotted-resource."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="accessLtpId" name="access-ltp-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the id of the access ltp of this allotted-resource."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="cvlan" name="cvlan" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the cvlan of this allotted-resource."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vpnName" name="vpn-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the vpn-name of this allotted-resource."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
+                <xml-element java-attribute="tunnelXconnects" name="tunnel-xconnects" type="inventory.aai.onap.org.v25.TunnelXconnects"/>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"/>
             </java-attributes>
+
             <xml-properties>
-                <xml-property name="description" value="General mechanism for mapping between instances; cg-nat."/>
-                <xml-property name="indexedProps" value="mapping-id,data-owner,data-source,data-source-version,prov-status"/>
-                <xml-property name="uniqueProps" value="mapping-id"/>
-                <xml-property name="container" value="mappings"/>
-                <xml-property name="namespace" value="network"/>
-                <xml-property name="uriTemplate" value="/network/mappings/mapping/{mapping-id}"/>
-                <xml-property name="requiredProps" value="mapping-id"/>
+                <xml-property name="description" value="Represents a slice or partial piece of a resource that gets separately allotted"/>
+                <xml-property name="nameProps" value="description,allotted-resource-name"/>
+                <xml-property name="indexedProps" value="id,model-invariant-id,model-version-id,type,role,allotted-resource-name,access-provider-id,access-client-id,access-topology-id,access-node-id,access-ltp-id,vpn-name,orchestration-status,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="service-instance"/>
+                <xml-property name="container" value="allotted-resources"/>
+                <!--  <xml-property name="namespace" value="network" /> -->
+                <xml-property name="uriTemplate" value="/allotted-resources/allotted-resource/{id}"/>
+                <xml-property name="requiredProps" value="id"/>
             </xml-properties>
         </java-type>
 
-        <java-type name="HwComponents">
-            <xml-root-element name="hw-components"/>
-            <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="hwComponent" name="hw-component" type="inventory.aai.onap.org.v25.HwComponent"/>
-            </java-attributes>
+        <java-type name="TunnelXconnects">
             <xml-properties>
+                <xml-property name="description" value="This object is used to store the specific tunnel cross connect aspects of an allotted resource"/>
             </xml-properties>
+            <xml-root-element name="tunnel-xconnects"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="tunnelXconnect" name="tunnel-xconnect" type="inventory.aai.onap.org.v25.TunnelXconnect"/>
+            </java-attributes>
         </java-type>
 
-        <java-type name="HwComponent">
-            <xml-root-element name="hw-component"/>
+        <java-type name="TunnelXconnect">
+            <xml-root-element name="tunnel-xconnect"/>
             <java-attributes>
-                <xml-element java-attribute="hwComponentId" name="hw-component-id" required="true" type="java.lang.String" xml-key="true">
-                    <xml-properties>
-                        <xml-property name="description" value="UUID"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="hwComponentName" name="hw-component-name" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="Name of hardware component"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="hwComponentType" name="hw-component-type" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="Type of hardware component"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="hwComponentRole" name="hw-component-role" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="Role of hardware component"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="hwComponentFunction" name="hw-component-function" type="java.lang.String">
+                <xml-element java-attribute="id" name="id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Function of hardware component"/>
+                        <xml-property name="description" value="Allotted Resource id UUID assigned to this instance."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                        <xml-property name="description" value="Concurrency value"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
             </java-attributes>
+
             <xml-properties>
-                <xml-property name="description" value="create/update/delete the hw-component node"/>
-                <xml-property name="indexedProps" value="hw-component-id,data-owner,data-source,data-source-version"/>
-               <xml-property name="uriTemplate" value="/network/hw-components/hw-component/{hw-component-id}"/>
-               <xml-property name="requiredProps" value="hw-component-id"/>
-               <xml-property name="namespace" value="network"/>
-               <xml-property name="container" value="hw-components"/>
+                <xml-property name="description" value="Represents the specifics of a tunnel cross connect piece of a resource that gets separately allotted"/>
+                <xml-property name="indexedProps" value="id,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="allotted-resource"/>
+                <xml-property name="container" value="tunnel-xconnects"/>
+                <!--  <xml-property name="namespace" value="network" /> -->
+                <xml-property name="uriTemplate" value="/tunnel-xconnects/tunnel-xconnect/{id}"/>
+                <xml-property name="requiredProps" value="id"/>
             </xml-properties>
         </java-type>
 
-        <java-type name="SwComponents">
-            <xml-root-element name="sw-components"/>
-                       <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="swComponent" name="sw-component" type="inventory.aai.onap.org.v25.SwComponent"/>
+        <java-type name="BgpGroups">
+            <xml-root-element name="bgp-groups"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="bgpGroup" name="bgp-group" type="inventory.aai.onap.org.v25.BgpGroup"/>
             </java-attributes>
             <xml-properties>
             </xml-properties>
         </java-type>
 
-        <java-type name="SwComponent">
-            <xml-root-element name="sw-component"/>
+        <java-type name="BgpGroup">
+            <xml-root-element name="bgp-group"/>
             <java-attributes>
-                <xml-element java-attribute="swComponentId" name="sw-component-id" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="bgpGroupId" name="bgp-group-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="UUID"/>
+                        <xml-property name="description" value="UUID."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="swComponentName" name="sw-component-name" type="java.lang.String">
+                <xml-element java-attribute="bgpGroupName" name="bgp-group-name" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Name of software component"/>
+                        <xml-property name="description" value="name of bgp-group"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="swComponentType" name="sw-component-type" type="java.lang.String">
+                <xml-element java-attribute="bgpGroupType" name="bgp-group-type" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Type of software component"/>
+                        <xml-property name="description" value="type of bgp-group"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="swComponentRole" name="sw-component-role" type="java.lang.String">
+                <xml-element java-attribute="bgpGroupRole" name="bgp-group-role" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Role of software component"/>
+                        <xml-property name="description" value="role of bgp-group"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="swComponentFunction" name="sw-component-function" type="java.lang.String">
+                <xml-element java-attribute="bgpGroupFunction" name="bgp-group-function" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Function of software component"/>
+                        <xml-property name="description" value="function of bgp-group"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="localAs" name="local-as" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="local a-s number type of vrf (bridge-domain as an example)"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="localAddress" name="local-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="local address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="peerAs" name="peer-as" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="peer a-s number"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="peerAddress" name="peer-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="peer address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="description" name="description" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="description of bgp-group"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="opsNote" name="ops-note" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Notes to aid OPs in troubleshooting, such as attribute aliases or additional descriptions/instructions about an object."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
+                <xml-element java-attribute="addressFamilies" name="address-families" type="inventory.aai.onap.org.v25.AddressFamilies"/>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="create/update/delete the sw-component node"/>
-                               <xml-property name="indexedProps" value="sw-component-id,data-owner,data-source,data-source-version"/>
-               <xml-property name="uriTemplate" value="/network/sw-components/sw-component/{sw-component-id}"/>
-                               <xml-property name="requiredProps" value="sw-component-id"/>
-                               <xml-property name="namespace" value="network"/>
-               <xml-property name="container" value="sw-components"/>
+                <xml-property name="description" value="Definition of bgp-group"/>
+                <xml-property name="indexedProps" value="bgp-group-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="pnf,vrf,generic-vnf"/>
+                <xml-property name="nameProps" value="bgp-group-id,bgp-group-name"/>
+                <xml-property name="container" value="bgp-groups"/>
+                <xml-property name="uriTemplate" value="/bgp-groups/bgp-group/{bgp-group-id}"/>
+                <xml-property name="requiredProps" value="bgp-group-id,bgp-group-name"/>
             </xml-properties>
         </java-type>
 
-               <java-type name="NetworkRoutes">
-            <xml-root-element name="network-routes"/>
-                       <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="networkRoute" name="network-route" type="inventory.aai.onap.org.v25.NetworkRoute"/>
+        <java-type name="BgpNeighbors">
+            <xml-root-element name="bgp-neighbors"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="bgpNeighbor" name="bgp-neighbor" type="inventory.aai.onap.org.v25.BgpNeighbor"/>
             </java-attributes>
             <xml-properties>
             </xml-properties>
         </java-type>
 
-        <java-type name="NetworkRoute">
-            <xml-root-element name="network-route"/>
+        <java-type name="BgpNeighbor">
+            <xml-root-element name="bgp-neighbor"/>
             <java-attributes>
-                <xml-element java-attribute="routeId" name="route-id" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="bgpNeighborId" name="bgp-neighbor-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="unique identifier example uuid."/>
+                        <xml-property name="description" value="UUID."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="type" name="type" required="true" type="java.lang.String">
+                <xml-element java-attribute="bgpNeighborType" name="bgp-neighbor-type" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="used to categorize this object in conjunction with role &amp; function. The most generic category."/>
+                        <xml-property name="description" value="name of bgp-group"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="role" name="role" required="true" type="java.lang.String">
+                <xml-element java-attribute="bgpNeighborRole" name="bgp-neighbor-role" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="used to categorize this object in conjunction with type &amp; function."/>
+                        <xml-property name="description" value="type of bgp-group"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="function" name="function" required="true" type="java.lang.String">
+                <xml-element java-attribute="bgpNeighborFunction" name="bgp-neighbor-function" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="used to categorize this object in conjunction with type &amp; role. The most specific category."/>
+                        <xml-property name="description" value="role of bgp-group"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="ipAddress" name="ip-address" required="true" type="java.lang.String">
+                <xml-element java-attribute="localAs" name="local-as" type="java.lang.Integer">
                     <xml-properties>
-                        <xml-property name="description" value="ip address that of the specific network-route."/>
+                        <xml-property name="description" value="local a-s number type of vrf (bridge-domain as an example)"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="prefixLength" name="prefix-length" required="true" type="java.lang.Integer">
+                <xml-element java-attribute="localAddress" name="local-address" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="ip-address prefix length."/>
+                        <xml-property name="description" value="local address"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="logicalInterfaceId" name="logical-interface-id" type="java.lang.String">
+                <xml-element java-attribute="peerAs" name="peer-as" type="java.lang.Integer">
                     <xml-properties>
-                        <xml-property name="description" value="Identity of a logical interface, e.g., VLAN ID."/>
+                        <xml-property name="description" value="peer a-s number"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="nextHop" name="next-hop" type="java.lang.String">
+                <xml-element java-attribute="peerAddress" name="peer-address" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Could be ip-address, hostname, or service-instance."/>
+                        <xml-property name="description" value="peer address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="description" name="description" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="description of bgp-group"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="nextHopType" name="next-hop-type" type="java.lang.String">
+                <xml-element java-attribute="opsNote" name="ops-note" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Should be ip-address, hostname, or service-instance to match next-hop."/>
+                        <xml-property name="description" value="Notes to aid OPs in troubleshooting, such as attribute aliases or additional descriptions/instructions about an object."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="metric" name="metric" type="java.lang.Integer">
+                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Value that is assigned to an IP route for a particular network interface that identifies the cost that is associated with using that route."/>
+                        <xml-property name="description" value="provisioning status. Valid values [PREPROV/NVTPROV/PROV]."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="addressFamily" name="address-family" required="true" type="java.lang.String">
+                <xml-element java-attribute="peerHostname" name="peer-hostname" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="whether the route address is ipv4, ipv6."/>
+                        <xml-property name="description" value="hostname of the peer"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="configurationStatus" name="configuration-status" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="Configuration status of the network route."/>
-                    </xml-properties>
-                </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
+                <xml-element java-attribute="addressFamilies" name="address-families" type="inventory.aai.onap.org.v25.AddressFamilies"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="This object represents a network route. For instance, host-route, static-route."/>
-                               <xml-property name="indexedProps" value="route-id,type,role,function,ip-address,prefix-length,next-hop,data-owner,data-source,data-source-version"/>
-               <xml-property name="uriTemplate" value="/network/network-routes/network-route/{route-id}"/>
-                               <xml-property name="requiredProps" value="route-id,type,role,function,ip-address,prefix-length,address-family"/>
-                               <xml-property name="namespace" value="network"/>
-               <xml-property name="container" value="network-routes"/>
+                <xml-property name="description" value="Definition of bgp-neighbor"/>
+                <xml-property name="indexedProps" value="bgp-neighbor-id,data-owner,data-source,data-source-version,prov-status"/>
+                <xml-property name="dependentOn" value="pnf,vrf,subnet,generic-vnf"/>
+                <xml-property name="nameProps" value="bgp-neighbor-id"/>
+                <xml-property name="container" value="bgp-neighbors"/>
+                <xml-property name="uriTemplate" value="/bgp-neighbors/bgp-neighbor/{bgp-neighbor-id}"/>
+                <xml-property name="requiredProps" value="bgp-neighbor-id,bgp-neighbor-type"/>
             </xml-properties>
         </java-type>
 
-               <java-type name="NextHops">
-            <xml-root-element name="next-hops"/>
+        <java-type name="AddressFamilies">
+            <xml-root-element name="address-families"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="nextHop" name="next-hop" type="inventory.aai.onap.org.v25.NextHop"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="addressFamily" name="address-family" type="inventory.aai.onap.org.v25.AddressFamily"/>
             </java-attributes>
             <xml-properties>
             </xml-properties>
         </java-type>
 
-        <java-type name="NextHop">
-            <xml-root-element name="next-hop"/>
+        <java-type name="AddressFamily">
+            <xml-root-element name="address-family"/>
             <java-attributes>
-                <xml-element java-attribute="nextHopId" name="next-hop-id" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="addressFamilyId" name="address-family-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="UUID."/>
+                        <xml-property name="description" value="address family UUID."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="nextHopType" name="next-hop-type" required="true" type="java.lang.String">
+                <xml-element java-attribute="afType" name="af-type" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used to categorize this object in conjunction with role &amp; function. The most generic category."/>
+                        <xml-property name="description" value="address family type (aka afi)"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="nextHopRole" name="next-hop-role" type="java.lang.String">
+                <xml-element java-attribute="afSubtype" name="af-subtype" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used to categorize this object in conjunction with type &amp; function."/>
+                        <xml-property name="description" value="address family subtype (aka safi)"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="nextHopFunction" name="next-hop-function" type="java.lang.String">
+                <xml-element java-attribute="afRole" name="af-role" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used to categorize this object in conjunction with type &amp; role. The most specific category."/>
+                        <xml-property name="description" value="role of address-family"/>
                     </xml-properties>
                 </xml-element>
-                                <xml-element java-attribute="sequence" name="sequence" type="java.lang.Integer">
+                <xml-element java-attribute="afFunction" name="af-function" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Sequence number."/>
+                        <xml-property name="description" value="function of address-family"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="addressFamily" name="address-family" type="java.lang.String">
+                <xml-element java-attribute="maxPrefixV4" name="max-prefix-v4" type="java.lang.Integer">
                     <xml-properties>
-                        <xml-property name="description" value="Ipv4 or Ipv6."/>
+                        <xml-property name="description" value="Max prefix for IPv4"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="ipAddress" name="ip-address" type="java.lang.String">
+                <xml-element java-attribute="maxPrefixV6" name="max-prefix-v6" type="java.lang.Integer">
                     <xml-properties>
-                        <xml-property name="description" value="Next hop ip-address."/>
+                        <xml-property name="description" value="Max prefix for IPv6"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="metric" name="metric" type="java.lang.Integer">
+                <xml-element java-attribute="maxPrefixThreshold" name="max-prefix-threshold" type="java.lang.Integer">
                     <xml-properties>
-                        <xml-property name="description" value="Cost that is associated with using the route."/>
+                        <xml-property name="description" value="Max prefix threshold"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Is among the series of routers that are connected together in a network and is the next possible destination for a data packet."/>
-                <xml-property name="indexedProps" value="next-hop-id,ip-address,sequence,data-owner,data-source,data-source-version"/>
-                <xml-property name="namespace" value="network"/>
-                               <xml-property name="container" value="next-hops"/>
-                <xml-property name="uriTemplate" value="/network/next-hops/next-hop/{next-hop-id}"/>
-                <xml-property name="uniqueProps" value="next-hop-id"/>
-                <xml-property name="requiredProps" value="next-hop-id,next-hop-type"/>
-            </xml-properties>
+                <xml-property name="description" value="Definition of address family"/>
+                <xml-property name="indexedProps" value="address-family-id,af-type,data-owner,data-source,data-source-version"/>
+                <xml-property name="nameProps" value="address-family-id,af-type"/>
+                <xml-property name="dependentOn" value="bgp-group,bgp-neighbor"/>
+                <xml-property name="container" value="address-families"/>
+                <xml-property name="uriTemplate" value="/address-families/address-family/{address-family-id}"/>
+                <xml-property name="requiredProps" value="address-family-id,af-type"/>
+            </xml-properties>
         </java-type>
 
-               <java-type name="Bfds">
-            <xml-root-element name="bfds"/>
-            <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="bfd" name="bfd" type="inventory.aai.onap.org.v25.Bfd"/>
-            </java-attributes>
+        <java-type name="Entitlements">
             <xml-properties>
+                <xml-property name="description" value="Entitlements, keyed by group-uuid and resource-uuid, related to license management"/>
             </xml-properties>
+            <xml-root-element name="entitlements"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="entitlement" name="entitlement" type="inventory.aai.onap.org.v25.Entitlement"/>
+            </java-attributes>
         </java-type>
 
-        <java-type name="Bfd">
-            <xml-root-element name="bfd"/>
+        <java-type name="Entitlement">
+            <xml-root-element name="entitlement"/>
             <java-attributes>
-                <xml-element java-attribute="bfdId" name="bfd-id" required="true" type="java.lang.String" xml-key="true">
-                    <xml-properties>
-                        <xml-property name="description" value="Unique identifier."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="bfdType" name="bfd-type" required="true" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="Used to categorize this object in conjunction with role &amp; function. The most generic category."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="bfdRole" name="bfd-role" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="Used to categorize this object in conjunction with type &amp; function."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="bfdFunction" name="bfd-function" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="Used to categorize this object in conjunction with type &amp; role. The most specific category."/>
-                    </xml-properties>
-                </xml-element>
-                                <xml-element java-attribute="bfdKeepAlive" name="bfd-keep-alive" type="java.lang.String">
+                <xml-element java-attribute="groupUuid" name="group-uuid" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="bfd keep-alive parameter"/>
+                        <xml-property name="description" value="Unique ID for the entitlement group the resource comes from, should be uuid."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="bfdTimeout" name="bfd-timeout" type="java.lang.String">
+                <xml-element java-attribute="resourceUuid" name="resource-uuid" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="bfd timeout parameter"/>
+                        <xml-property name="description" value="Unique ID of an entitlement resource. "/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="bfdMultihop" name="bfd-multihop" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="bfd multihop parameter"/>
-                    </xml-properties>
-                </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                        <xml-property name="description" value="Concurrency value"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="BFD (Bidirectional Forwarding Detection) is a protocol for detecting link failures.The BFD object is for persisting attributes for the links that have BFD enabled."/>
-                <xml-property name="indexedProps" value="bfd-id,data-owner,data-source,data-source-version"/>
-                <xml-property name="namespace" value="network"/>
-                               <xml-property name="container" value="bfds"/>
-                <xml-property name="uriTemplate" value="/network/bfds/bfd/{bfd-id}"/>
-                <xml-property name="uniqueProps" value="bfd-id"/>
-                <xml-property name="requiredProps" value="bfd-id,bfd-type"/>
-                               <xml-property name="nameProps" value="bfd-id"/>
+                <xml-property name="description" value="Metadata for entitlement group."/>
+                <xml-property name="indexedProps" value="group-uuid,resource-uuid,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="generic-vnf,vce"/>
+                <xml-property name="container" value="entitlements"/>
+                <xml-property name="uriTemplate" value="/entitlements/entitlement/{group-uuid}/{resource-uuid}"/>
+                <xml-property name="requiredProps" value="group-uuid,resource-uuid"/>
             </xml-properties>
         </java-type>
 
-               <java-type name="Fqdns">
-            <xml-root-element name="fqdns"/>
-            <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="fqdn" name="fqdn" type="inventory.aai.onap.org.v25.Fqdn"/>
-            </java-attributes>
+
+        <java-type name="Licenses">
             <xml-properties>
+                <xml-property name="description" value="Licenses to be allocated across resources, keyed by group-uuid and resource-uuid, related to license management"/>
             </xml-properties>
+            <xml-root-element name="licenses"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="license" name="license" type="inventory.aai.onap.org.v25.License"/>
+            </java-attributes>
         </java-type>
 
-        <java-type name="Fqdn">
-            <xml-root-element name="fqdn"/>
+        <java-type name="License">
+            <xml-root-element name="license"/>
             <java-attributes>
-                <xml-element java-attribute="fqdn" name="fqdn" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="groupUuid" name="group-uuid" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Fully qualified domain name."/>
+                        <xml-property name="description" value="Unique ID for the license group the resource belongs to, should be uuid."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="fqdnType" name="fqdn-type" type="java.lang.String">
+                <xml-element java-attribute="resourceUuid" name="resource-uuid" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Used to categorize this object in conjunction with role &amp; function. The most generic category."/>
+                        <xml-property name="description" value="Unique ID of a license resource. "/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="fqdnRole" name="fqdn-role" type="java.lang.String">
+                <xml-element java-attribute="projectNumber" name="project-number" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used to categorize this object in conjunction with type &amp; function."/>
+                        <xml-property name="description" value="Used to store CFAS or other project numbers."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="fqdnFunction" name="fqdn-function" type="java.lang.String">
+                <xml-element java-attribute="orderNumber" name="order-number" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used to categorize this object in conjunction with type &amp; role. The most specific category."/>
+                        <xml-property name="description" value="Order number."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dnsDomain" name="dns-domain" required="true" type="java.lang.String">
+                <xml-element java-attribute="receiptDate" name="receipt-date" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Domain name."/>
+                        <xml-property name="description" value="Date of receipt."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                        <xml-property name="description" value="Concurrency value"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="A fully qualified domain name (FQDN) is the complete domain name for a specific computer, or host, on the internet."/>
-                <xml-property name="requiredProps" value="fqdn,dns-domain"/>
-                               <xml-property name="indexedProps" value="fqdn,data-owner,data-source,data-source-version"/>
-                <xml-property name="namespace" value="network"/>
-                               <xml-property name="container" value="fqdns"/>
-                <xml-property name="uriTemplate" value="/network/fqdns/fqdn/{fqdn}"/>
+                <xml-property name="description" value="Metadata for license group."/>
+                <xml-property name="indexedProps" value="group-uuid,resource-uuid,project-number,order-number,receipt-date,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="chassis,generic-vnf,vce"/>
+                <xml-property name="container" value="licenses"/>
+                <xml-property name="uriTemplate" value="/licenses/license/{group-uuid}/{resource-uuid}"/>
+                <xml-property name="requiredProps" value="group-uuid,resource-uuid"/>
             </xml-properties>
         </java-type>
 
-        <java-type name="RouteTargets">
-            <xml-properties>
-                <xml-property name="description" value="Collection of route target information"/>
-            </xml-properties>
-            <xml-root-element name="route-targets"/>
-            <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="routeTarget" name="route-target" type="inventory.aai.onap.org.v25.RouteTarget"/>
-            </java-attributes>
-        </java-type>
-        <java-type name="RouteTarget">
-            <xml-root-element name="route-target"/>
+        <java-type name="Vnf">
+            <xml-root-element name="vnf"/>
             <java-attributes>
-                <xml-element java-attribute="globalRouteTarget" name="global-route-target" required="true" type="java.lang.String" xml-key="true">
-                    <xml-properties>
-                        <xml-property name="description" value="Number used to identify an RT, globally unique in the network"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="routeTargetRole" name="route-target-role" required="true" type="java.lang.String" xml-key="true">
-                    <xml-properties>
-                        <xml-property name="description" value="Role assigned to this route target"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
-                                               <xml-property name="ownerCheck" value="N/A"/>
-                    </xml-properties>
-                </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="Identifies the upstream source of the data."/>
-                    </xml-properties>
-                </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="Identifies the version of the upstream source."/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                <xml-element java-attribute="vnfId" name="vnf-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                        <xml-property name="description" value="Unique id of VNF.  This is unique across the graph."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Route target information"/>
-                <xml-property name="container" value="route-targets"/>
-                <xml-property name="dependentOn" value="vpn-binding,vrf"/>
-                <xml-property name="canBeLinked" value="true"/>
-                <xml-property name="uriTemplate" value="/route-targets/route-target/{global-route-target}/{route-target-role}"/>
-                <xml-property name="requiredProps" value="global-route-target,route-target-role"/>
-                               <xml-property name="indexedProps" value="data-owner,data-source,data-source-version"/>
+                <xml-property name="description" value="Abstract vnf class"/>
+                <xml-property name="indexedProps" value="vnf-id"/>
+                <xml-property name="uniqueProps" value="vnf-id"/>
+                <xml-property name="inheritors" value="vce,generic-vnf"/>
+                <xml-property name="abstract" value="true"/>
+                <xml-property name="requiredProps" value="vnf-id"/>
             </xml-properties>
         </java-type>
 
-        <java-type name="SriovPfs">
+        <java-type name="Zones">
             <xml-properties>
-                <xml-property name="description" value="Collection of SR-IOV Physical Functions."/>
+                <xml-property name="description" value="Collection of zones"/>
             </xml-properties>
-            <xml-root-element name="sriov-pfs"/>
+            <xml-root-element name="zones"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="sriovPf" name="sriov-pf" type="inventory.aai.onap.org.v25.SriovPf"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="zone" name="zone" type="inventory.aai.onap.org.v25.Zone"/>
             </java-attributes>
         </java-type>
-        <java-type name="SriovPf">
-            <xml-root-element name="sriov-pf"/>
+
+        <java-type name="Zone">
+            <xml-root-element name="zone"/>
             <java-attributes>
-                <xml-element java-attribute="pfPciId" name="pf-pci-id" required="true" type="java.lang.String" xml-key="true">
-                    <xml-properties>
-                        <xml-property name="description" value="Identifier for the sriov-pf"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                <xml-element java-attribute="zoneId" name="zone-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
-                                               <xml-property name="ownerCheck" value="N/A"/>
+                        <xml-property name="description" value="Code assigned by AIC to the zone"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="zoneName" name="zone-name" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                        <xml-property name="description" value="English name associated with the zone"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="zoneType" name="zone-type" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                        <xml-property name="description" value="The type of zone (ex. AIC or NC)."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                <xml-element java-attribute="designType" name="design-type" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                        <xml-property name="description" value="Design of zone [Medium/Large&#x2026;]"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-            </java-attributes>
-            <xml-properties>
-                <xml-property name="description" value="SR-IOV Physical Function"/>
-                <xml-property name="indexedProps" value="pf-pci-id,data-owner,data-source,data-source-version"/>
-                <xml-property name="dependentOn" value="p-interface"/>
-                <xml-property name="container" value="sriov-pfs"/>
-                <xml-property name="uriTemplate" value="/sriov-pfs/sriov-pf/{pf-pci-id}"/>
-            <xml-property name="requiredProps" value="pf-pci-id"/>
-            </xml-properties>
-        </java-type>
-
-        <java-type name="HostRoutes">
-            <xml-root-element name="host-routes"/>
-            <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="hostRoute" name="host-route" type="inventory.aai.onap.org.v25.HostRoute"/>
-            </java-attributes>
-        </java-type>
-        <java-type name="HostRoute">
-            <xml-root-element name="host-route"/>
-            <java-attributes>
-                <xml-element java-attribute="hostRouteId" name="host-route-id" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="zoneContext" name="zone-context" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="host-route id"/>
+                        <xml-property name="description" value="Context of zone [production/test]"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="routePrefix" name="route-prefix" required="true" type="java.lang.String">
+                <xml-element java-attribute="status" name="status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="subnet prefix"/>
+                        <xml-property name="description" value="Status of a zone."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="nextHop" name="next-hop" required="true" type="java.lang.String">
+                <xml-element java-attribute="zoneRole" name="zone-role" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Could be ip-address, hostname, or service-instance"/>
+                        <xml-property name="description" value="Role of a zone."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="nextHopType" name="next-hop-type" type="java.lang.String">
+                <xml-element java-attribute="zoneFunction" name="zone-function" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Should be ip-address, hostname, or service-instance to match next-hop"/>
+                        <xml-property name="description" value="Function of a zone."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="metric" name="metric" type="java.lang.Integer">
+                <xml-element java-attribute="zoneNumber" name="zone-number" type="java.lang.Integer">
                     <xml-properties>
-                        <xml-property name="description" value="Value that is assigned to an IP route for a particular network interface that identifies the cost that is associated with using that route."/>
+                        <xml-property name="description" value="Zone number identifier for multi-zone locations."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                        <xml-property name="description" value="Concurrency value"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-            </java-attributes>
-            <xml-properties>
-                   <xml-property name="description" value="Route packets to a specific host. Host routes are automatically added to the routing table for all IPv4 and IPv6 addresses that are configured on the router. The purpose of a host route is to create a corresponding CEF entry as a receive entry so that the packets destined to this IP address can be processed by the router itself."/>
-                <xml-property name="indexedProps" value="host-route-id,next-hop,data-owner,data-source,data-source-version"/>
-                <xml-property name="dependentOn" value="subnet"/>
-                <xml-property name="container" value="host-routes"/>
-                <xml-property name="uriTemplate" value="/host-routes/host-route/{host-route-id}"/>
+                <xml-element default-value="false" java-attribute="inMaint" name="in-maint" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="Used to indicate whether or not zone object is in maintenance mode."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
+                <xml-element java-attribute="subnets" name="subnets" type="inventory.aai.onap.org.v25.Subnets"/>
+                <xml-element java-attribute="vlanRanges" name="vlan-ranges" type="inventory.aai.onap.org.v25.VlanRanges"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="A zone is a grouping of assets in a location homing to the same connections into the CBB"/>
+                <xml-property name="nameProps" value="zone-name"/>
+                <xml-property name="indexedProps" value="zone-id,design-type,zone-context,data-owner,data-source,data-source-version,zone-number"/>
+                <xml-property name="uniqueProps" value="zone-id"/>
+                <xml-property name="container" value="zones"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/zones/zone/{zone-id}"/>
+                <xml-property name="requiredProps" value="zone-id,zone-name,design-type,zone-context,in-maint"/>
             </xml-properties>
         </java-type>
 
-        <java-type name="VipIpv4AddressList">
-            <xml-root-element name="vip-ipv4-address-list"/>
+        <java-type name="AutonomousSystems">
+            <xml-properties>
+                <xml-property name="description" value="Collection of Autonomous Systems"/>
+            </xml-properties>
+            <xml-root-element name="autonomous-systems"/>
             <java-attributes>
-                <xml-element java-attribute="vipIpv4Address" name="vip-ipv4-address" required="true" type="java.lang.String" xml-key="true">
-                    <xml-properties>
-                        <xml-property name="description" value="IP address"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="vipIpv4PrefixLength" name="vip-ipv4-prefix-length" type="java.lang.Long">
-                    <xml-properties>
-                        <xml-property name="description" value="Prefix length, 32 for single address"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
-                    <xml-properties>
-                        <xml-property name="description" value="Inner VLAN tag"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
-                    <xml-properties>
-                        <xml-property name="description" value="Outer VLAN tag"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="isFloating" name="is-floating" type="java.lang.Boolean">
+                <xml-element container-type="java.util.ArrayList" java-attribute="autonomousSystem" name="autonomous-system" type="inventory.aai.onap.org.v25.AutonomousSystem"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="AutonomousSystem">
+            <xml-root-element name="autonomous-system"/>
+            <java-attributes>
+                <xml-element java-attribute="autonomousSystemId" name="autonomous-system-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Indicator of fixed or floating address"/>
+                        <xml-property name="description" value="UUID"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                <xml-element java-attribute="autonomousSystemNumber" name="autonomous-system-number" required="true" type="java.lang.Long">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                        <xml-property name="description" value="asn in the range of 0 to 9223372036854775807"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
+                <xml-element java-attribute="autonomousSystemType" name="autonomous-system-type" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Neutron network id of the interface that address belongs to"/>
+                        <xml-property name="description" value="type (global vs. local)."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String">
+                <xml-element java-attribute="autonomousSystemRegion" name="autonomous-system-region" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Neutron id of subnet that address belongs to"/>
+                        <xml-property name="description" value="geographic region"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="opsNote" name="ops-note" type="java.lang.String">
+                <xml-element java-attribute="autonomousSystemRole" name="autonomous-system-role" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Notes to aid OPs in troubleshooting, such as attribute aliases or additional descriptions/instructions about an object."/>
+                        <xml-property name="description" value="role of autonomous system"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Concurrency value"/>
+                    </xml-properties>
+                </xml-element>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="IPv4 Address Range"/>
-                <xml-property name="indexedProps" value="vip-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id,vlan-id-outer,data-owner,data-source,data-source-version"/>
-                <xml-property name="dependentOn" value="cloud-region"/>
-            <xml-property name="uriTemplate" value="/vip-ipv4-address-list/{vip-ipv4-address}"/>
-            <xml-property name="requiredProps" value="vip-ipv4-address"/>
+                <xml-property name="description" value="Description of Autonomous System"/>
+                <xml-property name="nameProps" value="autonomous-system-id,autonomous-system-number"/>
+                <xml-property name="indexedProps" value="autonomous-system-id,autonomous-system-number,autonomous-system-type,data-owner,data-source,data-source-version"/>
+                <xml-property name="uniqueProps" value="autonomous-system-id"/>
+                <xml-property name="container" value="autonomous-systems"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/autonomous-systems/autonomous-system/{autonomous-system-id}"/>
+                <xml-property name="requiredProps" value="autonomous-system-id,autonomous-system-number,autonomous-system-type"/>
             </xml-properties>
         </java-type>
 
-        <java-type name="VipIpv6AddressList">
-            <xml-root-element name="vip-ipv6-address-list"/>
+        <java-type name="NetworkRanges">
+            <xml-properties>
+                <xml-property name="description" value="Collection of Network Ranges"/>
+            </xml-properties>
+            <xml-root-element name="network-ranges"/>
             <java-attributes>
-                <xml-element java-attribute="vipIpv6Address" name="vip-ipv6-address" required="true" type="java.lang.String" xml-key="true">
+                <xml-element container-type="java.util.ArrayList" java-attribute="networkRange" name="network-range" type="inventory.aai.onap.org.v25.NetworkRange"/>
+            </java-attributes>
+        </java-type>
+        <!-- Comments to trigger build -->
+        <java-type name="NetworkRange">
+            <xml-root-element name="network-range"/>
+            <java-attributes>
+                <xml-element java-attribute="networkRangeId" name="network-range-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="IP address"/>
+                        <xml-property name="description" value="UUID"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="vipIpv6PrefixLength" name="vip-ipv6-prefix-length" type="java.lang.Long">
+                <xml-element java-attribute="networkRangeName" name="network-range-name" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Prefix length, 128 for single address"/>
+                        <xml-property name="description" value="name"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
+                <xml-element java-attribute="networkRangeType" name="network-range-type" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Inner VLAN tag"/>
+                        <xml-property name="description" value="type (ex, esi, vni, vni-rt, lacp-id)."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
+                <xml-element java-attribute="networkRangeRole" name="network-range-role" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Outer VLAN tag"/>
+                        <xml-property name="description" value="role of network-range"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="isFloating" name="is-floating" type="java.lang.Boolean">
+                <xml-element java-attribute="networkRangeFunction" name="network-range-function" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Indicator of fixed or floating address"/>
+                        <xml-property name="description" value="descriptive function"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                <xml-element java-attribute="startRange" name="start-range" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                        <xml-property name="description" value="starting range for simple network ranges."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
+                <xml-element java-attribute="endRange" name="end-range" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Neutron network id of the interface that address belongs to"/>
+                        <xml-property name="description" value="end range for simple network ranges."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String">
+                <xml-element java-attribute="lastAssigned" name="last-assigned" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Neutron id of subnet that address belongs to"/>
+                        <xml-property name="description" value="last assigned value for simple network ranges"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="opsNote" name="ops-note" type="java.lang.String">
+                <xml-element java-attribute="rangeFormat" name="range-format" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Notes to aid OPs in troubleshooting, such as attribute aliases or additional descriptions/instructions about an object."/>
+                        <xml-property name="description" value="Format Decimal, Hexadecimal, etc."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="rangePrefix" name="range-prefix" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Prefix of network range."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Concurrency value"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="activities" name="activities" type="inventory.aai.onap.org.v25.Activities"/>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="IPv6 Address Range"/>
-                <xml-property name="indexedProps" value="vip-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id,vlan-id-outer,data-owner,data-source,data-source-version"/>
-                <xml-property name="dependentOn" value="cloud-region"/>
-            <xml-property name="uriTemplate" value="/vip-ipv6-address-list/{vip-ipv6-address}"/>
-            <xml-property name="requiredProps" value="vip-ipv6-address"/>
+                <xml-property name="description" value="Description of Network Range"/>
+                <xml-property name="nameProps" value="network-range-name,network-range-type"/>
+                <xml-property name="indexedProps" value="network-range-id,network-range-name,data-owner,data-source,data-source-version"/>
+                <xml-property name="container" value="network-ranges"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/network-ranges/network-range/{network-range-id}"/>
+                <xml-property name="requiredProps" value="network-range-id,network-range-name,network-range-type"/>
             </xml-properties>
         </java-type>
 
-        <java-type name="OperationalEnvironments">
+        <java-type name="Mappings">
             <xml-properties>
-                <xml-property name="description" value="a logical partition of the cloud which allows to have multiple environments in the production AIC."/>
+                <xml-property name="description" value="Collection of mappings."/>
             </xml-properties>
-            <xml-root-element name="operational-environments"/>
+            <xml-root-element name="mappings"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="operationalEnvironment" name="operational-environment" type="inventory.aai.onap.org.v25.OperationalEnvironment"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="mapping" name="mapping" type="inventory.aai.onap.org.v25.Mapping"/>
             </java-attributes>
-            <xml-properties>
-                <xml-property name="maximumDepth" value="0"/>
-            </xml-properties>
         </java-type>
 
-        <java-type name="OperationalEnvironment">
-            <xml-root-element name="operational-environment"/>
+        <java-type name="Mapping">
+            <xml-root-element name="mapping"/>
             <java-attributes>
-                <xml-element java-attribute="operationalEnvironmentId" name="operational-environment-id" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="mappingId" name="mapping-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="UUID of an operational environment"/>
+                        <xml-property name="description" value="Key for mapping object."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="operationalEnvironmentName" name="operational-environment-name" required="true" type="java.lang.String">
+                <xml-element java-attribute="mappingName" name="mapping-name" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Operational Environment name"/>
+                        <xml-property name="description" value="Name of mapping"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="operationalEnvironmentType" name="operational-environment-type" required="true" type="java.lang.String">
+                <xml-element java-attribute="mappingType" name="mapping-type" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Operational Environment Type."/>
+                        <xml-property name="description" value="Type of mapping."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="operationalEnvironmentStatus" name="operational-environment-status" required="true" type="java.lang.String">
+                <xml-element java-attribute="mappingRole" name="mapping-role" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Status"/>
+                        <xml-property name="description" value="Role of mapping"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="tenantContext" name="tenant-context" required="true" type="java.lang.String">
+                <xml-element java-attribute="mappingFunction" name="mapping-function" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Tenant Context."/>
+                        <xml-property name="description" value="Function of mapping"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="workloadContext" name="workload-context" required="true" type="java.lang.String">
+                <xml-element java-attribute="mappingNumber" name="mapping-number" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Workload Context."/>
+                        <xml-property name="description" value="Number of mapping"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="location1" name="location-1" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Location 1"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="location2" name="location-2" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Location 2"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="mappingGroupId" name="mapping-group-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Non-unique ID for grouping mappings"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Provision status for the mapping object. Valid values [PREPROV/NVTPROV/PROV]."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="homedLocation" name="homed-location" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Location the object is homed to"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="plannedLocation" name="planned-location" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Location the object is planned for"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
-                    </xml-properties>
-                </xml-element>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="It is a logical partition of the cloud which allows to have multiple environments in the production AIC."/>
-                <xml-property name="indexedProps" value="operational-environment-id,data-owner,data-source,data-source-version,tenant-context,workload-context"/>
-                <xml-property name="nameProps" value="operational-environment-name"/>
-                <xml-property name="uniqueProps" value="operational-environment-id"/>
-                <xml-property name="container" value="operational-environments"/>
-                <xml-property name="namespace" value="cloud-infrastructure"/>
-                <xml-property name="uriTemplate" value="/cloud-infrastructure/operational-environments/operational-environment/{operational-environment-id}"/>
-            <xml-property name="requiredProps" value="operational-environment-id,operational-environment-name,operational-environment-type,operational-environment-status,tenant-context,workload-context"/>
+                <xml-property name="description" value="General mechanism for mapping between instances; cg-nat."/>
+                <xml-property name="indexedProps" value="mapping-id,data-owner,data-source,data-source-version,prov-status"/>
+                <xml-property name="uniqueProps" value="mapping-id"/>
+                <xml-property name="container" value="mappings"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="uriTemplate" value="/network/mappings/mapping/{mapping-id}"/>
+                <xml-property name="requiredProps" value="mapping-id"/>
             </xml-properties>
         </java-type>
 
-        <java-type name="ForwardingPaths">
-            <xml-root-element name="forwarding-paths"/>
+        <java-type name="HwComponents">
+            <xml-root-element name="hw-components"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="forwardingPath" name="forwarding-path" type="inventory.aai.onap.org.v25.ForwardingPath"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="hwComponent" name="hw-component" type="inventory.aai.onap.org.v25.HwComponent"/>
             </java-attributes>
-        </java-type>
-
-        <java-type name="ForwardingPath">
-            <xml-root-element name="forwarding-path"/>
             <xml-properties>
-                <xml-property name="namespace" value="network"/>
-                <xml-property name="indexedProps" value="forwarding-path-id,forwarding-path-name,data-owner,data-source,data-source-version"/>
-                <xml-property name="description" value="Entity that describes the sequenced forwarding path between interfaces of services or resources"/>
-                <xml-property name="container" value="forwarding-paths"/>
-                <xml-property name="nameProps" value="forwarding-path-name"/>
-                <xml-property name="uniqueProps" value="forwarding-path-id"/>
-                <xml-property name="uriTemplate" value="/network/forwarding-paths/forwarding-path/{forwarding-path-id}"/>
-            <xml-property name="requiredProps" value="forwarding-path-id,forwarding-path-name"/>
             </xml-properties>
+        </java-type>
+
+        <java-type name="HwComponent">
+            <xml-root-element name="hw-component"/>
             <java-attributes>
-                <xml-element java-attribute="forwardingPathId" name="forwarding-path-id" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="hwComponentId" name="hw-component-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Unique ID of this FP"/>
+                        <xml-property name="description" value="UUID"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="forwardingPathName" name="forwarding-path-name" required="true" type="java.lang.String">
+                <xml-element java-attribute="hwComponentName" name="hw-component-name" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Name of the FP"/>
+                        <xml-property name="description" value="Name of hardware component"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                <xml-element java-attribute="hwComponentType" name="hw-component-type" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete."/>
+                        <xml-property name="description" value="Type of hardware component"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+                <xml-element java-attribute="hwComponentRole" name="hw-component-role" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="the self link for this FP"/>
+                        <xml-property name="description" value="Role of hardware component"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="hwComponentFunction" name="hw-component-function" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Function of hardware component"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="forwarders" name="forwarders" type="inventory.aai.onap.org.v25.Forwarders"/>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
             </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="create/update/delete the hw-component node"/>
+                <xml-property name="indexedProps" value="hw-component-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="uriTemplate" value="/network/hw-components/hw-component/{hw-component-id}"/>
+                <xml-property name="requiredProps" value="hw-component-id"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="container" value="hw-components"/>
+            </xml-properties>
         </java-type>
 
-        <java-type name="Forwarders">
-            <xml-root-element name="forwarders"/>
+        <java-type name="SwComponents">
+            <xml-root-element name="sw-components"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="forwarder" name="forwarder" type="inventory.aai.onap.org.v25.Forwarder"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="swComponent" name="sw-component" type="inventory.aai.onap.org.v25.SwComponent"/>
             </java-attributes>
-        </java-type>
-
-        <java-type name="Forwarder">
-            <xml-root-element name="forwarder"/>
             <xml-properties>
-                <xml-property name="indexedProps" value="sequence,data-owner,data-source,data-source-version"/>
-                <xml-property name="description" value="Entity describing a sequenced segment of forwarding path"/>
-                <xml-property name="container" value="forwarders"/>
-                <xml-property name="dependentOn" value="forwarding-path"/>
-                <xml-property name="uriTemplate" value="/forwarders/forwarder/{sequence}"/>
-            <xml-property name="requiredProps" value="sequence"/>
             </xml-properties>
+        </java-type>
+
+        <java-type name="SwComponent">
+            <xml-root-element name="sw-component"/>
             <java-attributes>
-                <xml-element java-attribute="sequence" name="sequence" required="true" type="java.lang.Integer" xml-key="true">
+                <xml-element java-attribute="swComponentId" name="sw-component-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Unique ID of this segmentation"/>
+                        <xml-property name="description" value="UUID"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="forwarderRole" name="forwarder-role" type="java.lang.String">
+                <xml-element java-attribute="swComponentName" name="sw-component-name" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="ingress, intermediate, egress"/>
+                        <xml-property name="description" value="Name of software component"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="swComponentType" name="sw-component-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Type of software component"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="swComponentRole" name="sw-component-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Role of software component"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="swComponentFunction" name="sw-component-function" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Function of software component"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete."/>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
             </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="create/update/delete the sw-component node"/>
+                <xml-property name="indexedProps" value="sw-component-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="uriTemplate" value="/network/sw-components/sw-component/{sw-component-id}"/>
+                <xml-property name="requiredProps" value="sw-component-id"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="container" value="sw-components"/>
+            </xml-properties>
         </java-type>
 
-        <java-type name="ForwarderEvcs">
-            <xml-root-element name="forwarder-evcs"/>
+        <java-type name="NetworkRoutes">
+            <xml-root-element name="network-routes"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="forwarderEvc" name="forwarder-evc" type="inventory.aai.onap.org.v25.ForwarderEvc"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="networkRoute" name="network-route" type="inventory.aai.onap.org.v25.NetworkRoute"/>
             </java-attributes>
+            <xml-properties>
+            </xml-properties>
         </java-type>
 
-        <java-type name="ForwarderEvc">
-            <xml-root-element name="forwarder-evc"/>
+        <java-type name="NetworkRoute">
+            <xml-root-element name="network-route"/>
             <java-attributes>
-                <xml-element java-attribute="forwarderEvcId" name="forwarder-evc-id" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="routeId" name="route-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Key for forwarder-evc object"/>
+                        <xml-property name="description" value="unique identifier example uuid."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="circuitId" name="circuit-id" type="java.lang.String">
+                <xml-element java-attribute="type" name="type" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Circuit ID from customer/ESP/ingress end of EVC, or reference to beater circuit on gateway/network/egress end of EVC"/>
+                        <xml-property name="description" value="used to categorize this object in conjunction with role &amp; function. The most generic category."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="ivlan" name="ivlan" type="java.lang.String">
+                <xml-element java-attribute="role" name="role" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Internal VLAN."/>
+                        <xml-property name="description" value="used to categorize this object in conjunction with type &amp; function."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="svlan" name="svlan" type="java.lang.String">
+                <xml-element java-attribute="function" name="function" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="SVLAN value for ingress of egress forwarder."/>
+                        <xml-property name="description" value="used to categorize this object in conjunction with type &amp; role. The most specific category."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="cvlan" name="cvlan" type="java.lang.String">
+                <xml-element java-attribute="ipAddress" name="ip-address" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="CVLAN value for ingress of egress forwarder."/>
+                        <xml-property name="description" value="ip address that of the specific network-route."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="prefixLength" name="prefix-length" required="true" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="ip-address prefix length."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="logicalInterfaceId" name="logical-interface-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identity of a logical interface, e.g., VLAN ID."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="nextHop" name="next-hop" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Could be ip-address, hostname, or service-instance."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="nextHopType" name="next-hop-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Should be ip-address, hostname, or service-instance to match next-hop."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="metric" name="metric" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Value that is assigned to an IP route for a particular network interface that identifies the cost that is associated with using that route."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="addressFamily" name="address-family" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="whether the route address is ipv4, ipv6."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="vlanMappings" name="vlan-mappings" type="inventory.aai.onap.org.v25.VlanMappings"/>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
+                <xml-element java-attribute="configurationStatus" name="configuration-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Configuration status of the network route."/>
+                    </xml-properties>
+                </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete."/>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="forwarder object is an optional child object of the Configuration object."/>
-                <xml-property name="dependentOn" value="configuration"/>
-                <xml-property name="uniqueProps" value="forwarder-evc-id"/>
-                <xml-property name="container" value="forwarder-evcs"/>
-                <xml-property name="uriTemplate" value="/forwarder-evcs/forwarder-evc/{forwarder-evc-id}"/>
-                <xml-property name="requiredProps" value="forwarder-evc-id"/>
-                <xml-property name="indexedProps" value="circuit-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="description" value="This object represents a network route. For instance, host-route, static-route."/>
+                <xml-property name="indexedProps" value="route-id,type,role,function,ip-address,prefix-length,next-hop,data-owner,data-source,data-source-version"/>
+                <xml-property name="uriTemplate" value="/network/network-routes/network-route/{route-id}"/>
+                <xml-property name="requiredProps" value="route-id,type,role,function,ip-address,prefix-length,address-family"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="container" value="network-routes"/>
             </xml-properties>
         </java-type>
 
-        <java-type name="VlanMappings">
-            <xml-properties>
-                <xml-property name="description" value="Collection of vlan mappings."/>
-            </xml-properties>
-            <xml-root-element name="vlan-mappings"/>
+        <java-type name="NextHops">
+            <xml-root-element name="next-hops"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="vlanMapping" name="vlan-mapping" type="inventory.aai.onap.org.v25.VlanMapping"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="nextHop" name="next-hop" type="inventory.aai.onap.org.v25.NextHop"/>
             </java-attributes>
+            <xml-properties>
+            </xml-properties>
         </java-type>
 
-        <java-type name="VlanMapping">
-            <xml-root-element name="vlan-mapping"/>
+        <java-type name="NextHop">
+            <xml-root-element name="next-hop"/>
             <java-attributes>
-                <xml-element java-attribute="vlanMappingId" name="vlan-mapping-id" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="nextHopId" name="next-hop-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Key for vlan-mapping object."/>
+                        <xml-property name="description" value="UUID."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="uniCvlan" name="uni-cvlan" type="java.lang.String">
+                <xml-element java-attribute="nextHopType" name="next-hop-type" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="CVLAN value from the UNI/ingress side of the SAREA gateway access device."/>
+                        <xml-property name="description" value="Used to categorize this object in conjunction with role &amp; function. The most generic category."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="nniSvlan" name="nni-svlan" type="java.lang.String">
+                <xml-element java-attribute="nextHopRole" name="next-hop-role" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="SVLAN value from the NNI/egress side of the SAREA gateway access device."/>
+                        <xml-property name="description" value="Used to categorize this object in conjunction with type &amp; function."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="nniCvlan" name="nni-cvlan" type="java.lang.String">
+                <xml-element java-attribute="nextHopFunction" name="next-hop-function" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="CVLAN value from the NNI/egress side of the SAREA gateway access device."/>
+                        <xml-property name="description" value="Used to categorize this object in conjunction with type &amp; role. The most specific category."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="ivLan" name="ivlan" type="java.lang.String">
+                <xml-element java-attribute="sequence" name="sequence" type="java.lang.Integer">
                     <xml-properties>
-                        <xml-property name="description" value="The internal VLAN ('IVLAN') value.  Specific to Arista devices."/>
+                        <xml-property name="description" value="Sequence number."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="addressFamily" name="address-family" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Ipv4 or Ipv6."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipAddress" name="ip-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Next hop ip-address."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="metric" name="metric" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Cost that is associated with using the route."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="vlan-mapping object is an optional child object of the forwarder-evc object.  A given forwarder-evc object may have multiple vlan-mapping objects."/>
-                <xml-property name="dependentOn" value="forwarder-evc"/>
-                <xml-property name="uniqueProps" value="vlan-mapping-id"/>
-                <xml-property name="container" value="vlan-mappings"/>
-                <xml-property name="uriTemplate" value="/vlan-mappings/vlan-mapping/{vlan-mapping-id}"/>
-               <xml-property name="requiredProps" value="vlan-mapping-id"/>
-               <xml-property name="indexedProps" value="data-owner,data-source,data-source-version"/>
+                <xml-property name="description" value="Is among the series of routers that are connected together in a network and is the next possible destination for a data packet."/>
+                <xml-property name="indexedProps" value="next-hop-id,ip-address,sequence,data-owner,data-source,data-source-version"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="container" value="next-hops"/>
+                <xml-property name="uriTemplate" value="/network/next-hops/next-hop/{next-hop-id}"/>
+                <xml-property name="uniqueProps" value="next-hop-id"/>
+                <xml-property name="requiredProps" value="next-hop-id,next-hop-type"/>
             </xml-properties>
         </java-type>
 
-        <java-type name="Evcs">
-            <xml-root-element name="evcs"/>
+        <java-type name="Bfds">
+            <xml-root-element name="bfds"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="evc" name="evc" type="inventory.aai.onap.org.v25.Evc"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="bfd" name="bfd" type="inventory.aai.onap.org.v25.Bfd"/>
             </java-attributes>
+            <xml-properties>
+            </xml-properties>
         </java-type>
 
-        <java-type name="Evc">
-            <xml-root-element name="evc"/>
+        <java-type name="Bfd">
+            <xml-root-element name="bfd"/>
             <java-attributes>
-                <xml-element java-attribute="evcId" name="evc-id" required="true" type="java.lang.String" xml-key="true">
-                    <xml-properties>
-                        <xml-property name="description" value="Unique/key field for the evc object"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="forwardingPathTopology" name="forwarding-path-topology" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="Point-to-Point, Multi-Point"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="cirValue" name="cir-value" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="Commited Information Rate"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="cirUnits" name="cir-units" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="CIR units"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="cmtu" name="cmtu" type="java.lang.Integer">
-                       <xml-properties>
-                               <xml-property name="description" value="Size of the Customer Requested MTU (Maximum Transmission Unit)."/>
-                       </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="connectionDiversityGroupId" name="connection-diversity-group-id" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="Diversity Group ID"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="serviceHours" name="service-hours" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="formerly Performance Group"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="enhancedMulticast" name="enhanced-multicast" type="java.lang.String">
-                       <xml-properties>
-                               <xml-property name="description" value="String value indicating whether the EVC uses enhanced multicast. Possible Values:yes/no/[empty string]"/>
-                       </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="espEvcCircuitId" name="esp-evc-circuit-id" type="java.lang.String">
+                <xml-element java-attribute="bfdId" name="bfd-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="EVC Circuit ID of ESP EVC"/>
+                        <xml-property name="description" value="Unique identifier."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="espEvcCirValue" name="esp-evc-cir-value" type="java.lang.String">
+                <xml-element java-attribute="bfdType" name="bfd-type" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Committed Information Rate (For ESP)"/>
+                        <xml-property name="description" value="Used to categorize this object in conjunction with role &amp; function. The most generic category."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="espEvcCirUnits" name="esp-evc-cir-units" type="java.lang.String">
+                <xml-element java-attribute="bfdRole" name="bfd-role" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="CIR units (For ESP)"/>
+                        <xml-property name="description" value="Used to categorize this object in conjunction with type &amp; function."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="espItuCode" name="esp-itu-code" type="java.lang.String">
+                <xml-element java-attribute="bfdFunction" name="bfd-function" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies ESP"/>
+                        <xml-property name="description" value="Used to categorize this object in conjunction with type &amp; role. The most specific category."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="collectorPopClli" name="collector-pop-clli" type="java.lang.String">
+                <xml-element java-attribute="bfdKeepAlive" name="bfd-keep-alive" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Collector POP CLLI (from the hostname of the access pnf)"/>
+                        <xml-property name="description" value="bfd keep-alive parameter"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="interConnectTypeIngress" name="inter-connect-type-ingress" type="java.lang.String">
+                <xml-element java-attribute="bfdTimeout" name="bfd-timeout" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Interconnect type on ingress side of EVC."/>
+                        <xml-property name="description" value="bfd timeout parameter"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="tagmodeAccessIngress" name="tagmode-access-ingress" type="java.lang.String">
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="tagode for collector side of EVC"/>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                                               <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="tagmodeAccessEgress" name="tagmode-access-egress" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="tagMode for network side of EVC"/>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                 <xml-element java-attribute="productEntryId" name="product-entry-id" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Product ID"/>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                <xml-element java-attribute="bfdMultihop" name="bfd-multihop" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
-                                               <xml-property name="ownerCheck" value="N/A"/>
+                        <xml-property name="description" value="bfd multihop parameter"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="minimumInterval" name="minimum-interval" type="java.lang.Integer">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                        <xml-property name="description" value="The shortest interval between sending BFD control packets to a neighbor."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete."/>
-                    </xml-properties>
-                </xml-element>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="evc object is an optional child object of the Configuration object."/>
-                <xml-property name="dependentOn" value="configuration"/>
-                <xml-property name="uniqueProps" value="evc-id"/>
-                <xml-property name="container" value="evcs"/>
-                <xml-property name="uriTemplate" value="/evcs/evc/{evc-id}"/>
-               <xml-property name="requiredProps" value="evc-id"/>
-               <xml-property name="indexedProps" value="data-owner,data-source,data-source-version"/>
+                <xml-property name="description" value="BFD (Bidirectional Forwarding Detection) is a protocol for detecting link failures.The BFD object is for persisting attributes for the links that have BFD enabled."/>
+                <xml-property name="indexedProps" value="bfd-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="container" value="bfds"/>
+                <xml-property name="uriTemplate" value="/network/bfds/bfd/{bfd-id}"/>
+                <xml-property name="uniqueProps" value="bfd-id"/>
+                <xml-property name="requiredProps" value="bfd-id,bfd-type"/>
+                <xml-property name="nameProps" value="bfd-id"/>
             </xml-properties>
         </java-type>
 
-        <java-type name="Collections">
-            <xml-root-element name="collections"/>
+        <java-type name="Fqdns">
+            <xml-root-element name="fqdns"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="collection" name="collection" type="inventory.aai.onap.org.v25.Collection"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="fqdn" name="fqdn" type="inventory.aai.onap.org.v25.Fqdn"/>
             </java-attributes>
+            <xml-properties>
+            </xml-properties>
         </java-type>
 
-        <java-type name="Collection">
-            <xml-root-element name="collection"/>
+        <java-type name="Fqdn">
+            <xml-root-element name="fqdn"/>
             <java-attributes>
-                <xml-element java-attribute="collectionId" name="collection-id" required="true" type="java.lang.String" xml-key="true">
-                    <xml-properties>
-                        <xml-property name="description" value="Collection Object UUID"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="ASDC model id for this resource or service model"/>
-                        <xml-property name="visibility" value="deployment"/>
-                        <xml-property name="requires" value="model-version-id"/>
-                        <xml-property name="dbAlias" value="model-invariant-id-local"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="Model Version"/>
-                        <xml-property name="visibility" value="deployment"/>
-                        <xml-property name="requires" value="model-invariant-id"/>
-                        <xml-property name="dbAlias" value="model-version-id-local"/>
-                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="collectionName" name="collection-name" type="java.lang.String">
-                    <xml-properties>
-                        <xml-property name="description" value="collection name"/>
-                    </xml-properties>
-                </xml-element>
-                <xml-element java-attribute="collectionType" name="collection-type" type="java.lang.String">
+                <xml-element java-attribute="fqdn" name="fqdn" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Collection type"/>
+                        <xml-property name="description" value="Fully qualified domain name."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="collectionRole" name="collection-role" type="java.lang.String">
+                <xml-element java-attribute="fqdnType" name="fqdn-type" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Collection Role"/>
+                        <xml-property name="description" value="Used to categorize this object in conjunction with role &amp; function. The most generic category."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="collectionFunction" name="collection-function" type="java.lang.String">
+                <xml-element java-attribute="fqdnRole" name="fqdn-role" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Collection function"/>
+                        <xml-property name="description" value="Used to categorize this object in conjunction with type &amp; function."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                <xml-element java-attribute="fqdnFunction" name="fqdn-function" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="orchestration status"/>
+                        <xml-property name="description" value="Used to categorize this object in conjunction with type &amp; role. The most specific category."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="collectionCustomizationId" name="collection-customization-id" type="java.lang.String">
+                <xml-element java-attribute="dnsDomain" name="dns-domain" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Captures the id of all the configuration used to customize the resource for the service"/>
+                        <xml-property name="description" value="Domain name."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete."/>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
             </java-attributes>
             <xml-properties>
+                <xml-property name="description" value="A fully qualified domain name (FQDN) is the complete domain name for a specific computer, or host, on the internet."/>
+                <xml-property name="requiredProps" value="fqdn,dns-domain"/>
+                <xml-property name="indexedProps" value="fqdn,data-owner,data-source,data-source-version"/>
                 <xml-property name="namespace" value="network"/>
-                <xml-property name="description" value="represents the collection resource in the TOSCA model"/>
-                <xml-property name="uniqueProps" value="collection-id"/>
-                <xml-property name="indexedProps" value="collection-id,model-invariant-id,model-version-id,orchestration-status,data-owner,data-source,data-source-version"/>
-                <xml-property name="container" value="collections"/>
-                <xml-property name="uriTemplate" value="/network/collections/collection/{collection-id}"/>
-            <xml-property name="requiredProps" value="collection-id"/>
+                <xml-property name="container" value="fqdns"/>
+                <xml-property name="uriTemplate" value="/network/fqdns/fqdn/{fqdn}"/>
             </xml-properties>
         </java-type>
 
-        <java-type name="Cps">
+        <java-type name="RouteTargets">
             <xml-properties>
-                <xml-property name="description" value="Collection of connection points."/>
+                <xml-property name="description" value="Collection of route target information"/>
             </xml-properties>
-            <xml-root-element name="cps"/>
+            <xml-root-element name="route-targets"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="cp" name="cp" type="inventory.aai.onap.org.v25.Cp"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="routeTarget" name="route-target" type="inventory.aai.onap.org.v25.RouteTarget"/>
             </java-attributes>
         </java-type>
-
-        <java-type name="Cp">
-            <xml-root-element name="cp"/>
+        <java-type name="RouteTarget">
+            <xml-root-element name="route-target"/>
             <java-attributes>
-                <xml-element java-attribute="cpInstanceId" name="cp-instance-id" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="globalRouteTarget" name="global-route-target" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Unique ID of the connection point."/>
+                        <xml-property name="description" value="Number used to identify an RT, globally unique in the network"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="portId" name="port-id" required="false" type="java.lang.Integer">
+                <xml-element java-attribute="routeTargetRole" name="route-target-role" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="port index to represent multiple CPs on VNFC connected to same network."/>
+                        <xml-property name="description" value="Role assigned to this route target"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="resourceVersion" name="resource-version" required="false" type="java.lang.String">
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete."/>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v25.L3InterfaceIpv4AddressList"/>
-                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v25.L3InterfaceIpv6AddressList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Captures the point of attachment from services or resources to a virtual link or network."/>
-                <xml-property name="uniqueProps" value="cp-instance-id"/>
-                <xml-property name="dependentOn" value="vnfc"/>
-                <xml-property name="container" value="cps"/>
-                <xml-property name="uriTemplate" value="/cps/cp/{cp-instance-id}"/>
-                               <xml-property name="requiredProps" value="cp-instance-id"/>
-                               <xml-property name="indexedProps" value="data-owner,data-source,data-source-version"/>
+                <xml-property name="description" value="Route target information"/>
+                <xml-property name="container" value="route-targets"/>
+                <xml-property name="dependentOn" value="vpn-binding,vrf"/>
+                <xml-property name="canBeLinked" value="true"/>
+                <xml-property name="uriTemplate" value="/route-targets/route-target/{global-route-target}/{route-target-role}"/>
+                <xml-property name="requiredProps" value="global-route-target,route-target-role"/>
+                <xml-property name="indexedProps" value="data-owner,data-source,data-source-version"/>
             </xml-properties>
         </java-type>
 
-        <java-type name="VlanTags">
+        <java-type name="SriovPfs">
             <xml-properties>
-                <xml-property name="description" value="Vlan Tags Assigned out of a Vlan Range"/>
+                <xml-property name="description" value="Collection of SR-IOV Physical Functions."/>
             </xml-properties>
-            <xml-root-element name="vlan-tags"/>
+            <xml-root-element name="sriov-pfs"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="vlanTag" name="vlan-tag" type="inventory.aai.onap.org.v25.VlanTag"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="sriovPf" name="sriov-pf" type="inventory.aai.onap.org.v25.SriovPf"/>
             </java-attributes>
         </java-type>
-        <java-type name="VlanTag">
-            <xml-root-element name="vlan-tag"/>
+        <java-type name="SriovPf">
+            <xml-root-element name="sriov-pf"/>
             <java-attributes>
-                <xml-element java-attribute="vlanTagId" name="vlan-tag-id" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="pfPciId" name="pf-pci-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Vlan Tag Id"/>
+                        <xml-property name="description" value="Identifier for the sriov-pf"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="vlanTagRole" name="vlan-tag-role" required="true" type="java.lang.String">
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Role assigned to this vlan-tag"/>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                                               <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Inner VLAN tag"/>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Outer VLAN tag"/>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="isPrivate" name="is-private" required="true" type="java.lang.Boolean">
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="is private flag."/>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="vlanTagType" name="vlan-tag-type" type="java.lang.String">
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="SR-IOV Physical Function"/>
+                <xml-property name="indexedProps" value="pf-pci-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="p-interface"/>
+                <xml-property name="container" value="sriov-pfs"/>
+                <xml-property name="uriTemplate" value="/sriov-pfs/sriov-pf/{pf-pci-id}"/>
+                <xml-property name="requiredProps" value="pf-pci-id"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="HostRoutes">
+            <xml-root-element name="host-routes"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="hostRoute" name="host-route" type="inventory.aai.onap.org.v25.HostRoute"/>
+            </java-attributes>
+        </java-type>
+        <java-type name="HostRoute">
+            <xml-root-element name="host-route"/>
+            <java-attributes>
+                <xml-element java-attribute="hostRouteId" name="host-route-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="VLAN tag Type"/>
+                        <xml-property name="description" value="host-route id"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="vlanTagFunction" name="vlan-tag-function" type="java.lang.String">
+                <xml-element java-attribute="routePrefix" name="route-prefix" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="VLAN Tag Function"/>
+                        <xml-property name="description" value="subnet prefix"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="configPhase" name="config-phase" type="java.lang.String">
+                <xml-element java-attribute="nextHop" name="next-hop" required="true" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The config-phase associated with this vlan-tag"/>
+                        <xml-property name="description" value="Could be ip-address, hostname, or service-instance"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="nextHopType" name="next-hop-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Should be ip-address, hostname, or service-instance to match next-hop"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="metric" name="metric" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Value that is assigned to an IP route for a particular network interface that identifies the cost that is associated with using that route."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="vlan tag information"/>
-                <xml-property name="container" value="vlan-tags"/>
-                <xml-property name="dependentOn" value="vlan-range"/>
-                <xml-property name="uriTemplate" value="/vlan-tags/vlan-tag/{vlan-tag-id}"/>
-                <xml-property name="requiredProps" value="vlan-tag-id,vlan-tag-role,is-private"/>
-                <xml-property name="indexedProps" value="data-owner,data-source,data-source-version,vlan-id-outer,vlan-id-inner"/>
-            </xml-properties>
-        </java-type>
-
-        <java-type name="GeoRegions">
-            <xml-properties>
-                <xml-property name="description" value="Collection of geo-regions"/>
+                <xml-property name="description" value="Route packets to a specific host. Host routes are automatically added to the routing table for all IPv4 and IPv6 addresses that are configured on the router. The purpose of a host route is to create a corresponding CEF entry as a receive entry so that the packets destined to this IP address can be processed by the router itself."/>
+                <xml-property name="indexedProps" value="host-route-id,next-hop,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="subnet"/>
+                <xml-property name="container" value="host-routes"/>
+                <xml-property name="uriTemplate" value="/host-routes/host-route/{host-route-id}"/>
             </xml-properties>
-            <xml-root-element name="geo-regions"/>
-            <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="geoRegion" name="geo-region" type="inventory.aai.onap.org.v25.GeoRegion"/>
-            </java-attributes>
         </java-type>
 
-        <java-type name="GeoRegion">
-            <xml-root-element name="geo-region"/>
+        <java-type name="VipIpv4AddressList">
+            <xml-root-element name="vip-ipv4-address-list"/>
             <java-attributes>
-                <xml-element java-attribute="geoRegionId" name="geo-region-id" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="vipIpv4Address" name="vip-ipv4-address" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="UUID, key for geo-region object."/>
+                        <xml-property name="description" value="IP address"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="geoRegionName" name="geo-region-name" type="java.lang.String">
+                <xml-element java-attribute="vipIpv4PrefixLength" name="vip-ipv4-prefix-length" type="java.lang.Long">
                     <xml-properties>
-                        <xml-property name="description" value="Name of geo-region"/>
+                        <xml-property name="description" value="Prefix length, 32 for single address"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="geoRegionType" name="geo-region-type" type="java.lang.String">
+                <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
                     <xml-properties>
-                        <xml-property name="description" value="Type of geo-region"/>
+                        <xml-property name="description" value="Inner VLAN tag"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="geoRegionRole" name="geo-region-role" type="java.lang.String">
+                <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
                     <xml-properties>
-                        <xml-property name="description" value="Role of geo-region"/>
+                        <xml-property name="description" value="Outer VLAN tag"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="geoRegionFunction" name="geo-region-function" type="java.lang.String">
+                <xml-element java-attribute="isFloating" name="is-floating" type="java.lang.Boolean">
                     <xml-properties>
-                        <xml-property name="description" value="Function of geo-region"/>
+                        <xml-property name="description" value="Indicator of fixed or floating address"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Neutron network id of the interface that address belongs to"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Neutron id of subnet that address belongs to"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="opsNote" name="ops-note" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Notes to aid OPs in troubleshooting, such as attribute aliases or additional descriptions/instructions about an object."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"/>
-            </java-attributes>
-            <xml-properties>
-                <xml-property name="description" value="Top level node for a cg-nat geographical region."/>
-                <xml-property name="indexedProps" value="geo-region-id,data-owner,data-source,data-source-version"/>
-                <xml-property name="uniqueProps" value="geo-region-id"/>
-                <xml-property name="container" value="geo-regions"/>
-                <xml-property name="namespace" value="cloud-infrastructure"/>
-                <xml-property name="uriTemplate" value="/cloud-infrastructure/geo-regions/geo-region/{geo-region-id}"/>
-                <xml-property name="requiredProps" value="geo-region-id"/>
-            </xml-properties>
-        </java-type>
-
-        <java-type name="NetworkTechnologies">
-            <xml-properties>
-                <xml-property name="description" value=" The network-technology object is used to capture the supported network technologies of a cloud-region."/>
-            </xml-properties>
-            <xml-root-element name="network-technologies"/>
-            <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="networkTechnology" name="network-technology" type="inventory.aai.onap.org.v25.NetworkTechnology"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="maximumDepth" value="0"/>
+                <xml-property name="description" value="IPv4 Address Range"/>
+                <xml-property name="indexedProps" value="vip-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id,vlan-id-outer,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+                <xml-property name="uriTemplate" value="/vip-ipv4-address-list/{vip-ipv4-address}"/>
+                <xml-property name="requiredProps" value="vip-ipv4-address"/>
             </xml-properties>
         </java-type>
 
-        <java-type name="NetworkTechnology">
-            <xml-root-element name="network-technology"/>
+        <java-type name="VipIpv6AddressList">
+            <xml-root-element name="vip-ipv6-address-list"/>
             <java-attributes>
-                <xml-element java-attribute="networkTechnologyId" name="network-technology-id" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="vipIpv6Address" name="vip-ipv6-address" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Unique identifier of the network-technology object (UUID)"/>
+                        <xml-property name="description" value="IP address"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="networkTechnologyName" name="network-technology-name" required="true" type="java.lang.String">
+                <xml-element java-attribute="vipIpv6PrefixLength" name="vip-ipv6-prefix-length" type="java.lang.Long">
                     <xml-properties>
-                        <xml-property name="description" value="The network-technology  that a cloud-region can support. Current valid values- CONTRAIL AIC_SR_IOV OVS STANDARD-SR-IOV"/>
+                        <xml-property name="description" value="Prefix length, 128 for single address"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
-                                               <xml-property name="ownerCheck" value="N/A"/>
+                        <xml-property name="description" value="Inner VLAN tag"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                        <xml-property name="description" value="Outer VLAN tag"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="isFloating" name="is-floating" type="java.lang.Boolean">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                        <xml-property name="description" value="Indicator of fixed or floating address"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-            </java-attributes>
-            <xml-properties>
-                <xml-property name="description" value="The network-technology object is used to capture the supported network technologies of a cloud-region."/>
-                <xml-property name="nameProps" value="network-technology-id,network-technology-name"/>
-                <xml-property name="uniqueProps" value="network-technology-id"/>
-                <xml-property name="container" value="network-technologies"/>
-                <xml-property name="namespace" value="cloud-infrastructure"/>
-                <xml-property name="uriTemplate" value="/cloud-infrastructure/network-technologies/network-technology/{network-technology-id}"/>
-                               <xml-property name="requiredProps" value="network-technology-id,network-technology-name"/>
-                               <xml-property name="indexedProps" value="data-owner,data-source,data-source-version"/>
-            </xml-properties>
-        </java-type>
-
-        <java-type name="SpPartner">
-            <xml-root-element name="sp-partner"/>
-            <java-attributes>
-                <xml-element java-attribute="spPartnerId" name="sp-partner-id" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Uniquely identifies this sp-partner by id"/>
+                        <xml-property name="description" value="Neutron network id of the interface that address belongs to"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="url" name="url" type="java.lang.String">
+                <xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Store the URL of this sp-partner."/>
+                        <xml-property name="description" value="Neutron id of subnet that address belongs to"/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="callsource" name="callsource" type="java.lang.String">
+                <xml-element java-attribute="opsNote" name="ops-note" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Store the callsource of this sp-partner."/>
+                        <xml-property name="description" value="Notes to aid OPs in troubleshooting, such as attribute aliases or additional descriptions/instructions about an object."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the operational-status for this sp-partner."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the model-customization-id for this sp-partner."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="the ASDC model id for this sp-partner model."/>
-                                               <xml-property name="visibility" value="deployment"/>
-                                               <xml-property name="requires" value="model-version-id"/>
-                                               <xml-property name="dbAlias" value="model-invariant-id-local"/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="the ASDC model version for this sp-partner model."/>
-                                               <xml-property name="visibility" value="deployment"/>
-                                               <xml-property name="requires" value="model-invariant-id"/>
-                                               <xml-property name="dbAlias" value="model-version-id-local"/>
-                                               <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
-                                       </xml-properties>
-                               </xml-element>
-
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Instance of an sp-partner"/>
-                <xml-property name="indexedProps" value="sp-partner-id,url,callsource,model-invariant-id,model-version-id,data-owner,data-source,data-source-version"/>
-                <xml-property name="nameProps" value="sp-partner-id"/>
-                <xml-property name="searchable" value="sp-partner-id"/>
-                <xml-property name="uniqueProps" value="sp-partner-id"/>
-                <xml-property name="container" value="sp-partners"/>
-                <xml-property name="namespace" value="business"/>
-                <xml-property name="uriTemplate" value="/business/sp-partners/sp-partner/{sp-partner-id}"/>
-            <xml-property name="requiredProps" value="sp-partner-id"/>
+                <xml-property name="description" value="IPv6 Address Range"/>
+                <xml-property name="indexedProps" value="vip-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id,vlan-id-outer,data-owner,data-source,data-source-version"/>
+                <xml-property name="dependentOn" value="cloud-region"/>
+                <xml-property name="uriTemplate" value="/vip-ipv6-address-list/{vip-ipv6-address}"/>
+                <xml-property name="requiredProps" value="vip-ipv6-address"/>
             </xml-properties>
         </java-type>
-        <java-type name="SpPartners">
-            <xml-root-element name="sp-partners"/>
+
+        <java-type name="OperationalEnvironments">
             <xml-properties>
-                <xml-property name="description" value="Collection of sp-partners"/>
+                <xml-property name="description" value="a logical partition of the cloud which allows to have multiple environments in the production AIC."/>
             </xml-properties>
+            <xml-root-element name="operational-environments"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="spPartner" name="sp-partner" type="inventory.aai.onap.org.v25.SpPartner"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="operationalEnvironment" name="operational-environment" type="inventory.aai.onap.org.v25.OperationalEnvironment"/>
             </java-attributes>
+            <xml-properties>
+                <xml-property name="maximumDepth" value="0"/>
+            </xml-properties>
         </java-type>
 
-               <java-type name="Connectivity">
-                       <xml-root-element name="connectivity"/>
-                       <java-attributes>
-                               <xml-element java-attribute="connectivityId" name="connectivity-id" required="true" type="java.lang.String" xml-key="true">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Uniquely identifies this connectivity by id"/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="bandwidthProfileName" name="bandwidth-profile-name" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the name of a bandwidth profile."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="vpnType" name="vpn-type" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the type of a bandwidth profile."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="cir" name="cir" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the CIR of this connectivity."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="eir" name="eir" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the EIR of this connectivity."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="cbs" name="cbs" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the CBS of this connectivity."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="ebs" name="ebs" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the EBS of this connectivity."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="colorAware" name="color-aware" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the color-awareness of this connectivity."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="couplingFlag" name="coupling-flag" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the coupling flag of this connectivity."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="ethtSvcName" name="etht-svc-name" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="The ethernet service name for this connectivity."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="accessProviderId" name="access-provider-id" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the id of the access provider of this connectivity."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="accessClientId" name="access-client-id" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the id of the access client of this connectivity."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="accessTopologyId" name="access-topology-id" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the id of the access topology of this connectivity."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="accessNodeId" name="access-node-id" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the id of the access node of this connectivity."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="accessLtpId" name="access-ltp-id" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the id of the access ltp of this connectivity."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="connectivitySelflink" name="connectivity-selflink" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the link to get more information for this connectivity."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="cvlan" name="cvlan" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the cvlan for this connectivity."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
-                                       <xml-properties>
+        <java-type name="OperationalEnvironment">
+            <xml-root-element name="operational-environment"/>
+            <java-attributes>
+                <xml-element java-attribute="operationalEnvironmentId" name="operational-environment-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="UUID of an operational environment"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="operationalEnvironmentName" name="operational-environment-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Operational Environment name"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="operationalEnvironmentType" name="operational-environment-type" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Operational Environment Type."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="operationalEnvironmentStatus" name="operational-environment-status" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Status"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="tenantContext" name="tenant-context" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Tenant Context."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="workloadContext" name="workload-context" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Workload Context."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                                               <xml-property name="ownerCheck" value="N/A"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="It is a logical partition of the cloud which allows to have multiple environments in the production AIC."/>
+                <xml-property name="indexedProps" value="operational-environment-id,data-owner,data-source,data-source-version,tenant-context,workload-context"/>
+                <xml-property name="nameProps" value="operational-environment-name"/>
+                <xml-property name="uniqueProps" value="operational-environment-id"/>
+                <xml-property name="container" value="operational-environments"/>
+                <xml-property name="namespace" value="cloud-infrastructure"/>
+                <xml-property name="uriTemplate" value="/cloud-infrastructure/operational-environments/operational-environment/{operational-environment-id}"/>
+                <xml-property name="requiredProps" value="operational-environment-id,operational-environment-name,operational-environment-type,operational-environment-status,tenant-context,workload-context"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="ForwardingPaths">
+            <xml-root-element name="forwarding-paths"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="forwardingPath" name="forwarding-path" type="inventory.aai.onap.org.v25.ForwardingPath"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ForwardingPath">
+            <xml-root-element name="forwarding-path"/>
+            <xml-properties>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="indexedProps" value="forwarding-path-id,forwarding-path-name,data-owner,data-source,data-source-version"/>
+                <xml-property name="description" value="Entity that describes the sequenced forwarding path between interfaces of services or resources"/>
+                <xml-property name="container" value="forwarding-paths"/>
+                <xml-property name="nameProps" value="forwarding-path-name"/>
+                <xml-property name="uniqueProps" value="forwarding-path-id"/>
+                <xml-property name="uriTemplate" value="/network/forwarding-paths/forwarding-path/{forwarding-path-id}"/>
+                <xml-property name="requiredProps" value="forwarding-path-id,forwarding-path-name"/>
+            </xml-properties>
+            <java-attributes>
+                <xml-element java-attribute="forwardingPathId" name="forwarding-path-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID of this FP"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="forwardingPathName" name="forwarding-path-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the FP"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the self link for this FP"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                                               <xml-property name="ownerCheck" value="N/A"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="forwarders" name="forwarders" type="inventory.aai.onap.org.v25.Forwarders"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Forwarders">
+            <xml-root-element name="forwarders"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="forwarder" name="forwarder" type="inventory.aai.onap.org.v25.Forwarder"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Forwarder">
+            <xml-root-element name="forwarder"/>
+            <xml-properties>
+                <xml-property name="indexedProps" value="sequence,data-owner,data-source,data-source-version"/>
+                <xml-property name="description" value="Entity describing a sequenced segment of forwarding path"/>
+                <xml-property name="container" value="forwarders"/>
+                <xml-property name="dependentOn" value="forwarding-path"/>
+                <xml-property name="uriTemplate" value="/forwarders/forwarder/{sequence}"/>
+                <xml-property name="requiredProps" value="sequence"/>
+            </xml-properties>
+            <java-attributes>
+                <xml-element java-attribute="sequence" name="sequence" required="true" type="java.lang.Integer" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID of this segmentation"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="forwarderRole" name="forwarder-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ingress, intermediate, egress"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                                               <xml-property name="ownerCheck" value="N/A"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ForwarderEvcs">
+            <xml-root-element name="forwarder-evcs"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="forwarderEvc" name="forwarder-evc" type="inventory.aai.onap.org.v25.ForwarderEvc"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ForwarderEvc">
+            <xml-root-element name="forwarder-evc"/>
+            <java-attributes>
+                <xml-element java-attribute="forwarderEvcId" name="forwarder-evc-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Key for forwarder-evc object"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="circuitId" name="circuit-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Circuit ID from customer/ESP/ingress end of EVC, or reference to beater circuit on gateway/network/egress end of EVC"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ivlan" name="ivlan" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Internal VLAN."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="svlan" name="svlan" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="SVLAN value for ingress of egress forwarder."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="cvlan" name="cvlan" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="CVLAN value for ingress of egress forwarder."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                                               <xml-property name="ownerCheck" value="N/A"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanMappings" name="vlan-mappings" type="inventory.aai.onap.org.v25.VlanMappings"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="forwarder object is an optional child object of the Configuration object."/>
+                <xml-property name="dependentOn" value="configuration"/>
+                <xml-property name="uniqueProps" value="forwarder-evc-id"/>
+                <xml-property name="container" value="forwarder-evcs"/>
+                <xml-property name="uriTemplate" value="/forwarder-evcs/forwarder-evc/{forwarder-evc-id}"/>
+                <xml-property name="requiredProps" value="forwarder-evc-id"/>
+                <xml-property name="indexedProps" value="circuit-id,data-owner,data-source,data-source-version"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="VlanMappings">
+            <xml-properties>
+                <xml-property name="description" value="Collection of vlan mappings."/>
+            </xml-properties>
+            <xml-root-element name="vlan-mappings"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vlanMapping" name="vlan-mapping" type="inventory.aai.onap.org.v25.VlanMapping"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="VlanMapping">
+            <xml-root-element name="vlan-mapping"/>
+            <java-attributes>
+                <xml-element java-attribute="vlanMappingId" name="vlan-mapping-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Key for vlan-mapping object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="uniCvlan" name="uni-cvlan" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="CVLAN value from the UNI/ingress side of the SAREA gateway access device."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="nniSvlan" name="nni-svlan" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="SVLAN value from the NNI/egress side of the SAREA gateway access device."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="nniCvlan" name="nni-cvlan" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="CVLAN value from the NNI/egress side of the SAREA gateway access device."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ivLan" name="ivlan" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The internal VLAN ('IVLAN') value.  Specific to Arista devices."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                                               <xml-property name="ownerCheck" value="N/A"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="vlan-mapping object is an optional child object of the forwarder-evc object.  A given forwarder-evc object may have multiple vlan-mapping objects."/>
+                <xml-property name="dependentOn" value="forwarder-evc"/>
+                <xml-property name="uniqueProps" value="vlan-mapping-id"/>
+                <xml-property name="container" value="vlan-mappings"/>
+                <xml-property name="uriTemplate" value="/vlan-mappings/vlan-mapping/{vlan-mapping-id}"/>
+                <xml-property name="requiredProps" value="vlan-mapping-id"/>
+                <xml-property name="indexedProps" value="data-owner,data-source,data-source-version"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Evcs">
+            <xml-root-element name="evcs"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="evc" name="evc" type="inventory.aai.onap.org.v25.Evc"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Evc">
+            <xml-root-element name="evc"/>
+            <java-attributes>
+                <xml-element java-attribute="evcId" name="evc-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique/key field for the evc object"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="forwardingPathTopology" name="forwarding-path-topology" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Point-to-Point, Multi-Point"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="cirValue" name="cir-value" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Commited Information Rate"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="cirUnits" name="cir-units" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="CIR units"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="cmtu" name="cmtu" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Size of the Customer Requested MTU (Maximum Transmission Unit)."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="connectionDiversityGroupId" name="connection-diversity-group-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Diversity Group ID"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceHours" name="service-hours" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="formerly Performance Group"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="enhancedMulticast" name="enhanced-multicast" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="String value indicating whether the EVC uses enhanced multicast. Possible Values:yes/no/[empty string]"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="espEvcCircuitId" name="esp-evc-circuit-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="EVC Circuit ID of ESP EVC"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="espEvcCirValue" name="esp-evc-cir-value" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Committed Information Rate (For ESP)"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="espEvcCirUnits" name="esp-evc-cir-units" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="CIR units (For ESP)"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="espItuCode" name="esp-itu-code" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies ESP"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="collectorPopClli" name="collector-pop-clli" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Collector POP CLLI (from the hostname of the access pnf)"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="interConnectTypeIngress" name="inter-connect-type-ingress" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Interconnect type on ingress side of EVC."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="tagmodeAccessIngress" name="tagmode-access-ingress" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="tagode for collector side of EVC"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="tagmodeAccessEgress" name="tagmode-access-egress" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="tagMode for network side of EVC"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="productEntryId" name="product-entry-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Product ID"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                                               <xml-property name="ownerCheck" value="N/A"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="evc object is an optional child object of the Configuration object."/>
+                <xml-property name="dependentOn" value="configuration"/>
+                <xml-property name="uniqueProps" value="evc-id"/>
+                <xml-property name="container" value="evcs"/>
+                <xml-property name="uriTemplate" value="/evcs/evc/{evc-id}"/>
+                <xml-property name="requiredProps" value="evc-id"/>
+                <xml-property name="indexedProps" value="data-owner,data-source,data-source-version"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Collections">
+            <xml-root-element name="collections"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="collection" name="collection" type="inventory.aai.onap.org.v25.Collection"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Collection">
+            <xml-root-element name="collection"/>
+            <java-attributes>
+                <xml-element java-attribute="collectionId" name="collection-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Collection Object UUID"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="ASDC model id for this resource or service model"/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-version-id"/>
+                        <xml-property name="dbAlias" value="model-invariant-id-local"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Model Version"/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="collectionName" name="collection-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="collection name"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="collectionType" name="collection-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Collection type"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="collectionRole" name="collection-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Collection Role"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="collectionFunction" name="collection-function" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Collection function"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="orchestration status"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="collectionCustomizationId" name="collection-customization-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Captures the id of all the configuration used to customize the resource for the service"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                                               <xml-property name="ownerCheck" value="N/A"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="description" value="represents the collection resource in the TOSCA model"/>
+                <xml-property name="uniqueProps" value="collection-id"/>
+                <xml-property name="indexedProps" value="collection-id,model-invariant-id,model-version-id,orchestration-status,data-owner,data-source,data-source-version"/>
+                <xml-property name="container" value="collections"/>
+                <xml-property name="uriTemplate" value="/network/collections/collection/{collection-id}"/>
+                <xml-property name="requiredProps" value="collection-id"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Cps">
+            <xml-properties>
+                <xml-property name="description" value="Collection of connection points."/>
+            </xml-properties>
+            <xml-root-element name="cps"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="cp" name="cp" type="inventory.aai.onap.org.v25.Cp"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Cp">
+            <xml-root-element name="cp"/>
+            <java-attributes>
+                <xml-element java-attribute="cpInstanceId" name="cp-instance-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID of the connection point."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="portId" name="port-id" required="false" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="port index to represent multiple CPs on VNFC connected to same network."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                                               <xml-property name="ownerCheck" value="N/A"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" required="false" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v25.L3InterfaceIpv4AddressList"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v25.L3InterfaceIpv6AddressList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Captures the point of attachment from services or resources to a virtual link or network."/>
+                <xml-property name="uniqueProps" value="cp-instance-id"/>
+                <xml-property name="dependentOn" value="vnfc"/>
+                <xml-property name="container" value="cps"/>
+                <xml-property name="uriTemplate" value="/cps/cp/{cp-instance-id}"/>
+                <xml-property name="requiredProps" value="cp-instance-id"/>
+                <xml-property name="indexedProps" value="data-owner,data-source,data-source-version"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="VlanTags">
+            <xml-properties>
+                <xml-property name="description" value="Vlan Tags Assigned out of a Vlan Range"/>
+            </xml-properties>
+            <xml-root-element name="vlan-tags"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vlanTag" name="vlan-tag" type="inventory.aai.onap.org.v25.VlanTag"/>
+            </java-attributes>
+        </java-type>
+        <java-type name="VlanTag">
+            <xml-root-element name="vlan-tag"/>
+            <java-attributes>
+                <xml-element java-attribute="vlanTagId" name="vlan-tag-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Vlan Tag Id"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanTagRole" name="vlan-tag-role" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Role assigned to this vlan-tag"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Inner VLAN tag"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="Outer VLAN tag"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="isPrivate" name="is-private" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="description" value="is private flag."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanTagType" name="vlan-tag-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="VLAN tag Type"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanTagFunction" name="vlan-tag-function" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="VLAN Tag Function"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="configPhase" name="config-phase" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The config-phase associated with this vlan-tag"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                                               <xml-property name="ownerCheck" value="N/A"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="vlan tag information"/>
+                <xml-property name="container" value="vlan-tags"/>
+                <xml-property name="dependentOn" value="vlan-range"/>
+                <xml-property name="uriTemplate" value="/vlan-tags/vlan-tag/{vlan-tag-id}"/>
+                <xml-property name="requiredProps" value="vlan-tag-id,vlan-tag-role,is-private"/>
+                <xml-property name="indexedProps" value="data-owner,data-source,data-source-version,vlan-id-outer,vlan-id-inner"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="GeoRegions">
+            <xml-properties>
+                <xml-property name="description" value="Collection of geo-regions"/>
+            </xml-properties>
+            <xml-root-element name="geo-regions"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="geoRegion" name="geo-region" type="inventory.aai.onap.org.v25.GeoRegion"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="GeoRegion">
+            <xml-root-element name="geo-region"/>
+            <java-attributes>
+                <xml-element java-attribute="geoRegionId" name="geo-region-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="UUID, key for geo-region object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="geoRegionName" name="geo-region-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of geo-region"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="geoRegionType" name="geo-region-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Type of geo-region"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="geoRegionRole" name="geo-region-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Role of geo-region"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="geoRegionFunction" name="geo-region-function" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Function of geo-region"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                                               <xml-property name="ownerCheck" value="N/A"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Top level node for a cg-nat geographical region."/>
+                <xml-property name="indexedProps" value="geo-region-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="uniqueProps" value="geo-region-id"/>
+                <xml-property name="container" value="geo-regions"/>
+                <xml-property name="namespace" value="cloud-infrastructure"/>
+                <xml-property name="uriTemplate" value="/cloud-infrastructure/geo-regions/geo-region/{geo-region-id}"/>
+                <xml-property name="requiredProps" value="geo-region-id"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="NetworkTechnologies">
+            <xml-properties>
+                <xml-property name="description" value=" The network-technology object is used to capture the supported network technologies of a cloud-region."/>
+            </xml-properties>
+            <xml-root-element name="network-technologies"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="networkTechnology" name="network-technology" type="inventory.aai.onap.org.v25.NetworkTechnology"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="maximumDepth" value="0"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="NetworkTechnology">
+            <xml-root-element name="network-technology"/>
+            <java-attributes>
+                <xml-element java-attribute="networkTechnologyId" name="network-technology-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique identifier of the network-technology object (UUID)"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="networkTechnologyName" name="network-technology-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The network-technology  that a cloud-region can support. Current valid values- CONTRAIL AIC_SR_IOV OVS STANDARD-SR-IOV"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                                               <xml-property name="ownerCheck" value="N/A"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="The network-technology object is used to capture the supported network technologies of a cloud-region."/>
+                <xml-property name="nameProps" value="network-technology-id,network-technology-name"/>
+                <xml-property name="uniqueProps" value="network-technology-id"/>
+                <xml-property name="container" value="network-technologies"/>
+                <xml-property name="namespace" value="cloud-infrastructure"/>
+                <xml-property name="uriTemplate" value="/cloud-infrastructure/network-technologies/network-technology/{network-technology-id}"/>
+                <xml-property name="requiredProps" value="network-technology-id,network-technology-name"/>
+                <xml-property name="indexedProps" value="data-owner,data-source,data-source-version"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="SpPartner">
+            <xml-root-element name="sp-partner"/>
+            <java-attributes>
+                <xml-element java-attribute="spPartnerId" name="sp-partner-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Uniquely identifies this sp-partner by id"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="url" name="url" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the URL of this sp-partner."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="callsource" name="callsource" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the callsource of this sp-partner."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                                               <xml-property name="ownerCheck" value="N/A"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the operational-status for this sp-partner."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the model-customization-id for this sp-partner."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC model id for this sp-partner model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-version-id"/>
+                        <xml-property name="dbAlias" value="model-invariant-id-local"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC model version for this sp-partner model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
+                    </xml-properties>
+                </xml-element>
+
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Instance of an sp-partner"/>
+                <xml-property name="indexedProps" value="sp-partner-id,url,callsource,model-invariant-id,model-version-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="nameProps" value="sp-partner-id"/>
+                <xml-property name="searchable" value="sp-partner-id"/>
+                <xml-property name="uniqueProps" value="sp-partner-id"/>
+                <xml-property name="container" value="sp-partners"/>
+                <xml-property name="namespace" value="business"/>
+                <xml-property name="uriTemplate" value="/business/sp-partners/sp-partner/{sp-partner-id}"/>
+                <xml-property name="requiredProps" value="sp-partner-id"/>
+            </xml-properties>
+        </java-type>
+        <java-type name="SpPartners">
+            <xml-root-element name="sp-partners"/>
+            <xml-properties>
+                <xml-property name="description" value="Collection of sp-partners"/>
+            </xml-properties>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="spPartner" name="sp-partner" type="inventory.aai.onap.org.v25.SpPartner"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Connectivity">
+            <xml-root-element name="connectivity"/>
+            <java-attributes>
+                <xml-element java-attribute="connectivityId" name="connectivity-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Uniquely identifies this connectivity by id"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="bandwidthProfileName" name="bandwidth-profile-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the name of a bandwidth profile."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vpnType" name="vpn-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the type of a bandwidth profile."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="cir" name="cir" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the CIR of this connectivity."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="eir" name="eir" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the EIR of this connectivity."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="cbs" name="cbs" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the CBS of this connectivity."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ebs" name="ebs" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the EBS of this connectivity."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="colorAware" name="color-aware" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the color-awareness of this connectivity."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="couplingFlag" name="coupling-flag" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the coupling flag of this connectivity."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ethtSvcName" name="etht-svc-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="The ethernet service name for this connectivity."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="accessProviderId" name="access-provider-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the id of the access provider of this connectivity."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="accessClientId" name="access-client-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the id of the access client of this connectivity."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="accessTopologyId" name="access-topology-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the id of the access topology of this connectivity."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="accessNodeId" name="access-node-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the id of the access node of this connectivity."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="accessLtpId" name="access-ltp-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the id of the access ltp of this connectivity."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="connectivitySelflink" name="connectivity-selflink" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the link to get more information for this connectivity."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="cvlan" name="cvlan" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the cvlan for this connectivity."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
+                    <xml-properties>
                                                <xml-property name="description" value="Store the operational-status of this connectivity."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="sliceId" name="slice-id" type="java.lang.String">
                                        <xml-properties>
                                                <xml-property name="description" value="Store the ID of the transport slice to which this connectivity may belong."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the model-customization-id for this object."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="the ASDC model id for this resource or service model."/>
-                                               <xml-property name="visibility" value="deployment"/>
-                                               <xml-property name="requires" value="model-version-id"/>
-                                               <xml-property name="dbAlias" value="model-invariant-id-local"/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="the ASDC model version for this resource or service model."/>
-                                               <xml-property name="visibility" value="deployment"/>
-                                               <xml-property name="requires" value="model-invariant-id"/>
-                                               <xml-property name="dbAlias" value="model-version-id-local"/>
-                                               <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
-                                       </xml-properties>
-                               </xml-element>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the model-customization-id for this object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC model id for this resource or service model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-version-id"/>
+                        <xml-property name="dbAlias" value="model-invariant-id-local"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC model version for this resource or service model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
+                    </xml-properties>
+                </xml-element>
+
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Instance of a connectivity"/>
+                <xml-property name="indexedProps" value="connectivity-id,etht-svc-name,bandwidth-profile-name,vpn-type,color-aware,coupling-flag,access-provider-id,access-client-id,access-topology-id,access-node-id,access-ltp-id,operational-status,model-invariant-id,model-version-id"/>
+                <xml-property name="nameProps" value="etht-svc-name"/>
+                <xml-property name="searchable" value="connectivity-id"/>
+                <xml-property name="uniqueProps" value="connectivity-id"/>
+                <xml-property name="container" value="connectivities"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="requiredProps" value="connectivity-id"/>
+                <xml-property name="uriTemplate" value="/network/connectivities/connectivity/{connectivity-id}"/>
+            </xml-properties>
+        </java-type>
+        <java-type name="Connectivities">
+            <xml-root-element name="connectivities"/>
+            <xml-properties>
+                <xml-property name="description" value="Collection of connectivities"/>
+            </xml-properties>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="connectivity" name="connectivity" type="inventory.aai.onap.org.v25.Connectivity"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="LanPortConfig">
+            <xml-root-element name="lan-port-config"/>
+            <java-attributes>
+                <xml-element java-attribute="lanPortConfigId" name="lan-port-config-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Uniquely identifies this lan-port-config by id"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="lanPortConfigName" name="lan-port-config-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the name of this lan-port-config."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="description" name="description" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the description of this lan-port-config."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="deviceId" name="device-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the device-id of this lan-port-config."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="portId" name="port-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the port-id of this lan-port-config."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipv4Address" name="ipv4-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the ipv4-address of this lan-port-config."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipv6Address" name="ipv6-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the ipv6-address of this lan-port-config."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vlanTag" name="vlan-tag" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the vlan-tag of this lan-port-config."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="inputBandwidth" name="input-bandwidth" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the input-bandwidth of this lan-port-config."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="outputBandwidth" name="output-bandwidth" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the output-bandwidth of this lan-port-config."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                                               <xml-property name="ownerCheck" value="N/A"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dhcpServices" name="dhcp-services" type="inventory.aai.onap.org.v25.DhcpServices"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Instance of a lan-port-config"/>
+                <xml-property name="indexedProps" value="lan-port-config-id,lan-port-config-name,device-id,port-id,ipv4-address,ipv6-address,vlan-tag,data-owner,data-source,data-source-version"/>
+                <xml-property name="nameProps" value="lan-port-config-name"/>
+                <xml-property name="searchable" value="lan-port-config-id"/>
+                <xml-property name="uniqueProps" value="lan-port-config-id"/>
+                <xml-property name="container" value="lan-port-configs"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="requiredProps" value="lan-port-config-id"/>
+                <xml-property name="uriTemplate" value="/network/lan-port-configs/lan-port-config/{lan-port-config-id}"/>
+            </xml-properties>
+        </java-type>
+        <java-type name="LanPortConfigs">
+            <xml-root-element name="lan-port-configs"/>
+            <xml-properties>
+                <xml-property name="description" value="Collection of lan-port-configs"/>
+            </xml-properties>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="lanPortConfig" name="lan-port-config" type="inventory.aai.onap.org.v25.LanPortConfig"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="DhcpService">
+            <xml-root-element name="dhcp-service"/>
+            <java-attributes>
+                <xml-element java-attribute="dhcpServiceId" name="dhcp-service-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Uniquely identifies this dhcp-service by id"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serverIpv4Address" name="server-ipv4-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the server-ip4-address of this dhcp-service."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serverIpv6Address" name="server-ipv6-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the server-ipv6-address of this dhcp-service."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceEnable" name="service-enable" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the service-enable of this dhcp-service."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dhcpServiceType" name="dhcp-service-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the dhcp-service-type of this dhcp-service."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="leaseTime" name="lease-time" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the lease-time of this dhcp-service."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="domainName" name="domain-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the domain-name of this dhcp-service."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dns" name="dns" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the dns of this dhcp-service."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ntpPrimary" name="ntp-primary" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the ntp-primary of this dhcp-service."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ntpSecondary" name="ntp-secondary" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the ntp-secondary of this dhcp-service."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="nbns" name="nbns" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the nbns of this dhcp-service."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                                               <xml-property name="ownerCheck" value="N/A"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Instance of a dhcp-service"/>
+                <xml-property name="indexedProps" value="dhcp-service-id,dhcp-service-type,domain-name,server-ipv4-address,server-ipv6-address,data-owner,data-source,data-source-version"/>
+                <xml-property name="nameProps" value="domain-name"/>
+                <xml-property name="searchable" value="dhcp-service-id"/>
+                <xml-property name="uniqueProps" value="dhcp-service-id"/>
+                <xml-property name="container" value="dhcp-services"/>
+                <xml-property name="dependentOn" value="lan-port-config"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="requiredProps" value="dhcp-service-id"/>
+                <xml-property name="uriTemplate" value="/network/dhcp-services/dhcp-service/{dhcp-service-id}"/>
+            </xml-properties>
+        </java-type>
+        <java-type name="DhcpServices">
+            <xml-root-element name="dhcp-services"/>
+            <xml-properties>
+                <xml-property name="description" value="Collection of dhcp-services"/>
+            </xml-properties>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="dhcpService" name="dhcp-service" type="inventory.aai.onap.org.v25.DhcpService"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="NetworkResource">
+            <xml-root-element name="network-resource"/>
+            <java-attributes>
+                <xml-element java-attribute="networkId" name="network-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Uniquely identifies this network-resource by id"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="providerId" name="provider-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the id of the provider of this network-resource."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="clientId" name="client-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the id of the client of this network-resource."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="teTopoId" name="te-topo-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the id of the te-topo of this network-resource."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="networkResourceType" name="network-resource-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Type of a network topology, e.g., Ethernet, OTN, WSON."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the link to get more information for this object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                                               <xml-property name="ownerCheck" value="N/A"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
 
-                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
-                                       </xml-properties>
-                               </xml-element>
+                <!-- Want to use pnf as sub-component, but workaround is to use COUSIN edge in relationship-list.
+                               <xml-element java-attribute="pnfs" name="pnfs" type="inventory.aai.onap.org.v25.Pnfs" /> -->
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Instance of a network-resource"/>
+                <xml-property name="indexedProps" value="network-id,provider-id,client-id,te-topo-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="nameProps" value="network-id"/>
+                <xml-property name="searchable" value="network-id"/>
+                <xml-property name="uniqueProps" value="network-id"/>
+                <xml-property name="container" value="network-resources"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="requiredProps" value="network-id"/>
+                <xml-property name="uriTemplate" value="/network/network-resources/network-resource/{network-id}"/>
+            </xml-properties>
+        </java-type>
+        <java-type name="NetworkResources">
+            <xml-root-element name="network-resources"/>
+            <xml-properties>
+                <xml-property name="description" value="Collection of network-resources"/>
+            </xml-properties>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="networkResource" name="network-resource" type="inventory.aai.onap.org.v25.NetworkResource"/>
+            </java-attributes>
+        </java-type>
 
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-                       </java-attributes>
-                       <xml-properties>
-                               <xml-property name="description" value="Instance of a connectivity"/>
-                               <xml-property name="indexedProps" value="connectivity-id,etht-svc-name,bandwidth-profile-name,vpn-type,color-aware,coupling-flag,access-provider-id,access-client-id,access-topology-id,access-node-id,access-ltp-id,operational-status,model-invariant-id,model-version-id"/>
-                               <xml-property name="nameProps" value="etht-svc-name"/>
-                               <xml-property name="searchable" value="connectivity-id"/>
-                               <xml-property name="uniqueProps" value="connectivity-id"/>
-                               <xml-property name="container" value="connectivities"/>
-                               <xml-property name="namespace" value="network"/>
-                       <xml-property name="requiredProps" value="connectivity-id"/>
-            <xml-property name="uriTemplate" value="/network/connectivities/connectivity/{connectivity-id}"/>
-            </xml-properties>
-               </java-type>
-               <java-type name="Connectivities">
-                       <xml-root-element name="connectivities"/>
-                       <xml-properties>
-                               <xml-property name="description" value="Collection of connectivities"/>
-                       </xml-properties>
-                       <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="connectivity" name="connectivity" type="inventory.aai.onap.org.v25.Connectivity"/>
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="LanPortConfig">
-                       <xml-root-element name="lan-port-config"/>
-                       <java-attributes>
-                               <xml-element java-attribute="lanPortConfigId" name="lan-port-config-id" required="true" type="java.lang.String" xml-key="true">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Uniquely identifies this lan-port-config by id"/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="lanPortConfigName" name="lan-port-config-name" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the name of this lan-port-config."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="description" name="description" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the description of this lan-port-config."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="deviceId" name="device-id" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the device-id of this lan-port-config."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="portId" name="port-id" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the port-id of this lan-port-config."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="ipv4Address" name="ipv4-address" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the ipv4-address of this lan-port-config."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="ipv6Address" name="ipv6-address" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the ipv6-address of this lan-port-config."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="vlanTag" name="vlan-tag" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the vlan-tag of this lan-port-config."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="inputBandwidth" name="input-bandwidth" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the input-bandwidth of this lan-port-config."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="outputBandwidth" name="output-bandwidth" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the output-bandwidth of this lan-port-config."/>
-                                       </xml-properties>
-                               </xml-element>
+        <java-type name="SiteResource">
+            <xml-root-element name="site-resource"/>
+            <java-attributes>
+                <xml-element java-attribute="siteResourceId" name="site-resource-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Uniquely identifies this site-resource by id"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="siteResourceName" name="site-resource-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the name of this site-resource."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="description" name="description" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the description of this site-resource."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="type" name="type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the type of this site-resource."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="role" name="role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the role of this site-resource."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="generatedSiteId" name="generated-site-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the generated-site-id of this site-resource."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the link to get more information for this object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the operational-status for this object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the model-customization-id for this object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC model id for this resource or service model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-version-id"/>
+                        <xml-property name="dbAlias" value="model-invariant-id-local"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC model version for this resource or service model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                                               <xml-property name="ownerCheck" value="N/A"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Instance of a site-resource"/>
+                <xml-property name="indexedProps" value="site-resource-id,site-resource-name,type,role,generated-site-id,operational-status,model-invariant-id,model-version-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="nameProps" value="site-resource-name"/>
+                <xml-property name="searchable" value="site-resource-id"/>
+                <xml-property name="uniqueProps" value="site-resource-id"/>
+                <xml-property name="container" value="site-resources"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="requiredProps" value="site-resource-id"/>
+                <xml-property name="uriTemplate" value="/network/site-resources/site-resource/{site-resource-id}"/>
+            </xml-properties>
+        </java-type>
+        <java-type name="SiteResources">
+            <xml-root-element name="site-resources"/>
+            <xml-properties>
+                <xml-property name="description" value="Collection of site-resources"/>
+            </xml-properties>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="siteResource" name="site-resource" type="inventory.aai.onap.org.v25.SiteResource"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="SdwanVpns">
+            <xml-root-element name="sdwan-vpns"/>
+            <xml-properties>
+                <xml-property name="description" value="Collection of sdwan-vpns"/>
+            </xml-properties>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="sdwanVpn" name="sdwan-vpn" type="inventory.aai.onap.org.v25.SdwanVpn"/>
+            </java-attributes>
+        </java-type>
+        <java-type name="SdwanVpn">
+            <xml-root-element name="sdwan-vpn"/>
+            <java-attributes>
+                <xml-element java-attribute="sdwanVpnId" name="sdwan-vpn-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Uniquely identifies this sdwan-vpn by id"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="sdwanVpnName" name="sdwan-vpn-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the name of this sdwan-vpn."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vxlanId" name="vxlan-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the vxlan-id of this sdwan-vpn."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="topology" name="topology" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the topology of this sdwan-vpn."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="tenantId" name="tenant-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the tenant-id of this sdwan-vpn."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vpnId" name="vpn-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the vpn-id of this sdwan-vpn."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the link to get more information for this object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the operational-status for this object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the model-customization-id for this object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC model id for this resource or service model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-version-id"/>
+                        <xml-property name="dbAlias" value="model-invariant-id-local"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC model version for this resource or service model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
+                    </xml-properties>
+                </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
-                                               <xml-property name="ownerCheck" value="N/A"/>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                                               <xml-property name="ownerCheck" value="N/A"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Instance of an sdwan-vpn"/>
+                <xml-property name="indexedProps" value="sdwan-vpn-id,sdwan-vpn-name,vxlan-id,topology,operational-status,model-invariant-id,model-version-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="nameProps" value="sdwan-vpn-name"/>
+                <xml-property name="searchable" value="sdwan-vpn-id"/>
+                <xml-property name="uniqueProps" value="sdwan-vpn-id"/>
+                <xml-property name="container" value="sdwan-vpns"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="requiredProps" value="sdwan-vpn-id"/>
+                <xml-property name="uriTemplate" value="/network/sdwan-vpns/sdwan-vpn/{sdwan-vpn-id}"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="Devices">
+            <xml-root-element name="devices"/>
+            <xml-properties>
+                <xml-property name="description" value="Collection of devices"/>
+            </xml-properties>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="device" name="device" type="inventory.aai.onap.org.v25.Device"/>
+            </java-attributes>
+        </java-type>
+        <java-type name="Device">
+            <xml-root-element name="device"/>
+            <java-attributes>
+                <xml-element java-attribute="deviceId" name="device-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Uniquely identifies this device by id"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="esn" name="esn" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                        <xml-property name="description" value="Store the esn of this device."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="deviceName" name="device-name" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                        <xml-property name="description" value="Store the name of this device."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="dhcpServices" name="dhcp-services" type="inventory.aai.onap.org.v25.DhcpServices"/>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-                       </java-attributes>
-                       <xml-properties>
-                               <xml-property name="description" value="Instance of a lan-port-config"/>
-                               <xml-property name="indexedProps" value="lan-port-config-id,lan-port-config-name,device-id,port-id,ipv4-address,ipv6-address,vlan-tag,data-owner,data-source,data-source-version"/>
-                               <xml-property name="nameProps" value="lan-port-config-name"/>
-                               <xml-property name="searchable" value="lan-port-config-id"/>
-                               <xml-property name="uniqueProps" value="lan-port-config-id"/>
-                               <xml-property name="container" value="lan-port-configs"/>
-                               <xml-property name="namespace" value="network"/>
-                       <xml-property name="requiredProps" value="lan-port-config-id"/>
-            <xml-property name="uriTemplate" value="/network/lan-port-configs/lan-port-config/{lan-port-config-id}"/>
-            </xml-properties>
-               </java-type>
-               <java-type name="LanPortConfigs">
-                       <xml-root-element name="lan-port-configs"/>
-                       <xml-properties>
-                               <xml-property name="description" value="Collection of lan-port-configs"/>
-                       </xml-properties>
-                       <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="lanPortConfig" name="lan-port-config" type="inventory.aai.onap.org.v25.LanPortConfig"/>
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="DhcpService">
-                       <xml-root-element name="dhcp-service"/>
-                       <java-attributes>
-                               <xml-element java-attribute="dhcpServiceId" name="dhcp-service-id" required="true" type="java.lang.String" xml-key="true">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Uniquely identifies this dhcp-service by id"/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="serverIpv4Address" name="server-ipv4-address" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the server-ip4-address of this dhcp-service."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="serverIpv6Address" name="server-ipv6-address" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the server-ipv6-address of this dhcp-service."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="serviceEnable" name="service-enable" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the service-enable of this dhcp-service."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="dhcpServiceType" name="dhcp-service-type" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the dhcp-service-type of this dhcp-service."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="leaseTime" name="lease-time" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the lease-time of this dhcp-service."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="domainName" name="domain-name" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the domain-name of this dhcp-service."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="dns" name="dns" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the dns of this dhcp-service."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="ntpPrimary" name="ntp-primary" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the ntp-primary of this dhcp-service."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="ntpSecondary" name="ntp-secondary" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the ntp-secondary of this dhcp-service."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="nbns" name="nbns" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the nbns of this dhcp-service."/>
-                                       </xml-properties>
-                               </xml-element>
-                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                <xml-element java-attribute="description" name="description" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
-                                               <xml-property name="ownerCheck" value="N/A"/>
+                        <xml-property name="description" value="Store the description of this device."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="vendor" name="vendor" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                        <xml-property name="description" value="Store the vendor of this device."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="class" name="class" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                        <xml-property name="description" value="Store the class of this device."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="type" name="type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the type of this device."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="version" name="version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the version of this device."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="systemIp" name="system-ip" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the system-ip of this device."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="systemIpv4" name="system-ipv4" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the system-ipv4 of this device."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="systemIpv6" name="system-ipv6" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the system-ipv6 of this device."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the link to get more information for this object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the operational-status for this object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the model-customization-id for this object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC model id for this resource or service model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-version-id"/>
+                        <xml-property name="dbAlias" value="model-invariant-id-local"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC model version for this resource or service model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-                       </java-attributes>
-                       <xml-properties>
-                               <xml-property name="description" value="Instance of a dhcp-service"/>
-                               <xml-property name="indexedProps" value="dhcp-service-id,dhcp-service-type,domain-name,server-ipv4-address,server-ipv6-address,data-owner,data-source,data-source-version"/>
-                               <xml-property name="nameProps" value="domain-name"/>
-                               <xml-property name="searchable" value="dhcp-service-id"/>
-                               <xml-property name="uniqueProps" value="dhcp-service-id"/>
-                               <xml-property name="container" value="dhcp-services"/>
-                               <xml-property name="dependentOn" value="lan-port-config"/>
-                               <xml-property name="namespace" value="network"/>
-                       <xml-property name="requiredProps" value="dhcp-service-id"/>
-            <xml-property name="uriTemplate" value="/network/dhcp-services/dhcp-service/{dhcp-service-id}"/>
-            </xml-properties>
-               </java-type>
-               <java-type name="DhcpServices">
-                       <xml-root-element name="dhcp-services"/>
-                       <xml-properties>
-                               <xml-property name="description" value="Collection of dhcp-services"/>
-                       </xml-properties>
-                       <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="dhcpService" name="dhcp-service" type="inventory.aai.onap.org.v25.DhcpService"/>
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="NetworkResource">
-                       <xml-root-element name="network-resource"/>
-                       <java-attributes>
-                               <xml-element java-attribute="networkId" name="network-id" required="true" type="java.lang.String" xml-key="true">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Uniquely identifies this network-resource by id"/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="providerId" name="provider-id" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the id of the provider of this network-resource."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="clientId" name="client-id" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the id of the client of this network-resource."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="teTopoId" name="te-topo-id" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the id of the te-topo of this network-resource."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="networkResourceType" name="network-resource-type" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Type of a network topology, e.g., Ethernet, OTN, WSON."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the link to get more information for this object."/>
-                                       </xml-properties>
-                               </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
-                                       </xml-properties>
-                               </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Instance of a device"/>
+                <xml-property name="indexedProps" value="device-id,device-name,esn,vendor,class,type,version,system-ip,system-ipv4,system-ipv6,operational-status,model-invariant-id,model-version-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="nameProps" value="device-name"/>
+                <xml-property name="searchable" value="device-id"/>
+                <xml-property name="uniqueProps" value="device-id"/>
+                <xml-property name="container" value="devices"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="requiredProps" value="device-id"/>
+                <xml-property name="uriTemplate" value="/network/devices/device/{device-id}"/>
+            </xml-properties>
+        </java-type>
 
-                               <!-- Want to use pnf as sub-component, but workaround is to use COUSIN edge in relationship-list.
-                               <xml-element java-attribute="pnfs" name="pnfs" type="inventory.aai.onap.org.v25.Pnfs" /> -->
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-                       </java-attributes>
-                       <xml-properties>
-                               <xml-property name="description" value="Instance of a network-resource"/>
-                               <xml-property name="indexedProps" value="network-id,provider-id,client-id,te-topo-id,data-owner,data-source,data-source-version"/>
-                               <xml-property name="nameProps" value="network-id"/>
-                               <xml-property name="searchable" value="network-id"/>
-                               <xml-property name="uniqueProps" value="network-id"/>
-                               <xml-property name="container" value="network-resources"/>
-                               <xml-property name="namespace" value="network"/>
-                       <xml-property name="requiredProps" value="network-id"/>
-            <xml-property name="uriTemplate" value="/network/network-resources/network-resource/{network-id}"/>
-            </xml-properties>
-               </java-type>
-               <java-type name="NetworkResources">
-                       <xml-root-element name="network-resources"/>
-                       <xml-properties>
-                               <xml-property name="description" value="Collection of network-resources"/>
-                       </xml-properties>
-                       <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="networkResource" name="network-resource" type="inventory.aai.onap.org.v25.NetworkResource"/>
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="SiteResource">
-                       <xml-root-element name="site-resource"/>
-                       <java-attributes>
-                               <xml-element java-attribute="siteResourceId" name="site-resource-id" required="true" type="java.lang.String" xml-key="true">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Uniquely identifies this site-resource by id"/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="siteResourceName" name="site-resource-name" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the name of this site-resource."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="description" name="description" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the description of this site-resource."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="type" name="type" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the type of this site-resource."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="role" name="role" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the role of this site-resource."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="generatedSiteId" name="generated-site-id" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the generated-site-id of this site-resource."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the link to get more information for this object."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the operational-status for this object."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the model-customization-id for this object."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="the ASDC model id for this resource or service model."/>
-                                               <xml-property name="visibility" value="deployment"/>
-                                               <xml-property name="requires" value="model-version-id"/>
-                                               <xml-property name="dbAlias" value="model-invariant-id-local"/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="the ASDC model version for this resource or service model."/>
-                                               <xml-property name="visibility" value="deployment"/>
-                                               <xml-property name="requires" value="model-invariant-id"/>
-                                               <xml-property name="dbAlias" value="model-version-id-local"/>
-                                               <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
-                                       </xml-properties>
-                               </xml-element>
-                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+        <java-type name="WanPortConfig">
+            <xml-root-element name="wan-port-config"/>
+            <java-attributes>
+                <xml-element java-attribute="wanPortConfigId" name="wan-port-config-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
-                                               <xml-property name="ownerCheck" value="N/A"/>
+                        <xml-property name="description" value="Uniquely identifies this wan-port-config by id"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="wanPortConfigName" name="wan-port-config-name" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                        <xml-property name="description" value="Store the name of this wan-port-config."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="deviceId" name="device-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                        <xml-property name="description" value="Store the id of the device of this wan-port-config."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-                       </java-attributes>
-                       <xml-properties>
-                               <xml-property name="description" value="Instance of a site-resource"/>
-                               <xml-property name="indexedProps" value="site-resource-id,site-resource-name,type,role,generated-site-id,operational-status,model-invariant-id,model-version-id,data-owner,data-source,data-source-version"/>
-                               <xml-property name="nameProps" value="site-resource-name"/>
-                               <xml-property name="searchable" value="site-resource-id"/>
-                               <xml-property name="uniqueProps" value="site-resource-id"/>
-                               <xml-property name="container" value="site-resources"/>
-                               <xml-property name="namespace" value="network"/>
-                       <xml-property name="requiredProps" value="site-resource-id"/>
-            <xml-property name="uriTemplate" value="/network/site-resources/site-resource/{site-resource-id}"/>
-            </xml-properties>
-               </java-type>
-               <java-type name="SiteResources">
-                       <xml-root-element name="site-resources"/>
-                       <xml-properties>
-                               <xml-property name="description" value="Collection of site-resources"/>
-                       </xml-properties>
-                       <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="siteResource" name="site-resource" type="inventory.aai.onap.org.v25.SiteResource"/>
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="SdwanVpns">
-                       <xml-root-element name="sdwan-vpns"/>
-                       <xml-properties>
-                               <xml-property name="description" value="Collection of sdwan-vpns"/>
-                       </xml-properties>
-                       <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="sdwanVpn" name="sdwan-vpn" type="inventory.aai.onap.org.v25.SdwanVpn"/>
-                       </java-attributes>
-               </java-type>
-               <java-type name="SdwanVpn">
-                       <xml-root-element name="sdwan-vpn"/>
-                       <java-attributes>
-                               <xml-element java-attribute="sdwanVpnId" name="sdwan-vpn-id" required="true" type="java.lang.String" xml-key="true">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Uniquely identifies this sdwan-vpn by id"/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="sdwanVpnName" name="sdwan-vpn-name" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the name of this sdwan-vpn."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="vxlanId" name="vxlan-id" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the vxlan-id of this sdwan-vpn."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="topology" name="topology" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the topology of this sdwan-vpn."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="tenantId" name="tenant-id" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the tenant-id of this sdwan-vpn."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="vpnId" name="vpn-id" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the vpn-id of this sdwan-vpn."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the link to get more information for this object."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the operational-status for this object."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the model-customization-id for this object."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="the ASDC model id for this resource or service model."/>
-                                               <xml-property name="visibility" value="deployment"/>
-                                               <xml-property name="requires" value="model-version-id"/>
-                                               <xml-property name="dbAlias" value="model-invariant-id-local"/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="the ASDC model version for this resource or service model."/>
-                                               <xml-property name="visibility" value="deployment"/>
-                                               <xml-property name="requires" value="model-invariant-id"/>
-                                               <xml-property name="dbAlias" value="model-version-id-local"/>
-                                               <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
-                                       </xml-properties>
-                               </xml-element>
-                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                <xml-element java-attribute="vlanId" name="vlan-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the id of the vlan of this wan-port-config."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipAddress" name="ip-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the ip-address of this wan-port-config."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipv4Address" name="ipv4-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the ipv4-address of this wan-port-config."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipv6Address" name="ipv6-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the ipv6-address of this wan-port-config."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="providerIpAddress" name="provider-ip-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the provider-ip-address of this wan-port-config."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="providerIpv4Address" name="provider-ipv4-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the provider-ipv4-address of this wan-port-config."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="providerIpv6Address" name="provider-ipv6-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the provider-ipv6-address of this wan-port-config."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="inputBandwidth" name="input-bandwidth" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the input-bandwidth of this wan-port-config."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="outputBandwidth" name="output-bandwidth" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the output-bandwidth of this wan-port-config."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="description" name="description" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the description of this wan-port-config."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="portType" name="port-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the port-type of this wan-port-config."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="portNumber" name="port-number" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
-                                               <xml-property name="ownerCheck" value="N/A"/>
+                        <xml-property name="description" value="Store the port-number of this wan-port-config."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="transportNetworkName" name="transport-network-name" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                        <xml-property name="description" value="Store the transport-network-name of this wan-port-config."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="devicePortId" name="device-port-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                        <xml-property name="description" value="Store the device-port-id of this wan-port-config."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-                       </java-attributes>
-                       <xml-properties>
-                               <xml-property name="description" value="Instance of an sdwan-vpn"/>
-                               <xml-property name="indexedProps" value="sdwan-vpn-id,sdwan-vpn-name,vxlan-id,topology,operational-status,model-invariant-id,model-version-id,data-owner,data-source,data-source-version"/>
-                               <xml-property name="nameProps" value="sdwan-vpn-name"/>
-                               <xml-property name="searchable" value="sdwan-vpn-id"/>
-                               <xml-property name="uniqueProps" value="sdwan-vpn-id"/>
-                               <xml-property name="container" value="sdwan-vpns"/>
-                               <xml-property name="namespace" value="network"/>
-                       <xml-property name="requiredProps" value="sdwan-vpn-id"/>
-            <xml-property name="uriTemplate" value="/network/sdwan-vpns/sdwan-vpn/{sdwan-vpn-id}"/>
-            </xml-properties>
-               </java-type>
-
-               <java-type name="Devices">
-                       <xml-root-element name="devices"/>
-                       <xml-properties>
-                               <xml-property name="description" value="Collection of devices"/>
-                       </xml-properties>
-                       <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="device" name="device" type="inventory.aai.onap.org.v25.Device"/>
-                       </java-attributes>
-               </java-type>
-               <java-type name="Device">
-                       <xml-root-element name="device"/>
-                       <java-attributes>
-                               <xml-element java-attribute="deviceId" name="device-id" required="true" type="java.lang.String" xml-key="true">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Uniquely identifies this device by id"/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="esn" name="esn" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the esn of this device."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="deviceName" name="device-name" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the name of this device."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="description" name="description" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the description of this device."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="vendor" name="vendor" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the vendor of this device."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="class" name="class" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the class of this device."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="type" name="type" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the type of this device."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="version" name="version" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the version of this device."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="systemIp" name="system-ip" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the system-ip of this device."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="systemIpv4" name="system-ipv4" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the system-ipv4 of this device."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="systemIpv6" name="system-ipv6" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the system-ipv6 of this device."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the link to get more information for this object."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the operational-status for this object."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the model-customization-id for this object."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="the ASDC model id for this resource or service model."/>
-                                               <xml-property name="visibility" value="deployment"/>
-                                               <xml-property name="requires" value="model-version-id"/>
-                                               <xml-property name="dbAlias" value="model-invariant-id-local"/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="the ASDC model version for this resource or service model."/>
-                                               <xml-property name="visibility" value="deployment"/>
-                                               <xml-property name="requires" value="model-invariant-id"/>
-                                               <xml-property name="dbAlias" value="model-version-id-local"/>
-                                               <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
-                                       </xml-properties>
-                               </xml-element>
-                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                <xml-element java-attribute="wanPortId" name="wan-port-id" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
-                                               <xml-property name="ownerCheck" value="N/A"/>
+                        <xml-property name="description" value="Store the wan-port-id of this wan-port-config."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                        <xml-property name="description" value="Store the link to get more information for this object."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                        <xml-property name="description" value="Store the operational-status for this object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Store the model-customization-id for this object."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC model id for this resource or service model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-version-id"/>
+                        <xml-property name="dbAlias" value="model-invariant-id-local"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC model version for this resource or service model."/>
+                        <xml-property name="visibility" value="deployment"/>
+                        <xml-property name="requires" value="model-invariant-id"/>
+                        <xml-property name="dbAlias" value="model-version-id-local"/>
+                        <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-                       </java-attributes>
-                       <xml-properties>
-                               <xml-property name="description" value="Instance of a device"/>
-                               <xml-property name="indexedProps" value="device-id,device-name,esn,vendor,class,type,version,system-ip,system-ipv4,system-ipv6,operational-status,model-invariant-id,model-version-id,data-owner,data-source,data-source-version"/>
-                               <xml-property name="nameProps" value="device-name"/>
-                               <xml-property name="searchable" value="device-id"/>
-                               <xml-property name="uniqueProps" value="device-id"/>
-                               <xml-property name="container" value="devices"/>
-                               <xml-property name="namespace" value="network"/>
-                       <xml-property name="requiredProps" value="device-id"/>
-            <xml-property name="uriTemplate" value="/network/devices/device/{device-id}"/>
-            </xml-properties>
-               </java-type>
-
-               <java-type name="WanPortConfig">
-                       <xml-root-element name="wan-port-config"/>
-                       <java-attributes>
-                               <xml-element java-attribute="wanPortConfigId" name="wan-port-config-id" required="true" type="java.lang.String" xml-key="true">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Uniquely identifies this wan-port-config by id"/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="wanPortConfigName" name="wan-port-config-name" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the name of this wan-port-config."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="deviceId" name="device-id" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the id of the device of this wan-port-config."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="vlanId" name="vlan-id" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the id of the vlan of this wan-port-config."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="ipAddress" name="ip-address" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the ip-address of this wan-port-config."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="ipv4Address" name="ipv4-address" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the ipv4-address of this wan-port-config."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="ipv6Address" name="ipv6-address" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the ipv6-address of this wan-port-config."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="providerIpAddress" name="provider-ip-address" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the provider-ip-address of this wan-port-config."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="providerIpv4Address" name="provider-ipv4-address" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the provider-ipv4-address of this wan-port-config."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="providerIpv6Address" name="provider-ipv6-address" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the provider-ipv6-address of this wan-port-config."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="inputBandwidth" name="input-bandwidth" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the input-bandwidth of this wan-port-config."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="outputBandwidth" name="output-bandwidth" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the output-bandwidth of this wan-port-config."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="description" name="description" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the description of this wan-port-config."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="portType" name="port-type" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the port-type of this wan-port-config."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="portNumber" name="port-number" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the port-number of this wan-port-config."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="transportNetworkName" name="transport-network-name" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the transport-network-name of this wan-port-config."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="devicePortId" name="device-port-id" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the device-port-id of this wan-port-config."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="wanPortId" name="wan-port-id" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the wan-port-id of this wan-port-config."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the link to get more information for this object."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the operational-status for this object."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Store the model-customization-id for this object."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="the ASDC model id for this resource or service model."/>
-                                               <xml-property name="visibility" value="deployment"/>
-                                               <xml-property name="requires" value="model-version-id"/>
-                                               <xml-property name="dbAlias" value="model-invariant-id-local"/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="the ASDC model version for this resource or service model."/>
-                                               <xml-property name="visibility" value="deployment"/>
-                                               <xml-property name="requires" value="model-invariant-id"/>
-                                               <xml-property name="dbAlias" value="model-version-id-local"/>
-                                               <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
-                                       </xml-properties>
-                               </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-                       </java-attributes>
-                       <xml-properties>
-                               <xml-property name="description" value="Instance of a wan-port-config"/>
-                               <xml-property name="indexedProps" value="wan-port-config-id,wan-port-config-name,device-id,ip-address,ipv4-address,ipv6-address,port-type,port-number,device-port-id,wan-port-id,operational-status,model-invariant-id,model-version-id,data-owner,data-source,data-source-version"/>
-                               <xml-property name="nameProps" value="wan-port-config-name"/>
-                               <xml-property name="searchable" value="wan-port-config-id"/>
-                               <xml-property name="uniqueProps" value="wan-port-config-id"/>
-                               <xml-property name="container" value="wan-port-configs"/>
-                               <xml-property name="namespace" value="network"/>
-                       <xml-property name="requiredProps" value="wan-port-config-id"/>
-            <xml-property name="uriTemplate" value="/network/wan-port-configs/wan-port-config/{wan-port-config-id}"/>
-            </xml-properties>
-               </java-type>
-               <java-type name="WanPortConfigs">
-                       <xml-root-element name="wan-port-configs"/>
-                       <xml-properties>
-                               <xml-property name="description" value="Collection of wan-port-configs"/>
-                       </xml-properties>
-                       <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="wanPortConfig" name="wan-port-config" type="inventory.aai.onap.org.v25.WanPortConfig"/>
-                       </java-attributes>
-               </java-type>
-
-               <java-type name="ExtAaiNetworks">
-                       <xml-root-element name="ext-aai-networks"/>
-                       <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="extAaiNetwork" name="ext-aai-network" type="inventory.aai.onap.org.v25.ExtAaiNetwork"/>
-                       </java-attributes>
-               </java-type>
-               <java-type name="ExtAaiNetwork">
-                       <xml-root-element name="ext-aai-network"/>
-                       <java-attributes>
-                               <xml-element java-attribute="aaiId" name="aai-id" required="true" type="java.lang.String" xml-key="true">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Unique ID of the referenced AAI."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="schemaVersion" name="schema-version" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Schema version of the referenced AAI."/>
-                                       </xml-properties>
-                               </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Instance of a wan-port-config"/>
+                <xml-property name="indexedProps" value="wan-port-config-id,wan-port-config-name,device-id,ip-address,ipv4-address,ipv6-address,port-type,port-number,device-port-id,wan-port-id,operational-status,model-invariant-id,model-version-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="nameProps" value="wan-port-config-name"/>
+                <xml-property name="searchable" value="wan-port-config-id"/>
+                <xml-property name="uniqueProps" value="wan-port-config-id"/>
+                <xml-property name="container" value="wan-port-configs"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="requiredProps" value="wan-port-config-id"/>
+                <xml-property name="uriTemplate" value="/network/wan-port-configs/wan-port-config/{wan-port-config-id}"/>
+            </xml-properties>
+        </java-type>
+        <java-type name="WanPortConfigs">
+            <xml-root-element name="wan-port-configs"/>
+            <xml-properties>
+                <xml-property name="description" value="Collection of wan-port-configs"/>
+            </xml-properties>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="wanPortConfig" name="wan-port-config" type="inventory.aai.onap.org.v25.WanPortConfig"/>
+            </java-attributes>
+        </java-type>
+
+        <java-type name="ExtAaiNetworks">
+            <xml-root-element name="ext-aai-networks"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="extAaiNetwork" name="ext-aai-network" type="inventory.aai.onap.org.v25.ExtAaiNetwork"/>
+            </java-attributes>
+        </java-type>
+        <java-type name="ExtAaiNetwork">
+            <xml-root-element name="ext-aai-network"/>
+            <java-attributes>
+                <xml-element java-attribute="aaiId" name="aai-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID of the referenced AAI."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="schemaVersion" name="schema-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Schema version of the referenced AAI."/>
+                    </xml-properties>
+                </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="esrSystemInfo" name="esr-system-info" type="inventory.aai.onap.org.v25.EsrSystemInfo"/>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="esrSystemInfo" name="esr-system-info" type="inventory.aai.onap.org.v25.EsrSystemInfo"/>
 
-                               <!-- Want to use these as sub-components, but workaround is to use COUSIN edges in relationship-list.
+                <!-- Want to use these as sub-components, but workaround is to use COUSIN edges in relationship-list.
                                <xml-element java-attribute="logicalLinks" name="logical-links" type="inventory.aai.onap.org.v25.LogicalLinks" />
                                <xml-element java-attribute="vpnBindings" name="vpn-bindings" type="inventory.aai.onap.org.v25.VpnBindings" />
                                <xml-element java-attribute="pnfs" name="pnfs" type="inventory.aai.onap.org.v25.Pnfs" />
                                <xml-element java-attribute="sdwanVpns" name="sdwan-vpns" type="inventory.aai.onap.org.v25.SdwanVpns" />
                                <xml-element java-attribute="devices" name="devices" type="inventory.aai.onap.org.v25.Devices" />
                                <xml-element java-attribute="wanPortConfigs" name="wan-port-configs" type="inventory.aai.onap.org.v25.WanPortConfigs" /> -->
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-                               </java-attributes>
-                       <xml-properties>
-                               <xml-property name="description" value="Refer to an external AAI in another ONAP."/>
-                               <xml-property name="indexedProps" value="aai-id,data-owner,data-source,data-source-version"/>
-                               <xml-property name="searchable" value="aai-id"/>
-                               <xml-property name="container" value="ext-aai-networks"/>
-                               <xml-property name="namespace" value="network"/>
-                       <xml-property name="requiredProps" value="aai-id"/>
-            <xml-property name="uriTemplate" value="/network/ext-aai-networks/ext-aai-network/{aai-id}"/>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Refer to an external AAI in another ONAP."/>
+                <xml-property name="indexedProps" value="aai-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="searchable" value="aai-id"/>
+                <xml-property name="container" value="ext-aai-networks"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="requiredProps" value="aai-id"/>
+                <xml-property name="uriTemplate" value="/network/ext-aai-networks/ext-aai-network/{aai-id}"/>
             </xml-properties>
-               </java-type>
+        </java-type>
 
-      <java-type name="Unis">
+        <java-type name="Unis">
             <xml-properties>
                 <xml-property name="description" value="Collection of User network interface."/>
             </xml-properties>
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
             </xml-properties>
         </java-type>
 
-       <java-type name="TeLinkAttributes">
+        <java-type name="TeLinkAttributes">
             <xml-properties>
                 <xml-property name="description" value="Collection of TE link attributes."/>
             </xml-properties>
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
             </xml-properties>
         </java-type>
 
-       <java-type name="LabelRestrictions">
+        <java-type name="LabelRestrictions">
             <xml-properties>
                 <xml-property name="description" value="Collection of Label Restriction."/>
             </xml-properties>
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
             </xml-properties>
         </java-type>
 
-       <java-type name="TunnelTerminationPoints">
+        <java-type name="TunnelTerminationPoints">
             <xml-properties>
                 <xml-property name="description" value="Collection of Tunnel Termination Point."/>
             </xml-properties>
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
             </xml-properties>
             <xml-root-element name="common"/>
             <java-attributes>
-               <xml-element java-attribute="hardwareCatalogItems" name="hardware-catalog-items" type="inventory.aai.onap.org.v25.HardwareCatalogItems"/>
-               <xml-element java-attribute="contacts" name="contacts" type="inventory.aai.onap.org.v25.Contacts"/>
+                <xml-element java-attribute="hardwareCatalogItems" name="hardware-catalog-items" type="inventory.aai.onap.org.v25.HardwareCatalogItems"/>
+                <xml-element java-attribute="contacts" name="contacts" type="inventory.aai.onap.org.v25.Contacts"/>
                 <xml-element java-attribute="profiles" name="profiles" type="inventory.aai.onap.org.v25.Profiles"/>
-                               <xml-element java-attribute="objectGroups" name="object-groups" type="inventory.aai.onap.org.v25.ObjectGroups"/>
-                               <xml-element java-attribute="policies" name="policies" type="inventory.aai.onap.org.v25.Policies"/>
-                               <xml-element java-attribute="vlanCharacteristics" name="vlan-characteristics" type="inventory.aai.onap.org.v25.VlanCharacteristics"/>
-                               <xml-element java-attribute="relationshipRules" name="relationship-rules" type="inventory.aai.onap.org.v25.RelationshipRules"/>
+                <xml-element java-attribute="objectGroups" name="object-groups" type="inventory.aai.onap.org.v25.ObjectGroups"/>
+                <xml-element java-attribute="policies" name="policies" type="inventory.aai.onap.org.v25.Policies"/>
+                <xml-element java-attribute="vlanCharacteristics" name="vlan-characteristics" type="inventory.aai.onap.org.v25.VlanCharacteristics"/>
+                <xml-element java-attribute="relationshipRules" name="relationship-rules" type="inventory.aai.onap.org.v25.RelationshipRules"/>
                 <xml-element java-attribute="parameterLists" name="parameter-lists" type="inventory.aai.onap.org.v25.ParameterLists"/>
                 <xml-element java-attribute="classMapMembers" name="class-map-members" type="inventory.aai.onap.org.v25.ClassMapMembers"/>
                 <xml-element java-attribute="classMaps" name="class-maps" type="inventory.aai.onap.org.v25.ClassMaps"/>
                 <xml-element java-attribute="policyKeyTerms" name="policy-key-terms" type="inventory.aai.onap.org.v25.PolicyKeyTerms"/>
                 <xml-element java-attribute="policyMapMembers" name="policy-map-members" type="inventory.aai.onap.org.v25.PolicyMapMembers"/>
+                <xml-element java-attribute="objectGroupMembers" name="object-group-members" type="inventory.aai.onap.org.v25.ObjectGroupMembers"/>
+                <xml-element java-attribute="objectGroupKeyTerms" name="object-group-key-terms" type="inventory.aai.onap.org.v25.ObjectGroupKeyTerms"/>
             </java-attributes>
-               </java-type>
+        </java-type>
 
-               <java-type name="HardwareCatalogItems">
+        <java-type name="HardwareCatalogItems">
             <xml-properties>
                 <xml-property name="description" value="Collection of hardware-catalog-items"/>
             </xml-properties>
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 <xml-property name="namespace" value="common"/>
                 <xml-property name="uriTemplate" value="/common/hardware-catalog-items/hardware-catalog-item/{item-name}"/>
                 <xml-property name="requiredProps" value="item-name,system-type,manufacturer,model,sku"/>
-             </xml-properties>
+            </xml-properties>
         </java-type>
 
         <java-type name="Profiles">
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-                               <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v25.Metadata"/>
+                <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v25.Metadata"/>
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="describes an profiles"/>
                 <xml-property name="indexedProps" value="profile-name,profile-role,profile-function,data-owner,data-source,data-source-version"/>
                 <xml-property name="uniqueProps" value="profile-name"/>
-                               <xml-property name="nameProps" value="profile-type"/>
+                <xml-property name="nameProps" value="profile-type"/>
                 <xml-property name="container" value="profiles"/>
                 <xml-property name="namespace" value="common"/>
                 <xml-property name="uriTemplate" value="/common/profiles/profile/{profile-name}"/>
                 <xml-property name="requiredProps" value="profile-name,profile-type,profile-selflink"/>
-             </xml-properties>
+            </xml-properties>
         </java-type>
 
 
-               <java-type name="Contacts">
+        <java-type name="Contacts">
             <xml-properties>
                 <xml-property name="description" value="Collection of contacts"/>
             </xml-properties>
             <java-attributes>
                 <xml-element container-type="java.util.ArrayList" java-attribute="contact" name="contact" type="inventory.aai.onap.org.v25.Contact"/>
             </java-attributes>
-               </java-type>
-               <java-type name="Contact">
+        </java-type>
+        <java-type name="Contact">
             <xml-root-element name="contact"/>
             <java-attributes>
                 <xml-element java-attribute="contactName" name="contact-name" required="true" type="java.lang.String" xml-key="true">
                         <xml-property name="description" value="Name of the contact"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="contactTelephone" name="contact-telephone" type="java.lang.String">
+                <xml-element java-attribute="contactTelephone" name="contact-telephone" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Tel no. of contact"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="contactEmail" name="contact-email" type="java.lang.String">
+                <xml-element java-attribute="contactEmail" name="contact-email" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="e-mail of contact"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="vendorType" name="vendor-type" type="java.lang.String">
+                <xml-element java-attribute="vendorType" name="vendor-type" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="NI (Network Integrator)SI (System Integrator) 3rd Party LCM"/>
                     </xml-properties>
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 <xml-property name="nameProps" value="contact-name,vendor-type"/>
                 <xml-property name="uriTemplate" value="/common/contacts/contact/{contact-name}"/>
                 <xml-property name="requiredProps" value="contact-name"/>
-                               <xml-property name="indexedProps" value="data-owner,data-source,data-source-version"/>
+                <xml-property name="indexedProps" value="data-owner,data-source,data-source-version"/>
             </xml-properties>
-               </java-type>
+        </java-type>
 
-               <java-type name="ObjectGroups">
+        <java-type name="ObjectGroups">
             <xml-properties>
                 <xml-property name="description" value="Collection of object-groups"/>
             </xml-properties>
         <java-type name="ObjectGroup">
             <xml-root-element name="object-group"/>
             <java-attributes>
-               <xml-element java-attribute="objectGroupId" name="object-group-id" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="objectGroupId" name="object-group-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
                         <xml-property name="description" value="UUID."/>
                     </xml-properties>
                         <xml-property name="description" value="used to track the versions of the object"/>
                     </xml-properties>
                 </xml-element>
+                <xml-element java-attribute="groupNumber" name="group-number" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="number of the group"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="groupRole" name="group-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="role for the group"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="groupFunction" name="group-function" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="function for the group"/>
+                    </xml-properties>
+                </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="communityList" name="community-list" type="inventory.aai.onap.org.v25.CommunityList"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="communityList" name="community-list" type="inventory.aai.onap.org.v25.CommunityList"/>
                 <xml-element container-type="java.util.ArrayList" java-attribute="ipAddressList" name="ip-address-list" type="inventory.aai.onap.org.v25.IpAddressList"/>
                 <xml-element container-type="java.util.ArrayList" java-attribute="portList" name="port-list" type="inventory.aai.onap.org.v25.PortList"/>
                 <xml-element container-type="java.util.ArrayList" java-attribute="selectorList" name="selector-list" type="inventory.aai.onap.org.v25.SelectorList"/>
                 <xml-property name="namespace" value="common"/>
                 <xml-property name="uriTemplate" value="/common/object-groups/object-group/{object-group-id}"/>
                 <xml-property name="requiredProps" value="object-group-id,group-type"/>
-             </xml-properties>
+            </xml-properties>
         </java-type>
 
         <java-type name="CommunityList">
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                         <xml-property name="description" value="Operator to apply to the port (greater than, less than, etc)."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="length" name="length" type="java.lang.Integer">
+                <xml-element java-attribute="length" name="length" type="java.lang.Integer">
                     <xml-properties>
                         <xml-property name="description" value="ip-address prefix length, 32 for single address."/>
                     </xml-properties>
                 </xml-element>
+                <xml-element java-attribute="prefixGroup" name="prefix-group" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="identifies the name or category the prefix belongs to"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="prefixSubGroup" name="prefix-sub-group" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="extends the identification of the prefix in the prefix-group"/>
+                    </xml-properties>
+                </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 <xml-property name="uriTemplate" value="/selector-list/{selector}"/>
                 <xml-property name="requiredProps" value="selector"/>
                 <xml-property name="indexedProps" value="data-owner,data-source,data-source-version,type"/>
-             </xml-properties>
+            </xml-properties>
         </java-type>
 
         <java-type name="Policies">
                 </xml-element>
                 <xml-element default-value="false" java-attribute="doNotTrack" name="do-not-track" required="true" type="java.lang.Boolean">
                     <xml-properties>
-                       <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="defaultValue" value="false"/>
                         <xml-property name="description" value="Do not track"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element default-value="false" java-attribute="preDnat" name="pre-dnat" required="true" type="java.lang.Boolean">
                     <xml-properties>
-                       <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="defaultValue" value="false"/>
                         <xml-property name="description" value="Pre destination NAT"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element default-value="false" java-attribute="applyOnForward" name="apply-on-forward" required="true" type="java.lang.Boolean">
                     <xml-properties>
-                       <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="defaultValue" value="false"/>
                         <xml-property name="description" value="apply on forward"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="selector" name="selector" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Host and Interface Type Selector"/>
-                                               <xml-property name="dbAlias" value="selector-local"/>
+                        <xml-property name="dbAlias" value="selector-local"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="order" name="order" type="java.lang.Integer">
                         <xml-property name="description" value="Description of the policy"/>
                     </xml-properties>
                 </xml-element>
-                 <xml-element java-attribute="policyVariables" name="policy-variables" type="java.lang.String">
+                <xml-element java-attribute="policyVariables" name="policy-variables" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Set of rule variables"/>
                     </xml-properties>
                         <xml-property name="description" value="policy direction set as ingress or egress"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                         <xml-property name="description" value="Action to perform when matching this rule."/>
                     </xml-properties>
                 </xml-element>
-                                <xml-element container-type="java.util.ArrayList" java-attribute="icmp" name="icmp" type="java.lang.String">
-                                <xml-properties>
+                <xml-element container-type="java.util.ArrayList" java-attribute="icmp" name="icmp" type="java.lang.String">
+                    <xml-properties>
                         <xml-property name="description" value=""/>
                     </xml-properties>
                 </xml-element>
-                                <xml-element container-type="java.util.ArrayList" java-attribute="notIcmp" name="not-icmp" type="java.lang.String">
-                                <xml-properties>
+                <xml-element container-type="java.util.ArrayList" java-attribute="notIcmp" name="not-icmp" type="java.lang.String">
+                    <xml-properties>
                         <xml-property name="description" value=""/>
                     </xml-properties>
                 </xml-element>
                         <xml-property name="description" value="Sequence number of the rule."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="threshold" name="threshold" type="java.lang.Integer">
+                <xml-element java-attribute="threshold" name="threshold" type="java.lang.Integer">
                     <xml-properties>
                         <xml-property name="description" value="Threshold"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element default-value="false" java-attribute="log" name="log" required="true" type="java.lang.Boolean">
                     <xml-properties>
-                       <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="defaultValue" value="false"/>
                         <xml-property name="description" value="Boolean to indicate whether or not logging is required."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="description" name="description" type="java.lang.String">
+                <xml-element java-attribute="description" name="description" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Description."/>
                     </xml-properties>
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element default-value="false" java-attribute="dhcpPool" name="dhcp-pool" required="true" type="java.lang.Boolean">
                     <xml-properties>
-                                               <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="defaultValue" value="false"/>
                         <xml-property name="description" value="DHCP Agent access."/>
                     </xml-properties>
                 </xml-element>
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 <xml-property name="container" value="vlan-characteristics"/>
                 <xml-property name="namespace" value="common"/>
                 <xml-property name="uriTemplate" value="/common/vlan-characteristics/vlan-characteristic/{vlan-characteristic-id}"/>
-               <xml-property name="requiredProps" value="vlan-characteristic-id,dhcp-pool,internet-access"/>
-             </xml-properties>
+                <xml-property name="requiredProps" value="vlan-characteristic-id,dhcp-pool,internet-access"/>
+            </xml-properties>
         </java-type>
 
         <java-type name="RelationshipRules">
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 <xml-property name="container" value="relationship-rules"/>
                 <xml-property name="namespace" value="common"/>
                 <xml-property name="uriTemplate" value="/common/relationship-rules/relationship-rule/{rule-id}"/>
-               <xml-property name="requiredProps" value="rule-id,context,rule-traversals,applies-to"/>
-             </xml-properties>
+                <xml-property name="requiredProps" value="rule-id,context,rule-traversals,applies-to"/>
+            </xml-properties>
         </java-type>
 
-               <java-type name="RelationshipComponents">
+        <java-type name="RelationshipComponents">
             <xml-properties>
                 <xml-property name="description" value="Collection of relationship components"/>
             </xml-properties>
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 <xml-property name="dependentOn" value="relationship-rule"/>
                 <xml-property name="uriTemplate" value="common/relationship-components/relationship-component/{rule-node}"/>
                 <xml-property name="requiredProps" value="rule-node,rule-property,rule-value,component-order"/>
-             </xml-properties>
+            </xml-properties>
         </java-type>
 
 
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
-                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 <xml-property name="container" value="aggregate-routes"/>
                 <xml-property name="dependentOn" value="vrf,l3-network"/>
                 <xml-property name="uriTemplate" value="/aggregate-routes/aggregate-route/{agg-route-id}"/>
-               <xml-property name="requiredProps" value="agg-route-id"/>
+                <xml-property name="requiredProps" value="agg-route-id"/>
             </xml-properties>
-               </java-type>
-               <java-type name="CommunicationServiceProfiles">
+        </java-type>
+        <java-type name="CommunicationServiceProfiles">
             <xml-properties>
                 <xml-property name="description" value="Collection of communication service profile."/>
             </xml-properties>
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 <xml-property name="uriTemplate" value="/service-instances/service-instance/{service-instance-id}/communication-service-profiles/communication-service-profile/{profile-id}"/>
                 <xml-property name="searcheable" value="profile-id"/>
             </xml-properties>
-               </java-type>
-               <java-type name="ServiceProfiles">
-                       <xml-properties>
-                               <xml-property name="description" value="Collection of E2E slice service profile."/>
-                       </xml-properties>
-                       <xml-root-element name="service-profiles"/>
-                       <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="serviceProfile" name="service-profile" type="inventory.aai.onap.org.v25.ServiceProfile"/>
-                       </java-attributes>
-               </java-type>
-               <java-type name="ServiceProfile">
-                       <xml-root-element name="service-profile"/>
-                       <java-attributes>
-                               <xml-element java-attribute="profileId" name="profile-id" required="true" type="java.lang.String" xml-key="true">
-                                       <xml-properties>
-                                               <xml-property name="description" value="ID of the profile."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="latency" name="latency" type="java.lang.Integer">
-                                       <xml-properties>
-                                               <xml-property name="description" value="The packet transmission latency (millisecond) through the RAN, CN, and TN part of 5G network and is used to evaluate utilization performance of the end-to-end network slice instance."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="maxNumberOfUEs" name="max-number-of-UEs" type="java.lang.Integer">
-                                       <xml-properties>
-                                               <xml-property name="description" value="The maximum number of UEs may simultaneously access the E2E slice service"/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="coverageAreaTAList" name="coverage-area-TA-list" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="A list of TrackingAreas where the NSI can be selected."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="uEMobilityLevel" name="ue-mobility-level" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="User mobility level, value can be stationary, nomadic, restricted mobility, fully mobility."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="resourceSharingLevel" name="resource-sharing-level" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Whether the resources to be allocated to the network slice instance may be shared with another network slice instance(s)."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="activityFactor" name="activity-factor" type="java.lang.Integer">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Percentage value of the amount of simultaneous active UEs to the total number of UEs where active means the UEs are exchanging data with the network."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="jitter" name="jitter" type="java.lang.Integer">
-                                       <xml-properties>
-                                               <xml-property name="description" value="The jitter requirements of network slice."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="survivalTime" name="survival-time" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="An attribute specifies the time that an application consuming a communication service may continue without an anticipated message."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="availability" name="availability" type="java.lang.Float">
-                                       <xml-properties>
-                                               <xml-property name="description" value="This parameter specifies the availability requirement, expressed as a percentage."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="reliability" name="reliability" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="An attribute specifies in the context of network layer packet transmissions, percentage value of the amount of sent network layer packets successfully delivered to a given system entity within the time constraint required by the targeted service, divided by the total number of sent network layer packets."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="dlThptPerSlice" name="dl-thpt-per-slice" type="java.lang.Integer">
-                                       <xml-properties>
-                                               <xml-property name="description" value="This attribute defines achievable data rate of the network slice in downlink that is available ubiquitously across the coverage area of the slice."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="dlThptPerUE" name="dl-thpt-per-UE" type="java.lang.Integer">
-                                       <xml-properties>
-                                               <xml-property name="description" value="This attribute defines downlink data rate supported by the network slice per UE."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="ulThptPerSlice" name="ul-thpt-per-slice" type="java.lang.Integer">
-                                       <xml-properties>
-                                               <xml-property name="description" value="This attribute defines achievable data rate of the network slice in uplink that is available ubiquitously across the coverage area of the slice."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="ulThptPerUE" name="ul-thpt-per-UE" type="java.lang.Integer">
-                                       <xml-properties>
-                                               <xml-property name="description" value="This attribute defines uplink data rate supported by the network slice per UE."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="maxPktSize" name="max-pkt-size" type="java.lang.Integer">
-                                       <xml-properties>
-                                               <xml-property name="description" value="This parameter specifies the maximum packet size supported by the network slice."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="maxNumberOfConns" name="max-number-of-conns" type="java.lang.Integer">
-                                       <xml-properties>
-                                               <xml-property name="description" value="This parameter defines the maximum number of concurrent sessions supported by the network slice."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="termDensity" name="term-density" type="java.lang.Integer">
-                                       <xml-properties>
-                                               <xml-property name="description" value="An attribute specifies the overall user density over the coverage area of the network slice."/>
-                                       </xml-properties>
-                               </xml-element>
+        </java-type>
+        <java-type name="ServiceProfiles">
+            <xml-properties>
+                <xml-property name="description" value="Collection of E2E slice service profile."/>
+            </xml-properties>
+            <xml-root-element name="service-profiles"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="serviceProfile" name="service-profile" type="inventory.aai.onap.org.v25.ServiceProfile"/>
+            </java-attributes>
+        </java-type>
+        <java-type name="ServiceProfile">
+            <xml-root-element name="service-profile"/>
+            <java-attributes>
+                <xml-element java-attribute="profileId" name="profile-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="ID of the profile."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="latency" name="latency" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="The packet transmission latency (millisecond) through the RAN, CN, and TN part of 5G network and is used to evaluate utilization performance of the end-to-end network slice instance."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="maxNumberOfUEs" name="max-number-of-UEs" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="The maximum number of UEs may simultaneously access the E2E slice service"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="coverageAreaTAList" name="coverage-area-TA-list" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="A list of TrackingAreas where the NSI can be selected."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="uEMobilityLevel" name="ue-mobility-level" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="User mobility level, value can be stationary, nomadic, restricted mobility, fully mobility."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceSharingLevel" name="resource-sharing-level" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Whether the resources to be allocated to the network slice instance may be shared with another network slice instance(s)."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="activityFactor" name="activity-factor" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Percentage value of the amount of simultaneous active UEs to the total number of UEs where active means the UEs are exchanging data with the network."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="jitter" name="jitter" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="The jitter requirements of network slice."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="survivalTime" name="survival-time" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="An attribute specifies the time that an application consuming a communication service may continue without an anticipated message."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="availability" name="availability" type="java.lang.Float">
+                    <xml-properties>
+                        <xml-property name="description" value="This parameter specifies the availability requirement, expressed as a percentage."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="reliability" name="reliability" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="An attribute specifies in the context of network layer packet transmissions, percentage value of the amount of sent network layer packets successfully delivered to a given system entity within the time constraint required by the targeted service, divided by the total number of sent network layer packets."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dlThptPerSlice" name="dl-thpt-per-slice" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="This attribute defines achievable data rate of the network slice in downlink that is available ubiquitously across the coverage area of the slice."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dlThptPerUE" name="dl-thpt-per-UE" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="This attribute defines downlink data rate supported by the network slice per UE."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ulThptPerSlice" name="ul-thpt-per-slice" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="This attribute defines achievable data rate of the network slice in uplink that is available ubiquitously across the coverage area of the slice."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ulThptPerUE" name="ul-thpt-per-UE" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="This attribute defines uplink data rate supported by the network slice per UE."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="maxPktSize" name="max-pkt-size" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="This parameter specifies the maximum packet size supported by the network slice."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="maxNumberOfConns" name="max-number-of-conns" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="This parameter defines the maximum number of concurrent sessions supported by the network slice."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="termDensity" name="term-density" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="An attribute specifies the overall user density over the coverage area of the network slice."/>
+                    </xml-properties>
+                </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
-                                               <xml-property name="ownerCheck" value="N/A"/>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                                               <xml-property name="ownerCheck" value="N/A"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Requirement of E2E Slice service."/>
+                <xml-property name="uniqueProps" value="profile-id"/>
+                <xml-property name="indexedProps" value="profile-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="container" value="service-profiles"/>
+                <xml-property name="dependentOn" value="service-instance"/>
+                <xml-property name="uriTemplate" value="/service-instances/service-instance/{service-instance-id}/service-profiles/service-profile/{profile-id}"/>
+                <xml-property name="searcheable" value="profile-id"/>
+            </xml-properties>
+        </java-type>
+        <java-type name="SliceProfiles">
+            <xml-properties>
+                <xml-property name="description" value="Collection of slice subnet service profile."/>
+            </xml-properties>
+            <xml-root-element name="slice-profiles"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="sliceProfile" name="slice-profile" type="inventory.aai.onap.org.v25.SliceProfile"/>
+            </java-attributes>
+        </java-type>
+        <java-type name="SliceProfile">
+            <xml-root-element name="slice-profile"/>
+            <java-attributes>
+                <xml-element java-attribute="profileId" name="profile-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="ID of the profile."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="latency" name="latency" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="The packet transmission latency (millisecond) through the RAN or CN or TN and is used to evaluate utilization performance of the end-to-end network slice instance."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="maxNumberOfUEs" name="max-number-of-UEs" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="The maximum number of UEs may simultaneously access the slice subnet service"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="coverageAreaTAList" name="coverage-area-TA-list" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                        <xml-property name="description" value="A list of TrackingAreas where the NSSI can be selected."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="ueMobilityLevel" name="ue-mobility-level" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                        <xml-property name="description" value="User mobility level, value can be stationary, nomadic, restricted mobility, fully mobility."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceSharingLevel" name="resource-sharing-level" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Whether the resources to be allocated to the slice subnet instance may be shared with another network slice instance(s)."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="expDataRateUL" name="exp-data-rate-UL" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="User experience data rate of upload."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="expDataRateDL" name="exp-data-rate-DL" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="User experience data rate of download."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="areaTrafficCapUL" name="area-traffic-cap-UL" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="The area traffic capbility of upload."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="areaTrafficCapDL" name="area-traffic-cap-DL" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="The area traffic capbility of download."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="activityFactor" name="activity-factor" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="An attribute specfies the percentage value of the amount of simultaneous active UEs to the total number of UEs where active means the UEs are exchanging data with the network."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="jitter" name="jitter" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="The jitter requirements of network slice subnet."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="survivalTime" name="survival-time" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Survival time for network slice subnet."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="csAvailabilityTarget" name="cs-availability-target" type="java.lang.Float">
+                    <xml-properties>
+                        <xml-property name="description" value="Communication service availability target value."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="maxBandwidth" name="max-bandwidth" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Maxmun bandwidth value of TN network."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="expDataRate" name="exp-data-rate" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Expected date rate for uRLLC."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="maxNumberOfPDUSession" name="max-number-of-PDU-session" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="maxNumberofPDUSession Integer 1        The maximum number of PDU sessions that can simultaneously/concurrently access to the network slice."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="overallUserDensity" name="overall-user-density" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="Overall User Density."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="csReliabilityMeanTime" name="cs-reliability-mean-time" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Communication service reliability mean time between failures."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="msgSizeByte" name="msg-size-byte" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Message size(byte) ."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="transferIntervalTarget" name="transfer-interval-target" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="transferIntervalTarget String 1        Target value of transfer interval."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-                       </java-attributes>
-                       <xml-properties>
-                               <xml-property name="description" value="Requirement of E2E Slice service."/>
-                               <xml-property name="uniqueProps" value="profile-id"/>
-                               <xml-property name="indexedProps" value="profile-id,data-owner,data-source,data-source-version"/>
-                               <xml-property name="container" value="service-profiles"/>
-                               <xml-property name="dependentOn" value="service-instance"/>
-                               <xml-property name="uriTemplate" value="/service-instances/service-instance/{service-instance-id}/service-profiles/service-profile/{profile-id}"/>
-                               <xml-property name="searcheable" value="profile-id"/>
-                       </xml-properties>
-               </java-type>
-               <java-type name="SliceProfiles">
-                       <xml-properties>
-                               <xml-property name="description" value="Collection of slice subnet service profile."/>
-                       </xml-properties>
-                       <xml-root-element name="slice-profiles"/>
-                       <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="sliceProfile" name="slice-profile" type="inventory.aai.onap.org.v25.SliceProfile"/>
-                       </java-attributes>
-               </java-type>
-               <java-type name="SliceProfile">
-                       <xml-root-element name="slice-profile"/>
-                       <java-attributes>
-                               <xml-element java-attribute="profileId" name="profile-id" required="true" type="java.lang.String" xml-key="true">
-                                       <xml-properties>
-                                               <xml-property name="description" value="ID of the profile."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="latency" name="latency" type="java.lang.Integer">
-                                       <xml-properties>
-                                               <xml-property name="description" value="The packet transmission latency (millisecond) through the RAN or CN or TN and is used to evaluate utilization performance of the end-to-end network slice instance."/>
-                                       </xml-properties>
-                               </xml-element>
-                <xml-element java-attribute="maxNumberOfUEs" name="max-number-of-UEs" type="java.lang.Integer">
-                                       <xml-properties>
-                                               <xml-property name="description" value="The maximum number of UEs may simultaneously access the slice subnet service"/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="coverageAreaTAList" name="coverage-area-TA-list" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="A list of TrackingAreas where the NSSI can be selected."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="ueMobilityLevel" name="ue-mobility-level" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="User mobility level, value can be stationary, nomadic, restricted mobility, fully mobility."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="resourceSharingLevel" name="resource-sharing-level" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Whether the resources to be allocated to the slice subnet instance may be shared with another network slice instance(s)."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="expDataRateUL" name="exp-data-rate-UL" type="java.lang.Integer">
-                                       <xml-properties>
-                                               <xml-property name="description" value="User experience data rate of upload."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="expDataRateDL" name="exp-data-rate-DL" type="java.lang.Integer">
-                                       <xml-properties>
-                                               <xml-property name="description" value="User experience data rate of download."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="areaTrafficCapUL" name="area-traffic-cap-UL" type="java.lang.Integer">
-                                       <xml-properties>
-                                               <xml-property name="description" value="The area traffic capbility of upload."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="areaTrafficCapDL" name="area-traffic-cap-DL" type="java.lang.Integer">
-                                       <xml-properties>
-                                               <xml-property name="description" value="The area traffic capbility of download."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="activityFactor" name="activity-factor" type="java.lang.Integer">
-                                       <xml-properties>
-                                               <xml-property name="description" value="An attribute specfies the percentage value of the amount of simultaneous active UEs to the total number of UEs where active means the UEs are exchanging data with the network."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="jitter" name="jitter" type="java.lang.Integer">
-                                       <xml-properties>
-                                               <xml-property name="description" value="The jitter requirements of network slice subnet."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="survivalTime" name="survival-time" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Survival time for network slice subnet."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="csAvailabilityTarget" name="cs-availability-target" type="java.lang.Float">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Communication service availability target value."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="maxBandwidth" name="max-bandwidth" type="java.lang.Integer">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Maxmun bandwidth value of TN network."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="expDataRate" name="exp-data-rate" type="java.lang.Integer">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Expected date rate for uRLLC."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="maxNumberOfPDUSession" name="max-number-of-PDU-session" type="java.lang.Integer">
-                                       <xml-properties>
-                                               <xml-property name="description" value="maxNumberofPDUSession Integer 1 The maximum number of PDU sessions that can simultaneously/concurrently access to the network slice."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="overallUserDensity" name="overall-user-density" type="java.lang.Integer">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Overall User Density."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="csReliabilityMeanTime" name="cs-reliability-mean-time" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Communication service reliability mean time between failures."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="msgSizeByte" name="msg-size-byte" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Message size(byte) ."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="transferIntervalTarget" name="transfer-interval-target" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="transferIntervalTarget String 1 Target value of transfer interval."/>
-                                       </xml-properties>
-                               </xml-element>
                 <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
                                                <xml-property name="ownerCheck" value="N/A"/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the upstream source of the data."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Identifies the version of the upstream source."/>
                     </xml-properties>
                 </xml-element>
-                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
-                                       </xml-properties>
-                               </xml-element>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
-                       </java-attributes>
-                       <xml-properties>
-                               <xml-property name="description" value="Requirement of network slice subnet service."/>
-                               <xml-property name="uniqueProps" value="profile-id"/>
-                               <xml-property name="indexedProps" value="profile-id,data-owner,data-source,data-source-version"/>
-                               <xml-property name="container" value="slice-profiles"/>
-                               <xml-property name="dependentOn" value="service-instance"/>
-                               <xml-property name="uriTemplate" value="/service-instances/service-instance/{service-instance-id}/slice-profiles/slice-profile/{profile-id}"/>
-                               <xml-property name="searcheable" value="profile-id"/>
-                       </xml-properties>
-               </java-type>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Requirement of network slice subnet service."/>
+                <xml-property name="uniqueProps" value="profile-id"/>
+                <xml-property name="indexedProps" value="profile-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="container" value="slice-profiles"/>
+                <xml-property name="dependentOn" value="service-instance"/>
+                <xml-property name="uriTemplate" value="/service-instances/service-instance/{service-instance-id}/slice-profiles/slice-profile/{profile-id}"/>
+                <xml-property name="searcheable" value="profile-id"/>
+            </xml-properties>
+        </java-type>
 
         <java-type name="K8sResources">
             <xml-properties>
                 <xml-property name="requiredProps" value="esi-id"/>
             </xml-properties>
         </java-type>
-        <java-type name="LcmpUnreachables">
+
+        <java-type name="IcmpUnreachables">
             <xml-properties>
-                <xml-property name="description" value="Collection of lcmp unreachables."/>
+                <xml-property name="description" value="Collection of icmp unreachables."/>
             </xml-properties>
-            <xml-root-element name="lcmp-unreachables"/>
+            <xml-root-element name="icmp-unreachables"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="lcmpUnreachable" name="lcmp-unreachable" type="inventory.aai.onap.org.v25.LcmpUnreachable"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="icmpUnreachable" name="icmp-unreachable" type="inventory.aai.onap.org.v25.IcmpUnreachable"/>
             </java-attributes>
         </java-type>
-        <java-type name="LcmpUnreachable">
-            <xml-root-element name="lcmp-unreachable"/>
+        <java-type name="IcmpUnreachable">
+            <xml-root-element name="icmp-unreachable"/>
             <java-attributes>
-                <xml-element java-attribute="lcmpUnreachableId" name="lcmp-unreachable-id" required="true" type="java.lang.String" xml-key="true">
+                <xml-element java-attribute="icmpUnreachableId" name="icmp-unreachable-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
                         <xml-property name="description" value="object identifier"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="afIpv4" name="af-ipv4" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Flag to indicate generation of Internet Control Message Protocol (ICMP) unreachable messages for ipv4 address family Values, null, disable, enable"/>
+                        <xml-property name="description" value="Flag to indicate generation of Internet Control Message Protocol (ICMP) unreachable messages for ipv4 address family Values: null, disable, enable"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="afIpv6" name="af-ipv6" type="java.lang.String">
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Flag to indicate generation of Internet Control Message Protocol (ICMP) unreachable messages"/>
-                <xml-property name="indexedProps" value="lcmp-unreachable-id,data-owner,data-source,data-source-version"/>
+                <xml-property name="indexedProps" value="icmp-unreachable-id,data-owner,data-source,data-source-version"/>
                 <xml-property name="dependentOn" value="l-interface"/>
-                <xml-property name="container" value="lcmp-unreachables"/>
-                <xml-property name="uriTemplate" value="/lcmp-unreachables/lcmp-unreachable/{lcmp-unreachable-id}"/>
-                <xml-property name="requiredProps" value="lcmp-unreachable-id"/>
-             </xml-properties>
+                <xml-property name="container" value="icmp-unreachables"/>
+                <xml-property name="uriTemplate" value="/icmp-unreachables/icmp-unreachable/{icmp-unreachable-id}"/>
+                <xml-property name="requiredProps" value="icmp-unreachable-id"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="ObjectGroupMembers">
+            <xml-properties>
+                <xml-property name="description" value="Collection of object group member."/>
+            </xml-properties>
+            <xml-root-element name="object-group-members"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="objectGroupMember" name="object-group-member" type="inventory.aai.onap.org.v25.ObjectGroupMember"/>
+            </java-attributes>
+        </java-type>
+        <java-type name="ObjectGroupMember">
+            <xml-root-element name="object-group-member"/>
+            <java-attributes>
+                <xml-element java-attribute="objectGroupMemberId" name="object-group-member-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="object identifier"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="sequenceNumber" name="sequence-number" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="indicates the sequence of the member in the group"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="memberType" name="member-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="type of member For object-group-type=OBJECT-TRACKING, member-type=ACTION"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                        <xml-property name="ownerCheck" value="N/A"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="used to identify a member of an object group"/>
+                <xml-property name="indexedProps" value="object-group-member-id,member-type,data-owner,data-source,data-source-version"/>
+                <xml-property name="container" value="object-group-members"/>
+                <xml-property name="uniqueProps" value="object-group-member-id"/>
+                <xml-property name="namespace" value="common"/>
+                <xml-property name="uriTemplate" value="/common/object-group-members/object-group-member/{object-group-member-id}"/>
+                <xml-property name="requiredProps" value="object-group-member-id"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="ObjectGroupKeyTerms">
+            <xml-properties>
+                <xml-property name="description" value="Collection of object group key term."/>
+            </xml-properties>
+            <xml-root-element name="object-group-key-terms"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="objectGroupKeyTerm" name="object-group-key-term" type="inventory.aai.onap.org.v25.ObjectGroupKeyTerm"/>
+            </java-attributes>
+        </java-type>
+        <java-type name="ObjectGroupKeyTerm">
+            <xml-root-element name="object-group-key-term"/>
+            <java-attributes>
+                <xml-element java-attribute="objectGroupKeyTermId" name="object-group-key-term-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="object identifier"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="sequenceNumber" name="sequence-number" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="indicates the sequence of the term in the group member"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="keyTermType" name="key-term-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="type of term For object-group-type=OBJECT-TRACKING, member-type=ACTION, key-term-type= STATE-CHANGE"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="keyWord" name="key-word" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="device configuration command"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="keyWordQualifier" name="key-word-qualifier" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="additional qualifier (sub key-word) used for device configuration"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                        <xml-property name="ownerCheck" value="N/A"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v25.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="used to identify key term of an object group member"/>
+                <xml-property name="indexedProps" value="object-group-key-term-id,key-term-type,key-word,data-owner,data-source,data-source-version"/>
+                <xml-property name="container" value="object-group-key-terms"/>
+                <xml-property name="uniqueProps" value="object-group-key-term-id"/>
+                <xml-property name="namespace" value="common"/>
+                <xml-property name="uriTemplate" value="/common/object-group-key-terms/object-group-key-term/{object-group-key-term-id}"/>
+                <xml-property name="requiredProps" value="object-group-key-term-id"/>
+            </xml-properties>
         </java-type>
-       </java-types>
+
+    </java-types>
 </xml-bindings>