DaanHoogland commented on code in PR #9796:
URL: https://github.com/apache/cloudstack/pull/9796#discussion_r1812611867
##########
python/incubation/cloud-web-ipallocator.py:
##########
@@ -16,144 +16,165 @@
# specific language governing permissions and limitations
# under the License.
-
-
-
-
import web
-import socket, struct
+import socket
+import struct
import cloud_utils
from cloud_utils import Command
+
+# Constants
+DNSMASQ_SERVICE = "dnsmasq"
+DNSMASQ_CONFIG = "/files/etc/dnsmasq.conf"
+RESTART = "restart"
+
+# URL mapping
urls = ("/ipallocator", "ipallocator")
app = web.application(urls, globals())
+# Command wrappers
augtool = Command("augtool")
service = Command("service")
+
class dhcp:
- _instance = None
- def __init__(self):
- self.availIP=[]
- self.router=None
- self.netmask=None
- self.initialized=False
-
- options =
augtool.match("/files/etc/dnsmasq.conf/dhcp-option").stdout.decode('utf-8').strip()
- for option in options.splitlines():
- if option.find("option:router") != -1:
- self.router =
option.split("=")[1].strip().split(",")[1]
- print(self.router)
-
- dhcp_range =
augtool.get("/files/etc/dnsmasq.conf/dhcp-range").stdout.decode('utf-8').strip()
- dhcp_start = dhcp_range.split("=")[1].strip().split(",")[0]
- dhcp_end = dhcp_range.split("=")[1].strip().split(",")[1]
- self.netmask = dhcp_range.split("=")[1].strip().split(",")[2]
- print(dhcp_start, dhcp_end, self.netmask)
-
- start_ip_num = self.ipToNum(dhcp_start);
- end_ip_num = self.ipToNum(dhcp_end)
- print(start_ip_num, end_ip_num)
-
- for ip in range(start_ip_num, end_ip_num + 1):
- self.availIP.append(ip)
- print(self.availIP[0], self.availIP[len(self.availIP) - 1])
-
- #load the ip already allocated
- self.reloadAllocatedIP()
-
- def ipToNum(self, ip):
- return struct.unpack("!I", socket.inet_aton(ip))[0]
-
- def numToIp(self, num):
- return socket.inet_ntoa(struct.pack('!I', num))
-
- def getFreeIP(self):
- if len(self.availIP) > 0:
- ip = self.numToIp(self.availIP[0])
- self.availIP.remove(self.availIP[0])
- return ip
- else:
- return None
-
- def getNetmask(self):
- return self.netmask
-
- def getRouter(self):
- return self.router
-
- def getInstance():
- if not dhcp._instance:
- dhcp._instance = dhcp()
- return dhcp._instance
- getInstance = staticmethod(getInstance)
-
- def reloadAllocatedIP(self):
- dhcp_hosts =
augtool.match("/files/etc/dnsmasq.conf/dhcp-host").stdout.decode('utf-8').strip().splitlines()
-
- for host in dhcp_hosts:
- if host.find("dhcp-host") != -1:
- allocatedIP =
self.ipToNum(host.split("=")[1].strip().split(",")[1])
- if allocatedIP in self.availIP:
- self.availIP.remove(allocatedIP)
-
- def allocateIP(self, mac):
- newIP = self.getFreeIP()
- dhcp_host =
augtool.match("/files/etc/dnsmasq.conf/dhcp-host").stdout.decode('utf-8').strip()
- cnt = len(dhcp_host.splitlines()) + 1
- script = """set %s %s
- save"""%("/files/etc/dnsmasq.conf/dhcp-host[" +
str(cnt) + "]", str(mac) + "," + newIP)
- augtool < script
- #reset dnsmasq
- service("dnsmasq", "restart", stdout=None, stderr=None)
- return newIP
-
- def releaseIP(self, ip):
- dhcp_host =
augtool.match("/files/etc/dnsmasq.conf/dhcp-host").stdout.decode('utf-8').strip()
- path = None
- for host in dhcp_host.splitlines():
- if host.find(ip) != -1:
- path = host.split("=")[0].strip()
-
- if path == None:
- print("Can't find " + str(ip) + " in conf file")
- return None
-
- print(path)
- script = """rm %s
- save"""%(path)
- augtool < script
-
- self.availIP.remove(ip)
-
- #reset dnsmasq
- service("dnsmasq", "restart", stdout=None, stderr=None)
+ _instance = None
+
+ def __init__(self):
+ self.availIP = []
+ self.router = None
+ self.netmask = None
+ self.initialized = False
+
+ # Load DHCP options
+ options =
augtool.match(f"{DNSMASQ_CONFIG}/dhcp-option").stdout.decode('utf-8').strip()
+ for option in options.splitlines():
+ if "option:router" in option:
+ self.router = option.split("=")[1].strip().split(",")[1]
+ print(self.router)
+
+ # Load DHCP range
+ dhcp_range =
augtool.get(f"{DNSMASQ_CONFIG}/dhcp-range").stdout.decode('utf-8').strip()
+ dhcp_start = dhcp_range.split("=")[1].strip().split(",")[0]
+ dhcp_end = dhcp_range.split("=")[1].strip().split(",")[1]
+ self.netmask = dhcp_range.split("=")[1].strip().split(",")[2]
+ print(dhcp_start, dhcp_end, self.netmask)
+
+ # Convert IP range to numbers
+ start_ip_num = self.ipToNum(dhcp_start)
+ end_ip_num = self.ipToNum(dhcp_end)
+ print(start_ip_num, end_ip_num)
+
+ # Populate available IPs
+ for ip in range(start_ip_num, end_ip_num + 1):
+ self.availIP.append(ip)
+ print(self.availIP[0], self.availIP[-1])
+
+ # Load already allocated IPs
+ self.reloadAllocatedIP()
+
+ def ipToNum(self, ip):
+ """Convert IP address string to a number."""
+ return struct.unpack("!I", socket.inet_aton(ip))[0]
+
+ def numToIp(self, num):
+ """Convert a number back to an IP address."""
+ return socket.inet_ntoa(struct.pack('!I', num))
+
+ def getFreeIP(self):
+ """Return the next available IP address."""
+ if len(self.availIP) > 0:
+ ip = self.numToIp(self.availIP.pop(0))
+ return ip
+ else:
+ return None
+
+ def getNetmask(self):
+ return self.netmask
+
+ def getRouter(self):
+ return self.router
+
+ @staticmethod
+ def getInstance():
+ if not dhcp._instance:
+ dhcp._instance = dhcp()
+ return dhcp._instance
+
+ def reloadAllocatedIP(self):
+ """Reload already allocated IPs from the config file."""
+ dhcp_hosts =
augtool.match(f"{DNSMASQ_CONFIG}/dhcp-host").stdout.decode('utf-8').strip().splitlines()
+ for host in dhcp_hosts:
+ if "dhcp-host" in host:
+ allocatedIP =
self.ipToNum(host.split("=")[1].strip().split(",")[1])
+ if allocatedIP in self.availIP:
+ self.availIP.remove(allocatedIP)
+
+ def allocateIP(self, mac):
+ """Allocate an IP address to the given MAC address."""
+ newIP = self.getFreeIP()
+ dhcp_host =
augtool.match(f"{DNSMASQ_CONFIG}/dhcp-host").stdout.decode('utf-8').strip()
+ cnt = len(dhcp_host.splitlines()) + 1
+ script = f"""set {DNSMASQ_CONFIG}/dhcp-host[{cnt}] {mac},{newIP}
+ save"""
+ with open("/path/to/script", "w") as script_file:
Review Comment:
what is the intention here?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
