# HG changeset patch
# User igor
# Date 1194803187 -7200
# Node ID 9d54d94a7dffea5790b6a53045a13b4dc29f7c6c
# Parent  58381d1fe31b55c04900baf399df5cd248b9cfce
minifixes

diff -r 58381d1fe31b -r 9d54d94a7dff xendomain.py
--- a/xendomain.py	Sun Nov 11 19:22:52 2007 +0200
+++ b/xendomain.py	Sun Nov 11 19:46:27 2007 +0200
@@ -42,7 +42,7 @@
 ############################
 
 def process_domains_brief():
-    global domains, domain_types, real_nodes, domain_notes
+    global domains, domain_types, real_nodes, domain_notes, domain_subtypes
     node_brief_re=re.compile('([a-zA-Z_0-9-]*)(?::([a-zA-Z_0-9-]*))?(?::([a-zA-Z_0-9-]*))?(\*?)(?:#(.*))?')
     if len(domains)==0:
         domains=map(lambda x:node_brief_re.search(x).groups()[0] or '', domains_brief)
@@ -68,7 +68,7 @@
 
 process_domains_brief()
 
-N = str(domains.index(domain))
+N = domains.index(domain)
 name=domain
 
 pae=1
@@ -82,6 +82,9 @@
 #builder='linux'
 cpu_cap = 10
 
+
+
+
 for br in bridges:
     if not br in vbridges_table.keys():
         vbridges_table[br]=[]
@@ -95,16 +98,21 @@
 vif=[]
 x=1
 for i in vbridges:
- vif.append('bridge='+i+',mac=00:16:3e:01:'+hex(int(N))[2:]+':'+hex(int('c0',16)+x)[2:])
+ vif.append('bridge='+i+',mac=00:16:3e:01:'+hex(N)[2:]+':'+hex(int('c0',16)+x)[2:])
  x+=1
 
-disk = [ 'file:'+xenomips_dir+'xenomips1.img,hda1,r', 'file:'+xenomips_dir+'xenomips-ios1.img,hda2,r', 'file:'+xenomips_dir+'xenomips-config'+N+'.img,hda3,w' ]
+disk = [ 'file:'+xenomips_dir+'xenomips1.img,hda1,r', 'file:'+xenomips_dir+'xenomips-ios1.img,hda2,r', 'file:'+xenomips_dir+'xenomips-config'+str(N)+'.img,hda3,w' ]
 root = "/dev/hda1 ro"
 
+if domain_types[N] == 'quagga':
+    memory = 64
+else:
+    memory = 400
+
 if domain_subtypes[N] != '' and platform == '':
     platform=domain_subtypes[N]
 
-if platform = '': 
+if platform == '': 
     platform='7200'
 platform_option=""
 if platform != '7200':
@@ -114,7 +122,7 @@
 if platform == '7200':
     npe_option=" -t "+npe_type
 
-mac_option=' -m 00:16:3e:01:'+hex(int(N))[2:]+':01'
+mac_option=' -m 00:16:3e:01:'+hex(N)[2:]+':01'
 if platform != '7200':
     mac_option =''
 
@@ -140,7 +148,7 @@
 for i in range(len(vbridges)):
  xenomips += ' -s '+str(i)+':0:gen_eth:eth'+str(i)
 
-if domain_types[int(N)] == 'quagga':
+if domain_types[N] == 'quagga':
     extra = "quagga"
 else:
     extra = "xenomips=\""+xenomips+"\""