Fixed invirt-database for NICs

diff --git a/debian/changelog b/debian/changelog
index 929d885..92270a4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+invirt-xen-config (0.0.51) unstable; urgency=low
+
+  * Fixed code for NIC model options.
+
+ -- Steven Valdez <dvorak42@mit.edu>  Wed, 31 Jul 2013 22:28:39 -0400
+

 invirt-xen-config (0.0.50) unstable; urgency=low
 
   * Adding NIC model option to DB.
 invirt-xen-config (0.0.50) unstable; urgency=low
 
   * Adding NIC model option to DB.

diff --git a/invirt-database b/invirt-database
index 5fa24e2..ec611c1 100644 (file)
--- a/invirt-database
+++ b/invirt-database
@@ -122,7 +122,7 @@ 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:
+    if n.nic_type:

         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))
         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))