From: hoban <adrian.hoban@intel.com>
Date: Fri, 2 Mar 2018 14:37:58 +0000 (+0100)
Subject: Merge changes Iddfdf664,Ifd7f98a4
X-Git-Tag: v3.1.0~8
X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FIM.git;a=commitdiff_plain;h=b869fa14a97777a70130db6eaf37e06c5b8fff14;hp=00be8bb5c4445cc0e8b9a5a90189176a3d82ec42

Merge changes Iddfdf664,Ifd7f98a4

* changes:
  Generalize member-vnf-index as string in constituent-vnfd in NSD to allow symbolic names
  Feature 639: support of floating IPs
---

diff --git a/models/yang/nsd-base.yang b/models/yang/nsd-base.yang
index c332869..8403730 100644
--- a/models/yang/nsd-base.yang
+++ b/models/yang/nsd-base.yang
@@ -175,6 +175,15 @@ module nsd-base
             "Type of the connection point.";
         type manotypes:connection-point-type;
       }
+
+      leaf floating-ip-required {
+        description
+            "Boolean parameter to indicate whether the CP must be exposed.
+             A public IP address will be allocated to this CP if exposed is true.
+             The default is false meaning a floating IP address is not required.
+             It must be explicitly asked for a floating IP address to be allocated.";
+        type boolean;
+      }
     }
 
     list scaling-group-descriptor {
diff --git a/models/yang/nsd.yang b/models/yang/nsd.yang
index 55b40eb..19aebe9 100644
--- a/models/yang/nsd.yang
+++ b/models/yang/nsd.yang
@@ -65,7 +65,7 @@ module nsd
           "Identifier/index for the VNFD. This separate id
            is required to ensure that multiple VNFs can be
            part of single NS";
-        type uint64;
+        type string;
       }
 
       leaf vnfd-id-ref {