|
695 | 695 | }, |
696 | 696 | 'test-net': { |
697 | 697 | 'klass': 'AppVM', |
698 | | - 'label': 'red', |
| 698 | + 'label': 'scarlet', |
699 | 699 | 'properties': { |
700 | 700 | 'maxmem': '300', |
701 | 701 | 'memory': '300', |
@@ -749,8 +749,11 @@ def assertCorrectlyConverted(self, backup_app, expected_data): |
749 | 749 | expected_data['domains'][vm]['template'], vm) |
750 | 750 | self.assertEqual(backup_app.domains[vm].klass, |
751 | 751 | expected_data['domains'][vm]['klass'], vm) |
752 | | - self.assertEqual(backup_app.domains[vm].label, |
753 | | - expected_data['domains'][vm]['label'], vm) |
| 752 | + if expected_data['domains'][vm]['label'] == 'scarlet': |
| 753 | + self.assertEqual(backup_app.domains[vm].label, 'red', vm) |
| 754 | + else: |
| 755 | + self.assertEqual(backup_app.domains[vm].label, |
| 756 | + expected_data['domains'][vm]['label'], vm) |
754 | 757 | self.assertEqual(backup_app.domains[vm].backup_path, |
755 | 758 | expected_data['domains'][vm]['backup_path'], vm) |
756 | 759 | self.assertEqual(backup_app.domains[vm].included_in_backup, |
@@ -1511,6 +1514,9 @@ def test_210_r2(self): |
1511 | 1514 | b'fedora-25 class=TemplateVM state=Halted\n' |
1512 | 1515 | b'testvm class=AppVM state=Running\n' |
1513 | 1516 | ) |
| 1517 | + self.app.expected_calls[('dom0', 'admin.label.List', None, None)] = ( |
| 1518 | + b'0\0red\norange\nyellow\ngreen\ngray\nblue\npurple\nblack\n' |
| 1519 | + ) |
1514 | 1520 | self.app.expected_calls[ |
1515 | 1521 | ('dom0', 'admin.property.Get', 'default_template', None)] = \ |
1516 | 1522 | b'0\0default=no type=vm fedora-25' |
@@ -1579,6 +1585,9 @@ def test_220_r2_encrypted(self): |
1579 | 1585 | b'fedora-25 class=TemplateVM state=Halted\n' |
1580 | 1586 | b'testvm class=AppVM state=Running\n' |
1581 | 1587 | ) |
| 1588 | + self.app.expected_calls[('dom0', 'admin.label.List', None, None)] = ( |
| 1589 | + b'0\0red\norange\nyellow\ngreen\ngray\nblue\npurple\nblack\n' |
| 1590 | + ) |
1582 | 1591 | self.app.expected_calls[ |
1583 | 1592 | ('dom0', 'admin.property.Get', 'default_template', None)] = \ |
1584 | 1593 | b'0\0default=no type=vm fedora-25' |
@@ -1647,6 +1656,9 @@ def test_230_r2_uncompressed(self): |
1647 | 1656 | b'fedora-25 class=TemplateVM state=Halted\n' |
1648 | 1657 | b'testvm class=AppVM state=Running\n' |
1649 | 1658 | ) |
| 1659 | + self.app.expected_calls[('dom0', 'admin.label.List', None, None)] = ( |
| 1660 | + b'0\0red\norange\nyellow\ngreen\ngray\nblue\npurple\nblack\n' |
| 1661 | + ) |
1650 | 1662 | self.app.expected_calls[ |
1651 | 1663 | ('dom0', 'admin.property.Get', 'default_template', None)] = \ |
1652 | 1664 | b'0\0default=no type=vm fedora-25' |
|
0 commit comments