diff options
Diffstat (limited to 'aai-schema/src/main/resources/onap')
25 files changed, 219 insertions, 192 deletions
diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v10.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v10.xsd index d304f90..1eb1a59 100644 --- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v10.xsd +++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v10.xsd @@ -3996,7 +3996,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Used to capture the network interfaces of this VCE",nameProps="port-group-name",indexedProps="port-group-id,heat-stack-id,interface-id,interface-name,switch-name",dependentOn="vce",container="port-groups",uriTemplate="/port-groups/port-group/{interface-id}",requiredProps="interface-id,orchestration-status")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Used to capture the network interfaces of this VCE",nameProps="port-group-name",indexedProps="port-group-id,heat-stack-id,interface-id,switch-name",dependentOn="vce",container="port-groups",uriTemplate="/port-groups/port-group/{interface-id}",requiredProps="interface-id,orchestration-status")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -4183,7 +4183,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Customer Edge Router, used specifically for Gamma. This object is deprecated.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vces",namespace="network",extendsFrom="vnf",uriTemplate="/network/vces/vce/{vnf-id}",requiredProps="vnf-id,vnf-name,vnf-type")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Customer Edge Router, used specifically for Gamma. This object is deprecated.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,regional-resource-zone,vpe-id,prov-status,service-id",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vces",namespace="network",extendsFrom="vnf",uriTemplate="/network/vces/vce/{vnf-id}",requiredProps="vnf-id,vnf-name,vnf-type")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -4611,7 +4611,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Generic network definition",nameProps="network-name",indexedProps="heat-stack-id,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role",searchable="network-id,network-name",uniqueProps="network-id",container="l3-networks",namespace="network",uriTemplate="/network/l3-networks/l3-network/{network-id}",requiredProps="network-id,is-bound-to-vpn,is-provider-network,is-shared-network,is-external-network")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Generic network definition",nameProps="network-name",indexedProps="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",searchable="network-id,network-name",uniqueProps="network-id",container="l3-networks",namespace="network",uriTemplate="/network/l3-networks/l3-network/{network-id}",requiredProps="network-id,is-bound-to-vpn,is-provider-network,is-shared-network,is-external-network")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -5509,7 +5509,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="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.",indexedProps="pnf-name,orchestration-status,inv-status",searchable="pnf-name",uniqueProps="pnf-name",container="pnfs",namespace="network",uriTemplate="/network/pnfs/pnf/{pnf-name}",requiredProps="pnf-name,in-maint")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="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.",indexedProps="pnf-name,inv-status",searchable="pnf-name",uniqueProps="pnf-name",container="pnfs",namespace="network",uriTemplate="/network/pnfs/pnf/{pnf-name}",requiredProps="pnf-name,in-maint")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v11.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v11.xsd index 69df34d..8b0dca8 100644 --- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v11.xsd +++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v11.xsd @@ -2812,7 +2812,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persist SDNC address information used by ONAP SDNC.",indexedProps="sdnc-id",searchable="sdnc-id",container="esr-thirdparty-sdnc-list",namespace="external-system",requiredProps="thirdparty-sdnc-id",uriTemplate="/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/{thirdparty-sdnc-id}")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persist SDNC address information used by ONAP SDNC.",container="esr-thirdparty-sdnc-list",namespace="external-system",requiredProps="thirdparty-sdnc-id",uriTemplate="/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/{thirdparty-sdnc-id}")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -4821,7 +4821,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Used to capture the network interfaces of this VCE",nameProps="port-group-name",indexedProps="port-group-id,heat-stack-id,interface-id,interface-name,switch-name",dependentOn="vce",container="port-groups",uriTemplate="/port-groups/port-group/{interface-id}",requiredProps="interface-id,orchestration-status")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Used to capture the network interfaces of this VCE",nameProps="port-group-name",indexedProps="port-group-id,heat-stack-id,interface-id,switch-name",dependentOn="vce",container="port-groups",uriTemplate="/port-groups/port-group/{interface-id}",requiredProps="interface-id,orchestration-status")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -5008,7 +5008,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Customer Edge Router, used specifically for Gamma. This object is deprecated.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vces",namespace="network",extendsFrom="vnf",uriTemplate="/network/vces/vce/{vnf-id}",requiredProps="vnf-id,vnf-name,vnf-type")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Customer Edge Router, used specifically for Gamma. This object is deprecated.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,regional-resource-zone,vpe-id,prov-status,service-id",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vces",namespace="network",extendsFrom="vnf",uriTemplate="/network/vces/vce/{vnf-id}",requiredProps="vnf-id,vnf-name,vnf-type")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -5535,7 +5535,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Generic network definition",nameProps="network-name",indexedProps="heat-stack-id,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role",searchable="network-id,network-name",uniqueProps="network-id",container="l3-networks",namespace="network",uriTemplate="/network/l3-networks/l3-network/{network-id}",requiredProps="network-id,is-bound-to-vpn,is-provider-network,is-shared-network,is-external-network")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Generic network definition",nameProps="network-name",indexedProps="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",searchable="network-id,network-name",uniqueProps="network-id",container="l3-networks",namespace="network",uriTemplate="/network/l3-networks/l3-network/{network-id}",requiredProps="network-id,is-bound-to-vpn,is-provider-network,is-shared-network,is-external-network")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -6510,7 +6510,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="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.",indexedProps="pnf-name,orchestration-status,inv-status",searchable="pnf-name",uniqueProps="pnf-name",container="pnfs",namespace="network",uriTemplate="/network/pnfs/pnf/{pnf-name}",requiredProps="pnf-name,in-maint")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="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.",indexedProps="pnf-name,inv-status",searchable="pnf-name",uniqueProps="pnf-name",container="pnfs",namespace="network",uriTemplate="/network/pnfs/pnf/{pnf-name}",requiredProps="pnf-name,in-maint")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v12.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v12.xsd index 1174be8..06bc2ae 100644 --- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v12.xsd +++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v12.xsd @@ -3007,7 +3007,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persist SDNC address information used by ONAP SDNC.",indexedProps="sdnc-id",searchable="sdnc-id",container="esr-thirdparty-sdnc-list",namespace="external-system",requiredProps="thirdparty-sdnc-id",uriTemplate="/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/{thirdparty-sdnc-id}")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persist SDNC address information used by ONAP SDNC.",container="esr-thirdparty-sdnc-list",namespace="external-system",requiredProps="thirdparty-sdnc-id",uriTemplate="/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/{thirdparty-sdnc-id}")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -5023,7 +5023,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Used to capture the network interfaces of this VCE",nameProps="port-group-name",indexedProps="port-group-id,heat-stack-id,interface-id,interface-name,switch-name",dependentOn="vce",container="port-groups",uriTemplate="/port-groups/port-group/{interface-id}",requiredProps="interface-id,orchestration-status")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Used to capture the network interfaces of this VCE",nameProps="port-group-name",indexedProps="port-group-id,heat-stack-id,interface-id,switch-name",dependentOn="vce",container="port-groups",uriTemplate="/port-groups/port-group/{interface-id}",requiredProps="interface-id,orchestration-status")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -5210,7 +5210,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Customer Edge Router, used specifically for Gamma. This object is deprecated.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vces",namespace="network",extendsFrom="vnf",uriTemplate="/network/vces/vce/{vnf-id}",requiredProps="vnf-id,vnf-name,vnf-type")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Customer Edge Router, used specifically for Gamma. This object is deprecated.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,regional-resource-zone,vpe-id,prov-status,service-id",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vces",namespace="network",extendsFrom="vnf",uriTemplate="/network/vces/vce/{vnf-id}",requiredProps="vnf-id,vnf-name,vnf-type")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -5737,7 +5737,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Generic network definition",nameProps="network-name",indexedProps="heat-stack-id,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role",searchable="network-id,network-name",uniqueProps="network-id",container="l3-networks",namespace="network",uriTemplate="/network/l3-networks/l3-network/{network-id}",requiredProps="network-id,is-bound-to-vpn,is-provider-network,is-shared-network,is-external-network")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Generic network definition",nameProps="network-name",indexedProps="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",searchable="network-id,network-name",uniqueProps="network-id",container="l3-networks",namespace="network",uriTemplate="/network/l3-networks/l3-network/{network-id}",requiredProps="network-id,is-bound-to-vpn,is-provider-network,is-shared-network,is-external-network")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -6712,7 +6712,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="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.",indexedProps="pnf-name,orchestration-status,inv-status",searchable="pnf-name",uniqueProps="pnf-name",container="pnfs",namespace="network",uriTemplate="/network/pnfs/pnf/{pnf-name}",requiredProps="pnf-name,in-maint")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="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.",indexedProps="pnf-name,inv-status",searchable="pnf-name",uniqueProps="pnf-name",container="pnfs",namespace="network",uriTemplate="/network/pnfs/pnf/{pnf-name}",requiredProps="pnf-name,in-maint")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v13.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v13.xsd index 95ee174..21b90e3 100644 --- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v13.xsd +++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v13.xsd @@ -3007,7 +3007,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persist SDNC address information used by ONAP SDNC.",indexedProps="sdnc-id",searchable="sdnc-id",container="esr-thirdparty-sdnc-list",namespace="external-system",requiredProps="thirdparty-sdnc-id",uriTemplate="/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/{thirdparty-sdnc-id}")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persist SDNC address information used by ONAP SDNC.",container="esr-thirdparty-sdnc-list",namespace="external-system",requiredProps="thirdparty-sdnc-id",uriTemplate="/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/{thirdparty-sdnc-id}")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -5002,7 +5002,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Used to capture the network interfaces of this VCE",nameProps="port-group-name",indexedProps="port-group-id,heat-stack-id,interface-id,interface-name,switch-name",dependentOn="vce",container="port-groups",uriTemplate="/port-groups/port-group/{interface-id}",requiredProps="interface-id,orchestration-status")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Used to capture the network interfaces of this VCE",nameProps="port-group-name",indexedProps="port-group-id,heat-stack-id,interface-id,switch-name",dependentOn="vce",container="port-groups",uriTemplate="/port-groups/port-group/{interface-id}",requiredProps="interface-id,orchestration-status")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -5189,7 +5189,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Customer Edge Router, used specifically for Gamma. This object is deprecated.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vces",namespace="network",extendsFrom="vnf",uriTemplate="/network/vces/vce/{vnf-id}",requiredProps="vnf-id,vnf-name,vnf-type")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Customer Edge Router, used specifically for Gamma. This object is deprecated.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,regional-resource-zone,vpe-id,prov-status,service-id",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vces",namespace="network",extendsFrom="vnf",uriTemplate="/network/vces/vce/{vnf-id}",requiredProps="vnf-id,vnf-name,vnf-type")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -5709,7 +5709,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Generic network definition",nameProps="network-name",indexedProps="heat-stack-id,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role",searchable="network-id,network-name",uniqueProps="network-id",container="l3-networks",namespace="network",uriTemplate="/network/l3-networks/l3-network/{network-id}",requiredProps="network-id,is-bound-to-vpn,is-provider-network,is-shared-network,is-external-network")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Generic network definition",nameProps="network-name",indexedProps="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",searchable="network-id,network-name",uniqueProps="network-id",container="l3-networks",namespace="network",uriTemplate="/network/l3-networks/l3-network/{network-id}",requiredProps="network-id,is-bound-to-vpn,is-provider-network,is-shared-network,is-external-network")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -6691,7 +6691,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="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.",indexedProps="pnf-name,orchestration-status,inv-status,model-invariant-id,model-version-id",searchable="pnf-name",uniqueProps="pnf-name",container="pnfs",namespace="network",uriTemplate="/network/pnfs/pnf/{pnf-name}",requiredProps="pnf-name,in-maint")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="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.",indexedProps="pnf-name,inv-status,model-invariant-id,model-version-id",searchable="pnf-name",uniqueProps="pnf-name",container="pnfs",namespace="network",uriTemplate="/network/pnfs/pnf/{pnf-name}",requiredProps="pnf-name,in-maint")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -7266,7 +7266,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="General mechanism for grouping instances",nameProps="description,instance-group-name",uniqueProps="id",searchable="id,description",indexedProps="id,description,type,sub-type,model-invariant-id,model-version-id",container="instance-groups",namespace="network",uriTemplate="/network/instance-groups/instance-group/{id}",requiredProps="id,description,instance-group-type")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="General mechanism for grouping instances",nameProps="description,instance-group-name",uniqueProps="id",searchable="id,description",indexedProps="id,description,model-invariant-id,model-version-id",container="instance-groups",namespace="network",uriTemplate="/network/instance-groups/instance-group/{id}",requiredProps="id,description,instance-group-type")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -7938,7 +7938,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Internal map to define some reserved properties of a vertex",uniqueProps="aai-unique-key,aai-uri,aai-uuid",indexedProps="aai-unique-key,source-of-truth,aai-node-type,aai-uri,aai-uuid")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Internal map to define some reserved properties of a vertex",uniqueProps="aai-unique-key,aai-uri",indexedProps="aai-unique-key,source-of-truth,aai-node-type,aai-uri,aai-uuid")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v14.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v14.xsd index c133411..8c6abd7 100644 --- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v14.xsd +++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v14.xsd @@ -2448,7 +2448,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Physical interface (e.g., nic)",indexedProps="interface-name,prov-status,networkRef,operational-status",nameProps="prov-status",dependentOn="vpls-pe,pserver,pnf",container="p-interfaces",uriTemplate="/p-interfaces/p-interface/{interface-name}",requiredProps="interface-name,in-maint")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Physical interface (e.g., nic)",indexedProps="interface-name,prov-status,network-ref,operational-status",nameProps="prov-status",dependentOn="vpls-pe,pserver,pnf",container="p-interfaces",uriTemplate="/p-interfaces/p-interface/{interface-name}",requiredProps="interface-name,in-maint")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -3196,7 +3196,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persist SDNC address information used by ONAP SDNC.",indexedProps="sdnc-id",searchable="sdnc-id",container="esr-thirdparty-sdnc-list",namespace="external-system",requiredProps="thirdparty-sdnc-id",uriTemplate="/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/{thirdparty-sdnc-id}")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persist SDNC address information used by ONAP SDNC.",container="esr-thirdparty-sdnc-list",namespace="external-system",requiredProps="thirdparty-sdnc-id",uriTemplate="/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/{thirdparty-sdnc-id}")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -5356,7 +5356,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Used to capture the network interfaces of this VCE",nameProps="port-group-name",indexedProps="port-group-id,heat-stack-id,interface-id,interface-name,switch-name",dependentOn="vce",container="port-groups",uriTemplate="/port-groups/port-group/{interface-id}",requiredProps="interface-id,orchestration-status")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Used to capture the network interfaces of this VCE",nameProps="port-group-name",indexedProps="port-group-id,heat-stack-id,interface-id,switch-name",dependentOn="vce",container="port-groups",uriTemplate="/port-groups/port-group/{interface-id}",requiredProps="interface-id,orchestration-status")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -5543,7 +5543,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Customer Edge Router, used specifically for Gamma. This object is deprecated.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vces",namespace="network",extendsFrom="vnf",uriTemplate="/network/vces/vce/{vnf-id}",requiredProps="vnf-id,vnf-name,vnf-type")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Customer Edge Router, used specifically for Gamma. This object is deprecated.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,regional-resource-zone,vpe-id,prov-status,service-id",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vces",namespace="network",extendsFrom="vnf",uriTemplate="/network/vces/vce/{vnf-id}",requiredProps="vnf-id,vnf-name,vnf-type")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -6118,7 +6118,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Generic network definition",nameProps="network-name",indexedProps="heat-stack-id,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role",searchable="network-id,network-name",uniqueProps="network-id",container="l3-networks",namespace="network",uriTemplate="/network/l3-networks/l3-network/{network-id}",requiredProps="network-id,is-bound-to-vpn,is-provider-network,is-shared-network,is-external-network")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Generic network definition",nameProps="network-name",indexedProps="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",searchable="network-id,network-name",uniqueProps="network-id",container="l3-networks",namespace="network",uriTemplate="/network/l3-networks/l3-network/{network-id}",requiredProps="network-id,is-bound-to-vpn,is-provider-network,is-shared-network,is-external-network")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -7107,7 +7107,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Software Version",indexedProps="softwareVersionId,isActiveSwVer",dependentOn="pnf",container="pnf",requiredProps="software-version-id,is-active-sw-ver",uriTemplate="/pnf/software-version/{software-version-id}")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Software Version",indexedProps="software-version-id,is-active-sw-ver",dependentOn="pnf",container="pnf",requiredProps="software-version-id,is-active-sw-ver",uriTemplate="/pnf/software-version/{software-version-id}")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -7144,7 +7144,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="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.",indexedProps="pnf-name,orchestration-status,inv-status,model-invariant-id,model-version-id,operational-status,admin-status",searchable="pnf-name",uniqueProps="pnf-name",container="pnfs",namespace="network",uriTemplate="/network/pnfs/pnf/{pnf-name}",requiredProps="pnf-name,in-maint")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="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.",indexedProps="pnf-name,inv-status,model-invariant-id,model-version-id,operational-status,admin-status",searchable="pnf-name",uniqueProps="pnf-name",container="pnfs",namespace="network",uriTemplate="/network/pnfs/pnf/{pnf-name}",requiredProps="pnf-name,in-maint")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -7755,7 +7755,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="General mechanism for grouping instances",nameProps="description,instance-group-name",uniqueProps="id",searchable="id,description",indexedProps="id,type,sub-type,model-invariant-id,model-version-id",container="instance-groups",namespace="network",uriTemplate="/network/instance-groups/instance-group/{id}",requiredProps="id,instance-group-type")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="General mechanism for grouping instances",nameProps="description,instance-group-name",uniqueProps="id",searchable="id,description",indexedProps="id,model-invariant-id,model-version-id",container="instance-groups",namespace="network",uriTemplate="/network/instance-groups/instance-group/{id}",requiredProps="id,instance-group-type")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v15.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v15.xsd index 66593d5..a501935 100644 --- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v15.xsd +++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v15.xsd @@ -2462,7 +2462,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Physical interface (e.g., nic)",indexedProps="interface-name,prov-status,networkRef,operational-status",nameProps="prov-status",dependentOn="vpls-pe,pserver,pnf",container="p-interfaces",uriTemplate="/p-interfaces/p-interface/{interface-name}",requiredProps="interface-name,in-maint")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Physical interface (e.g., nic)",indexedProps="interface-name,prov-status,network-ref,operational-status",nameProps="prov-status",dependentOn="vpls-pe,pserver,pnf",container="p-interfaces",uriTemplate="/p-interfaces/p-interface/{interface-name}",requiredProps="interface-name,in-maint")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -3210,7 +3210,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persist SDNC address information used by ONAP SDNC.",indexedProps="sdnc-id",searchable="sdnc-id",container="esr-thirdparty-sdnc-list",namespace="external-system",requiredProps="thirdparty-sdnc-id",uriTemplate="/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/{thirdparty-sdnc-id}")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persist SDNC address information used by ONAP SDNC.",container="esr-thirdparty-sdnc-list",namespace="external-system",requiredProps="thirdparty-sdnc-id",uriTemplate="/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/{thirdparty-sdnc-id}")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -5370,7 +5370,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Used to capture the network interfaces of this VCE",nameProps="port-group-name",indexedProps="port-group-id,heat-stack-id,interface-id,interface-name,switch-name",dependentOn="vce",container="port-groups",uriTemplate="/port-groups/port-group/{interface-id}",requiredProps="interface-id,orchestration-status")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Used to capture the network interfaces of this VCE",nameProps="port-group-name",indexedProps="port-group-id,heat-stack-id,interface-id,switch-name",dependentOn="vce",container="port-groups",uriTemplate="/port-groups/port-group/{interface-id}",requiredProps="interface-id,orchestration-status")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -5557,7 +5557,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Customer Edge Router, used specifically for Gamma. This object is deprecated.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vces",namespace="network",extendsFrom="vnf",uriTemplate="/network/vces/vce/{vnf-id}",requiredProps="vnf-id,vnf-name,vnf-type")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Customer Edge Router, used specifically for Gamma. This object is deprecated.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,regional-resource-zone,vpe-id,prov-status,service-id",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vces",namespace="network",extendsFrom="vnf",uriTemplate="/network/vces/vce/{vnf-id}",requiredProps="vnf-id,vnf-name,vnf-type")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -6191,7 +6191,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Generic network definition",nameProps="network-name",indexedProps="heat-stack-id,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role",searchable="network-id,network-name",uniqueProps="network-id",container="l3-networks",namespace="network",uriTemplate="/network/l3-networks/l3-network/{network-id}",requiredProps="network-id,is-bound-to-vpn,is-provider-network,is-shared-network,is-external-network")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Generic network definition",nameProps="network-name",indexedProps="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",searchable="network-id,network-name",uniqueProps="network-id",container="l3-networks",namespace="network",uriTemplate="/network/l3-networks/l3-network/{network-id}",requiredProps="network-id,is-bound-to-vpn,is-provider-network,is-shared-network,is-external-network")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -7181,7 +7181,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Software Version",indexedProps="softwareVersionId,isActiveSwVer",dependentOn="pnf",container="pnf",requiredProps="software-version-id,is-active-sw-ver",uriTemplate="/pnf/software-version/{software-version-id}")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Software Version",indexedProps="software-version-id,is-active-sw-ver",dependentOn="pnf",container="pnf",requiredProps="software-version-id,is-active-sw-ver",uriTemplate="/pnf/software-version/{software-version-id}")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -7906,7 +7906,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="General mechanism for grouping instances",nameProps="description,instance-group-name",uniqueProps="id",searchable="id,description",indexedProps="id,type,sub-type,model-invariant-id,model-version-id",container="instance-groups",namespace="network",uriTemplate="/network/instance-groups/instance-group/{id}",requiredProps="id,instance-group-type")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="General mechanism for grouping instances",nameProps="description,instance-group-name",uniqueProps="id",searchable="id,description",indexedProps="id,model-invariant-id,model-version-id",container="instance-groups",namespace="network",uriTemplate="/network/instance-groups/instance-group/{id}",requiredProps="id,instance-group-type")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -9762,7 +9762,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Internal map to define some reserved properties of a vertex",uniqueProps="aai-unique-key,aai-uri,aai-uuid",indexedProps="aai-unique-key,source-of-truth,aai-node-type,aai-uri,aai-uuid")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Internal map to define some reserved properties of a vertex",uniqueProps="aai-unique-key,aai-uri",indexedProps="aai-unique-key,source-of-truth,aai-node-type,aai-uri")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v16.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v16.xsd index 76b94da..2e9e2bd 100644 --- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v16.xsd +++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v16.xsd @@ -2476,7 +2476,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Physical interface (e.g., nic)",indexedProps="interface-name,prov-status,networkRef,operational-status",nameProps="prov-status",dependentOn="vpls-pe,pserver,pnf",container="p-interfaces",uriTemplate="/p-interfaces/p-interface/{interface-name}",requiredProps="interface-name,in-maint")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Physical interface (e.g., nic)",indexedProps="interface-name,prov-status,network-ref,operational-status",nameProps="prov-status",dependentOn="vpls-pe,pserver,pnf",container="p-interfaces",uriTemplate="/p-interfaces/p-interface/{interface-name}",requiredProps="interface-name,in-maint")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -3270,7 +3270,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persist SDNC address information used by ONAP SDNC.",indexedProps="sdnc-id",searchable="sdnc-id",container="esr-thirdparty-sdnc-list",namespace="external-system",requiredProps="thirdparty-sdnc-id",uriTemplate="/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/{thirdparty-sdnc-id}")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persist SDNC address information used by ONAP SDNC.",container="esr-thirdparty-sdnc-list",namespace="external-system",requiredProps="thirdparty-sdnc-id",uriTemplate="/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/{thirdparty-sdnc-id}")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -5431,7 +5431,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Used to capture the network interfaces of this VCE",nameProps="port-group-name",indexedProps="port-group-id,heat-stack-id,interface-id,interface-name,switch-name",dependentOn="vce",container="port-groups",uriTemplate="/port-groups/port-group/{interface-id}",requiredProps="interface-id,orchestration-status")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Used to capture the network interfaces of this VCE",nameProps="port-group-name",indexedProps="port-group-id,heat-stack-id,interface-id,switch-name",dependentOn="vce",container="port-groups",uriTemplate="/port-groups/port-group/{interface-id}",requiredProps="interface-id,orchestration-status")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -5618,7 +5618,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Customer Edge Router, used specifically for Gamma. This object is deprecated.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vces",namespace="network",extendsFrom="vnf",uriTemplate="/network/vces/vce/{vnf-id}",requiredProps="vnf-id,vnf-name,vnf-type")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Customer Edge Router, used specifically for Gamma. This object is deprecated.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,regional-resource-zone,vpe-id,prov-status,service-id",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vces",namespace="network",extendsFrom="vnf",uriTemplate="/network/vces/vce/{vnf-id}",requiredProps="vnf-id,vnf-name,vnf-type")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -6252,7 +6252,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Generic network definition",nameProps="network-name",indexedProps="heat-stack-id,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role",searchable="network-id,network-name",uniqueProps="network-id",container="l3-networks",namespace="network",uriTemplate="/network/l3-networks/l3-network/{network-id}",requiredProps="network-id,is-bound-to-vpn,is-provider-network,is-shared-network,is-external-network")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Generic network definition",nameProps="network-name",indexedProps="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",searchable="network-id,network-name",uniqueProps="network-id",container="l3-networks",namespace="network",uriTemplate="/network/l3-networks/l3-network/{network-id}",requiredProps="network-id,is-bound-to-vpn,is-provider-network,is-shared-network,is-external-network")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -7242,7 +7242,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Software Version",indexedProps="softwareVersionId,isActiveSwVer",dependentOn="pnf",container="pnf",requiredProps="software-version-id,is-active-sw-ver",uriTemplate="/pnf/software-version/{software-version-id}")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Software Version",indexedProps="software-version-id,is-active-sw-ver",dependentOn="pnf",container="pnf",requiredProps="software-version-id,is-active-sw-ver",uriTemplate="/pnf/software-version/{software-version-id}")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -7967,7 +7967,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="General mechanism for grouping instances",nameProps="description,instance-group-name",uniqueProps="id",searchable="id,description",indexedProps="id,type,sub-type,model-invariant-id,model-version-id",container="instance-groups",namespace="network",uriTemplate="/network/instance-groups/instance-group/{id}",requiredProps="id,instance-group-type")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="General mechanism for grouping instances",nameProps="description,instance-group-name",uniqueProps="id",searchable="id,description",indexedProps="id,model-invariant-id,model-version-id",container="instance-groups",namespace="network",uriTemplate="/network/instance-groups/instance-group/{id}",requiredProps="id,instance-group-type")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -9837,7 +9837,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Internal map to define some reserved properties of a vertex",uniqueProps="aai-unique-key,aai-uri,aai-uuid",indexedProps="aai-unique-key,source-of-truth,aai-node-type,aai-uri,aai-uuid")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Internal map to define some reserved properties of a vertex",uniqueProps="aai-unique-key,aai-uri",indexedProps="aai-unique-key,source-of-truth,aai-node-type,aai-uri")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v17.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v17.xsd index 78a323a..023579d 100644 --- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v17.xsd +++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v17.xsd @@ -2476,7 +2476,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Physical interface (e.g., nic)",indexedProps="interface-name,prov-status,networkRef,operational-status,interface-role",nameProps="prov-status",dependentOn="vpls-pe,pserver,pnf",container="p-interfaces",uriTemplate="/p-interfaces/p-interface/{interface-name}",requiredProps="interface-name,in-maint",dslStartNodeProps="interface-name")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Physical interface (e.g., nic)",indexedProps="interface-name,prov-status,network-ref,operational-status,interface-role",nameProps="prov-status",dependentOn="vpls-pe,pserver,pnf",container="p-interfaces",uriTemplate="/p-interfaces/p-interface/{interface-name}",requiredProps="interface-name,in-maint",dslStartNodeProps="interface-name")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -3270,7 +3270,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persist SDNC address information used by ONAP SDNC.",indexedProps="sdnc-id",searchable="sdnc-id",container="esr-thirdparty-sdnc-list",namespace="external-system",requiredProps="thirdparty-sdnc-id",uriTemplate="/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/{thirdparty-sdnc-id}",dslStartNodeProps="sdnc-id")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persist SDNC address information used by ONAP SDNC.",container="esr-thirdparty-sdnc-list",namespace="external-system",requiredProps="thirdparty-sdnc-id",uriTemplate="/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/{thirdparty-sdnc-id}",dslStartNodeProps="sdnc-id")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -5438,7 +5438,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Used to capture the network interfaces of this VCE",nameProps="port-group-name",indexedProps="port-group-id,heat-stack-id,interface-id,interface-name,switch-nameinterface-role,orchestration-status",dependentOn="vce",container="port-groups",uriTemplate="/port-groups/port-group/{interface-id}",requiredProps="interface-id,orchestration-status",dslStartNodeProps="port-group-id,heat-stack-id,interface-id,interface-name,switch-name")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Used to capture the network interfaces of this VCE",nameProps="port-group-name",indexedProps="port-group-id,heat-stack-id,interface-id,switch-name,interface-role,orchestration-status",dependentOn="vce",container="port-groups",uriTemplate="/port-groups/port-group/{interface-id}",requiredProps="interface-id,orchestration-status",dslStartNodeProps="port-group-id,heat-stack-id,interface-id,interface-name,switch-name")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -5625,7 +5625,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Customer Edge Router, used specifically for Gamma. This object is deprecated.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id,orchestration-status",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vces",namespace="network",extendsFrom="vnf",uriTemplate="/network/vces/vce/{vnf-id}",requiredProps="vnf-id,vnf-name,vnf-type",dslStartNodeProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,service-id")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Customer Edge Router, used specifically for Gamma. This object is deprecated.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,regional-resource-zone,vpe-id,prov-status,service-id,orchestration-status",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vces",namespace="network",extendsFrom="vnf",uriTemplate="/network/vces/vce/{vnf-id}",requiredProps="vnf-id,vnf-name,vnf-type",dslStartNodeProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,service-id")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -6259,7 +6259,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Generic network definition",nameProps="network-name",indexedProps="heat-stack-id,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role,orchestration-status",searchable="network-id,network-name",uniqueProps="network-id",container="l3-networks",namespace="network",uriTemplate="/network/l3-networks/l3-network/{network-id}",requiredProps="network-id,is-bound-to-vpn,is-provider-network,is-shared-network,is-external-network",dslStartNodeProps="heat-stack-id,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Generic network definition",nameProps="network-name",indexedProps="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,orchestration-status",searchable="network-id,network-name",uniqueProps="network-id",container="l3-networks",namespace="network",uriTemplate="/network/l3-networks/l3-network/{network-id}",requiredProps="network-id,is-bound-to-vpn,is-provider-network,is-shared-network,is-external-network",dslStartNodeProps="heat-stack-id,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -7249,7 +7249,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Software Version",indexedProps="softwareVersionId,isActiveSwVer",dependentOn="pnf",container="pnf",requiredProps="software-version-id,is-active-sw-ver",uriTemplate="/pnf/software-version/{software-version-id}",dslStartNodeProps="softwareVersionId,isActiveSwVer")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Software Version",indexedProps="software-version-id,is-active-sw-ver",dependentOn="pnf",container="pnf",requiredProps="software-version-id,is-active-sw-ver",uriTemplate="/pnf/software-version/{software-version-id}",dslStartNodeProps="softwareVersionId,isActiveSwVer")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -7974,7 +7974,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="General mechanism for grouping instances",nameProps="description,instance-group-name",uniqueProps="id",searchable="id,description",indexedProps="id,type,sub-type,model-invariant-id,model-version-id",container="instance-groups",namespace="network",uriTemplate="/network/instance-groups/instance-group/{id}",requiredProps="id,instance-group-type")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="General mechanism for grouping instances",nameProps="description,instance-group-name",uniqueProps="id",searchable="id,description",indexedProps="id,model-invariant-id,model-version-id",container="instance-groups",namespace="network",uriTemplate="/network/instance-groups/instance-group/{id}",requiredProps="id,instance-group-type")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -9844,7 +9844,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Internal map to define some reserved properties of a vertex",uniqueProps="aai-unique-key,aai-uri,aai-uuid",indexedProps="aai-unique-key,source-of-truth,aai-node-type,aai-uri,aai-uuid")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Internal map to define some reserved properties of a vertex",uniqueProps="aai-unique-key,aai-uri",indexedProps="aai-unique-key,source-of-truth,aai-node-type,aai-uri")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v18.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v18.xsd index 2a9e671..9410a91 100644 --- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v18.xsd +++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v18.xsd @@ -2476,7 +2476,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Physical interface (e.g., nic)",indexedProps="interface-name,prov-status,networkRef,operational-status,interface-role,interface-name2",nameProps="prov-status",dependentOn="vpls-pe,pserver,pnf",container="p-interfaces",uriTemplate="/p-interfaces/p-interface/{interface-name}",searchable="interface-name",requiredProps="interface-name,in-maint",dslStartNodeProps="interface-name,interface-type,interface-role,interface-function")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Physical interface (e.g., nic)",indexedProps="interface-name,prov-status,network-ref,operational-status,interface-role,interface-name2",nameProps="prov-status",dependentOn="vpls-pe,pserver,pnf",container="p-interfaces",uriTemplate="/p-interfaces/p-interface/{interface-name}",searchable="interface-name",requiredProps="interface-name,in-maint",dslStartNodeProps="interface-name,interface-type,interface-role,interface-function")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -3277,7 +3277,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persist SDNC address information used by ONAP SDNC.",indexedProps="sdnc-id",searchable="sdnc-id",container="esr-thirdparty-sdnc-list",namespace="external-system",requiredProps="thirdparty-sdnc-id",uriTemplate="/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/{thirdparty-sdnc-id}",dslStartNodeProps="sdnc-id")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persist SDNC address information used by ONAP SDNC.",container="esr-thirdparty-sdnc-list",namespace="external-system",requiredProps="thirdparty-sdnc-id",uriTemplate="/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/{thirdparty-sdnc-id}",dslStartNodeProps="sdnc-id")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -5445,7 +5445,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Used to capture the network interfaces of this VCE",nameProps="port-group-name",indexedProps="port-group-id,heat-stack-id,interface-id,interface-name,switch-name,interface-role,orchestration-status",dependentOn="vce",container="port-groups",uriTemplate="/port-groups/port-group/{interface-id}",requiredProps="interface-id,orchestration-status",dslStartNodeProps="port-group-id,heat-stack-id,interface-id,interface-name,switch-name")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Used to capture the network interfaces of this VCE",nameProps="port-group-name",indexedProps="port-group-id,heat-stack-id,interface-id,switch-name,interface-role,orchestration-status",dependentOn="vce",container="port-groups",uriTemplate="/port-groups/port-group/{interface-id}",requiredProps="interface-id,orchestration-status",dslStartNodeProps="port-group-id,heat-stack-id,interface-id,interface-name,switch-name")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -5632,7 +5632,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Customer Edge Router, used specifically for Gamma. This object is deprecated.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vces",namespace="network",extendsFrom="vnf",uriTemplate="/network/vces/vce/{vnf-id}",requiredProps="vnf-id,vnf-name,vnf-type",dslStartNodeProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,service-id")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Customer Edge Router, used specifically for Gamma. This object is deprecated.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,regional-resource-zone,vpe-id,prov-status,service-id",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vces",namespace="network",extendsFrom="vnf",uriTemplate="/network/vces/vce/{vnf-id}",requiredProps="vnf-id,vnf-name,vnf-type",dslStartNodeProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,service-id")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -6266,7 +6266,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Generic network definition",nameProps="network-name",indexedProps="heat-stack-id,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role,orchestration-status",searchable="network-id,network-name",uniqueProps="network-id",container="l3-networks",namespace="network",uriTemplate="/network/l3-networks/l3-network/{network-id}",requiredProps="network-id,is-bound-to-vpn,is-provider-network,is-shared-network,is-external-network",dslStartNodeProps="heat-stack-id,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Generic network definition",nameProps="network-name",indexedProps="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,orchestration-status",searchable="network-id,network-name",uniqueProps="network-id",container="l3-networks",namespace="network",uriTemplate="/network/l3-networks/l3-network/{network-id}",requiredProps="network-id,is-bound-to-vpn,is-provider-network,is-shared-network,is-external-network",dslStartNodeProps="heat-stack-id,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -7263,7 +7263,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Software Version",indexedProps="softwareVersionId,isActiveSwVer",dependentOn="pnf",container="pnf",requiredProps="software-version-id,is-active-sw-ver",uriTemplate="/pnf/software-version/{software-version-id}",dslStartNodeProps="softwareVersionId,isActiveSwVer")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Software Version",indexedProps="software-version-id,is-active-sw-ver",dependentOn="pnf",container="pnf",requiredProps="software-version-id,is-active-sw-ver",uriTemplate="/pnf/software-version/{software-version-id}",dslStartNodeProps="softwareVersionId,isActiveSwVer")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -7995,7 +7995,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="General mechanism for grouping instances",nameProps="description,instance-group-name",uniqueProps="id",searchable="id,description",indexedProps="id,type,sub-type,model-invariant-id,model-version-id",container="instance-groups",namespace="network",uriTemplate="/network/instance-groups/instance-group/{id}",requiredProps="id,instance-group-type")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="General mechanism for grouping instances",nameProps="description,instance-group-name",uniqueProps="id",searchable="id,description",indexedProps="id,model-invariant-id,model-version-id",container="instance-groups",namespace="network",uriTemplate="/network/instance-groups/instance-group/{id}",requiredProps="id,instance-group-type")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -9893,7 +9893,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Internal map to define some reserved properties of a vertex",uniqueProps="aai-unique-key,aai-uri,aai-uuid",indexedProps="aai-unique-key,source-of-truth,aai-node-type,aai-uri,aai-uuid")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Internal map to define some reserved properties of a vertex",uniqueProps="aai-unique-key,aai-uri",indexedProps="aai-unique-key,source-of-truth,aai-node-type,aai-uri")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v19.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v19.xsd index c7f0a29..6320725 100644 --- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v19.xsd +++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v19.xsd @@ -2648,7 +2648,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Physical interface (e.g., nic)",indexedProps="interface-name,prov-status,networkRef,operational-status,interface-role,interface-name2",nameProps="prov-status",dependentOn="vpls-pe,pserver,pnf",container="p-interfaces",uriTemplate="/p-interfaces/p-interface/{interface-name}",searchable="interface-name",requiredProps="interface-name,in-maint",dslStartNodeProps="interface-name,interface-type,interface-role,interface-function")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Physical interface (e.g., nic)",indexedProps="interface-name,prov-status,network-ref,operational-status,interface-role,interface-name2",nameProps="prov-status",dependentOn="vpls-pe,pserver,pnf",container="p-interfaces",uriTemplate="/p-interfaces/p-interface/{interface-name}",searchable="interface-name",requiredProps="interface-name,in-maint",dslStartNodeProps="interface-name,interface-type,interface-role,interface-function")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -3477,7 +3477,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persist SDNC address information used by ONAP SDNC.",indexedProps="sdnc-id",searchable="sdnc-id",container="esr-thirdparty-sdnc-list",namespace="external-system",requiredProps="thirdparty-sdnc-id",uriTemplate="/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/{thirdparty-sdnc-id}",dslStartNodeProps="sdnc-id")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persist SDNC address information used by ONAP SDNC.",container="esr-thirdparty-sdnc-list",namespace="external-system",requiredProps="thirdparty-sdnc-id",uriTemplate="/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/{thirdparty-sdnc-id}",dslStartNodeProps="sdnc-id")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -6133,7 +6133,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Used to capture the network interfaces of this VCE",nameProps="port-group-name",indexedProps="port-group-id,heat-stack-id,interface-id,interface-name,switch-name,interface-role,orchestration-status",dependentOn="vce",container="port-groups",uriTemplate="/port-groups/port-group/{interface-id}",requiredProps="interface-id,orchestration-status",dslStartNodeProps="port-group-id,heat-stack-id,interface-id,interface-name,switch-name")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Used to capture the network interfaces of this VCE",nameProps="port-group-name",indexedProps="port-group-id,heat-stack-id,interface-id,switch-name,interface-role,orchestration-status",dependentOn="vce",container="port-groups",uriTemplate="/port-groups/port-group/{interface-id}",requiredProps="interface-id,orchestration-status",dslStartNodeProps="port-group-id,heat-stack-id,interface-id,interface-name,switch-name")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -6230,7 +6230,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Metadata for license group.",indexedProps="group-uuid,resource-uuid,projectNumber,orderNumber,receiptDate",dependentOn="generic-vnf,vce",container="licenses",uriTemplate="/licenses/license/{group-uuid}/{resource-uuid}",requiredProps="group-uuid,resource-uuid")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Metadata for license group.",indexedProps="group-uuid,resource-uuid,project-number,order-number,receipt-date",dependentOn="generic-vnf,vce",container="licenses",uriTemplate="/licenses/license/{group-uuid}/{resource-uuid}",requiredProps="group-uuid,resource-uuid")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -6341,7 +6341,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Customer Edge Router, used specifically for Gamma. This object is deprecated.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id,orchestration-status",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vces",namespace="network",extendsFrom="vnf",uriTemplate="/network/vces/vce/{vnf-id}",requiredProps="vnf-id,vnf-name,vnf-type",dslStartNodeProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,service-id")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Customer Edge Router, used specifically for Gamma. This object is deprecated.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,regional-resource-zone,vpe-id,prov-status,service-id,orchestration-status",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vces",namespace="network",extendsFrom="vnf",uriTemplate="/network/vces/vce/{vnf-id}",requiredProps="vnf-id,vnf-name,vnf-type",dslStartNodeProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,service-id")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -6975,7 +6975,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Generic network definition",nameProps="network-name",indexedProps="heat-stack-id,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role,orchestration-status",searchable="network-id,network-name",uniqueProps="network-id",container="l3-networks",namespace="network",uriTemplate="/network/l3-networks/l3-network/{network-id}",requiredProps="network-id,is-bound-to-vpn,is-provider-network,is-shared-network,is-external-network",dslStartNodeProps="heat-stack-id,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Generic network definition",nameProps="network-name",indexedProps="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,orchestration-status",searchable="network-id,network-name",uniqueProps="network-id",container="l3-networks",namespace="network",uriTemplate="/network/l3-networks/l3-network/{network-id}",requiredProps="network-id,is-bound-to-vpn,is-provider-network,is-shared-network,is-external-network",dslStartNodeProps="heat-stack-id,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -7979,7 +7979,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Software Version",indexedProps="softwareVersionId,isActiveSwVer",dependentOn="pnf",container="pnf",requiredProps="software-version-id,is-active-sw-ver",uriTemplate="/pnf/software-version/{software-version-id}",dslStartNodeProps="softwareVersionId,isActiveSwVer")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Software Version",indexedProps="software-version-id,is-active-sw-ver",dependentOn="pnf",container="pnf",requiredProps="software-version-id,is-active-sw-ver",uriTemplate="/pnf/software-version/{software-version-id}",dslStartNodeProps="softwareVersionId,isActiveSwVer")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -8718,7 +8718,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="General mechanism for grouping instances",nameProps="description,instance-group-name",uniqueProps="id",searchable="id,description",indexedProps="id,type,sub-type,model-invariant-id,model-version-id",container="instance-groups",namespace="network",uriTemplate="/network/instance-groups/instance-group/{id}",requiredProps="id,instance-group-type")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="General mechanism for grouping instances",nameProps="description,instance-group-name",uniqueProps="id",searchable="id,description",indexedProps="id,model-invariant-id,model-version-id",container="instance-groups",namespace="network",uriTemplate="/network/instance-groups/instance-group/{id}",requiredProps="id,instance-group-type")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -11161,7 +11161,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Internal map to define some reserved properties of a vertex",uniqueProps="aai-unique-key,aai-uri,aai-uuid",indexedProps="aai-unique-key,source-of-truth,aai-node-type,aai-uri,aai-uuid")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Internal map to define some reserved properties of a vertex",uniqueProps="aai-unique-key,aai-uri",indexedProps="aai-unique-key,source-of-truth,aai-node-type,aai-uri")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v20.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v20.xsd index ea1273b..9e17c47 100644 --- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v20.xsd +++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v20.xsd @@ -1297,6 +1297,9 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> + <xs:element ref="tns:volumes" minOccurs="0"/> + <xs:element ref="tns:relationship-list" minOccurs="0"/> + <xs:element ref="tns:l-interfaces" minOccurs="0"/> <xs:element name="operational-status" type="xs:string" minOccurs="0"> <xs:annotation> <xs:appinfo> @@ -1304,9 +1307,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element ref="tns:volumes" minOccurs="0"/> - <xs:element ref="tns:relationship-list" minOccurs="0"/> - <xs:element ref="tns:l-interfaces" minOccurs="0"/> </xs:sequence> </xs:complexType> </xs:element> @@ -2662,7 +2662,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Physical interface (e.g., nic)",indexedProps="interface-name,prov-status,networkRef,operational-status,interface-role,interface-name2",nameProps="prov-status",dependentOn="vpls-pe,pserver,pnf",container="p-interfaces",uriTemplate="/p-interfaces/p-interface/{interface-name}",searchable="interface-name",requiredProps="interface-name,in-maint")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Physical interface (e.g., nic)",indexedProps="interface-name,prov-status,network-ref,operational-status,interface-role,interface-name2",nameProps="prov-status",dependentOn="vpls-pe,pserver,pnf",container="p-interfaces",uriTemplate="/p-interfaces/p-interface/{interface-name}",searchable="interface-name",requiredProps="interface-name,in-maint")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -3498,7 +3498,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persist SDNC address information used by ONAP SDNC.",indexedProps="sdnc-id",searchable="sdnc-id",container="esr-thirdparty-sdnc-list",namespace="external-system",requiredProps="thirdparty-sdnc-id",uriTemplate="/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/{thirdparty-sdnc-id}")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persist SDNC address information used by ONAP SDNC.",container="esr-thirdparty-sdnc-list",namespace="external-system",requiredProps="thirdparty-sdnc-id",uriTemplate="/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/{thirdparty-sdnc-id}")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -4437,13 +4437,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="operational-status" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicator for whether the resource is considered operational. Valid values are in-service-path and out-of-service-path.",suggestibleOnSearch="true")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> <xs:element ref="tns:relationship-list" minOccurs="0"/> <xs:element ref="tns:metadata" minOccurs="0"/> <xs:element ref="tns:allotted-resources" minOccurs="0"/> @@ -4457,6 +4450,13 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> + <xs:element name="operational-status" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicator for whether the resource is considered operational. Valid values are in-service-path and out-of-service-path.",suggestibleOnSearch="true")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> </xs:sequence> </xs:complexType> </xs:element> @@ -6154,7 +6154,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Used to capture the network interfaces of this VCE",nameProps="port-group-name",indexedProps="port-group-id,heat-stack-id,interface-id,interface-name,switch-name,interface-role,orchestration-status",dependentOn="vce",container="port-groups",uriTemplate="/port-groups/port-group/{interface-id}",requiredProps="interface-id,orchestration-status")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Used to capture the network interfaces of this VCE",nameProps="port-group-name",indexedProps="port-group-id,heat-stack-id,interface-id,switch-name,interface-role,orchestration-status",dependentOn="vce",container="port-groups",uriTemplate="/port-groups/port-group/{interface-id}",requiredProps="interface-id,orchestration-status")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -6251,7 +6251,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Metadata for license group.",indexedProps="group-uuid,resource-uuid,projectNumber,orderNumber,receiptDate",dependentOn="generic-vnf,vce",container="licenses",uriTemplate="/licenses/license/{group-uuid}/{resource-uuid}",requiredProps="group-uuid,resource-uuid")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Metadata for license group.",indexedProps="group-uuid,resource-uuid,project-number,order-number,receipt-date",dependentOn="generic-vnf,vce",container="licenses",uriTemplate="/licenses/license/{group-uuid}/{resource-uuid}",requiredProps="group-uuid,resource-uuid")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -6362,7 +6362,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Customer Edge Router, used specifically for Gamma. This object is deprecated.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id,orchestration-status",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vces",namespace="network",extendsFrom="vnf",uriTemplate="/network/vces/vce/{vnf-id}",requiredProps="vnf-id,vnf-name,vnf-type")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Customer Edge Router, used specifically for Gamma. This object is deprecated.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,regional-resource-zone,vpe-id,prov-status,service-id,orchestration-status",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vces",namespace="network",extendsFrom="vnf",uriTemplate="/network/vces/vce/{vnf-id}",requiredProps="vnf-id,vnf-name,vnf-type")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -6996,7 +6996,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Generic network definition",nameProps="network-name",indexedProps="heat-stack-id,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role,orchestration-status",searchable="network-id,network-name",uniqueProps="network-id",container="l3-networks",namespace="network",uriTemplate="/network/l3-networks/l3-network/{network-id}",requiredProps="network-id,is-bound-to-vpn,is-provider-network,is-shared-network,is-external-network")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Generic network definition",nameProps="network-name",indexedProps="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,orchestration-status",searchable="network-id,network-name",uniqueProps="network-id",container="l3-networks",namespace="network",uriTemplate="/network/l3-networks/l3-network/{network-id}",requiredProps="network-id,is-bound-to-vpn,is-provider-network,is-shared-network,is-external-network")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -7377,6 +7377,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> + <xs:element ref="tns:relationship-list" minOccurs="0"/> <xs:element name="operational-status" type="xs:string" minOccurs="0"> <xs:annotation> <xs:appinfo> @@ -7384,7 +7385,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element ref="tns:relationship-list" minOccurs="0"/> </xs:sequence> </xs:complexType> </xs:element> @@ -8007,7 +8007,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Software Version",indexedProps="softwareVersionId,isActiveSwVer",dependentOn="pnf",container="pnf",requiredProps="software-version-id,is-active-sw-ver",uriTemplate="/pnf/software-version/{software-version-id}")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Software Version",indexedProps="software-version-id,is-active-sw-ver",dependentOn="pnf",container="pnf",requiredProps="software-version-id,is-active-sw-ver",uriTemplate="/pnf/software-version/{software-version-id}")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -8739,7 +8739,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="General mechanism for grouping instances",nameProps="description,instance-group-name",uniqueProps="id",searchable="id,description",indexedProps="id,type,sub-type,model-invariant-id,model-version-id",container="instance-groups",namespace="network",uriTemplate="/network/instance-groups/instance-group/{id}",requiredProps="id,instance-group-type")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="General mechanism for grouping instances",nameProps="description,instance-group-name",uniqueProps="id",searchable="id,description",indexedProps="id,model-invariant-id,model-version-id",container="instance-groups",namespace="network",uriTemplate="/network/instance-groups/instance-group/{id}",requiredProps="id,instance-group-type")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -10637,7 +10637,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Internal map to define some reserved properties of a vertex",uniqueProps="aai-unique-key,aai-uri,aai-uuid",indexedProps="aai-unique-key,source-of-truth,aai-node-type,aai-uri,aai-uuid")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Internal map to define some reserved properties of a vertex",uniqueProps="aai-unique-key,aai-uri",indexedProps="aai-unique-key,source-of-truth,aai-node-type,aai-uri")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> diff --git a/aai-schema/src/main/resources/onap/dbedgerules/v20/DbEdgeRules_v20.json b/aai-schema/src/main/resources/onap/dbedgerules/v20/DbEdgeRules_v20.json index 16ae415..9121ca5 100644 --- a/aai-schema/src/main/resources/onap/dbedgerules/v20/DbEdgeRules_v20.json +++ b/aai-schema/src/main/resources/onap/dbedgerules/v20/DbEdgeRules_v20.json @@ -1559,6 +1559,29 @@ "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", @@ -3065,6 +3088,30 @@ "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", diff --git a/aai-schema/src/main/resources/onap/oxm/v10/aai_oxm_v10.xml b/aai-schema/src/main/resources/onap/oxm/v10/aai_oxm_v10.xml index 88bfd31..c2c53dd 100644 --- a/aai-schema/src/main/resources/onap/oxm/v10/aai_oxm_v10.xml +++ b/aai-schema/src/main/resources/onap/oxm/v10/aai_oxm_v10.xml @@ -3013,7 +3013,7 @@ <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,interface-name,regional-resource-zone,vpe-id,prov-status,service-id"/> + <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"/> <xml-property name="searchable" value="vnf-id,vnf-name,vnf-name2"/> <xml-property name="uniqueProps" value="vnf-id"/> <xml-property name="container" value="vces"/> @@ -3095,7 +3095,7 @@ <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,interface-name,switch-name"/> + <xml-property name="indexedProps" value="port-group-id,heat-stack-id,interface-id,switch-name"/> <xml-property name="dependentOn" value="vce"/> <xml-property name="container" value="port-groups"/> <xml-property name="uriTemplate" value="/port-groups/port-group/{interface-id}"/> @@ -3377,7 +3377,7 @@ <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,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role"/> + <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"/> <xml-property name="searchable" value="network-id,network-name"/> <xml-property name="uniqueProps" value="network-id"/> <xml-property name="container" value="l3-networks"/> @@ -4199,7 +4199,7 @@ </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"/> + <xml-property name="indexedProps" value="pnf-name,inv-status"/> <xml-property name="searchable" value="pnf-name"/> <xml-property name="uniqueProps" value="pnf-name"/> <xml-property name="container" value="pnfs"/> diff --git a/aai-schema/src/main/resources/onap/oxm/v11/aai_oxm_v11.xml b/aai-schema/src/main/resources/onap/oxm/v11/aai_oxm_v11.xml index 5df8b38..3f3a1bf 100644 --- a/aai-schema/src/main/resources/onap/oxm/v11/aai_oxm_v11.xml +++ b/aai-schema/src/main/resources/onap/oxm/v11/aai_oxm_v11.xml @@ -360,8 +360,6 @@ </java-attributes> <xml-properties> <xml-property name="description" value="Persist SDNC address information used by ONAP SDNC."/> - <xml-property name="indexedProps" value="sdnc-id"/> - <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"/> @@ -3662,7 +3660,7 @@ <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,interface-name,regional-resource-zone,vpe-id,prov-status,service-id"/> + <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"/> <xml-property name="searchable" value="vnf-id,vnf-name,vnf-name2"/> <xml-property name="uniqueProps" value="vnf-id"/> <xml-property name="container" value="vces"/> @@ -3744,7 +3742,7 @@ <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,interface-name,switch-name"/> + <xml-property name="indexedProps" value="port-group-id,heat-stack-id,interface-id,switch-name"/> <xml-property name="dependentOn" value="vce"/> <xml-property name="container" value="port-groups"/> <xml-property name="uriTemplate" value="/port-groups/port-group/{interface-id}"/> @@ -4048,7 +4046,7 @@ <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,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role"/> + <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"/> <xml-property name="searchable" value="network-id,network-name"/> <xml-property name="uniqueProps" value="network-id"/> <xml-property name="container" value="l3-networks"/> @@ -4943,7 +4941,7 @@ </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"/> + <xml-property name="indexedProps" value="pnf-name,inv-status"/> <xml-property name="searchable" value="pnf-name"/> <xml-property name="uniqueProps" value="pnf-name"/> <xml-property name="container" value="pnfs"/> diff --git a/aai-schema/src/main/resources/onap/oxm/v12/aai_oxm_v12.xml b/aai-schema/src/main/resources/onap/oxm/v12/aai_oxm_v12.xml index f260850..7320b47 100644 --- a/aai-schema/src/main/resources/onap/oxm/v12/aai_oxm_v12.xml +++ b/aai-schema/src/main/resources/onap/oxm/v12/aai_oxm_v12.xml @@ -340,8 +340,6 @@ </java-attributes> <xml-properties> <xml-property name="description" value="Persist SDNC address information used by ONAP SDNC."/> - <xml-property name="indexedProps" value="sdnc-id"/> - <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"/> @@ -3755,7 +3753,7 @@ <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,interface-name,regional-resource-zone,vpe-id,prov-status,service-id"/> + <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"/> <xml-property name="searchable" value="vnf-id,vnf-name,vnf-name2"/> <xml-property name="uniqueProps" value="vnf-id"/> <xml-property name="container" value="vces"/> @@ -3837,7 +3835,7 @@ <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,interface-name,switch-name"/> + <xml-property name="indexedProps" value="port-group-id,heat-stack-id,interface-id,switch-name"/> <xml-property name="dependentOn" value="vce"/> <xml-property name="container" value="port-groups"/> <xml-property name="uriTemplate" value="/port-groups/port-group/{interface-id}"/> @@ -4141,7 +4139,7 @@ <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,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role"/> + <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"/> <xml-property name="searchable" value="network-id,network-name"/> <xml-property name="uniqueProps" value="network-id"/> <xml-property name="container" value="l3-networks"/> @@ -5041,7 +5039,7 @@ </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"/> + <xml-property name="indexedProps" value="pnf-name,inv-status"/> <xml-property name="searchable" value="pnf-name"/> <xml-property name="uniqueProps" value="pnf-name"/> <xml-property name="container" value="pnfs"/> diff --git a/aai-schema/src/main/resources/onap/oxm/v13/aai_oxm_v13.xml b/aai-schema/src/main/resources/onap/oxm/v13/aai_oxm_v13.xml index 9f74c54..e963d5e 100644 --- a/aai-schema/src/main/resources/onap/oxm/v13/aai_oxm_v13.xml +++ b/aai-schema/src/main/resources/onap/oxm/v13/aai_oxm_v13.xml @@ -360,8 +360,6 @@ </java-attributes> <xml-properties> <xml-property name="description" value="Persist SDNC address information used by ONAP SDNC."/> - <xml-property name="indexedProps" value="sdnc-id"/> - <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"/> @@ -3755,7 +3753,7 @@ <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,interface-name,regional-resource-zone,vpe-id,prov-status,service-id"/> + <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"/> <xml-property name="searchable" value="vnf-id,vnf-name,vnf-name2"/> <xml-property name="uniqueProps" value="vnf-id"/> <xml-property name="container" value="vces"/> @@ -3837,7 +3835,7 @@ <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,interface-name,switch-name"/> + <xml-property name="indexedProps" value="port-group-id,heat-stack-id,interface-id,switch-name"/> <xml-property name="dependentOn" value="vce"/> <xml-property name="container" value="port-groups"/> <xml-property name="uriTemplate" value="/port-groups/port-group/{interface-id}"/> @@ -4135,7 +4133,7 @@ <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,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role"/> + <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"/> <xml-property name="searchable" value="network-id,network-name"/> <xml-property name="uniqueProps" value="network-id"/> <xml-property name="container" value="l3-networks"/> @@ -5059,7 +5057,7 @@ </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"/> + <xml-property name="indexedProps" value="pnf-name,inv-status,model-invariant-id,model-version-id"/> <xml-property name="searchable" value="pnf-name"/> <xml-property name="uniqueProps" value="pnf-name"/> <xml-property name="container" value="pnfs"/> @@ -5371,7 +5369,7 @@ <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,aai-uuid"/> + <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,aai-uuid"/> </xml-properties> <xml-root-element name="reserved-prop-names"/> @@ -6104,7 +6102,7 @@ <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,description,type,sub-type,model-invariant-id,model-version-id"/> + <xml-property name="indexedProps" value="id,description,model-invariant-id,model-version-id"/> <xml-property name="container" value="instance-groups"/> <xml-property name="namespace" value="network"/> <xml-property name="uriTemplate" value="/network/instance-groups/instance-group/{id}"/> diff --git a/aai-schema/src/main/resources/onap/oxm/v14/aai_oxm_v14.xml b/aai-schema/src/main/resources/onap/oxm/v14/aai_oxm_v14.xml index a73f802..3fc2b16 100644 --- a/aai-schema/src/main/resources/onap/oxm/v14/aai_oxm_v14.xml +++ b/aai-schema/src/main/resources/onap/oxm/v14/aai_oxm_v14.xml @@ -360,8 +360,6 @@ </java-attributes> <xml-properties> <xml-property name="description" value="Persist SDNC address information used by ONAP SDNC."/> - <xml-property name="indexedProps" value="sdnc-id"/> - <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"/> @@ -2280,7 +2278,7 @@ </java-attributes> <xml-properties> <xml-property name="description" value="Physical interface (e.g., nic)"/> - <xml-property name="indexedProps" value="interface-name,prov-status,networkRef,operational-status"/> + <xml-property name="indexedProps" value="interface-name,prov-status,network-ref,operational-status"/> <xml-property name="nameProps" value="prov-status"/> <xml-property name="dependentOn" value="vpls-pe,pserver,pnf"/> <xml-property name="container" value="p-interfaces"/> @@ -3936,7 +3934,7 @@ <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,interface-name,regional-resource-zone,vpe-id,prov-status,service-id"/> + <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"/> <xml-property name="searchable" value="vnf-id,vnf-name,vnf-name2"/> <xml-property name="uniqueProps" value="vnf-id"/> <xml-property name="container" value="vces"/> @@ -4018,7 +4016,7 @@ <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,interface-name,switch-name"/> + <xml-property name="indexedProps" value="port-group-id,heat-stack-id,interface-id,switch-name"/> <xml-property name="dependentOn" value="vce"/> <xml-property name="container" value="port-groups"/> <xml-property name="uriTemplate" value="/port-groups/port-group/{interface-id}"/> @@ -4328,7 +4326,7 @@ <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,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role"/> + <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"/> <xml-property name="searchable" value="network-id,network-name"/> <xml-property name="uniqueProps" value="network-id"/> <xml-property name="container" value="l3-networks"/> @@ -5278,7 +5276,7 @@ </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,admin-status"/> + <xml-property name="indexedProps" value="pnf-name,inv-status,model-invariant-id,model-version-id,operational-status,admin-status"/> <xml-property name="searchable" value="pnf-name"/> <xml-property name="uniqueProps" value="pnf-name"/> <xml-property name="container" value="pnfs"/> @@ -5314,7 +5312,7 @@ </java-attributes> <xml-properties> <xml-property name="description" value="Software Version"/> - <xml-property name="indexedProps" value="softwareVersionId,isActiveSwVer"/> + <xml-property name="indexedProps" value="software-version-id,is-active-sw-ver"/> <xml-property name="dependentOn" value="pnf"/> <xml-property name="container" value="pnf"/> <xml-property name="requiredProps" value="software-version-id,is-active-sw-ver"/> @@ -6355,7 +6353,7 @@ <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,type,sub-type,model-invariant-id,model-version-id"/> + <xml-property name="indexedProps" value="id,model-invariant-id,model-version-id"/> <xml-property name="container" value="instance-groups"/> <xml-property name="namespace" value="network"/> <xml-property name="uriTemplate" value="/network/instance-groups/instance-group/{id}"/> diff --git a/aai-schema/src/main/resources/onap/oxm/v15/aai_oxm_v15.xml b/aai-schema/src/main/resources/onap/oxm/v15/aai_oxm_v15.xml index 64ea84d..1be48d1 100644 --- a/aai-schema/src/main/resources/onap/oxm/v15/aai_oxm_v15.xml +++ b/aai-schema/src/main/resources/onap/oxm/v15/aai_oxm_v15.xml @@ -361,8 +361,6 @@ </java-attributes> <xml-properties> <xml-property name="description" value="Persist SDNC address information used by ONAP SDNC."/> - <xml-property name="indexedProps" value="sdnc-id"/> - <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"/> @@ -2291,7 +2289,7 @@ </java-attributes> <xml-properties> <xml-property name="description" value="Physical interface (e.g., nic)"/> - <xml-property name="indexedProps" value="interface-name,prov-status,networkRef,operational-status"/> + <xml-property name="indexedProps" value="interface-name,prov-status,network-ref,operational-status"/> <xml-property name="nameProps" value="prov-status"/> <xml-property name="dependentOn" value="vpls-pe,pserver,pnf"/> <xml-property name="container" value="p-interfaces"/> @@ -4008,7 +4006,7 @@ <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,interface-name,regional-resource-zone,vpe-id,prov-status,service-id"/> + <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"/> <xml-property name="searchable" value="vnf-id,vnf-name,vnf-name2"/> <xml-property name="uniqueProps" value="vnf-id"/> <xml-property name="container" value="vces"/> @@ -4090,7 +4088,7 @@ <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,interface-name,switch-name"/> + <xml-property name="indexedProps" value="port-group-id,heat-stack-id,interface-id,switch-name"/> <xml-property name="dependentOn" value="vce"/> <xml-property name="container" value="port-groups"/> <xml-property name="uriTemplate" value="/port-groups/port-group/{interface-id}"/> @@ -4401,7 +4399,7 @@ <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,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role"/> + <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"/> <xml-property name="searchable" value="network-id,network-name"/> <xml-property name="uniqueProps" value="network-id"/> <xml-property name="container" value="l3-networks"/> @@ -5393,7 +5391,7 @@ </java-attributes> <xml-properties> <xml-property name="description" value="Software Version"/> - <xml-property name="indexedProps" value="softwareVersionId,isActiveSwVer"/> + <xml-property name="indexedProps" value="software-version-id,is-active-sw-ver"/> <xml-property name="dependentOn" value="pnf"/> <xml-property name="container" value="pnf"/> <xml-property name="requiredProps" value="software-version-id,is-active-sw-ver"/> @@ -5703,8 +5701,8 @@ <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,aai-uuid"/> - <xml-property name="indexedProps" value="aai-unique-key,source-of-truth,aai-node-type,aai-uri,aai-uuid"/> + <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> @@ -6434,7 +6432,7 @@ <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,type,sub-type,model-invariant-id,model-version-id"/> + <xml-property name="indexedProps" value="id,model-invariant-id,model-version-id"/> <xml-property name="container" value="instance-groups"/> <xml-property name="namespace" value="network"/> <xml-property name="uriTemplate" value="/network/instance-groups/instance-group/{id}"/> diff --git a/aai-schema/src/main/resources/onap/oxm/v16/aai_oxm_v16.xml b/aai-schema/src/main/resources/onap/oxm/v16/aai_oxm_v16.xml index c77347d..795770b 100644 --- a/aai-schema/src/main/resources/onap/oxm/v16/aai_oxm_v16.xml +++ b/aai-schema/src/main/resources/onap/oxm/v16/aai_oxm_v16.xml @@ -405,8 +405,6 @@ </java-attributes> <xml-properties> <xml-property name="description" value="Persist SDNC address information used by ONAP SDNC."/> - <xml-property name="indexedProps" value="sdnc-id"/> - <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"/> @@ -2347,7 +2345,7 @@ </java-attributes> <xml-properties> <xml-property name="description" value="Physical interface (e.g., nic)"/> - <xml-property name="indexedProps" value="interface-name,prov-status,networkRef,operational-status"/> + <xml-property name="indexedProps" value="interface-name,prov-status,network-ref,operational-status"/> <xml-property name="nameProps" value="prov-status"/> <xml-property name="dependentOn" value="vpls-pe,pserver,pnf"/> <xml-property name="container" value="p-interfaces"/> @@ -4064,7 +4062,7 @@ <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,interface-name,regional-resource-zone,vpe-id,prov-status,service-id"/> + <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"/> <xml-property name="searchable" value="vnf-id,vnf-name,vnf-name2"/> <xml-property name="uniqueProps" value="vnf-id"/> <xml-property name="container" value="vces"/> @@ -4146,7 +4144,7 @@ <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,interface-name,switch-name"/> + <xml-property name="indexedProps" value="port-group-id,heat-stack-id,interface-id,switch-name"/> <xml-property name="dependentOn" value="vce"/> <xml-property name="container" value="port-groups"/> <xml-property name="uriTemplate" value="/port-groups/port-group/{interface-id}"/> @@ -4457,7 +4455,7 @@ <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,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role"/> + <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"/> <xml-property name="searchable" value="network-id,network-name"/> <xml-property name="uniqueProps" value="network-id"/> <xml-property name="container" value="l3-networks"/> @@ -5449,7 +5447,7 @@ </java-attributes> <xml-properties> <xml-property name="description" value="Software Version"/> - <xml-property name="indexedProps" value="softwareVersionId,isActiveSwVer"/> + <xml-property name="indexedProps" value="software-version-id,is-active-sw-ver"/> <xml-property name="dependentOn" value="pnf"/> <xml-property name="container" value="pnf"/> <xml-property name="requiredProps" value="software-version-id,is-active-sw-ver"/> @@ -5759,8 +5757,8 @@ <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,aai-uuid"/> - <xml-property name="indexedProps" value="aai-unique-key,source-of-truth,aai-node-type,aai-uri,aai-uuid"/> + <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> @@ -6490,7 +6488,7 @@ <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,type,sub-type,model-invariant-id,model-version-id"/> + <xml-property name="indexedProps" value="id,model-invariant-id,model-version-id"/> <xml-property name="container" value="instance-groups"/> <xml-property name="namespace" value="network"/> <xml-property name="uriTemplate" value="/network/instance-groups/instance-group/{id}"/> diff --git a/aai-schema/src/main/resources/onap/oxm/v17/aai_oxm_v17.xml b/aai-schema/src/main/resources/onap/oxm/v17/aai_oxm_v17.xml index 565f181..ef4b0c2 100644 --- a/aai-schema/src/main/resources/onap/oxm/v17/aai_oxm_v17.xml +++ b/aai-schema/src/main/resources/onap/oxm/v17/aai_oxm_v17.xml @@ -408,8 +408,6 @@ </java-attributes> <xml-properties> <xml-property name="description" value="Persist SDNC address information used by ONAP SDNC."/> - <xml-property name="indexedProps" value="sdnc-id"/> - <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"/> @@ -2377,7 +2375,7 @@ </java-attributes> <xml-properties> <xml-property name="description" value="Physical interface (e.g., nic)"/> - <xml-property name="indexedProps" value="interface-name,prov-status,networkRef,operational-status,interface-role"/> + <xml-property name="indexedProps" value="interface-name,prov-status,network-ref,operational-status,interface-role"/> <xml-property name="nameProps" value="prov-status"/> <xml-property name="dependentOn" value="vpls-pe,pserver,pnf"/> <xml-property name="container" value="p-interfaces"/> @@ -4120,7 +4118,7 @@ <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,interface-name,regional-resource-zone,vpe-id,prov-status,service-id,orchestration-status"/> + <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"/> <xml-property name="searchable" value="vnf-id,vnf-name,vnf-name2"/> <xml-property name="uniqueProps" value="vnf-id"/> <xml-property name="container" value="vces"/> @@ -4203,7 +4201,7 @@ <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,interface-name,switch-nameinterface-role,orchestration-status"/> + <xml-property name="indexedProps" value="port-group-id,heat-stack-id,interface-id,switch-name,interface-role,orchestration-status"/> <xml-property name="dependentOn" value="vce"/> <xml-property name="container" value="port-groups"/> <xml-property name="uriTemplate" value="/port-groups/port-group/{interface-id}"/> @@ -4517,7 +4515,7 @@ <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,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role,orchestration-status"/> + <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,orchestration-status"/> <xml-property name="searchable" value="network-id,network-name"/> <xml-property name="uniqueProps" value="network-id"/> <xml-property name="container" value="l3-networks"/> @@ -5518,7 +5516,7 @@ </java-attributes> <xml-properties> <xml-property name="description" value="Software Version"/> - <xml-property name="indexedProps" value="softwareVersionId,isActiveSwVer"/> + <xml-property name="indexedProps" value="software-version-id,is-active-sw-ver"/> <xml-property name="dependentOn" value="pnf"/> <xml-property name="container" value="pnf"/> <xml-property name="requiredProps" value="software-version-id,is-active-sw-ver"/> @@ -5829,8 +5827,8 @@ <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,aai-uuid"/> - <xml-property name="indexedProps" value="aai-unique-key,source-of-truth,aai-node-type,aai-uri,aai-uuid"/> + <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> @@ -6566,7 +6564,7 @@ <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,type,sub-type,model-invariant-id,model-version-id"/> + <xml-property name="indexedProps" value="id,model-invariant-id,model-version-id"/> <xml-property name="container" value="instance-groups"/> <xml-property name="namespace" value="network"/> <xml-property name="uriTemplate" value="/network/instance-groups/instance-group/{id}"/> diff --git a/aai-schema/src/main/resources/onap/oxm/v18/aai_oxm_v18.xml b/aai-schema/src/main/resources/onap/oxm/v18/aai_oxm_v18.xml index 16e93d5..a770ba3 100644 --- a/aai-schema/src/main/resources/onap/oxm/v18/aai_oxm_v18.xml +++ b/aai-schema/src/main/resources/onap/oxm/v18/aai_oxm_v18.xml @@ -408,8 +408,6 @@ </java-attributes> <xml-properties> <xml-property name="description" value="Persist SDNC address information used by ONAP SDNC."/> - <xml-property name="indexedProps" value="sdnc-id"/> - <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"/> @@ -2382,7 +2380,7 @@ </java-attributes> <xml-properties> <xml-property name="description" value="Physical interface (e.g., nic)"/> - <xml-property name="indexedProps" value="interface-name,prov-status,networkRef,operational-status,interface-role,interface-name2"/> + <xml-property name="indexedProps" value="interface-name,prov-status,network-ref,operational-status,interface-role,interface-name2"/> <xml-property name="nameProps" value="prov-status"/> <xml-property name="dependentOn" value="vpls-pe,pserver,pnf"/> <xml-property name="container" value="p-interfaces"/> @@ -4145,7 +4143,7 @@ <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,interface-name,regional-resource-zone,vpe-id,prov-status,service-id"/> + <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"/> <xml-property name="searchable" value="vnf-id,vnf-name,vnf-name2"/> <xml-property name="uniqueProps" value="vnf-id"/> <xml-property name="container" value="vces"/> @@ -4228,7 +4226,7 @@ <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,interface-name,switch-name,interface-role,orchestration-status"/> + <xml-property name="indexedProps" value="port-group-id,heat-stack-id,interface-id,switch-name,interface-role,orchestration-status"/> <xml-property name="dependentOn" value="vce"/> <xml-property name="container" value="port-groups"/> <xml-property name="uriTemplate" value="/port-groups/port-group/{interface-id}"/> @@ -4542,7 +4540,7 @@ <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,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role,orchestration-status"/> + <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,orchestration-status"/> <xml-property name="searchable" value="network-id,network-name"/> <xml-property name="uniqueProps" value="network-id"/> <xml-property name="container" value="l3-networks"/> @@ -5553,7 +5551,7 @@ </java-attributes> <xml-properties> <xml-property name="description" value="Software Version"/> - <xml-property name="indexedProps" value="softwareVersionId,isActiveSwVer"/> + <xml-property name="indexedProps" value="software-version-id,is-active-sw-ver"/> <xml-property name="dependentOn" value="pnf"/> <xml-property name="container" value="pnf"/> <xml-property name="requiredProps" value="software-version-id,is-active-sw-ver"/> @@ -5864,8 +5862,8 @@ <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,aai-uuid"/> - <xml-property name="indexedProps" value="aai-unique-key,source-of-truth,aai-node-type,aai-uri,aai-uuid"/> + <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> @@ -6609,7 +6607,7 @@ <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,type,sub-type,model-invariant-id,model-version-id"/> + <xml-property name="indexedProps" value="id,model-invariant-id,model-version-id"/> <xml-property name="container" value="instance-groups"/> <xml-property name="namespace" value="network"/> <xml-property name="uriTemplate" value="/network/instance-groups/instance-group/{id}"/> diff --git a/aai-schema/src/main/resources/onap/oxm/v19/aai_oxm_v19.xml b/aai-schema/src/main/resources/onap/oxm/v19/aai_oxm_v19.xml index 8a3dc17..9644306 100644 --- a/aai-schema/src/main/resources/onap/oxm/v19/aai_oxm_v19.xml +++ b/aai-schema/src/main/resources/onap/oxm/v19/aai_oxm_v19.xml @@ -413,8 +413,6 @@ </java-attributes> <xml-properties> <xml-property name="description" value="Persist SDNC address information used by ONAP SDNC."/> - <xml-property name="indexedProps" value="sdnc-id"/> - <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"/> @@ -2412,7 +2410,7 @@ </java-attributes> <xml-properties> <xml-property name="description" value="Physical interface (e.g., nic)"/> - <xml-property name="indexedProps" value="interface-name,prov-status,networkRef,operational-status,interface-role,interface-name2"/> + <xml-property name="indexedProps" value="interface-name,prov-status,network-ref,operational-status,interface-role,interface-name2"/> <xml-property name="nameProps" value="prov-status"/> <xml-property name="dependentOn" value="vpls-pe,pserver,pnf"/> <xml-property name="container" value="p-interfaces"/> @@ -4362,7 +4360,7 @@ <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,interface-name,regional-resource-zone,vpe-id,prov-status,service-id,orchestration-status"/> + <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"/> <xml-property name="searchable" value="vnf-id,vnf-name,vnf-name2"/> <xml-property name="uniqueProps" value="vnf-id"/> <xml-property name="container" value="vces"/> @@ -4445,7 +4443,7 @@ <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,interface-name,switch-name,interface-role,orchestration-status"/> + <xml-property name="indexedProps" value="port-group-id,heat-stack-id,interface-id,switch-name,interface-role,orchestration-status"/> <xml-property name="dependentOn" value="vce"/> <xml-property name="container" value="port-groups"/> <xml-property name="uriTemplate" value="/port-groups/port-group/{interface-id}"/> @@ -4759,7 +4757,7 @@ <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,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role,orchestration-status"/> + <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,orchestration-status"/> <xml-property name="searchable" value="network-id,network-name"/> <xml-property name="uniqueProps" value="network-id"/> <xml-property name="container" value="l3-networks"/> @@ -5780,7 +5778,7 @@ </java-attributes> <xml-properties> <xml-property name="description" value="Software Version"/> - <xml-property name="indexedProps" value="softwareVersionId,isActiveSwVer"/> + <xml-property name="indexedProps" value="software-version-id,is-active-sw-ver"/> <xml-property name="dependentOn" value="pnf"/> <xml-property name="container" value="pnf"/> <xml-property name="requiredProps" value="software-version-id,is-active-sw-ver"/> @@ -6091,8 +6089,8 @@ <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,aai-uuid"/> - <xml-property name="indexedProps" value="aai-unique-key,source-of-truth,aai-node-type,aai-uri,aai-uuid"/> + <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> @@ -6835,7 +6833,7 @@ <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,type,sub-type,model-invariant-id,model-version-id"/> + <xml-property name="indexedProps" value="id,model-invariant-id,model-version-id"/> <xml-property name="container" value="instance-groups"/> <xml-property name="namespace" value="network"/> <xml-property name="uriTemplate" value="/network/instance-groups/instance-group/{id}"/> @@ -7132,7 +7130,7 @@ </java-attributes> <xml-properties> <xml-property name="description" value="Metadata for license group."/> - <xml-property name="indexedProps" value="group-uuid,resource-uuid,projectNumber,orderNumber,receiptDate"/> + <xml-property name="indexedProps" value="group-uuid,resource-uuid,project-number,order-number,receipt-date"/> <xml-property name="dependentOn" value="generic-vnf,vce"/> <xml-property name="container" value="licenses"/> <xml-property name="uriTemplate" value="/licenses/license/{group-uuid}/{resource-uuid}"/> diff --git a/aai-schema/src/main/resources/onap/oxm/v20/aai_oxm_v20.xml b/aai-schema/src/main/resources/onap/oxm/v20/aai_oxm_v20.xml index 5d6cda6..9ddd1f0 100644 --- a/aai-schema/src/main/resources/onap/oxm/v20/aai_oxm_v20.xml +++ b/aai-schema/src/main/resources/onap/oxm/v20/aai_oxm_v20.xml @@ -409,8 +409,6 @@ </java-attributes> <xml-properties> <xml-property name="description" value="Persist SDNC address information used by ONAP SDNC."/> - <xml-property name="indexedProps" value="sdnc-id"/> - <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"/> @@ -2405,7 +2403,7 @@ </java-attributes> <xml-properties> <xml-property name="description" value="Physical interface (e.g., nic)"/> - <xml-property name="indexedProps" value="interface-name,prov-status,networkRef,operational-status,interface-role,interface-name2"/> + <xml-property name="indexedProps" value="interface-name,prov-status,network-ref,operational-status,interface-role,interface-name2"/> <xml-property name="nameProps" value="prov-status"/> <xml-property name="dependentOn" value="vpls-pe,pserver,pnf"/> <xml-property name="container" value="p-interfaces"/> @@ -4331,7 +4329,7 @@ <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,interface-name,regional-resource-zone,vpe-id,prov-status,service-id,orchestration-status"/> + <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"/> <xml-property name="searchable" value="vnf-id,vnf-name,vnf-name2"/> <xml-property name="uniqueProps" value="vnf-id"/> <xml-property name="container" value="vces"/> @@ -4413,7 +4411,7 @@ <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,interface-name,switch-name,interface-role,orchestration-status"/> + <xml-property name="indexedProps" value="port-group-id,heat-stack-id,interface-id,switch-name,interface-role,orchestration-status"/> <xml-property name="dependentOn" value="vce"/> <xml-property name="container" value="port-groups"/> <xml-property name="uriTemplate" value="/port-groups/port-group/{interface-id}"/> @@ -4724,7 +4722,7 @@ <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,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role,orchestration-status"/> + <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,orchestration-status"/> <xml-property name="searchable" value="network-id,network-name"/> <xml-property name="uniqueProps" value="network-id"/> <xml-property name="container" value="l3-networks"/> @@ -5739,7 +5737,7 @@ </java-attributes> <xml-properties> <xml-property name="description" value="Software Version"/> - <xml-property name="indexedProps" value="softwareVersionId,isActiveSwVer"/> + <xml-property name="indexedProps" value="software-version-id,is-active-sw-ver"/> <xml-property name="dependentOn" value="pnf"/> <xml-property name="container" value="pnf"/> <xml-property name="requiredProps" value="software-version-id,is-active-sw-ver"/> @@ -6050,8 +6048,8 @@ <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,aai-uuid"/> - <xml-property name="indexedProps" value="aai-unique-key,source-of-truth,aai-node-type,aai-uri,aai-uuid"/> + <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> @@ -6789,7 +6787,7 @@ <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,type,sub-type,model-invariant-id,model-version-id"/> + <xml-property name="indexedProps" value="id,model-invariant-id,model-version-id"/> <xml-property name="container" value="instance-groups"/> <xml-property name="namespace" value="network"/> <xml-property name="uriTemplate" value="/network/instance-groups/instance-group/{id}"/> @@ -7086,7 +7084,7 @@ </java-attributes> <xml-properties> <xml-property name="description" value="Metadata for license group."/> - <xml-property name="indexedProps" value="group-uuid,resource-uuid,projectNumber,orderNumber,receiptDate"/> + <xml-property name="indexedProps" value="group-uuid,resource-uuid,project-number,order-number,receipt-date"/> <xml-property name="dependentOn" value="generic-vnf,vce"/> <xml-property name="container" value="licenses"/> <xml-property name="uriTemplate" value="/licenses/license/{group-uuid}/{resource-uuid}"/> diff --git a/aai-schema/src/main/resources/onap/oxm/v8/aai_oxm_v8.xml b/aai-schema/src/main/resources/onap/oxm/v8/aai_oxm_v8.xml index f23be3c..16df581 100644 --- a/aai-schema/src/main/resources/onap/oxm/v8/aai_oxm_v8.xml +++ b/aai-schema/src/main/resources/onap/oxm/v8/aai_oxm_v8.xml @@ -2848,7 +2848,7 @@ <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,interface-name,regional-resource-zone,vpe-id,prov-status,service-id"/> + <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"/> <xml-property name="searchable" value="vnf-id,vnf-name,vnf-name2"/> <xml-property name="uniqueProps" value="vnf-id"/> <xml-property name="container" value="vces"/> @@ -2930,7 +2930,7 @@ <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,interface-name,switch-name"/> + <xml-property name="indexedProps" value="port-group-id,heat-stack-id,interface-id,switch-name"/> <xml-property name="dependentOn" value="vce"/> <xml-property name="container" value="port-groups"/> <xml-property name="requiredProps" value="interface-id,orchestration-status"/> @@ -3194,7 +3194,7 @@ <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,network-uuid,service-id,network-id,network-name,persona-model-id,persona-model-version,widget-model-id,widget-model-version,contrail-network-fqdn"/> + <xml-property name="indexedProps" value="heat-stack-id,service-id,network-id,network-name,persona-model-id,persona-model-version,widget-model-id,widget-model-version,contrail-network-fqdn"/> <xml-property name="uniqueProps" value="network-id"/> <xml-property name="container" value="l3-networks"/> <xml-property name="namespace" value="network"/> diff --git a/aai-schema/src/main/resources/onap/oxm/v9/aai_oxm_v9.xml b/aai-schema/src/main/resources/onap/oxm/v9/aai_oxm_v9.xml index 59aea58..d3adbee 100644 --- a/aai-schema/src/main/resources/onap/oxm/v9/aai_oxm_v9.xml +++ b/aai-schema/src/main/resources/onap/oxm/v9/aai_oxm_v9.xml @@ -3002,7 +3002,7 @@ <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,interface-name,regional-resource-zone,vpe-id,prov-status,service-id"/> + <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"/> <xml-property name="searchable" value="vnf-id,vnf-name,vnf-name2"/> <xml-property name="uniqueProps" value="vnf-id"/> <xml-property name="container" value="vces"/> @@ -3084,7 +3084,7 @@ <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,interface-name,switch-name"/> + <xml-property name="indexedProps" value="port-group-id,heat-stack-id,interface-id,switch-name"/> <xml-property name="dependentOn" value="vce"/> <xml-property name="container" value="port-groups"/> <xml-property name="requiredProps" value="interface-id,orchestration-status"/> @@ -3362,7 +3362,7 @@ <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,network-uuid,service-id,network-id,network-name,persona-model-id,persona-model-version,widget-model-id,widget-model-version,contrail-network-fqdn,network-role"/> + <xml-property name="indexedProps" value="heat-stack-id,service-id,network-id,network-name,persona-model-id,persona-model-version,widget-model-id,widget-model-version,contrail-network-fqdn,network-role"/> <xml-property name="searchable" value="network-id,network-name"/> <xml-property name="uniqueProps" value="network-id"/> <xml-property name="container" value="l3-networks"/> @@ -4144,7 +4144,7 @@ </java-attributes> <xml-properties> <xml-property name="description" value="PNF represents a physical network function. typically equipment used in the D1 world."/> - <xml-property name="indexedProps" value="pnf-name,orchestration-status,inv-status"/> + <xml-property name="indexedProps" value="pnf-name,inv-status"/> <xml-property name="searchable" value="pnf-name"/> <xml-property name="uniqueProps" value="pnf-name"/> <xml-property name="container" value="pnfs"/> |