Use Round Robin in Address Ranges

jujokini · jujokini · commit 8e67db162aa8 · 2025-05-09T09:43:07.000+03:00
Signed-off-by: Jukka Jokiniva &lt;jukka.jokiniva@qt.io&gt;
diff --git a/include/AddressRange.h b/include/AddressRange.h
@@ -120,6 +120,7 @@ class AddressRange
      *    - IP
      *    - ULA_PREFIX
      *    - GLOBAL_PREFIX
+     *    - NEXT_INDEX*
      *
      *  The following can be defined to override VNET values:
      *    - BRIDGE
@@ -437,7 +438,7 @@ class AddressRange
      *  Base constructor it cannot be called directly but from the
      *  AddressRange factory constructor.
      */
-    AddressRange(unsigned int _id):id(_id) {};
+    AddressRange(unsigned int _id):id(_id), next(0) {};
 
     /* ---------------------------------------------------------------------- */
     /* Address/AR helper functions to build/parse driver messages             */
@@ -557,6 +558,11 @@ class AddressRange
      */
     std::map<unsigned int, long long> allocated;
 
+    /**
+     *  Lookup index for the next free address lease
+     */
+    unsigned int next;
+
 private:
     /* ---------------------------------------------------------------------- */
     /* String to binary conversion functions for different address types      */
diff --git a/include/AddressRangeInternal.h b/include/AddressRangeInternal.h
@@ -26,7 +26,7 @@ class VectorAttribute;
 class AddressRangeInternal : public AddressRange
 {
 public:
-    AddressRangeInternal(unsigned int _id):AddressRange(_id), next(0) {};
+    AddressRangeInternal(unsigned int _id):AddressRange(_id) {};
 
     virtual ~AddressRangeInternal() {};
 
@@ -90,11 +90,6 @@ class AddressRangeInternal : public AddressRange
     };
 
 private:
-    /**
-     *  Lookup index for the next free address lease
-     */
-    unsigned int next;
-
     /**
      *  Get a free lease
      *    @param index of the free lease, undefined if error
@@ -110,7 +105,7 @@ class AddressRangeInternal : public AddressRange
      *    @param msg with error description if any
      *    @return 0 on success -1 otherwise
      */
-    int get_range_addr(unsigned int& index, unsigned int sz, std::string& msg) const;
+    int get_range_addr(unsigned int& index, unsigned int sz, std::string& msg);
 };
 
 #endif
diff --git a/share/doc/xsd/vnet_pool.xsd b/share/doc/xsd/vnet_pool.xsd
@@ -97,6 +97,7 @@
                           <xs:element name="MAC" type="xs:string"/>
                           <xs:element name="PARENT_NETWORK_AR_ID" type="xs:string" minOccurs="0"/>
                           <xs:element name="SIZE" type="xs:integer"/>
+                          <xs:element name="NEXT_INDEX" type="xs:integer"/>
                           <xs:element name="TYPE" type="xs:string"/>
                           <xs:element name="ULA_PREFIX" type="xs:string" minOccurs="0"/>
                           <xs:element name="VN_MAD" type="xs:string"  minOccurs="0"/>
@@ -112,4 +113,4 @@
       </xs:sequence>
     </xs:complexType>
   </xs:element>
-</xs:schema>
+</xs:schema>
diff --git a/src/oca/go/src/goca/schemas/virtualnetwork/virtualnetwork.go b/src/oca/go/src/goca/schemas/virtualnetwork/virtualnetwork.go
@@ -67,6 +67,7 @@ type AR struct {
 	MAC               string        `xml:"MAC,omitempty"`
 	ParentNetworkARID string        `xml:"PARENT_NETWORK_AR_ID,omitempty"` // minOccurs=0
 	Size              int           `xml:"SIZE"`
+        NextIndex         int           `xml:"NEXT_INDEX,omitempty"`
 	Type              string        `xml:"TYPE"`
 	ULAPrefix         string        `xml:"ULA_PREFIX,omitempty"` // minOccurs=0
 	VNMAD             string        `xml:"VN_MAD,omitempty"`     // minOccurs=0
diff --git a/src/vnm/AddressRange.cc b/src/vnm/AddressRange.cc
@@ -263,6 +263,13 @@ int AddressRange::from_attr(VectorAttribute *vattr, string& error_msg)
         return -1;
     }
 
+    /* ------------------------- Next Index -------------------------------- */
+
+    if ( vattr->vector_value("NEXT_INDEX", next) != 0 )
+    {
+        next = 0;
+    }
+
     /* ------------------------- Security Groups ---------------------------- */
 
     value = vattr->vector_value("SECURITY_GROUPS");
@@ -488,6 +495,8 @@ int AddressRange::update_attributes(
 
     vup->replace("SIZE", size);
 
+    vup->replace("NEXT_INDEX", next);
+
     string value = vup->vector_value("SECURITY_GROUPS");
 
     security_groups.clear();
@@ -562,6 +571,11 @@ int AddressRange::from_vattr_db(VectorAttribute *vattr)
 
     rc += vattr->vector_value("SIZE", size);
 
+    if ( vattr->vector_value("NEXT_INDEX", next) != 0 )
+    {
+        next = 0;
+    }
+
     rc += mac_to_i(vattr->vector_value("MAC"), mac);
 
     if (is_ipv4())
@@ -737,6 +751,7 @@ void AddressRange::to_xml(ostringstream &oss) const
     }
 
     oss << "<USED_LEASES>" << get_used_addr() << "</USED_LEASES>";
+    oss << "<NEXT_INDEX>" << next << "</NEXT_INDEX>";
     oss << "</AR>";
 }
 
@@ -907,7 +922,7 @@ void AddressRange::to_xml(ostringstream &oss, const vector<int>& vms,
 
         oss << "</LEASES>";
     }
-
+    oss << "<NEXT_INDEX>" << next << "</NEXT_INDEX>";
     oss << "</AR>";
 }
 
@@ -1429,6 +1444,8 @@ void AddressRange::allocated_to_attr()
     }
 
     attr->replace("ALLOCATED", oss.str());
+
+    attr->replace("NEXT_INDEX", next);
 }
 
 /* -------------------------------------------------------------------------- */
@@ -1854,6 +1871,7 @@ const char * AddressRange::SG_RULE_ATTRIBUTES[] =
     "AR_ID",
     "TYPE",
     "SIZE",
+    "NEXT_INDEX",
     "MAC",
     "IP",
     "IP6"
@@ -2005,6 +2023,8 @@ int AddressRange::reserve_addr(int vid, unsigned int rsize, AddressRange *rar)
 
     new_ar->replace("SIZE", rsize);
 
+    new_ar->replace("NEXT_INDEX", next);
+
     new_ar->remove("IPAM_MAD");
 
     rar->from_vattr(new_ar, errmsg);
@@ -2064,6 +2084,8 @@ int AddressRange::reserve_addr_by_index(int vid, unsigned int rsize,
 
     new_ar->replace("SIZE", rsize);
 
+    new_ar->replace("NEXT_INDEX", next);
+
     new_ar->remove("IPAM_MAD");
 
     rar->from_vattr(new_ar, errmsg);
diff --git a/src/vnm/AddressRangeInternal.cc b/src/vnm/AddressRangeInternal.cc
@@ -19,38 +19,42 @@
 int AddressRangeInternal::get_single_addr(unsigned int& index, std::string& msg)
 {
     unsigned int ar_size = get_size();
+    unsigned int next_original = next;
 
     for ( unsigned int i=0; i<ar_size; i++, next = (next+1)%ar_size )
     {
         if ( allocated.count(next) == 0 )
         {
             index = next;
+            next = (next+1)%ar_size;
             return 0;
         }
     }
 
+    next = next_original;
     msg = "Not free addresses available";
     return -1;
 }
 
 int AddressRangeInternal::get_range_addr(unsigned int& index,
-                                         unsigned int rsize, std::string& msg) const
+                                         unsigned int rsize, std::string& msg)
 {
     unsigned int ar_size = get_size();
+    unsigned int next_original = next;
     bool valid;
 
-    for (unsigned int i=0; i< ar_size; i++)
+    for (unsigned int i=0; i< ar_size; i++, next = (next+1)%ar_size )
     {
-        if ( allocated.count(i) != 0 )
+        if ( allocated.count(next) != 0 )
         {
             continue;
         }
 
         valid = true;
 
-        for (unsigned int j=0; j<rsize; j++, i++)
+        for (unsigned int j=0; j<rsize; j++, i++, next++)
         {
-            if ( allocated.count(i) != 0 || i >= ar_size )
+            if ( allocated.count(next) != 0 || i >= ar_size || next >= ar_size )
             {
                 valid = false;
                 break;
@@ -59,11 +63,13 @@ int AddressRangeInternal::get_range_addr(unsigned int& index,
 
         if (valid == true)
         {
-            index = i - rsize;
+            index = next - rsize;
+            next = next%ar_size;
             return 0;
         }
     }
 
+    next = next_original;
     msg = "There isn't a continuous range big enough";
     return -1;
 }

Original file line number	Diff line number	Diff line change
`@@ -19,38 +19,42 @@`
`19`	`19`	`int AddressRangeInternal::get_single_addr(unsigned int& index, std::string& msg)`
`20`	`20`	`{`
`21`	`21`	`unsigned int ar_size = get_size();`
	`22`	`+ unsigned int next_original = next;`
`22`	`23`
`23`	`24`	`for ( unsigned int i=0; i<ar_size; i++, next = (next+1)%ar_size )`
`24`	`25`	`{`
`25`	`26`	`if ( allocated.count(next) == 0 )`
`26`	`27`	`{`
`27`	`28`	`index = next;`
	`29`	`+ next = (next+1)%ar_size;`
`28`	`30`	`return 0;`
`29`	`31`	`}`
`30`	`32`	`}`
`31`	`33`
	`34`	`+ next = next_original;`
`32`	`35`	`msg = "Not free addresses available";`
`33`	`36`	`return -1;`
`34`	`37`	`}`
`35`	`38`
`36`	`39`	`int AddressRangeInternal::get_range_addr(unsigned int& index,`
`37`		`- unsigned int rsize, std::string& msg) const`
	`40`	`+ unsigned int rsize, std::string& msg)`
`38`	`41`	`{`
`39`	`42`	`unsigned int ar_size = get_size();`
	`43`	`+ unsigned int next_original = next;`
`40`	`44`	`bool valid;`
`41`	`45`
`42`		`- for (unsigned int i=0; i< ar_size; i++)`
	`46`	`+ for (unsigned int i=0; i< ar_size; i++, next = (next+1)%ar_size )`
`43`	`47`	`{`
`44`		`- if ( allocated.count(i) != 0 )`
	`48`	`+ if ( allocated.count(next) != 0 )`
`45`	`49`	`{`
`46`	`50`	`continue;`
`47`	`51`	`}`
`48`	`52`
`49`	`53`	`valid = true;`
`50`	`54`
`51`		`- for (unsigned int j=0; j<rsize; j++, i++)`
	`55`	`+ for (unsigned int j=0; j<rsize; j++, i++, next++)`
`52`	`56`	`{`
`53`		`- if ( allocated.count(i) != 0 \|\| i >= ar_size )`
	`57`	`+ if ( allocated.count(next) != 0 \|\| i >= ar_size \|\| next >= ar_size )`
`54`	`58`	`{`
`55`	`59`	`valid = false;`
`56`	`60`	`break;`
`@@ -59,11 +63,13 @@ int AddressRangeInternal::get_range_addr(unsigned int& index,`
`59`	`63`
`60`	`64`	`if (valid == true)`
`61`	`65`	`{`
`62`		`- index = i - rsize;`
	`66`	`+ index = next - rsize;`
	`67`	`+ next = next%ar_size;`
`63`	`68`	`return 0;`
`64`	`69`	`}`
`65`	`70`	`}`
`66`	`71`
	`72`	`+ next = next_original;`
`67`	`73`	`msg = "There isn't a continuous range big enough";`
`68`	`74`	`return -1;`
`69`	`75`	`}`