AETHER-2707 Mark ip-domain.dnn as mandatory; remove deprecated connectivity-service fields
Change-Id: I530c4e58a8ce0526fe0e6cf5d0c4109b62481e00
diff --git a/config-models/aether-4.x/files/yang/onf-connectivity-service.yang b/config-models/aether-4.x/files/yang/onf-connectivity-service.yang
index e5aaaff..dfcd8d0 100755
--- a/config-models/aether-4.x/files/yang/onf-connectivity-service.yang
+++ b/config-models/aether-4.x/files/yang/onf-connectivity-service.yang
@@ -12,7 +12,7 @@
organization "Open Networking Foundation.";
contact "Scott Baker";
- description
+ description
"An Aether Connectivity service is the linkage between the
ROC and a core that provides connectivity.";
@@ -52,24 +52,6 @@
description "description of this connectivity service";
}
- // deprecated
- leaf spgwc-endpoint {
- type inet:uri;
- description "url of the spgwc service";
- }
-
- // deprecated
- leaf hss-endpoint {
- type inet:uri;
- description "url of the hss service";
- }
-
- // deprecated
- leaf pcrf-endpoint {
- type inet:uri;
- description "url of the pcrf service";
- }
-
leaf core-5g-endpoint {
type inet:uri;
description "url of the 5g core";
diff --git a/config-models/aether-4.x/files/yang/onf-ip-domain.yang b/config-models/aether-4.x/files/yang/onf-ip-domain.yang
index 837647a..fdd8c2b 100755
--- a/config-models/aether-4.x/files/yang/onf-ip-domain.yang
+++ b/config-models/aether-4.x/files/yang/onf-ip-domain.yang
@@ -51,8 +51,9 @@
leaf dnn {
type at:dnn;
+ mandatory true;
description "DNN/APN";
- }
+ }
leaf dns-primary {
type inet:ip-address;
@@ -80,7 +81,7 @@
leaf mtu {
type at:mtu;
description "maximum transmission unit";
- }
+ }
leaf description {
type at:description;
@@ -96,7 +97,7 @@
mandatory true;
description
"Link to enterprise that owns this IP-Domain";
- }
+ }
}
- }
+ }
}
diff --git a/config-models/aether-4.x/files/yang/onf-vcs.yang b/config-models/aether-4.x/files/yang/onf-vcs.yang
index a0dbbff..9597f9a 100755
--- a/config-models/aether-4.x/files/yang/onf-vcs.yang
+++ b/config-models/aether-4.x/files/yang/onf-vcs.yang
@@ -11,7 +11,6 @@
import onf-application{ prefix app; }
import onf-device-group{ prefix dg; }
import onf-enterprise{ prefix ent; }
- import onf-template{ prefix vt; }
import onf-upf { prefix upf; }
import onf-site{ prefix st; }