# HG changeset patch
# User igor
# Date 1190747784 -10800
# Node ID 244f1602496a2e9f6730a0d184f3bba934c1ef89
# Parent  dd8c79bc715c3b30c0065c72cbdfd4c394528b2a
config splitted to several modules

diff -r dd8c79bc715c -r 244f1602496a xendomain.py
--- a/xendomain.py	Tue Sep 25 20:12:24 2007 +0300
+++ b/xendomain.py	Tue Sep 25 22:16:24 2007 +0300
@@ -1,9 +1,3 @@
-try:
-    from xenomips_vars import N
-except:
-    print "can't find xenomips_vars module"
-
-
 ####
 #
 # External variables:
@@ -11,67 +5,24 @@
 # * domain
 
 
-############################################################################################
-# Topology description
+try: 
+    domain
+except NameError:
+    import sys
+    network=sys.modules['__main__'].network
+    domain=sys.modules['__main__'].domain
 
-network='change-default-route'
+#sys.path.append('/home/igor/xentaur')
+#try:
 
-domains =       [ 'dyn1',     'dyn2',     'dyn3',     'qua4',   'qua5',   'qua6',   'qua7',   'qua8',   'qua9',   ]
-domain_types =  [ 'xenomips', 'xenomips', 'xenomips', 'quagga', 'quagga', 'quagga', 'quagga', 'quagga', 'quagga', ]
-bridges =       [
-                  'vlan100',
-                  'vlan101',
-                  'vlan102',
-                  'vlan103',
-                  'vlan104',
-                  'vlan105',
-                  'vlan106',
-                  'vlan107',
-                  'vlan108',
-                  'vlan109',
-                  'vlan110',
-                  'vlan111',
-                ]
+exec 'from %s import *' % (network)
+#except:
+#    print "Can't find or interpret module %s with topology description" %(network)
+#    sys.exit(1)
 
-vbridges_table = {
-                  'dyn1'    : [ 'vlan101', 'vlan102' ],
-                  'dyn2'    : [ 'vlan101', 'vlan103' ],
-                  'dyn3'    : [ 'vlan102', 'vlan103', 'vlan104' ],
 
-                  'qua4'    : [ 'vlan105', 'vlan106', 'vlan111' ],
-                  'qua5'    : [ 'vlan110', 'vlan111' ],
-                  'qua6'    : [ 'vlan109',  'vlan110' ],
-                  'qua7'    : [ 'vlan108',  'vlan109'  ],
-                  'qua8'    : [ 'vlan107',  'vlan108' ],
-                  'qua9'    : [ 'vlan106',  'vlan107' ],
-                 }
-
-hidden_bridges  = []
-broken_links    = []
-temporary_links = []
-
-xenomips_dir='/xen/images/'
-ios_name='C7200-JK.BIN'
-npe_type="npe-200"
-
-name = domain
-
-# property should be specified only to override default values
-properties       = {
-                    'dyn1': {
-                                npe_type: "npe-400",
-                            }
-                   }
-
-#this instance configuration
-if domain_types[domain] == 'quagga':
-    memory = 64
-else:
-    memory = 400
-
-############################################################################################
-
-N = domains.index(domain)
+N = str(domains.index(domain))
+name=domain
 
 pae=1
 if pae:
diff -r dd8c79bc715c -r 244f1602496a xentaur.py
--- a/xentaur.py	Tue Sep 25 20:12:24 2007 +0300
+++ b/xentaur.py	Tue Sep 25 22:16:24 2007 +0300
@@ -4,14 +4,21 @@
 import sys,os,time
 import xenomips_vars
 xenomips_vars.N='1'
+
+xentaur_path=os.environ['HOME']+"/xentaur"
+
 sys.path.append('/etc/xen')
+sys.path.append(xentaur_path)
 
-xen_config_name='four_quaggasN'
-try:
-    exec 'from '+xen_config_name+' import bridges,vbridges_table, hidden_bridges, domains, broken_links, temporary_links, domain_types'
-except:
-    print "Can't find module: %s " % (xen_config_name)
-    sys.exit(0)
+network='faberge'
+domain='dyn1'
+from xendomain import *
+
+#try:
+#    exec 'from '+network+' import bridges,vbridges_table, hidden_bridges, domains, broken_links, temporary_links, domain_types'
+#except:
+#    print "Can't find module: %s " % (xen_config_name)
+#    sys.exit(0)
 
 bridges_turned_down=[]
 
@@ -49,12 +56,12 @@
 
 
 def create_domains_script():
-    for N in range(len(domains)):
-        print "sudo /usr/sbin/xm create "+xen_config_name+" N="+str(N)+" && sleep 1 && sudo /usr/sbin/xm sched-credit -d $(sudo /usr/sbin/xm list | grep "+domains[N]+" | awk '{print $2}') -c 10 && sleep 1"
+    for domain in domains:
+        print "sudo /usr/sbin/xm create "+xentaur_path+"/xendomain "+" domain="+domain+" && sleep 1 && sudo /usr/sbin/xm sched-credit -d $(sudo /usr/sbin/xm list | grep "+domain+" | awk '{print $2}') -c 10 && sleep 1"
 
 def destroy_domains_script():
-    for N in range(len(domains)):
-        print "sudo /usr/sbin/xm shutdown "+domains[N]
+    for domain in domains:
+        print "sudo /usr/sbin/xm shutdown "+domain
 
 def create_screens_script():
     N=1