Feature 639: support of floating IPs

[osm/IM.git] / models / yang / nsd-base.yang

diff --git a/models/yang/nsd-base.yang b/models/yang/nsd-base.yang
index 6c852cb..8403730 100644 (file)
--- a/models/yang/nsd-base.yang
+++ b/models/yang/nsd-base.yang
@@ -23,10 +23,6 @@ module nsd-base
   namespace "http://riftio.com/ns/riftware-1.0/nsd-base";
   prefix "nsd-base";
 
   namespace "http://riftio.com/ns/riftware-1.0/nsd-base";
   prefix "nsd-base";
 

-  import rw-pb-ext {
-    prefix "rwpb";
-  }
-

   import ietf-inet-types {
     prefix "inet";
   }
   import ietf-inet-types {
     prefix "inet";
   }


@@ -179,6 +175,15 @@ module nsd-base
             "Type of the connection point.";
         type manotypes:connection-point-type;
       }
             "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 {
     }
 
     list scaling-group-descriptor {


@@ -578,7 +583,6 @@ module nsd-base
     uses manotypes:ip-profile-list;
 
     list initial-service-primitive {
     uses manotypes:ip-profile-list;
 
     list initial-service-primitive {

-      rwpb:msg-new NsdInitialServicePrimitive;

       description
         "Initial set of service primitives for NSD.";
       key "seq";
       description
         "Initial set of service primitives for NSD.";
       key "seq";


@@ -587,7 +591,6 @@ module nsd-base
     }
 
     list terminate-service-primitive {
     }
 
     list terminate-service-primitive {

-      rwpb:msg-new NsdTerminateServicePrimitive;

       description
         "Set of service primitives during
          termination for NSD.";
       description
         "Set of service primitives during
          termination for NSD.";


@@ -743,11 +746,6 @@ module nsd-base
       default false;
     }
 
       default false;
     }
 

-    leaf ipv4-nat-pool-name{
-      type string;
-      description "IPV4 nat pool name";
-    }
-

     choice init-params {
       description "Extra parameters for VLD instantiation";
 
     choice init-params {
       description "Extra parameters for VLD instantiation";