add pyOpenSSL to the list of packages to pip2 install for sfa

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

diff --git a/qaapi/qa/qa_config.py b/qaapi/qa/qa_config.py
index 149fabc..f612d24 100644 (file)
--- 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,
@@ -32,39 +32,69 @@ sites = [
        }
        ]
 
+#nodegroups = [
+#      {'plcs': ['TestPLC', 'ParisPLC'],
+#       'name': '41',   
+#       'nodes': ['vm41.test.org'],
+#      }
+#      ]
+        
 nodes = [
-       {'plc': 'ParisPLC',     
+       {'plcs': ['TestPLC', 'ParisPLC'],       
         'site': 'ts',
         'hostname': 'vm1.paris.cs.princeton.edu',
         'host': 'localhost',
-        'redir_port': '51101',
+        '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'
                           }]
+       },
+       {'plcs': ['TestPLC', 'ParisPLC'],
+        'site': 'ts',
+        'hostname': 'vm41.test.org',
+        'host': 'localhost',
+        'redir_ssh_port': '51122',
+        'type': 'vm',
+        'model': 'qemu/minhw',
+        'boot_state': 'rins',
+        #'nodegroups': ['41'], 
+        'nodenetworks': [{'type': 'ipv4',
+                          'method': 'static',
+                          'ip': '10.0.2.17',
+                          'gateway': '10.0.2.2',
+                           'dns1': '10.0.2.3',
+                           'network': '10.0.2.0',
+                           'netmask': '255.255.255.0',
+                           '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,
         'description': 'blank',
         'url': 'http://test.org',
-        'nodes': ['vm1.paris.cs.princeton.edu']
+        'nodes': ['vm1.paris.cs.princeton.edu', 'vm41.test.org'],
+        'persons': ['person@cs.princeton.edu'] 
        }
        ]
 
 persons = [
-       {'plc': 'ParisPLC',
+       {'plc': ['TestPLC', 'ParisPLC'],
         'first_name': 'fname',
         'last_name': 'lname',
         'password': 'password',