X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=rwcal%2Fplugins%2Fyang%2Frwcal.yang;h=1ed2f7bdb9af684179279ba7e9babd42da7fb820;hb=4bd9025f301e1e341af70f6f3a0fb5f239f59b44;hp=872375d4c2d0090854fe5f603e0612012706142c;hpb=66ed44eebbbe7bbc23d44780ae11e7feaa4b43ba;p=osm%2FSO.git

diff --git a/rwcal/plugins/yang/rwcal.yang b/rwcal/plugins/yang/rwcal.yang
index 872375d4..1ed2f7bd 100644
--- a/rwcal/plugins/yang/rwcal.yang
+++ b/rwcal/plugins/yang/rwcal.yang
@@ -100,62 +100,6 @@ module rwcal
 
   uses connection-status;
 
-  typedef sdn-account-type {
-    description "SDN account type";
-    type enumeration {
-      enum odl;
-      enum mock;
-      enum sdnsim;
-    }
-  }
-
-  grouping sdn-provider-auth {
-    leaf account-type {
-      type sdn-account-type;
-    }
-
-    choice provider-specific-info {
-      container odl {
-        leaf username {
-          type string {
-            length "1..255";
-          }
-        }
-
-        leaf password {
-          type string {
-            length "1..32";
-          }
-        }
-
-        leaf url {
-          type string {
-            length "1..255";
-          }
-        }
-      }
-      container mock {
-        leaf username {
-          type string;
-        }
-        leaf plugin-name {
-          type string;
-          default "rwsdn_mock";
-        }
-      }
-
-      container sdnsim {
-        leaf username {
-          type string;
-        }
-        leaf plugin-name {
-          type string;
-          default "rwsdn_sim";
-        }
-      }
-    }
-  }
-
   grouping provider-auth {
     leaf account-type {
       type manotypes:cloud-account-type;
@@ -247,6 +191,11 @@ module rwcal
           mandatory true;
         }
 
+        leaf region {
+          type string;
+          default "RegionOne";
+        }
+        
         leaf admin {
           type boolean;
           default false;
@@ -982,6 +931,10 @@ module rwcal
         description "Name of the security group";
         type string;
       }
+      leaf port-security-enabled {
+        description "Enables the port security";
+        type boolean;
+      }
 
       uses connection-point-type;
     }
@@ -1010,7 +963,7 @@ module rwcal
       }
     }
  
-    uses manotypes:custom-boot-data;
+    uses manotypes:supplemental-boot-data;
 
     list volumes {
       key "name";
@@ -1061,6 +1014,10 @@ module rwcal
         type boolean;
         default false;
       }
+      leaf port-security-enabled {
+        description "Enables the port security";
+        type boolean;
+      }
 
       uses connection-point-type;
     }
@@ -1244,7 +1201,7 @@ module rwcal
       description "Console URL from the VIM, if available";
     }
 
-    uses manotypes:custom-boot-data;
+    uses manotypes:supplemental-boot-data;
 
     list volumes {
       key "name";
@@ -1260,7 +1217,6 @@ module rwcal
         rwpb:field-string-max 64;
         type string;
       }
-      uses manotypes:custom-meta-data;
     } 
   }