|
@@ -36,7 +36,7 @@ import qubesadmin.tests
|
|
|
|
|
|
class TC_00_VMCollection(qubesadmin.tests.QubesTestCase):
|
|
class TC_00_VMCollection(qubesadmin.tests.QubesTestCase):
|
|
def test_000_list(self):
|
|
def test_000_list(self):
|
|
- self.app.expected_calls[('dom0', 'mgmt.vm.List', None, None)] = \
|
|
|
|
|
|
+ self.app.expected_calls[('dom0', 'admin.vm.List', None, None)] = \
|
|
b'0\x00test-vm class=AppVM state=Running\n'
|
|
b'0\x00test-vm class=AppVM state=Running\n'
|
|
self.assertEqual(
|
|
self.assertEqual(
|
|
list(self.app.domains.keys()),
|
|
list(self.app.domains.keys()),
|
|
@@ -44,7 +44,7 @@ class TC_00_VMCollection(qubesadmin.tests.QubesTestCase):
|
|
self.assertAllCalled()
|
|
self.assertAllCalled()
|
|
|
|
|
|
def test_001_getitem(self):
|
|
def test_001_getitem(self):
|
|
- self.app.expected_calls[('dom0', 'mgmt.vm.List', None, None)] = \
|
|
|
|
|
|
+ self.app.expected_calls[('dom0', 'admin.vm.List', None, None)] = \
|
|
b'0\x00test-vm class=AppVM state=Running\n'
|
|
b'0\x00test-vm class=AppVM state=Running\n'
|
|
try:
|
|
try:
|
|
vm = self.app.domains['test-vm']
|
|
vm = self.app.domains['test-vm']
|
|
@@ -58,7 +58,7 @@ class TC_00_VMCollection(qubesadmin.tests.QubesTestCase):
|
|
self.assertAllCalled()
|
|
self.assertAllCalled()
|
|
|
|
|
|
def test_002_in(self):
|
|
def test_002_in(self):
|
|
- self.app.expected_calls[('dom0', 'mgmt.vm.List', None, None)] = \
|
|
|
|
|
|
+ self.app.expected_calls[('dom0', 'admin.vm.List', None, None)] = \
|
|
b'0\x00test-vm class=AppVM state=Running\n'
|
|
b'0\x00test-vm class=AppVM state=Running\n'
|
|
self.assertIn('test-vm', self.app.domains)
|
|
self.assertIn('test-vm', self.app.domains)
|
|
self.assertAllCalled()
|
|
self.assertAllCalled()
|
|
@@ -67,13 +67,13 @@ class TC_00_VMCollection(qubesadmin.tests.QubesTestCase):
|
|
self.assertAllCalled()
|
|
self.assertAllCalled()
|
|
|
|
|
|
def test_003_iter(self):
|
|
def test_003_iter(self):
|
|
- self.app.expected_calls[('dom0', 'mgmt.vm.List', None, None)] = \
|
|
|
|
|
|
+ self.app.expected_calls[('dom0', 'admin.vm.List', None, None)] = \
|
|
b'0\x00test-vm class=AppVM state=Running\n'
|
|
b'0\x00test-vm class=AppVM state=Running\n'
|
|
self.assertEqual([vm.name for vm in self.app.domains], ['test-vm'])
|
|
self.assertEqual([vm.name for vm in self.app.domains], ['test-vm'])
|
|
self.assertAllCalled()
|
|
self.assertAllCalled()
|
|
|
|
|
|
def test_004_delitem(self):
|
|
def test_004_delitem(self):
|
|
- self.app.expected_calls[('test-vm', 'mgmt.vm.Remove', None, None)] = \
|
|
|
|
|
|
+ self.app.expected_calls[('test-vm', 'admin.vm.Remove', None, None)] = \
|
|
b'0\x00'
|
|
b'0\x00'
|
|
del self.app.domains['test-vm']
|
|
del self.app.domains['test-vm']
|
|
self.assertAllCalled()
|
|
self.assertAllCalled()
|
|
@@ -81,9 +81,9 @@ class TC_00_VMCollection(qubesadmin.tests.QubesTestCase):
|
|
|
|
|
|
class TC_10_QubesBase(qubesadmin.tests.QubesTestCase):
|
|
class TC_10_QubesBase(qubesadmin.tests.QubesTestCase):
|
|
def test_010_new_simple(self):
|
|
def test_010_new_simple(self):
|
|
- self.app.expected_calls[('dom0', 'mgmt.vm.Create.AppVM', None,
|
|
|
|
|
|
+ self.app.expected_calls[('dom0', 'admin.vm.Create.AppVM', None,
|
|
b'name=new-vm label=red')] = b'0\x00'
|
|
b'name=new-vm label=red')] = b'0\x00'
|
|
- self.app.expected_calls[('dom0', 'mgmt.vm.List', None, None)] = \
|
|
|
|
|
|
+ self.app.expected_calls[('dom0', 'admin.vm.List', None, None)] = \
|
|
b'0\x00new-vm class=AppVM state=Running\n'
|
|
b'0\x00new-vm class=AppVM state=Running\n'
|
|
vm = self.app.add_new_vm('AppVM', 'new-vm', 'red')
|
|
vm = self.app.add_new_vm('AppVM', 'new-vm', 'red')
|
|
self.assertEqual(vm.name, 'new-vm')
|
|
self.assertEqual(vm.name, 'new-vm')
|
|
@@ -91,9 +91,9 @@ class TC_10_QubesBase(qubesadmin.tests.QubesTestCase):
|
|
self.assertAllCalled()
|
|
self.assertAllCalled()
|
|
|
|
|
|
def test_011_new_template(self):
|
|
def test_011_new_template(self):
|
|
- self.app.expected_calls[('dom0', 'mgmt.vm.Create.TemplateVM', None,
|
|
|
|
|
|
+ self.app.expected_calls[('dom0', 'admin.vm.Create.TemplateVM', None,
|
|
b'name=new-template label=red')] = b'0\x00'
|
|
b'name=new-template label=red')] = b'0\x00'
|
|
- self.app.expected_calls[('dom0', 'mgmt.vm.List', None, None)] = \
|
|
|
|
|
|
+ self.app.expected_calls[('dom0', 'admin.vm.List', None, None)] = \
|
|
b'0\x00new-template class=TemplateVM state=Running\n'
|
|
b'0\x00new-template class=TemplateVM state=Running\n'
|
|
vm = self.app.add_new_vm('TemplateVM', 'new-template', 'red')
|
|
vm = self.app.add_new_vm('TemplateVM', 'new-template', 'red')
|
|
self.assertEqual(vm.name, 'new-template')
|
|
self.assertEqual(vm.name, 'new-template')
|
|
@@ -101,9 +101,9 @@ class TC_10_QubesBase(qubesadmin.tests.QubesTestCase):
|
|
self.assertAllCalled()
|
|
self.assertAllCalled()
|
|
|
|
|
|
def test_012_new_template_based(self):
|
|
def test_012_new_template_based(self):
|
|
- self.app.expected_calls[('dom0', 'mgmt.vm.Create.AppVM',
|
|
|
|
|
|
+ self.app.expected_calls[('dom0', 'admin.vm.Create.AppVM',
|
|
'some-template', b'name=new-vm label=red')] = b'0\x00'
|
|
'some-template', b'name=new-vm label=red')] = b'0\x00'
|
|
- self.app.expected_calls[('dom0', 'mgmt.vm.List', None, None)] = \
|
|
|
|
|
|
+ self.app.expected_calls[('dom0', 'admin.vm.List', None, None)] = \
|
|
b'0\x00new-vm class=AppVM state=Running\n'
|
|
b'0\x00new-vm class=AppVM state=Running\n'
|
|
vm = self.app.add_new_vm('AppVM', 'new-vm', 'red', 'some-template')
|
|
vm = self.app.add_new_vm('AppVM', 'new-vm', 'red', 'some-template')
|
|
self.assertEqual(vm.name, 'new-vm')
|
|
self.assertEqual(vm.name, 'new-vm')
|
|
@@ -111,11 +111,11 @@ class TC_10_QubesBase(qubesadmin.tests.QubesTestCase):
|
|
self.assertAllCalled()
|
|
self.assertAllCalled()
|
|
|
|
|
|
def test_013_new_objects_params(self):
|
|
def test_013_new_objects_params(self):
|
|
- self.app.expected_calls[('dom0', 'mgmt.vm.Create.AppVM',
|
|
|
|
|
|
+ self.app.expected_calls[('dom0', 'admin.vm.Create.AppVM',
|
|
'some-template', b'name=new-vm label=red')] = b'0\x00'
|
|
'some-template', b'name=new-vm label=red')] = b'0\x00'
|
|
- self.app.expected_calls[('dom0', 'mgmt.label.List', None, None)] = \
|
|
|
|
|
|
+ self.app.expected_calls[('dom0', 'admin.label.List', None, None)] = \
|
|
b'0\x00red\nblue\n'
|
|
b'0\x00red\nblue\n'
|
|
- self.app.expected_calls[('dom0', 'mgmt.vm.List', None, None)] = \
|
|
|
|
|
|
+ self.app.expected_calls[('dom0', 'admin.vm.List', None, None)] = \
|
|
b'0\x00new-vm class=AppVM state=Running\n' \
|
|
b'0\x00new-vm class=AppVM state=Running\n' \
|
|
b'some-template class=TemplateVM state=Running\n'
|
|
b'some-template class=TemplateVM state=Running\n'
|
|
vm = self.app.add_new_vm(self.app.get_vm_class('AppVM'), 'new-vm',
|
|
vm = self.app.add_new_vm(self.app.get_vm_class('AppVM'), 'new-vm',
|
|
@@ -125,9 +125,9 @@ class TC_10_QubesBase(qubesadmin.tests.QubesTestCase):
|
|
self.assertAllCalled()
|
|
self.assertAllCalled()
|
|
|
|
|
|
def test_014_new_pool(self):
|
|
def test_014_new_pool(self):
|
|
- self.app.expected_calls[('dom0', 'mgmt.vm.CreateInPool.AppVM', None,
|
|
|
|
|
|
+ self.app.expected_calls[('dom0', 'admin.vm.CreateInPool.AppVM', None,
|
|
b'name=new-vm label=red pool=some-pool')] = b'0\x00'
|
|
b'name=new-vm label=red pool=some-pool')] = b'0\x00'
|
|
- self.app.expected_calls[('dom0', 'mgmt.vm.List', None, None)] = \
|
|
|
|
|
|
+ self.app.expected_calls[('dom0', 'admin.vm.List', None, None)] = \
|
|
b'0\x00new-vm class=AppVM state=Running\n'
|
|
b'0\x00new-vm class=AppVM state=Running\n'
|
|
vm = self.app.add_new_vm('AppVM', 'new-vm', 'red', pool='some-pool')
|
|
vm = self.app.add_new_vm('AppVM', 'new-vm', 'red', pool='some-pool')
|
|
self.assertEqual(vm.name, 'new-vm')
|
|
self.assertEqual(vm.name, 'new-vm')
|
|
@@ -135,10 +135,10 @@ class TC_10_QubesBase(qubesadmin.tests.QubesTestCase):
|
|
self.assertAllCalled()
|
|
self.assertAllCalled()
|
|
|
|
|
|
def test_015_new_pools(self):
|
|
def test_015_new_pools(self):
|
|
- self.app.expected_calls[('dom0', 'mgmt.vm.CreateInPool.AppVM', None,
|
|
|
|
|
|
+ self.app.expected_calls[('dom0', 'admin.vm.CreateInPool.AppVM', None,
|
|
b'name=new-vm label=red pool:private=some-pool '
|
|
b'name=new-vm label=red pool:private=some-pool '
|
|
b'pool:volatile=other-pool')] = b'0\x00'
|
|
b'pool:volatile=other-pool')] = b'0\x00'
|
|
- self.app.expected_calls[('dom0', 'mgmt.vm.List', None, None)] = \
|
|
|
|
|
|
+ self.app.expected_calls[('dom0', 'admin.vm.List', None, None)] = \
|
|
b'0\x00new-vm class=AppVM state=Running\n'
|
|
b'0\x00new-vm class=AppVM state=Running\n'
|
|
vm = self.app.add_new_vm('AppVM', 'new-vm', 'red',
|
|
vm = self.app.add_new_vm('AppVM', 'new-vm', 'red',
|
|
pools={'private': 'some-pool', 'volatile': 'other-pool'})
|
|
pools={'private': 'some-pool', 'volatile': 'other-pool'})
|
|
@@ -147,16 +147,16 @@ class TC_10_QubesBase(qubesadmin.tests.QubesTestCase):
|
|
self.assertAllCalled()
|
|
self.assertAllCalled()
|
|
|
|
|
|
def test_020_get_label(self):
|
|
def test_020_get_label(self):
|
|
- self.app.expected_calls[('dom0', 'mgmt.label.List', None, None)] = \
|
|
|
|
|
|
+ self.app.expected_calls[('dom0', 'admin.label.List', None, None)] = \
|
|
b'0\x00red\nblue\n'
|
|
b'0\x00red\nblue\n'
|
|
label = self.app.get_label('red')
|
|
label = self.app.get_label('red')
|
|
self.assertEqual(label.name, 'red')
|
|
self.assertEqual(label.name, 'red')
|
|
self.assertAllCalled()
|
|
self.assertAllCalled()
|
|
|
|
|
|
def test_030_clone(self):
|
|
def test_030_clone(self):
|
|
- self.app.expected_calls[('test-vm', 'mgmt.vm.Clone', None,
|
|
|
|
|
|
+ self.app.expected_calls[('test-vm', 'admin.vm.Clone', None,
|
|
b'name=new-name')] = b'0\x00'
|
|
b'name=new-name')] = b'0\x00'
|
|
- self.app.expected_calls[('dom0', 'mgmt.vm.List', None, None)] = \
|
|
|
|
|
|
+ self.app.expected_calls[('dom0', 'admin.vm.List', None, None)] = \
|
|
b'0\x00new-name class=AppVM state=Halted\n' \
|
|
b'0\x00new-name class=AppVM state=Halted\n' \
|
|
b'test-vm class=AppVM state=Halted\n'
|
|
b'test-vm class=AppVM state=Halted\n'
|
|
new_vm = self.app.clone_vm('test-vm', 'new-name')
|
|
new_vm = self.app.clone_vm('test-vm', 'new-name')
|
|
@@ -164,9 +164,9 @@ class TC_10_QubesBase(qubesadmin.tests.QubesTestCase):
|
|
self.assertAllCalled()
|
|
self.assertAllCalled()
|
|
|
|
|
|
def test_031_clone_object(self):
|
|
def test_031_clone_object(self):
|
|
- self.app.expected_calls[('test-vm', 'mgmt.vm.Clone', None,
|
|
|
|
|
|
+ self.app.expected_calls[('test-vm', 'admin.vm.Clone', None,
|
|
b'name=new-name')] = b'0\x00'
|
|
b'name=new-name')] = b'0\x00'
|
|
- self.app.expected_calls[('dom0', 'mgmt.vm.List', None, None)] = \
|
|
|
|
|
|
+ self.app.expected_calls[('dom0', 'admin.vm.List', None, None)] = \
|
|
b'0\x00new-name class=AppVM state=Halted\n' \
|
|
b'0\x00new-name class=AppVM state=Halted\n' \
|
|
b'test-vm class=AppVM state=Halted\n'
|
|
b'test-vm class=AppVM state=Halted\n'
|
|
new_vm = self.app.clone_vm(self.app.domains['test-vm'], 'new-name')
|
|
new_vm = self.app.clone_vm(self.app.domains['test-vm'], 'new-name')
|
|
@@ -174,9 +174,9 @@ class TC_10_QubesBase(qubesadmin.tests.QubesTestCase):
|
|
self.assertAllCalled()
|
|
self.assertAllCalled()
|
|
|
|
|
|
def test_032_clone_pool(self):
|
|
def test_032_clone_pool(self):
|
|
- self.app.expected_calls[('test-vm', 'mgmt.vm.CloneInPool', None,
|
|
|
|
|
|
+ self.app.expected_calls[('test-vm', 'admin.vm.CloneInPool', None,
|
|
b'name=new-name pool=some-pool')] = b'0\x00'
|
|
b'name=new-name pool=some-pool')] = b'0\x00'
|
|
- self.app.expected_calls[('dom0', 'mgmt.vm.List', None, None)] = \
|
|
|
|
|
|
+ self.app.expected_calls[('dom0', 'admin.vm.List', None, None)] = \
|
|
b'0\x00new-name class=AppVM state=Halted\n' \
|
|
b'0\x00new-name class=AppVM state=Halted\n' \
|
|
b'test-vm class=AppVM state=Halted\n'
|
|
b'test-vm class=AppVM state=Halted\n'
|
|
new_vm = self.app.clone_vm('test-vm', 'new-name', pool='some-pool')
|
|
new_vm = self.app.clone_vm('test-vm', 'new-name', pool='some-pool')
|
|
@@ -184,10 +184,10 @@ class TC_10_QubesBase(qubesadmin.tests.QubesTestCase):
|
|
self.assertAllCalled()
|
|
self.assertAllCalled()
|
|
|
|
|
|
def test_033_clone_pools(self):
|
|
def test_033_clone_pools(self):
|
|
- self.app.expected_calls[('test-vm', 'mgmt.vm.CloneInPool', None,
|
|
|
|
|
|
+ self.app.expected_calls[('test-vm', 'admin.vm.CloneInPool', None,
|
|
b'name=new-name pool:private=some-pool '
|
|
b'name=new-name pool:private=some-pool '
|
|
b'pool:volatile=other-pool')] = b'0\x00'
|
|
b'pool:volatile=other-pool')] = b'0\x00'
|
|
- self.app.expected_calls[('dom0', 'mgmt.vm.List', None, None)] = \
|
|
|
|
|
|
+ self.app.expected_calls[('dom0', 'admin.vm.List', None, None)] = \
|
|
b'0\x00new-name class=AppVM state=Halted\n' \
|
|
b'0\x00new-name class=AppVM state=Halted\n' \
|
|
b'test-vm class=AppVM state=Halted\n'
|
|
b'test-vm class=AppVM state=Halted\n'
|
|
new_vm = self.app.clone_vm('test-vm', 'new-name',
|
|
new_vm = self.app.clone_vm('test-vm', 'new-name',
|
|
@@ -268,7 +268,7 @@ class TC_20_QubesLocal(unittest.TestCase):
|
|
stderr=subprocess.PIPE)
|
|
stderr=subprocess.PIPE)
|
|
|
|
|
|
self.assertEqual(self.get_request(),
|
|
self.assertEqual(self.get_request(),
|
|
- b'dom0\0mgmt.vm.Start\0some-vm\0\0')
|
|
|
|
|
|
+ b'dom0\0admin.vm.Start\0some-vm\0\0')
|
|
|
|
|
|
def test_011_run_service_filter_esc(self):
|
|
def test_011_run_service_filter_esc(self):
|
|
self.listen_and_send(b'0\0')
|
|
self.listen_and_send(b'0\0')
|
|
@@ -282,7 +282,7 @@ class TC_20_QubesLocal(unittest.TestCase):
|
|
stderr=subprocess.PIPE)
|
|
stderr=subprocess.PIPE)
|
|
|
|
|
|
self.assertEqual(self.get_request(),
|
|
self.assertEqual(self.get_request(),
|
|
- b'dom0\0mgmt.vm.Start\0some-vm\0\0')
|
|
|
|
|
|
+ b'dom0\0admin.vm.Start\0some-vm\0\0')
|
|
|
|
|
|
def test_012_run_service_user(self):
|
|
def test_012_run_service_user(self):
|
|
self.listen_and_send(b'0\0')
|
|
self.listen_and_send(b'0\0')
|
|
@@ -296,7 +296,7 @@ class TC_20_QubesLocal(unittest.TestCase):
|
|
stderr=subprocess.PIPE)
|
|
stderr=subprocess.PIPE)
|
|
|
|
|
|
self.assertEqual(self.get_request(),
|
|
self.assertEqual(self.get_request(),
|
|
- b'dom0\0mgmt.vm.Start\0some-vm\0\0')
|
|
|
|
|
|
+ b'dom0\0admin.vm.Start\0some-vm\0\0')
|
|
|
|
|
|
def test_013_run_service_default_target(self):
|
|
def test_013_run_service_default_target(self):
|
|
with self.assertRaises(ValueError):
|
|
with self.assertRaises(ValueError):
|