Add the Python bits

systemvm/patches/debian/config/opt/cloud/bin/merge.py

@@ -0,0 +1,112 @@
+#!/usr/bin/python
+
+import json
+import os
+import logging
+import cs_ip
+
+from pprint import pprint
+
+class updateDataBag:
+
+    qFile = {}
+    fpath = ''
+    bdata  = { }
+    DPATH = "/var/chef/data_bags/vr"
+
+    def __init__(self,qFile):
+        self.qFile = qFile
+        self.process()
+
+    def save(self, dbag):
+        try:
+            handle = open(self.fpath, 'w')
+        except IOError:
+            logging.error("Could not write data bag %s", self.qFile.type)
+        else:
+            logging.debug("Writing data bag type %s", self.qFile.type)
+        jsono = json.dumps(dbag, indent=4, sort_keys=True)
+        handle.write(jsono)
+
+    def load(self, key):
+        data = self.bdata
+        if not os.path.exists(self.DPATH):
+           os.makedirs(self.DPATH)
+        self.fpath = self.DPATH + '/' + key + '.json'
+        try:
+            handle = open(self.fpath)
+        except IOError:
+            logging.debug("Creating data bag type %s for key %s", self.qFile.type, key)
+            data.update( { "id": key } )
+        else:
+            logging.debug("Loading data bag type %s for key %s", self.qFile.type, key)
+            data = json.load(handle)
+            handle.close()
+        return data
+
+    def process(self):
+        dbag = self.load( self.qFile.type )
+        logging.info("Command of type %s received", self.qFile.type)
+        if self.qFile.type == 'ips':
+           dbag = self.processIP(dbag)
+        if self.qFile.type == 'cl':
+           dbag = self.processCL(dbag)
+        self.save(dbag)
+  
+    def processIP(self, dbag):
+        for ip in self.qFile.data:
+            dbag = cs_ip.merge(dbag, ip)
+        return dbag
+
+    def processCL(self, dbag):
+        # Convert the ip stuff to an ip object and pass that into cs_ip_merge
+        # "eth0ip": "192.168.56.32",
+        # "eth0mask": "255.255.255.0",
+        dbag['id'] = self.qFile.type
+        self.processCLItem('0', dbag)
+        self.processCLItem('1', dbag)
+        return dbag
+
+    def processCLItem(self, num, dbag):
+        key = 'eth' + num + 'ip'
+        dp  = {}
+        if(key in self.qFile.data['cmdline']):
+           dp['publicIp']    = self.qFile.data['cmdline'][key]
+           dp['vlanNetmask'] = self.qFile.data['cmdline']['eth' + num + 'mask']
+           dp['sourceNat'] = False
+           dp['add'] = True
+           dp['oneToOneNat'] = False
+           dp['vlanGateway'] = ??
+           dp['nicDevId'] = num
+           return 
+            
+class loadQueueFile:
+
+    fileName = ''
+    dpath = "/etc/cloudstack"
+    data = {}
+    type = 'ips'
+
+    def load(self):
+        fn = self.dpath + '/' + self.fileName
+        try:
+            handle = open(fn)
+        except IOError:
+            logging.error("Could not open %s", fn)
+        else:
+            self.data = json.load(handle)
+            handle.close()
+            proc = updateDataBag(self)
+
+    def setFile(self, name):
+        self.fileName = name
+
+    def setType(self, name):
+        self.type = name
+
+    def getData(self):
+        return self.data 
+
+    def setPath(self, path):
+        self.dpath = path
+

systemvm/patches/debian/config/opt/cloud/bin/merge_cline.py

@@ -0,0 +1,18 @@
+#!/usr/bin/python
+
+import sys
+from merge import loadQueueFile
+import logging
+
+logging.basicConfig(filename='/var/log/cloud.log',level=logging.DEBUG, format='%(asctime)s %(message)s')
+
+# first commandline argument should be the file to process
+if ( len(sys.argv) != 2 ):
+    print "Invalid usage"
+    sys.exit(1)
+
+qf = loadQueueFile()
+qf.setType("cl")
+qf.setFile("cmdline.json")
+qf.setPath("/var/chef/data_bags/vr")
+qf.load()

systemvm/patches/debian/config/opt/cloud/bin/test.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+/opt/cloud/bin/update_config.py ips0001.json
+/opt/cloud/bin/update_config.py ips0002.json
+/opt/cloud/bin/update_config.py ips0003.json
+

systemvm/patches/debian/config/opt/cloud/bin/update_config.py

@@ -1,13 +1,17 @@
 #!/usr/bin/python
 
-import syslog
 import sys
+from merge import loadQueueFile
+import logging
+
+logging.basicConfig(filename='/var/log/cloud.log',level=logging.DEBUG, format='%(asctime)s %(message)s')
 
 # first commandline argument should be the file to process
 if ( len(sys.argv) != 2 ):
     print "Invalid usage"
     sys.exit(1)
 
-json_file = sys.argv[1]
-
-syslog.syslog(sys.argv[0] + " called for file " + json_file)
+qf = loadQueueFile()
+qf.setType("ips")
+qf.setFile(sys.argv[1])
+qf.load()