-change default redir_ssh_port

[tests.git] / qaapi / qa / qa_config.py

diff --git a/qaapi/qa/qa_config.py b/qaapi/qa/qa_config.py
index e94af55..f5678c4 100644 (file)
--- a/qaapi/qa/qa_config.py
+++ b/qaapi/qa/qa_config.py
@@ -12,16 +12,16 @@ plcs = [
          'port': '443'
         },
        {'name': 'ParisPLC',
-        'host': 'localhost',
-        'ip': '127.0.0.1',
-        'url': 'https://localhost.localdomain/',
+        'host': 'paris.cs.princeton.edu',
+        'ip': '128.112.95.151',
+        'url': 'https://paris.cs.princeton.edu/',
         'port': '443',
         'chroot': '/plc/root/'
        }
        ]
 
 sites = [
-       {'plc': 'ParisPLC',
+       {'plcs': ['TestPLC', 'ParisPLC'],
         'name': 'TestSite1',
         'login_base': 'ts',
         'enabled': True,
@@ -33,26 +33,30 @@ sites = [
        ]
 
 nodes = [
-       {'plc': 'ParisPLC',     
+       {'plcs': ['TestPLC', 'ParisPLC'],       
         'site': 'ts',
         'hostname': 'vm1.paris.cs.princeton.edu',
         'host': 'localhost',
-        'type': 'virtual',
+        'redir_ssh_port': '51022',
+        '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,
@@ -63,7 +67,7 @@ slices = [
        ]
 
 persons = [
-       {'plc': 'ParisPLC',
+       {'plc': ['TestPLC', 'ParisPLC'],
         'first_name': 'fname',
         'last_name': 'lname',
         'password': 'password',