commit | ee0a68f6ef1d3267992322f268d77a213a2facb6 | [log] [tgz] |
---|---|---|
author | Scott Baker <smbaker@gmail.com> | Mon Feb 07 16:35:43 2022 -0800 |
committer | Scott Baker <smbaker@gmail.com> | Mon Feb 07 16:35:43 2022 -0800 |
tree | bbbc2fcf25b4a8a2a3f9748ff86e7f8cfff20e62 | |
parent | 6fc996813eaf83a2bc6392054459bbf521ca3e42 [diff] |
AETHER-2837 support subnet in Application filter Change-Id: I5c8e3b3b0ab73cf8e9223fd754519bf46a673746
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.";