From: Tony Mack <tmack@cs.princeton.edu>
Date: Tue, 8 Apr 2008 18:25:26 +0000 (+0000)
Subject: updated config
X-Git-Tag: tests-4.2-4~64
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=bb17082ec8ac48a5684904bb0979da6862a150ef;p=tests.git

updated config
---

diff --git a/qaapi/qa/qa_config.py b/qaapi/qa/qa_config.py
index 149fabc..aa6954b 100644
--- a/qaapi/qa/qa_config.py
+++ b/qaapi/qa/qa_config.py
@@ -21,7 +21,7 @@ plcs = [
 	]
 
 sites = [
-	{'plc': 'ParisPLC',
+	{'plcs': ['TestPLC', 'ParisPLC'],
 	 'name': 'TestSite1',
 	 'login_base': 'ts',
 	 'enabled': True,
@@ -33,27 +33,30 @@ sites = [
 	]
 
 nodes = [
-	{'plc': 'ParisPLC',   	
+	{'plcs': ['TestPLC', 'ParisPLC'],   	
 	 'site': 'ts',
 	 'hostname': 'vm1.paris.cs.princeton.edu',
 	 'host': 'localhost',
-	 'redir_port': '51101',
+	 'redir_ssh_port': '51101',
 	 'type': 'vm',
+	 'model' : 'qemu/minhw',
+	 'boot_state': 'rins', 
 	 'nodenetworks' : [{'type': 'ipv4',
 			   'method': 'static',
 			   'ip': '10.0.2.16',
 			   'gateway': '10.0.2.2',
-			   'dns1': '10.0.2.2',
+			   'dns1': '10.0.2.3',
 			   'network': '10.0.2.0',
 			   'netmask': '255.255.255.0',
-			   'broadcast': '10.0.2.255'
+			   'broadcast': '10.0.2.255',
+			   'mac': u'52:54:00:12:34:56'
 			   }]
 	}
 	
 	]
 
 slices = [
-	{'plc': 'ParisPLC',   
+	{'plcs': ['TestPLC','ParisPLC'],   
 	 'name': 'ts_slice1',
 	 'instantiation': 'plc-instantiated',
 	 'max_nodes': 1000,
@@ -64,7 +67,7 @@ slices = [
 	]
 
 persons = [
-	{'plc': 'ParisPLC',
+	{'plc': ['TestPLC', 'ParisPLC'],
 	 'first_name': 'fname',
 	 'last_name': 'lname',
 	 'password': 'password',