Repository: cloudstack Updated Branches: refs/heads/feature/systemvm-persistent-config [created] 4fe7264b6
New unit test Some stupid typos pep8 Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5b752701 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5b752701 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5b752701 Branch: refs/heads/feature/systemvm-persistent-config Commit: 5b752701243f213f29c7977d63dbf7c1079f6792 Parents: 90157f7 Author: Ian Southam <[email protected]> Authored: Mon Dec 15 15:17:32 2014 +0100 Committer: wilderrodrigues <[email protected]> Committed: Wed Feb 4 18:41:09 2015 +0100 ---------------------------------------------------------------------- .../debian/config/opt/cloud/bin/cs/CsDatabag.py | 2 +- .../config/opt/cloud/bin/cs/CsRedundant.py | 2 +- systemvm/test/python/TestCsCmdLine.py | 33 ++++++++++++++++++++ 3 files changed, 35 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5b752701/systemvm/patches/debian/config/opt/cloud/bin/cs/CsDatabag.py ---------------------------------------------------------------------- diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsDatabag.py b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsDatabag.py index 2b28430..0f19a7c 100644 --- a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsDatabag.py +++ b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsDatabag.py @@ -105,7 +105,7 @@ class CsCmdLine(CsDataBag): return "unknown" def get_domain(self): - if "domain" in self.idata(); + if "domain" in self.idata(): return self.idata()['domain'] else: return "cloudnine.internal" http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5b752701/systemvm/patches/debian/config/opt/cloud/bin/cs/CsRedundant.py ---------------------------------------------------------------------- diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsRedundant.py b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsRedundant.py index f12f8fa..4a61409 100644 --- a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsRedundant.py +++ b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsRedundant.py @@ -146,7 +146,7 @@ class CsRedundant(object): if not self.cl.is_redundant(): logging.error("Set backup called on non-redundant router") return - """ + """ if not self.cl.is_master(): logging.error("Set backup called on node that is already backup") return http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5b752701/systemvm/test/python/TestCsCmdLine.py ---------------------------------------------------------------------- diff --git a/systemvm/test/python/TestCsCmdLine.py b/systemvm/test/python/TestCsCmdLine.py new file mode 100644 index 0000000..8b954d8 --- /dev/null +++ b/systemvm/test/python/TestCsCmdLine.py @@ -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()
