diff options
| author |   Robby Maharajh <rx2202@us.att.com> | 2022-02-14 18:01:06 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2022-02-14 18:01:06 +0000 |
| commit | 2f79d50b8948888a4a7099e4fd4f21d1e27dd994 (patch) | |
| tree | d7f7100ad2e46f65c59c68e6bb3a245b9736c587 /aai-schema | |
| parent | 484f6a1fb1eae95219e2f48d6f72bccfa2dc4bc4 (diff) | |
| parent | 627260bf0d25cdeca2a36ed7ddd92de13a164875 (diff) | |
Merge "[AAI] Update schema service to be on v26 by default and upversion to 1.9.4"
Diffstat (limited to 'aai-schema')
| -rw-r--r-- | aai-schema/pom.xml | 2 | ||||
| -rw-r--r-- | aai-schema/src/main/resources/onap/oxm/v25/aai_oxm_v25.xml | 4 | ||||
| -rw-r--r-- | aai-schema/src/main/resources/onap/oxm/v26/aai_oxm_v26.xml | 4 | ||||
| -rw-r--r-- | aai-schema/src/main/xjb/bindings-onap.xjb | 10 |
4 files changed, 15 insertions, 5 deletions
diff --git a/aai-schema/pom.xml b/aai-schema/pom.xml index 99e9c63..956c882 100644 --- a/aai-schema/pom.xml +++ b/aai-schema/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.onap.aai.schema-service</groupId> <artifactId>schema-service</artifactId> - <version>1.9.3-SNAPSHOT</version> + <version>1.9.4-SNAPSHOT</version> </parent> <artifactId>aai-schema</artifactId> <name>aai-schema</name> diff --git a/aai-schema/src/main/resources/onap/oxm/v25/aai_oxm_v25.xml b/aai-schema/src/main/resources/onap/oxm/v25/aai_oxm_v25.xml index 03044be..f658f16 100644 --- a/aai-schema/src/main/resources/onap/oxm/v25/aai_oxm_v25.xml +++ b/aai-schema/src/main/resources/onap/oxm/v25/aai_oxm_v25.xml @@ -12302,7 +12302,7 @@ </xml-element> <xml-element java-attribute="enhancedMulticast" name="enhanced-multicast" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="String value indicating whether the EVC uses enhanced multicast. Possible Values:yes/no/[empty string]"/> + <xml-property name="description" value="String value indicating whether the EVC uses enhanced multicast. Possible Values, yes/no/[empty string]"/> </xml-properties> </xml-element> <xml-element java-attribute="espEvcCircuitId" name="esp-evc-circuit-id" type="java.lang.String"> @@ -16749,7 +16749,7 @@ </xml-element> <xml-element java-attribute="afIpv4" name="af-ipv4" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="Flag to indicate generation of Internet Control Message Protocol (ICMP) unreachable messages for ipv4 address family Values: null, disable, enable"/> + <xml-property name="description" value="Flag to indicate generation of Internet Control Message Protocol (ICMP) unreachable messages for ipv4 address family Values, null, disable, enable"/> </xml-properties> </xml-element> <xml-element java-attribute="afIpv6" name="af-ipv6" type="java.lang.String"> diff --git a/aai-schema/src/main/resources/onap/oxm/v26/aai_oxm_v26.xml b/aai-schema/src/main/resources/onap/oxm/v26/aai_oxm_v26.xml index d0cec2a..f5b6c7f 100644 --- a/aai-schema/src/main/resources/onap/oxm/v26/aai_oxm_v26.xml +++ b/aai-schema/src/main/resources/onap/oxm/v26/aai_oxm_v26.xml @@ -12317,7 +12317,7 @@ </xml-element> <xml-element java-attribute="enhancedMulticast" name="enhanced-multicast" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="String value indicating whether the EVC uses enhanced multicast. Possible Values:yes/no/[empty string]"/> + <xml-property name="description" value="String value indicating whether the EVC uses enhanced multicast. Possible Values, yes/no/[empty string]"/> </xml-properties> </xml-element> <xml-element java-attribute="espEvcCircuitId" name="esp-evc-circuit-id" type="java.lang.String"> @@ -16784,7 +16784,7 @@ </xml-element> <xml-element java-attribute="afIpv4" name="af-ipv4" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="Flag to indicate generation of Internet Control Message Protocol (ICMP) unreachable messages for ipv4 address family Values: null, disable, enable"/> + <xml-property name="description" value="Flag to indicate generation of Internet Control Message Protocol (ICMP) unreachable messages for ipv4 address family Values, null, disable, enable"/> </xml-properties> </xml-element> <xml-element java-attribute="afIpv6" name="af-ipv6" type="java.lang.String"> diff --git a/aai-schema/src/main/xjb/bindings-onap.xjb b/aai-schema/src/main/xjb/bindings-onap.xjb index a80099e..49d8c46 100644 --- a/aai-schema/src/main/xjb/bindings-onap.xjb +++ b/aai-schema/src/main/xjb/bindings-onap.xjb @@ -89,6 +89,16 @@ </jaxb:bindings> <jaxb:bindings scd="x-schema::a" xmlns:a="http://org.onap.aai.inventory/v24"> <jaxb:schemaBindings> + <jaxb:package name="org.onap.aai.domain.yang.v24"/> + </jaxb:schemaBindings> + </jaxb:bindings> + <jaxb:bindings scd="x-schema::a" xmlns:a="http://org.onap.aai.inventory/v25"> + <jaxb:schemaBindings> + <jaxb:package name="org.onap.aai.domain.yang.v25"/> + </jaxb:schemaBindings> + </jaxb:bindings> + <jaxb:bindings scd="x-schema::a" xmlns:a="http://org.onap.aai.inventory/v26"> + <jaxb:schemaBindings> <jaxb:package name="org.onap.aai.domain.yang"/> </jaxb:schemaBindings> </jaxb:bindings> |