Merge "Feature 5648: specification of IP addresses at CP level"
diff --git a/models/yang/nsd.yang b/models/yang/nsd.yang
index 4a88eac..6c8b8c5 100644
--- a/models/yang/nsd.yang
+++ b/models/yang/nsd.yang
@@ -35,6 +35,10 @@
prefix "manotypes";
}
+ import ietf-inet-types {
+ prefix "inet";
+ }
+
revision 2017-02-28 {
description
"Update model to support projects.";
@@ -100,6 +104,15 @@
}
}
+ leaf vnfd-connection-point-ref {
+ description "A reference to a connection point name";
+ type leafref {
+ path "/vnfd:vnfd-catalog/vnfd:vnfd" +
+ "[vnfd:id = current()/../vnfd-id-ref]/" +
+ "vnfd:connection-point/vnfd:name";
+ }
+ }
+
leaf vnfd-id-ref {
description
"A reference to a VNFD";
@@ -110,14 +123,11 @@
}
}
- leaf vnfd-connection-point-ref {
- description "A reference to a connection point name";
- type leafref {
- path "/vnfd:vnfd-catalog/vnfd:vnfd" +
- "[vnfd:id = current()/../vnfd-id-ref]/" +
- "vnfd:connection-point/vnfd:name";
- }
+ leaf ip-address {
+ description "IP address of the connection point";
+ type inet:ip-address;
}
+
}
}
}
diff --git a/models/yang/vnfd-base.yang b/models/yang/vnfd-base.yang
index 8e4333a..9163e33 100644
--- a/models/yang/vnfd-base.yang
+++ b/models/yang/vnfd-base.yang
@@ -303,6 +303,10 @@
path "../../../vdu/internal-connection-point/id";
}
}
+ leaf ip-address {
+ description "IP address of the internal connection point";
+ type inet:ip-address;
+ }
}
uses manotypes:provider-network;