aboutsummaryrefslogtreecommitdiffstats
path: root/aai-schema/src/main
diff options
context:
space:
mode:
authorSrinivasan Ramanathan <srinivasan.ramanathan2@us.fujitsu.com>2020-01-17 11:17:44 +0000
committerSrinivasan Ramanathan <srinivasan.ramanathan2@us.fujitsu.com>2020-01-17 11:18:02 +0000
commit7784d82d95e767a7ed61c7591762d47ba5f7e0e4 (patch)
treed1852cfb60c5f2b0b5f0232a8512433757131bea /aai-schema/src/main
parent7c8d9e4024189e567556385ef6328d7fe64bc337 (diff)
Changes for MDONS usecase
Updated schema for p-interface, logical-link, esr-thirdparty-sdnc, service-instance Updated DbEdgeRules for the usecase Updated stored-queries for new custom queries needed for the usecase Change-Id: If052355944c7c1cd72b54e83323909733de21c98 Issue-ID: AAI-2683 Signed-off-by: Srinivasan Ramanathan <srinivasan.ramanathan2@us.fujitsu.com>
Diffstat (limited to 'aai-schema/src/main')
-rw-r--r--aai-schema/src/main/resources/onap/aai_schema/aai_schema_v19.xsd63
-rw-r--r--aai-schema/src/main/resources/onap/dbedgerules/v19/DbEdgeRules_esr_v19.json13
-rw-r--r--aai-schema/src/main/resources/onap/dbedgerules/v19/DbEdgeRules_v19.json12
-rw-r--r--aai-schema/src/main/resources/onap/oxm/v19/aai_oxm_v19.xml45
4 files changed, 133 insertions, 0 deletions
diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v19.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v19.xsd
index 0b7cc27..a9f56c4 100644
--- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v19.xsd
+++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v19.xsd
@@ -2508,6 +2508,13 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
</xs:appinfo>
</xs:annotation>
</xs:element>
+ <xs:element name="available-capacity" type="xs:string" minOccurs="0">
+ <xs:annotation>
+ <xs:appinfo>
+ <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Captures the units corresponding to the speed")</annox:annotate>
+ </xs:appinfo>
+ </xs:annotation>
+ </xs:element>
<xs:element name="port-description" type="xs:string" minOccurs="0">
<xs:annotation>
<xs:appinfo>
@@ -2536,6 +2543,13 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
</xs:appinfo>
</xs:annotation>
</xs:element>
+ <xs:element name="network-interface-type" type="xs:string" minOccurs="0">
+ <xs:annotation>
+ <xs:appinfo>
+ <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicates the physical properties of the interface.")</annox:annotate>
+ </xs:appinfo>
+ </xs:annotation>
+ </xs:element>
<xs:element name="prov-status" type="xs:string" minOccurs="0">
<xs:annotation>
<xs:appinfo>
@@ -3302,6 +3316,13 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
</xs:appinfo>
</xs:annotation>
</xs:element>
+ <xs:element name="domain-type" type="xs:string" minOccurs="0">
+ <xs:annotation>
+ <xs:appinfo>
+ <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Domain type of the SDNC controllerr.")</annox:annotate>
+ </xs:appinfo>
+ </xs:annotation>
+ </xs:element>
<xs:element name="resource-version" type="xs:string" minOccurs="0">
<xs:annotation>
<xs:appinfo>
@@ -3633,6 +3654,34 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
</xs:appinfo>
</xs:annotation>
</xs:element>
+ <xs:element name="service-rate" type="xs:string" minOccurs="0">
+ <xs:annotation>
+ <xs:appinfo>
+ <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Rate of the service instance.")</annox:annotate>
+ </xs:appinfo>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="service-layer" type="xs:string" minOccurs="0">
+ <xs:annotation>
+ <xs:appinfo>
+ <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Definition of the service layer.")</annox:annotate>
+ </xs:appinfo>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="due-date" type="xs:string" minOccurs="0">
+ <xs:annotation>
+ <xs:appinfo>
+ <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Due date of the service creation.")</annox:annotate>
+ </xs:appinfo>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="end-date" type="xs:string" minOccurs="0">
+ <xs:annotation>
+ <xs:appinfo>
+ <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="End date of the service creation.")</annox:annotate>
+ </xs:appinfo>
+ </xs:annotation>
+ </xs:element>
<xs:element name="environment-context" type="xs:string" minOccurs="0">
<xs:annotation>
<xs:appinfo>
@@ -4759,6 +4808,20 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
</xs:appinfo>
</xs:annotation>
</xs:element>
+ <xs:element name="available-capacity" type="xs:string" minOccurs="0">
+ <xs:annotation>
+ <xs:appinfo>
+ <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Captures the units corresponding to the speed")</annox:annotate>
+ </xs:appinfo>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="admin-state" type="xs:string" minOccurs="0">
+ <xs:annotation>
+ <xs:appinfo>
+ <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Captures the administrative state of the link")</annox:annotate>
+ </xs:appinfo>
+ </xs:annotation>
+ </xs:element>
<xs:element name="ip-version" type="xs:string" minOccurs="0">
<xs:annotation>
<xs:appinfo>
diff --git a/aai-schema/src/main/resources/onap/dbedgerules/v19/DbEdgeRules_esr_v19.json b/aai-schema/src/main/resources/onap/dbedgerules/v19/DbEdgeRules_esr_v19.json
index baa6ab8..9849616 100644
--- a/aai-schema/src/main/resources/onap/dbedgerules/v19/DbEdgeRules_esr_v19.json
+++ b/aai-schema/src/main/resources/onap/dbedgerules/v19/DbEdgeRules_esr_v19.json
@@ -61,6 +61,19 @@
"default": "true"
},
{
+ "from": "esr-thirdparty-sdnc",
+ "to": "network-resource",
+ "label": "org.onap.relationships.inventory.AppliesTo",
+ "direction": "OUT",
+ "multiplicity": "ONE2MANY",
+ "contains-other-v": "NONE",
+ "delete-other-v": "NONE",
+ "SVC-INFRA": "NONE",
+ "prevent-delete": "NONE",
+ "default": "true",
+ "description":"For MDONS Usecase"
+ },
+ {
"from": "esr-system-info",
"to": "cloud-region",
"label": "org.onap.relationships.inventory.BelongsTo",
diff --git a/aai-schema/src/main/resources/onap/dbedgerules/v19/DbEdgeRules_v19.json b/aai-schema/src/main/resources/onap/dbedgerules/v19/DbEdgeRules_v19.json
index 2d448aa..b581854 100644
--- a/aai-schema/src/main/resources/onap/dbedgerules/v19/DbEdgeRules_v19.json
+++ b/aai-schema/src/main/resources/onap/dbedgerules/v19/DbEdgeRules_v19.json
@@ -937,6 +937,18 @@
"description":""
},
{
+ "from": "service-instance",
+ "to": "p-interface",
+ "label": "org.onap.relationships.inventory.ComposedOf",
+ "direction": "OUT",
+ "multiplicity": "ONE2MANY",
+ "contains-other-v": "NONE",
+ "delete-other-v": "NONE",
+ "prevent-delete": "NONE",
+ "default": "true",
+ "description":"For MDONS Use case"
+ },
+ {
"from": "subnet",
"to": "l3-network",
"label": "org.onap.relationships.inventory.BelongsTo",
diff --git a/aai-schema/src/main/resources/onap/oxm/v19/aai_oxm_v19.xml b/aai-schema/src/main/resources/onap/oxm/v19/aai_oxm_v19.xml
index 01e4a5a..4326ad4 100644
--- a/aai-schema/src/main/resources/onap/oxm/v19/aai_oxm_v19.xml
+++ b/aai-schema/src/main/resources/onap/oxm/v19/aai_oxm_v19.xml
@@ -394,6 +394,11 @@
<xml-property name="description" value="password used to access SDNC server."/>
</xml-properties>
</xml-element>
+ <xml-element java-attribute="domainType" name="domain-type" type="java.lang.String">
+ <xml-properties>
+ <xml-property name="description" value="Domain type of the SDNC controllerr."/>
+ </xml-properties>
+ </xml-element>
<xml-element java-attribute="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."/>
@@ -2288,6 +2293,11 @@
<xml-property name="description" value="Nature of the services and connectivity on this port."/>
</xml-properties>
</xml-element>
+ <xml-element java-attribute="domainType" name="domain-type" type="java.lang.String">
+ <xml-properties>
+ <xml-property name="description" value="Domain type of the SDNC controllerr."/>
+ </xml-properties>
+ </xml-element>
<xml-element java-attribute="equipmentIdentifier" name="equipment-identifier" type="java.lang.String">
<xml-properties>
<xml-property name="description" value="CLEI or other specification for p-interface hardware."/>
@@ -2303,6 +2313,11 @@
<xml-property name="description" value="Indicates the physical properties of the interface."/>
</xml-properties>
</xml-element>
+ <xml-element java-attribute="networkInterfaceType" name="network-interface-type" type="java.lang.String">
+ <xml-properties>
+ <xml-property name="description" value="Indicates the physical properties of the interface."/>
+ </xml-properties>
+ </xml-element>
<xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
<xml-properties>
<xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems."/>
@@ -2998,6 +3013,26 @@
<xml-property name="description" value="String capturing the service role."/>
</xml-properties>
</xml-element>
+ <xml-element java-attribute="serviceRate" name="service-rate" type="java.lang.String">
+ <xml-properties>
+ <xml-property name="description" value="Rate of the service instance."/>
+ </xml-properties>
+ </xml-element>
+ <xml-element java-attribute="serviceLayer" name="service-layer" type="java.lang.String">
+ <xml-properties>
+ <xml-property name="description" value="Definition of the service layer."/>
+ </xml-properties>
+ </xml-element>
+ <xml-element java-attribute="dueDate" name="due-date" type="java.lang.String">
+ <xml-properties>
+ <xml-property name="description" value="Due date of the service creation."/>
+ </xml-properties>
+ </xml-element>
+ <xml-element java-attribute="endDate" name="end-date" type="java.lang.String">
+ <xml-properties>
+ <xml-property name="description" value="End date of the service creation."/>
+ </xml-properties>
+ </xml-element>
<xml-element java-attribute="environmentContext" name="environment-context" type="java.lang.String">
<xml-properties>
<xml-property name="description" value="This field will store the environment context assigned to the service-instance."/>
@@ -3458,6 +3493,16 @@
<xml-property name="description" value="Captures the units corresponding to the speed"/>
</xml-properties>
</xml-element>
+ <xml-element java-attribute="availableCapacity" name="available-capacity" type="java.lang.String">
+ <xml-properties>
+ <xml-property name="description" value="Captures the units corresponding to the speed"/>
+ </xml-properties>
+ </xml-element>
+ <xml-element java-attribute="adminState" name="admin-state" type="java.lang.String">
+ <xml-properties>
+ <xml-property name="description" value="Captures the administrative state of the link"/>
+ </xml-properties>
+ </xml-element>
<xml-element java-attribute="ipVersion" name="ip-version" type="java.lang.String">
<xml-properties>
<xml-property name="description" value="v4, v6, or ds for dual stack"/>