Revision 6e8091f9 test/ganeti.locking_unittest.py

b/test/ganeti.locking_unittest.py
1762 1762
    self.nodes=['n1', 'n2']
1763 1763
    self.nodegroups=['g1', 'g2']
1764 1764
    self.instances=['i1', 'i2', 'i3']
1765
    self.networks=['net1', 'net2', 'net3']
1765 1766
    self.GL = locking.GanetiLockManager(self.nodes, self.nodegroups,
1766
                                        self.instances)
1767
                                        self.instances, self.networks)
1767 1768

  
1768 1769
  def tearDown(self):
1769 1770
    # Don't try this at home...
......
1778 1779
      self.assertEqual(i, locking.LEVELS[i])
1779 1780

  
1780 1781
  def testDoubleGLFails(self):
1781
    self.assertRaises(AssertionError, locking.GanetiLockManager, [], [], [])
1782
    self.assertRaises(AssertionError, locking.GanetiLockManager, [], [], [], [])
1782 1783

  
1783 1784
  def testLockNames(self):
1784 1785
    self.assertEqual(self.GL._names(locking.LEVEL_CLUSTER), set(['BGL']))
......
1787 1788
                     set(self.nodegroups))
1788 1789
    self.assertEqual(self.GL._names(locking.LEVEL_INSTANCE),
1789 1790
                     set(self.instances))
1791
    self.assertEqual(self.GL._names(locking.LEVEL_NETWORK),
1792
                     set(self.networks))
1790 1793

  
1791 1794
  def testInitAndResources(self):
1792 1795
    locking.GanetiLockManager._instance = None
1793
    self.GL = locking.GanetiLockManager([], [], [])
1796
    self.GL = locking.GanetiLockManager([], [], [], [])
1794 1797
    self.assertEqual(self.GL._names(locking.LEVEL_CLUSTER), set(['BGL']))
1795 1798
    self.assertEqual(self.GL._names(locking.LEVEL_NODE), set())
1796 1799
    self.assertEqual(self.GL._names(locking.LEVEL_NODEGROUP), set())
1797 1800
    self.assertEqual(self.GL._names(locking.LEVEL_INSTANCE), set())
1801
    self.assertEqual(self.GL._names(locking.LEVEL_NETWORK), set())
1798 1802

  
1799 1803
    locking.GanetiLockManager._instance = None
1800
    self.GL = locking.GanetiLockManager(self.nodes, self.nodegroups, [])
1804
    self.GL = locking.GanetiLockManager(self.nodes, self.nodegroups, [], [])
1801 1805
    self.assertEqual(self.GL._names(locking.LEVEL_CLUSTER), set(['BGL']))
1802 1806
    self.assertEqual(self.GL._names(locking.LEVEL_NODE), set(self.nodes))
1803 1807
    self.assertEqual(self.GL._names(locking.LEVEL_NODEGROUP),
1804 1808
                                    set(self.nodegroups))
1805 1809
    self.assertEqual(self.GL._names(locking.LEVEL_INSTANCE), set())
1810
    self.assertEqual(self.GL._names(locking.LEVEL_NETWORK), set())
1806 1811

  
1807 1812
    locking.GanetiLockManager._instance = None
1808
    self.GL = locking.GanetiLockManager([], [], self.instances)
1813
    self.GL = locking.GanetiLockManager([], [], self.instances, [])
1809 1814
    self.assertEqual(self.GL._names(locking.LEVEL_CLUSTER), set(['BGL']))
1810 1815
    self.assertEqual(self.GL._names(locking.LEVEL_NODE), set())
1811 1816
    self.assertEqual(self.GL._names(locking.LEVEL_NODEGROUP), set())
1812 1817
    self.assertEqual(self.GL._names(locking.LEVEL_INSTANCE),
1813 1818
                     set(self.instances))
1814 1819

  
1820
    locking.GanetiLockManager._instance = None
1821
    self.GL = locking.GanetiLockManager([], [], [], self.networks)
1822
    self.assertEqual(self.GL._names(locking.LEVEL_CLUSTER), set(['BGL']))
1823
    self.assertEqual(self.GL._names(locking.LEVEL_NODE), set())
1824
    self.assertEqual(self.GL._names(locking.LEVEL_NODEGROUP), set())
1825
    self.assertEqual(self.GL._names(locking.LEVEL_INSTANCE), set())
1826
    self.assertEqual(self.GL._names(locking.LEVEL_NETWORK),
1827
                     set(self.networks))
1828

  
1815 1829
  def testAcquireRelease(self):
1816 1830
    self.GL.acquire(locking.LEVEL_CLUSTER, ['BGL'], shared=1)
1817 1831
    self.assertEquals(self.GL.list_owned(locking.LEVEL_CLUSTER), set(['BGL']))

Also available in: Unified diff