mirror of https://github.com/apache/cloudstack.git
parent
8f9f39fa39
commit
636dfd6217
|
|
@ -105,7 +105,7 @@ class CsCmdLine(CsDataBag):
|
||||||
return "unknown"
|
return "unknown"
|
||||||
|
|
||||||
def get_domain(self):
|
def get_domain(self):
|
||||||
if "domain" in self.idata();
|
if "domain" in self.idata():
|
||||||
return self.idata()['domain']
|
return self.idata()['domain']
|
||||||
else:
|
else:
|
||||||
return "cloudnine.internal"
|
return "cloudnine.internal"
|
||||||
|
|
|
||||||
|
|
@ -146,7 +146,7 @@ class CsRedundant(object):
|
||||||
if not self.cl.is_redundant():
|
if not self.cl.is_redundant():
|
||||||
logging.error("Set backup called on non-redundant router")
|
logging.error("Set backup called on non-redundant router")
|
||||||
return
|
return
|
||||||
"""
|
"""
|
||||||
if not self.cl.is_master():
|
if not self.cl.is_master():
|
||||||
logging.error("Set backup called on node that is already backup")
|
logging.error("Set backup called on node that is already backup")
|
||||||
return
|
return
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,33 @@
|
||||||
|
import unittest
|
||||||
|
from cs.CsDatabag import CsCmdLine
|
||||||
|
import merge
|
||||||
|
|
||||||
|
|
||||||
|
class TestCsCmdLine(unittest.TestCase):
|
||||||
|
|
||||||
|
def setUp(self):
|
||||||
|
merge.DataBag.DPATH = "."
|
||||||
|
self.cscmdline = CsCmdLine('cmdline', {})
|
||||||
|
|
||||||
|
def test_ini(self):
|
||||||
|
self.assertTrue(self.cscmdline is not None)
|
||||||
|
|
||||||
|
def test_idata(self):
|
||||||
|
self.assertTrue(self.cscmdline.idata() == {})
|
||||||
|
|
||||||
|
def test_get_priority(self):
|
||||||
|
self.assertTrue(self.cscmdline.get_priority() == 99)
|
||||||
|
|
||||||
|
def test_is_redundant(self):
|
||||||
|
self.assertTrue(self.cscmdline.is_redundant() is False)
|
||||||
|
self.cscmdline.set_redundant()
|
||||||
|
self.assertTrue(self.cscmdline.is_redundant() is True)
|
||||||
|
|
||||||
|
def test_get_guest_gw(self):
|
||||||
|
self.assertTrue(self.cscmdline.get_guest_gw() == '1.2.3.4')
|
||||||
|
tval = "192.168.1.4"
|
||||||
|
self.cscmdline.set_guest_gw(tval)
|
||||||
|
self.assertTrue(self.cscmdline.get_guest_gw() == tval)
|
||||||
|
|
||||||
|
if __name__ == '__main__':
|
||||||
|
unittest.main()
|
||||||
Loading…
Reference in New Issue