diff options
Diffstat (limited to 'aai-schema')
10 files changed, 580 insertions, 151 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 d1b84a96..c783fe8f 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 @@ -908,7 +908,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="in-maint" type="xs:boolean"> + <xs:element name="in-maint" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)")</annox:annotate> @@ -1121,7 +1121,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="is-port-mirrored" type="xs:boolean"> + <xs:element name="is-port-mirrored" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="boolean indicatating whether or not port is a mirrored.")</annox:annotate> @@ -1135,7 +1135,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="in-maint" type="xs:boolean"> + <xs:element name="in-maint" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)")</annox:annotate> @@ -1206,14 +1206,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="in-maint" type="xs:boolean"> + <xs:element name="in-maint" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="Used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="is-closed-loop-disabled" type="xs:boolean"> + <xs:element name="is-closed-loop-disabled" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="Used to indicate whether closed loop function is enabled on this node")</annox:annotate> @@ -1909,7 +1909,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="in-maint" type="xs:boolean"> + <xs:element name="in-maint" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)")</annox:annotate> @@ -1997,7 +1997,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="in-maint" type="xs:boolean"> + <xs:element name="in-maint" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)")</annox:annotate> @@ -2169,7 +2169,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="in-maint" type="xs:boolean"> + <xs:element name="in-maint" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.")</annox:annotate> @@ -4389,14 +4389,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="in-maint" type="xs:boolean"> + <xs:element name="in-maint" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="is-closed-loop-disabled" type="xs:boolean"> + <xs:element name="is-closed-loop-disabled" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether closed loop function is enabled on this node")</annox:annotate> @@ -4497,7 +4497,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="dhcp-enabled" type="xs:boolean"> + <xs:element name="dhcp-enabled" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="dhcp enabled")</annox:annotate> @@ -4657,7 +4657,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="is-bound-to-vpn" type="xs:boolean"> + <xs:element name="is-bound-to-vpn" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="Set to true if bound to VPN")</annox:annotate> @@ -4762,21 +4762,21 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="is-provider-network" type="xs:boolean"> + <xs:element name="is-provider-network" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="boolean indicatating whether or not network is a provider network.")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="is-shared-network" type="xs:boolean"> + <xs:element name="is-shared-network" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="boolean indicatating whether or not network is a shared network.")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="is-external-network" type="xs:boolean"> + <xs:element name="is-external-network" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="boolean indicatating whether or not network is an external network.")</annox:annotate> @@ -4900,7 +4900,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="is-base-vf-module" type="xs:boolean"> + <xs:element name="is-base-vf-module" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is base vf module")</annox:annotate> @@ -5169,14 +5169,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="in-maint" type="xs:boolean"> + <xs:element name="in-maint" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="is-closed-loop-disabled" type="xs:boolean"> + <xs:element name="is-closed-loop-disabled" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether closed loop function is enabled on this node")</annox:annotate> @@ -5583,7 +5583,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="in-maint" type="xs:boolean"> + <xs:element name="in-maint" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="Used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.")</annox:annotate> 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 62046734..3e6d6dd4 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 @@ -908,7 +908,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="in-maint" type="xs:boolean"> + <xs:element name="in-maint" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)")</annox:annotate> @@ -922,7 +922,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="is-ip-unnumbered" type="xs:boolean"> + <xs:element name="is-ip-unnumbered" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="Flag indicating the interface uses the IP Unnumbered configuration.")</annox:annotate> @@ -1135,7 +1135,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="is-port-mirrored" type="xs:boolean"> + <xs:element name="is-port-mirrored" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="boolean indicatating whether or not port is a mirrored.")</annox:annotate> @@ -1149,7 +1149,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="in-maint" type="xs:boolean"> + <xs:element name="in-maint" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)")</annox:annotate> @@ -1163,7 +1163,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="is-ip-unnumbered" type="xs:boolean"> + <xs:element name="is-ip-unnumbered" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="Flag indicating the interface uses the IP Unnumbered configuration.")</annox:annotate> @@ -1241,14 +1241,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="in-maint" type="xs:boolean"> + <xs:element name="in-maint" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="Used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="is-closed-loop-disabled" type="xs:boolean"> + <xs:element name="is-closed-loop-disabled" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="Used to indicate whether closed loop function is enabled on this node")</annox:annotate> @@ -2103,7 +2103,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="sriov-automation" type="xs:boolean"> + <xs:element name="sriov-automation" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="Whether the cloud region supports (true) or does not support (false) SR-IOV automation.")</annox:annotate> @@ -2320,7 +2320,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="in-maint" type="xs:boolean"> + <xs:element name="in-maint" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)")</annox:annotate> @@ -2416,7 +2416,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="in-maint" type="xs:boolean"> + <xs:element name="in-maint" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)")</annox:annotate> @@ -2588,7 +2588,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="in-maint" type="xs:boolean"> + <xs:element name="in-maint" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.")</annox:annotate> @@ -4177,7 +4177,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="in-maint" type="xs:boolean"> + <xs:element name="in-maint" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.")</annox:annotate> @@ -5214,14 +5214,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="in-maint" type="xs:boolean"> + <xs:element name="in-maint" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="is-closed-loop-disabled" type="xs:boolean"> + <xs:element name="is-closed-loop-disabled" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether closed loop function is enabled on this node")</annox:annotate> @@ -5392,7 +5392,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="dhcp-enabled" type="xs:boolean"> + <xs:element name="dhcp-enabled" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="dhcp enabled")</annox:annotate> @@ -5574,7 +5574,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="is-bound-to-vpn" type="xs:boolean"> + <xs:element name="is-bound-to-vpn" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="Set to true if bound to VPN")</annox:annotate> @@ -5679,21 +5679,21 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="is-provider-network" type="xs:boolean"> + <xs:element name="is-provider-network" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="boolean indicatating whether or not network is a provider network.")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="is-shared-network" type="xs:boolean"> + <xs:element name="is-shared-network" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="boolean indicatating whether or not network is a shared network.")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="is-external-network" type="xs:boolean"> + <xs:element name="is-external-network" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="boolean indicatating whether or not network is an external network.")</annox:annotate> @@ -5817,7 +5817,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="is-base-vf-module" type="xs:boolean"> + <xs:element name="is-base-vf-module" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is base vf module")</annox:annotate> @@ -6135,14 +6135,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="in-maint" type="xs:boolean"> + <xs:element name="in-maint" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="is-closed-loop-disabled" type="xs:boolean"> + <xs:element name="is-closed-loop-disabled" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether closed loop function is enabled on this node")</annox:annotate> @@ -6577,7 +6577,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="in-maint" type="xs:boolean"> + <xs:element name="in-maint" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="Used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.")</annox:annotate> 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 c37d9335..b8c8a866 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 @@ -915,7 +915,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="in-maint" type="xs:boolean"> + <xs:element name="in-maint" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)")</annox:annotate> @@ -929,7 +929,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="is-ip-unnumbered" type="xs:boolean"> + <xs:element name="is-ip-unnumbered" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="Flag indicating the interface uses the IP Unnumbered configuration.")</annox:annotate> @@ -1142,7 +1142,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="is-port-mirrored" type="xs:boolean"> + <xs:element name="is-port-mirrored" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="boolean indicatating whether or not port is a mirrored.")</annox:annotate> @@ -1156,7 +1156,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="in-maint" type="xs:boolean"> + <xs:element name="in-maint" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)")</annox:annotate> @@ -1170,7 +1170,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="is-ip-unnumbered" type="xs:boolean"> + <xs:element name="is-ip-unnumbered" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="Flag indicating the interface uses the IP Unnumbered configuration.")</annox:annotate> @@ -1248,14 +1248,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="in-maint" type="xs:boolean"> + <xs:element name="in-maint" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="Used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="is-closed-loop-disabled" type="xs:boolean"> + <xs:element name="is-closed-loop-disabled" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="Used to indicate whether closed loop function is enabled on this node")</annox:annotate> @@ -2210,7 +2210,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="sriov-automation" type="xs:boolean"> + <xs:element name="sriov-automation" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="Whether the cloud region supports (true) or does not support (false) SR-IOV automation.")</annox:annotate> @@ -2441,7 +2441,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="in-maint" type="xs:boolean"> + <xs:element name="in-maint" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)")</annox:annotate> @@ -2537,7 +2537,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="in-maint" type="xs:boolean"> + <xs:element name="in-maint" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)")</annox:annotate> @@ -2709,7 +2709,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="in-maint" type="xs:boolean"> + <xs:element name="in-maint" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.")</annox:annotate> @@ -4379,7 +4379,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="in-maint" type="xs:boolean"> + <xs:element name="in-maint" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.")</annox:annotate> @@ -5416,14 +5416,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="in-maint" type="xs:boolean"> + <xs:element name="in-maint" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="is-closed-loop-disabled" type="xs:boolean"> + <xs:element name="is-closed-loop-disabled" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether closed loop function is enabled on this node")</annox:annotate> @@ -5594,7 +5594,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="dhcp-enabled" type="xs:boolean"> + <xs:element name="dhcp-enabled" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="dhcp enabled")</annox:annotate> @@ -5776,7 +5776,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="is-bound-to-vpn" type="xs:boolean"> + <xs:element name="is-bound-to-vpn" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="Set to true if bound to VPN")</annox:annotate> @@ -5881,21 +5881,21 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="is-provider-network" type="xs:boolean"> + <xs:element name="is-provider-network" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="boolean indicatating whether or not network is a provider network.")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="is-shared-network" type="xs:boolean"> + <xs:element name="is-shared-network" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="boolean indicatating whether or not network is a shared network.")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="is-external-network" type="xs:boolean"> + <xs:element name="is-external-network" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="boolean indicatating whether or not network is an external network.")</annox:annotate> @@ -6019,7 +6019,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="is-base-vf-module" type="xs:boolean"> + <xs:element name="is-base-vf-module" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is base vf module")</annox:annotate> @@ -6337,14 +6337,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="in-maint" type="xs:boolean"> + <xs:element name="in-maint" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="is-closed-loop-disabled" type="xs:boolean"> + <xs:element name="is-closed-loop-disabled" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether closed loop function is enabled on this node")</annox:annotate> @@ -6786,7 +6786,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="in-maint" type="xs:boolean"> + <xs:element name="in-maint" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="Used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.")</annox:annotate> 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 f8d876bc..e90f8da8 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 @@ -915,7 +915,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="in-maint" type="xs:boolean"> + <xs:element name="in-maint" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)")</annox:annotate> @@ -929,7 +929,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="is-ip-unnumbered" type="xs:boolean"> + <xs:element name="is-ip-unnumbered" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="Flag indicating the interface uses the IP Unnumbered configuration.")</annox:annotate> @@ -1142,7 +1142,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="is-port-mirrored" type="xs:boolean"> + <xs:element name="is-port-mirrored" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="boolean indicatating whether or not port is a mirrored.")</annox:annotate> @@ -1156,7 +1156,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="in-maint" type="xs:boolean"> + <xs:element name="in-maint" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)")</annox:annotate> @@ -1170,7 +1170,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="is-ip-unnumbered" type="xs:boolean"> + <xs:element name="is-ip-unnumbered" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="Flag indicating the interface uses the IP Unnumbered configuration.")</annox:annotate> @@ -1248,14 +1248,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="in-maint" type="xs:boolean"> + <xs:element name="in-maint" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="Used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="is-closed-loop-disabled" type="xs:boolean"> + <xs:element name="is-closed-loop-disabled" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="Used to indicate whether closed loop function is enabled on this node")</annox:annotate> @@ -2210,7 +2210,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="sriov-automation" type="xs:boolean"> + <xs:element name="sriov-automation" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="Whether the cloud region supports (true) or does not support (false) SR-IOV automation.")</annox:annotate> @@ -2441,7 +2441,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="in-maint" type="xs:boolean"> + <xs:element name="in-maint" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)")</annox:annotate> @@ -2537,7 +2537,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="in-maint" type="xs:boolean"> + <xs:element name="in-maint" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)")</annox:annotate> @@ -2709,7 +2709,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="in-maint" type="xs:boolean"> + <xs:element name="in-maint" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.")</annox:annotate> @@ -4379,7 +4379,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="in-maint" type="xs:boolean"> + <xs:element name="in-maint" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.")</annox:annotate> @@ -5416,14 +5416,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="in-maint" type="xs:boolean"> + <xs:element name="in-maint" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="is-closed-loop-disabled" type="xs:boolean"> + <xs:element name="is-closed-loop-disabled" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether closed loop function is enabled on this node")</annox:annotate> @@ -5594,7 +5594,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="dhcp-enabled" type="xs:boolean"> + <xs:element name="dhcp-enabled" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="dhcp enabled")</annox:annotate> @@ -5776,7 +5776,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="is-bound-to-vpn" type="xs:boolean"> + <xs:element name="is-bound-to-vpn" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="Set to true if bound to VPN")</annox:annotate> @@ -5881,21 +5881,21 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="is-provider-network" type="xs:boolean"> + <xs:element name="is-provider-network" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="boolean indicatating whether or not network is a provider network.")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="is-shared-network" type="xs:boolean"> + <xs:element name="is-shared-network" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="boolean indicatating whether or not network is a shared network.")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="is-external-network" type="xs:boolean"> + <xs:element name="is-external-network" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="boolean indicatating whether or not network is an external network.")</annox:annotate> @@ -6019,7 +6019,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="is-base-vf-module" type="xs:boolean"> + <xs:element name="is-base-vf-module" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is base vf module")</annox:annotate> @@ -6337,14 +6337,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="in-maint" type="xs:boolean"> + <xs:element name="in-maint" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="is-closed-loop-disabled" type="xs:boolean"> + <xs:element name="is-closed-loop-disabled" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether closed loop function is enabled on this node")</annox:annotate> @@ -6786,7 +6786,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="in-maint" type="xs:boolean"> + <xs:element name="in-maint" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="Used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.")</annox:annotate> 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 2019a6ae..1d1ff724 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 @@ -915,7 +915,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="in-maint" type="xs:boolean"> + <xs:element name="in-maint" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)")</annox:annotate> @@ -929,7 +929,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="is-ip-unnumbered" type="xs:boolean"> + <xs:element name="is-ip-unnumbered" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="Flag indicating the interface uses the IP Unnumbered configuration.")</annox:annotate> @@ -1142,7 +1142,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="is-port-mirrored" type="xs:boolean"> + <xs:element name="is-port-mirrored" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="boolean indicatating whether or not port is a mirrored.")</annox:annotate> @@ -1156,7 +1156,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="in-maint" type="xs:boolean"> + <xs:element name="in-maint" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)")</annox:annotate> @@ -1170,7 +1170,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="is-ip-unnumbered" type="xs:boolean"> + <xs:element name="is-ip-unnumbered" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="Flag indicating the interface uses the IP Unnumbered configuration.")</annox:annotate> @@ -1248,14 +1248,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="in-maint" type="xs:boolean"> + <xs:element name="in-maint" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="Used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="is-closed-loop-disabled" type="xs:boolean"> + <xs:element name="is-closed-loop-disabled" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="Used to indicate whether closed loop function is enabled on this node")</annox:annotate> @@ -2210,7 +2210,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="sriov-automation" type="xs:boolean"> + <xs:element name="sriov-automation" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="Whether the cloud region supports (true) or does not support (false) SR-IOV automation.")</annox:annotate> @@ -2353,7 +2353,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",nameProps="prov-status",dependentOn="vpls-pe,pserver,pnf",container="p-interfaces")</annox:annotate> + <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")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -2434,7 +2434,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="in-maint" type="xs:boolean"> + <xs:element name="in-maint" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)")</annox:annotate> @@ -2448,6 +2448,27 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> + <xs:element name="network-ref" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the network-ref of this p-interface. Derived from ietf-restconf-notification that identifies a termination-point.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="transparent" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the transparent value of this p-interface.")</annox:annotate> + </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="oper Status of this p-interface.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> <xs:element ref="tns:relationship-list" minOccurs="0"/> <xs:element ref="tns:sriov-pfs" minOccurs="0"/> <xs:element ref="tns:l-interfaces" minOccurs="0"/> @@ -2530,7 +2551,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="in-maint" type="xs:boolean"> + <xs:element name="in-maint" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)")</annox:annotate> @@ -2702,7 +2723,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="in-maint" type="xs:boolean"> + <xs:element name="in-maint" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.")</annox:annotate> @@ -3207,7 +3228,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="Represents a slice or partial piece of a resource that gets separately allotted",nameProps="description",uniqueProps="id",indexedProps="id,model-invariant-id,model-version-id,type,role",dependentOn="service-instance",container="allotted-resources")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Represents a slice or partial piece of a resource that gets separately allotted",nameProps="description,allotted-resource-name",uniqueProps="id",indexedProps="id,model-invariant-id,model-version-id,type,role,allotted-resource-name,access-provider-id,access-client-id,access-topology-id,access-node-id,access-ltp-id,vpn-name",dependentOn="service-instance",container="allotted-resources")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -3288,6 +3309,62 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> + <xs:element name="allotted-resource-name" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the name of this allotted-resource.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="access-provider-id" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the access provider of this allotted-resource.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="access-client-id" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the access client of this allotted-resource.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="access-topology-id" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the access topology of this allotted-resource.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="access-node-id" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the access node of this allotted-resource.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="access-ltp-id" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the access ltp of this allotted-resource.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="cvlan" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the cvlan of this allotted-resource.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="vpn-name" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the vpn-name of this allotted-resource.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> <xs:element ref="tns:tunnel-xconnects" minOccurs="0"/> <xs:element ref="tns:relationship-list" minOccurs="0"/> </xs:sequence> @@ -3481,6 +3558,13 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> + <xs:element name="input-parameters" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="String capturing request parameters from SO to pass to Closed Loop.")</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"/> @@ -3757,6 +3841,51 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:sequence> </xs:complexType> </xs:element> + <xs:element name="sp-partner"> + <xs:complexType> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of an sp-partner",indexedProps="sp-partner-id,url,callsource",nameProps="sp-partner-id",searchable="sp-partner-id",uniqueProps="sp-partner-id",container="sp-partners",namespace="business")</annox:annotate> + </xs:appinfo> + </xs:annotation> + <xs:sequence> + <xs:element name="sp-partner-id" type="xs:string"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Uniquely identifies this sp-partner by id")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="url" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the URL of this sp-partner.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="callsource" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the callsource of this sp-partner.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element ref="tns:relationship-list" minOccurs="0"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="sp-partners"> + <xs:complexType> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of sp-partners")</annox:annotate> + </xs:appinfo> + </xs:annotation> + <xs:sequence> + <xs:element ref="tns:sp-partner" minOccurs="0" maxOccurs="5000"/> + </xs:sequence> + </xs:complexType> + </xs:element> <xs:element name="business"> <xs:complexType> <xs:annotation> @@ -3771,6 +3900,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:element ref="tns:owning-entities" minOccurs="0"/> <xs:element ref="tns:platforms" minOccurs="0"/> <xs:element ref="tns:projects" minOccurs="0"/> + <xs:element ref="tns:sp-partners" minOccurs="0"/> </xs:sequence> </xs:complexType> </xs:element> @@ -4361,7 +4491,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="Logical links generally connect l-interfaces but are used to express logical connectivity between two points",indexedProps="link-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,link-id,prov-status,circuit-id,purpose",uniqueProps="link-id",container="logical-links",namespace="network",searchable="link-name")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Logical links generally connect l-interfaces but are used to express logical connectivity between two points",indexedProps="link-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,link-id,prov-status,circuit-id,purpose,operational-status",uniqueProps="link-id",container="logical-links",namespace="network",searchable="link-name")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -4372,7 +4502,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="in-maint" type="xs:boolean"> + <xs:element name="in-maint" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.")</annox:annotate> @@ -4781,7 +4911,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="VPN binding",nameProps="vpn-name,vpn-type",indexedProps="vpn-name,vpn-id,vpn-type",searchable="vpn-id,vpn-name",uniqueProps="vpn-id",container="vpn-bindings",namespace="network")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="VPN binding",nameProps="vpn-name,vpn-type",indexedProps="vpn-name,vpn-id,vpn-type,access-provider-id,access-client-id,access-topology-id,src-access-node-id,src-access-ltp-id,dst-access-node-id,dst-access-ltp-id,operational-status",searchable="vpn-id,vpn-name",uniqueProps="vpn-id",container="vpn-bindings",namespace="network")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -4834,6 +4964,83 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> + <xs:element name="access-provider-id" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the access provider of this vpn.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="access-client-id" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the access client of this vpn.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="access-topology-id" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the access topology of this vpn.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="src-access-node-id" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the src-access-node of this vpn.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="src-access-ltp-id" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the src-access-ltp of this vpn.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="dst-access-node-id" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the dst-access-node of this vpn.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="dst-access-ltp-id" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the dst-access-ltp of this vpn.")</annox:annotate> + </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="Store the operational-status for this object.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="model-customization-id" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the model-customization-id for this object.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="model-version-id" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the model-version-id for this object.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="model-invariant-id" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the model-invariant-id for this object.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> <xs:element name="resource-version" type="xs:string" minOccurs="0"> <xs:annotation> <xs:appinfo> @@ -5409,14 +5616,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="in-maint" type="xs:boolean"> + <xs:element name="in-maint" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="is-closed-loop-disabled" type="xs:boolean"> + <xs:element name="is-closed-loop-disabled" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether closed loop function is enabled on this node")</annox:annotate> @@ -5587,7 +5794,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="dhcp-enabled" type="xs:boolean"> + <xs:element name="dhcp-enabled" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="dhcp enabled")</annox:annotate> @@ -5769,7 +5976,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="is-bound-to-vpn" type="xs:boolean"> + <xs:element name="is-bound-to-vpn" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="Set to true if bound to VPN")</annox:annotate> @@ -5874,21 +6081,21 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="is-provider-network" type="xs:boolean"> + <xs:element name="is-provider-network" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="boolean indicatating whether or not network is a provider network.")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="is-shared-network" type="xs:boolean"> + <xs:element name="is-shared-network" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="boolean indicatating whether or not network is a shared network.")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="is-external-network" type="xs:boolean"> + <xs:element name="is-external-network" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="boolean indicatating whether or not network is an external network.")</annox:annotate> @@ -6012,7 +6219,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="is-base-vf-module" type="xs:boolean"> + <xs:element name="is-base-vf-module" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is base vf module")</annox:annotate> @@ -6330,14 +6537,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="in-maint" type="xs:boolean"> + <xs:element name="in-maint" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="is-closed-loop-disabled" type="xs:boolean"> + <xs:element name="is-closed-loop-disabled" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether closed loop function is enabled on this node")</annox:annotate> @@ -6698,7 +6905,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")</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,orchestration-status,inv-status,operational-status,admin-status",searchable="pnf-name",uniqueProps="pnf-name",container="pnfs",namespace="network")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -6779,7 +6986,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="in-maint" type="xs:boolean"> + <xs:element name="in-maint" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="Used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.")</annox:annotate> @@ -6863,6 +7070,27 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> + <xs:element name="admin-status" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="admin Status of this PNF")</annox:annotate> + </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="Store the operational-status for this object.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="model-customization-id" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the model-customization-id for this object.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> <xs:element name="model-invariant-id" type="xs:string" minOccurs="0"> <xs:annotation> <xs:appinfo> diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v8.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v8.xsd index b5c16871..0aa9d37b 100644 --- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v8.xsd +++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v8.xsd @@ -458,8 +458,8 @@ <xs:element name="vserver-name2" type="xs:string" minOccurs="0"/> <xs:element name="prov-status" type="xs:string" minOccurs="0"/> <xs:element name="vserver-selflink" type="xs:string"/> - <xs:element name="in-maint" type="xs:boolean"/> - <xs:element name="is-closed-loop-disabled" type="xs:boolean"/> + <xs:element name="in-maint" type="xs:boolean" minOccurs="0"/> + <xs:element name="is-closed-loop-disabled" type="xs:boolean" minOccurs="0"/> <xs:element name="resource-version" type="xs:string" minOccurs="0"/> <xs:element ref="tns:volumes" minOccurs="0"/> <xs:element ref="tns:relationship-list" minOccurs="0"/> @@ -717,7 +717,7 @@ <xs:element name="serial-number" type="xs:string" minOccurs="0"/> <xs:element name="pserver-id" type="xs:string" minOccurs="0"/> <xs:element name="internet-topology" type="xs:string" minOccurs="0"/> - <xs:element name="in-maint" type="xs:boolean"/> + <xs:element name="in-maint" type="xs:boolean" minOccurs="0"/> <xs:element name="resource-version" type="xs:string" minOccurs="0"/> <xs:element name="pserver-name2" type="xs:string" minOccurs="0"/> <xs:element name="purpose" type="xs:string" minOccurs="0"/> @@ -1361,8 +1361,8 @@ <xs:element name="prov-status" type="xs:string" minOccurs="0"/> <xs:element name="orchestration-status" type="xs:string" minOccurs="0"/> <xs:element name="ipaddress-v4-oam-vip" type="xs:string" minOccurs="0"/> - <xs:element name="in-maint" type="xs:boolean"/> - <xs:element name="is-closed-loop-disabled" type="xs:boolean"/> + <xs:element name="in-maint" type="xs:boolean" minOccurs="0"/> + <xs:element name="is-closed-loop-disabled" type="xs:boolean" minOccurs="0"/> <xs:element name="group-notation" type="xs:string" minOccurs="0"/> <xs:element name="resource-version" type="xs:string" minOccurs="0"/> <xs:element ref="tns:relationship-list" minOccurs="0"/> @@ -1387,7 +1387,7 @@ <xs:element name="cidr-mask" type="xs:string" minOccurs="0"/> <xs:element name="ip-version" type="xs:string" minOccurs="0"/> <xs:element name="orchestration-status" type="xs:string" minOccurs="0"/> - <xs:element name="dhcp-enabled" type="xs:boolean"/> + <xs:element name="dhcp-enabled" type="xs:boolean" minOccurs="0"/> <xs:element name="dhcp-start" type="xs:string" minOccurs="0"/> <xs:element name="dhcp-end" type="xs:string" minOccurs="0"/> <xs:element name="resource-version" type="xs:string" minOccurs="0"/> @@ -1443,7 +1443,7 @@ <xs:element name="network-role" type="xs:string" minOccurs="0"/> <xs:element name="network-technology" type="xs:string" minOccurs="0"/> <xs:element name="neutron-network-id" type="xs:string" minOccurs="0"/> - <xs:element name="is-bound-to-vpn" type="xs:boolean"/> + <xs:element name="is-bound-to-vpn" type="xs:boolean" minOccurs="0"/> <xs:element name="service-id" type="xs:string" minOccurs="0"/> <xs:element name="network-role-instance" type="xs:unsignedInt" minOccurs="0"/> <xs:element name="resource-version" type="xs:string" minOccurs="0"/> @@ -1457,9 +1457,9 @@ <xs:element name="widget-model-id" type="xs:string" minOccurs="0"/> <xs:element name="widget-model-version" type="xs:string" minOccurs="0"/> <xs:element name="physical-network-name" type="xs:string" minOccurs="0"/> - <xs:element name="is-provider-network" type="xs:boolean"/> - <xs:element name="is-shared-network" type="xs:boolean"/> - <xs:element name="is-external-network" type="xs:boolean"/> + <xs:element name="is-provider-network" type="xs:boolean" minOccurs="0"/> + <xs:element name="is-shared-network" type="xs:boolean" minOccurs="0"/> + <xs:element name="is-external-network" type="xs:boolean" minOccurs="0"/> <xs:element ref="tns:subnets" minOccurs="0"/> <xs:element ref="tns:ctag-assignments" minOccurs="0"/> <xs:element ref="tns:segmentation-assignments" minOccurs="0"/> @@ -1499,7 +1499,7 @@ <xs:element name="vf-module-name" type="xs:string" minOccurs="0"/> <xs:element name="heat-stack-id" type="xs:string" minOccurs="0"/> <xs:element name="orchestration-status" type="xs:string" minOccurs="0"/> - <xs:element name="is-base-vf-module" type="xs:boolean"/> + <xs:element name="is-base-vf-module" type="xs:boolean" minOccurs="0"/> <xs:element name="resource-version" type="xs:string" minOccurs="0"/> <xs:element name="persona-model-id" type="xs:string" minOccurs="0"/> <xs:element name="persona-model-version" type="xs:string" minOccurs="0"/> @@ -1545,8 +1545,8 @@ <xs:element name="vmemory-units" type="xs:string" minOccurs="0"/> <xs:element name="vdisk" type="xs:unsignedInt" minOccurs="0"/> <xs:element name="vdisk-units" type="xs:string" minOccurs="0"/> - <xs:element name="in-maint" type="xs:boolean"/> - <xs:element name="is-closed-loop-disabled" type="xs:boolean"/> + <xs:element name="in-maint" type="xs:boolean" minOccurs="0"/> + <xs:element name="is-closed-loop-disabled" type="xs:boolean" minOccurs="0"/> <xs:element name="resource-version" type="xs:string" minOccurs="0"/> <xs:element name="summary-status" type="xs:string" minOccurs="0"/> <xs:element name="encrypted-access-flag" type="xs:boolean" minOccurs="0"/> @@ -1630,7 +1630,7 @@ <xs:element name="ipaddress-v4-oam" type="xs:string" minOccurs="0"/> <xs:element name="sw-version" type="xs:string" minOccurs="0"/> <xs:element name="orchestration-status" type="xs:string" minOccurs="0"/> - <xs:element name="in-maint" type="xs:boolean"/> + <xs:element name="in-maint" type="xs:boolean" minOccurs="0"/> <xs:element name="frame-id" type="xs:string" minOccurs="0"/> <xs:element name="resource-version" type="xs:string" minOccurs="0"/> <xs:element ref="tns:relationship-list" minOccurs="0"/> diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v9.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v9.xsd index a316eaac..08e5d5bd 100644 --- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v9.xsd +++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v9.xsd @@ -1184,14 +1184,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="in-maint" type="xs:boolean"> + <xs:element name="in-maint" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="Used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="is-closed-loop-disabled" type="xs:boolean"> + <xs:element name="is-closed-loop-disabled" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="Used to indicate whether closed loop function is enabled on this node")</annox:annotate> @@ -2133,7 +2133,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="in-maint" type="xs:boolean"> + <xs:element name="in-maint" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.")</annox:annotate> @@ -4300,14 +4300,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="in-maint" type="xs:boolean"> + <xs:element name="in-maint" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="is-closed-loop-disabled" type="xs:boolean"> + <xs:element name="is-closed-loop-disabled" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether closed loop function is enabled on this node")</annox:annotate> @@ -4408,7 +4408,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="dhcp-enabled" type="xs:boolean"> + <xs:element name="dhcp-enabled" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="dhcp enabled")</annox:annotate> @@ -4568,7 +4568,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="is-bound-to-vpn" type="xs:boolean"> + <xs:element name="is-bound-to-vpn" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="Set to true if bound to VPN")</annox:annotate> @@ -4673,21 +4673,21 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="is-provider-network" type="xs:boolean"> + <xs:element name="is-provider-network" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="boolean indicatating whether or not network is a provider network.")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="is-shared-network" type="xs:boolean"> + <xs:element name="is-shared-network" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="boolean indicatating whether or not network is a shared network.")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="is-external-network" type="xs:boolean"> + <xs:element name="is-external-network" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="boolean indicatating whether or not network is an external network.")</annox:annotate> @@ -4804,7 +4804,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="is-base-vf-module" type="xs:boolean"> + <xs:element name="is-base-vf-module" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is base vf module")</annox:annotate> @@ -5073,14 +5073,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="in-maint" type="xs:boolean"> + <xs:element name="in-maint" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="is-closed-loop-disabled" type="xs:boolean"> + <xs:element name="is-closed-loop-disabled" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether closed loop function is enabled on this node")</annox:annotate> @@ -5431,7 +5431,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="in-maint" type="xs:boolean"> + <xs:element name="in-maint" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="Used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.")</annox:annotate> diff --git a/aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_ccvpn_v14.json b/aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_ccvpn_v14.json new file mode 100644 index 00000000..468e6a8d --- /dev/null +++ b/aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_ccvpn_v14.json @@ -0,0 +1,28 @@ +{ + "rules": [ + { + "from": "vpn-binding", + "to": "p-interface", + "label": "org.onap.relationships.inventory.BindsTo", + "direction": "OUT", + "multiplicity": "ONE2MANY", + "contains-other-v": "NONE", + "delete-other-v": "NONE", + "prevent-delete": "NONE", + "default": "true", + "description":"For CCVPN Usecase" + }, + { + "from": "sp-partner", + "to": "service-instance", + "label": "org.onap.relationships.inventory.PartOf", + "direction": "OUT", + "multiplicity": "ONE2MANY", + "contains-other-v": "NONE", + "delete-other-v": "NONE", + "prevent-delete": "NONE", + "default": "true", + "description":"For CCVPN Usecase" + } + ] +} diff --git a/aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_v14.json b/aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_v14.json index b407c875..2e65669b 100644 --- a/aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_v14.json +++ b/aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_v14.json @@ -2979,6 +2979,6 @@ "default": "true", "description":"" } - + ] } 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 111946fb..1f0e81bf 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 @@ -4,6 +4,7 @@ org.onap.aai ================================================================================ Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + Copyright (C) 2018 Huawei Technologies (Australia) Pty Ltd. All rights reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -2104,13 +2105,28 @@ <xml-property name="description" value="inventory status" /> </xml-properties> </xml-element> + <xml-element java-attribute="networkRef" name="network-ref" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Store the network-ref of this p-interface. Derived from ietf-restconf-notification that identifies a termination-point." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="transparent" name="transparent" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Store the transparent value of this p-interface." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="oper Status of this p-interface." /> + </xml-properties> + </xml-element> <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList" /> <xml-element java-attribute="sriovPfs" name="sriov-pfs" type="inventory.aai.onap.org.v14.SriovPfs" /> <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v14.LInterfaces" /> </java-attributes> <xml-properties> <xml-property name="description" value="Physical interface (e.g., nic)" /> - <xml-property name="indexedProps" value="interface-name,prov-status" /> + <xml-property name="indexedProps" value="interface-name,prov-status,networkRef,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" /> @@ -2335,6 +2351,8 @@ <xml-element java-attribute="owningEntities" name="owning-entities" type="inventory.aai.onap.org.v14.OwningEntities" /> <xml-element java-attribute="platforms" name="platforms" type="inventory.aai.onap.org.v14.Platforms" /> <xml-element java-attribute="projects" name="projects" type="inventory.aai.onap.org.v14.Projects" /> + + <xml-element java-attribute="spPartners" name="sp-partners" type="inventory.aai.onap.org.v14.SpPartners" /> </java-attributes> </java-type> @@ -2783,6 +2801,11 @@ <xml-property name="description" value="Orchestration status of this service." /> </xml-properties> </xml-element> + <xml-element java-attribute="inputParameters" name="input-parameters" required="false" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="String capturing request parameters from SO to pass to Closed Loop." /> + </xml-properties> + </xml-element> <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList" /> <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v14.Metadata" /> <xml-element java-attribute="allottedResources" name="allotted-resources" type="inventory.aai.onap.org.v14.AllottedResources" /> @@ -3213,7 +3236,7 @@ </java-attributes> <xml-properties> <xml-property name="description" value="Logical links generally connect l-interfaces but are used to express logical connectivity between two points" /> - <xml-property name="indexedProps" value="link-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,link-id,prov-status,circuit-id,purpose" /> + <xml-property name="indexedProps" value="link-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,link-id,prov-status,circuit-id,purpose,operational-status" /> <xml-property name="uniqueProps" value="link-id" /> <xml-property name="container" value="logical-links" /> <xml-property name="namespace" value="network" /> @@ -3440,6 +3463,61 @@ <xml-property name="description" value="Used to distinguish the distinct VPN routes of separate customers who connect to the provider in an MPLS network." /> </xml-properties> </xml-element> + <xml-element java-attribute="accessProviderId" name="access-provider-id" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Store the id of the access provider of this vpn." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="accessClientId" name="access-client-id" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Store the id of the access client of this vpn." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="accessTopologyId" name="access-topology-id" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Store the id of the access topology of this vpn." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="srcAccessNodeId" name="src-access-node-id" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Store the id of the src-access-node of this vpn." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="srcAccessLtpId" name="src-access-ltp-id" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Store the id of the src-access-ltp of this vpn." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="dstAccessNodeId" name="dst-access-node-id" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Store the id of the dst-access-node of this vpn." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="dstAccessLtpId" name="dst-access-ltp-id" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Store the id of the dst-access-ltp of this vpn." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Store the operational-status for this object." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Store the model-customization-id for this object." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Store the model-version-id for this object." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Store the model-invariant-id for this object." /> + </xml-properties> + </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> @@ -3455,7 +3533,7 @@ <xml-properties> <xml-property name="description" value="VPN binding" /> <xml-property name="nameProps" value="vpn-name,vpn-type" /> - <xml-property name="indexedProps" value="vpn-name,vpn-id,vpn-type" /> + <xml-property name="indexedProps" value="vpn-name,vpn-id,vpn-type,access-provider-id,access-client-id,access-topology-id,src-access-node-id,src-access-ltp-id,dst-access-node-id,dst-access-ltp-id,operational-status" /> <xml-property name="searchable" value="vpn-id,vpn-name" /> <xml-property name="uniqueProps" value="vpn-id" /> <xml-property name="container" value="vpn-bindings" /> @@ -4932,6 +5010,21 @@ <xml-property name="description" value="Nf Role is the role performed by this instance in the network." /> </xml-properties> </xml-element> + <xml-element java-attribute="adminStatus" name="admin-status" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="admin Status of this PNF" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Store the operational-status for this object." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Store the model-customization-id for this object." /> + </xml-properties> + </xml-element> <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String"> <xml-properties> <xml-property name="description" value="The ASDC model id for this resource model."/> @@ -4955,7 +5048,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,orchestration-status,inv-status,operational-status,admin-status" /> <xml-property name="searchable" value="pnf-name" /> <xml-property name="uniqueProps" value="pnf-name" /> <xml-property name="container" value="pnfs" /> @@ -6084,15 +6177,55 @@ <xml-property name="description" value="role in the network that this resource will be providing." /> </xml-properties> </xml-element> + <xml-element java-attribute="allottedResourceName" name="allotted-resource-name" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Store the name of this allotted-resource." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="accessProviderId" name="access-provider-id" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Store the id of the access provider of this allotted-resource." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="accessClientId" name="access-client-id" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Store the id of the access client of this allotted-resource." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="accessTopologyId" name="access-topology-id" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Store the id of the access topology of this allotted-resource." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="accessNodeId" name="access-node-id" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Store the id of the access node of this allotted-resource." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="accessLtpId" name="access-ltp-id" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Store the id of the access ltp of this allotted-resource." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="cvlan" name="cvlan" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Store the cvlan of this allotted-resource." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="vpnName" name="vpn-name" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Store the vpn-name of this allotted-resource." /> + </xml-properties> + </xml-element> <xml-element java-attribute="tunnelXconnects" name="tunnel-xconnects" type="inventory.aai.onap.org.v14.TunnelXconnects" /> <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Represents a slice or partial piece of a resource that gets separately allotted" /> - <xml-property name="nameProps" value="description" /> + <xml-property name="nameProps" value="description,allotted-resource-name" /> <xml-property name="uniqueProps" value="id" /> - <xml-property name="indexedProps" value="id,model-invariant-id,model-version-id,type,role" /> + <xml-property name="indexedProps" value="id,model-invariant-id,model-version-id,type,role,allotted-resource-name,access-provider-id,access-client-id,access-topology-id,access-node-id,access-ltp-id,vpn-name" /> <xml-property name="dependentOn" value="service-instance" /> <xml-property name="container" value="allotted-resources" /> <!-- <xml-property name="namespace" value="network" /> --> @@ -6884,5 +7017,45 @@ </xml-properties> </java-type> + <java-type name="SpPartner"> + <xml-root-element name="sp-partner" /> + <java-attributes> + <xml-element java-attribute="spPartnerId" name="sp-partner-id" required="true" type="java.lang.String" xml-key="true"> + <xml-properties> + <xml-property name="description" value="Uniquely identifies this sp-partner by id" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="url" name="url" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Store the URL of this sp-partner." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="callsource" name="callsource" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Store the callsource of this sp-partner." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList" /> + </java-attributes> + <xml-properties> + <xml-property name="description" value="Instance of an sp-partner" /> + <xml-property name="indexedProps" value="sp-partner-id,url,callsource" /> + <xml-property name="nameProps" value="sp-partner-id" /> + <xml-property name="searchable" value="sp-partner-id" /> + <xml-property name="uniqueProps" value="sp-partner-id" /> + <xml-property name="container" value="sp-partners" /> + <xml-property name="namespace" value="business" /> + </xml-properties> + </java-type> + <java-type name="SpPartners"> + <xml-root-element name="sp-partners" /> + <xml-properties> + <xml-property name="description" value="Collection of sp-partners" /> + </xml-properties> + <java-attributes> + <xml-element container-type="java.util.ArrayList" java-attribute="spPartner" name="sp-partner" type="inventory.aai.onap.org.v14.SpPartner" /> + </java-attributes> + </java-type> + </java-types> </xml-bindings> |