AETHER-2837 support subnet in Application filter
Change-Id: I5c8e3b3b0ab73cf8e9223fd754519bf46a673746
diff --git a/aether-roc-umbrella/Chart.yaml b/aether-roc-umbrella/Chart.yaml
index e8f5fcd..545cd90 100644
--- a/aether-roc-umbrella/Chart.yaml
+++ b/aether-roc-umbrella/Chart.yaml
@@ -7,7 +7,7 @@
description: Aether ROC Umbrella chart to deploy all Aether ROC
kubeVersion: ">=1.18.0"
type: application
-version: 2.0.16
+version: 2.0.17
appVersion: v0.0.0
keywords:
- aether
@@ -24,7 +24,7 @@
- name: config-model-aether-2
condition: onos-config.models.aether.v2.enabled
repository: "file://../config-models/aether-2.0.x"
- version: 2.0.6
+ version: 2.0.7
- name: config-model-aether-4
condition: onos-config.models.aether.v4.enabled
repository: "file://../config-models/aether-4.x"
diff --git a/config-models/aether-2.0.x/Chart.yaml b/config-models/aether-2.0.x/Chart.yaml
index 26632d3..bcffb03 100644
--- a/config-models/aether-2.0.x/Chart.yaml
+++ b/config-models/aether-2.0.x/Chart.yaml
@@ -4,7 +4,7 @@
apiVersion: v2
name: config-model-aether-2
-version: 2.0.6
+version: 2.0.7
kubeVersion: ">=1.18.0"
appVersion: 2.0.0
description: Aether config model
diff --git a/config-models/aether-2.0.x/files/aether-2.0.0.tree b/config-models/aether-2.0.x/files/aether-2.0.0.tree
index 0065ab6..808e65b 100644
--- a/config-models/aether-2.0.x/files/aether-2.0.0.tree
+++ b/config-models/aether-2.0.x/files/aether-2.0.0.tree
@@ -20,7 +20,7 @@
| +--rw application-id application-id
| +--rw display-name? string
| +--rw description? description
- | +--rw address ietf:host
+ | +--rw address at:host-or-network
| +--rw endpoint* [endpoint-id]
| +--rw endpoint-id yg:yang-identifier
| +--rw display-name? string
@@ -153,3 +153,4 @@
+--rw subnet inet:ipv4-prefix
+--rw admin-status? at:admin-status
+--rw mtu? at:mtu
+
diff --git a/config-models/aether-2.0.x/files/yang/onf-aether-types.yang b/config-models/aether-2.0.x/files/yang/onf-aether-types.yang
index e0d655d..5e6fbfd 100755
--- a/config-models/aether-2.0.x/files/yang/onf-aether-types.yang
+++ b/config-models/aether-2.0.x/files/yang/onf-aether-types.yang
@@ -189,4 +189,23 @@
description "long description field";
}
}
+
+ typedef ipv4-subnet {
+ type string {
+ pattern
+ '(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}'
+ + '([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])'
+ + '(/([0-9]|[1-2][0-9]|3[0-2]))';
+ }
+ description "IPv4 network in CIDR notation";
+ }
+
+ typedef host-or-network {
+ type union {
+ type inet:host;
+ type ipv4-subnet;
+ }
+ description "hostname, ip-address, or network";
+ }
}
+
\ No newline at end of file
diff --git a/config-models/aether-2.0.x/files/yang/onf-application.yang b/config-models/aether-2.0.x/files/yang/onf-application.yang
index 31aa19d..d8eb9d1 100755
--- a/config-models/aether-2.0.x/files/yang/onf-application.yang
+++ b/config-models/aether-2.0.x/files/yang/onf-application.yang
@@ -51,7 +51,7 @@
uses at:desc-display-name;
leaf address {
- type ietf:host;
+ type at:host-or-network;
mandatory true;
description
"Address of this application. Either a hostname, an IP, or a subnet.";