Added model selection by DB

diff --git a/debian/changelog b/debian/changelog
index a0383f1..929d885 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+invirt-xen-config (0.0.50) unstable; urgency=low
+
+  * Adding NIC model option to DB.
+
+ -- Steven Valdez <dvorak42@mit.edu>  Fri, 26 Jul 2013 22:28:47 -0400
+

 invirt-xen-config (0.0.49) precise; urgency=low
 
   * Change HVM emulated network card to pcnet, because the emulated
 invirt-xen-config (0.0.49) precise; urgency=low
 
   * Change HVM emulated network card to pcnet, because the emulated

diff --git a/invirt-database b/invirt-database
index 9350316..5fa24e2 100644 (file)
--- a/invirt-database
+++ b/invirt-database
@@ -122,6 +122,8 @@ elif codepath == 'paravm':
 
 for n in machine.nics:
     check(re.match('^[0-9a-fA-F:]+$', n.mac_addr) and re.match('^[0-9.]*$', n.ip))
 
 for n in machine.nics:
     check(re.match('^[0-9a-fA-F:]+$', n.mac_addr) and re.match('^[0-9.]*$', n.ip))

+    if n.model:
+        viftype = viftype.replace("pcnet", n.nic_type)

     d = ('%smac=%s, ip=%s, script=vif-invirtroute netdev=%s'
          % (viftype, n.mac_addr, n.ip, config.xen.iface))
     vif.append(d)
     d = ('%smac=%s, ip=%s, script=vif-invirtroute netdev=%s'
          % (viftype, n.mac_addr, n.ip, config.xen.iface))
     vif.append(d)