You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ts...@apache.org on 2013/06/18 12:42:59 UTC
[1/2] git commit: updated refs/heads/master to 746af2b
Updated Branches:
refs/heads/master 882220e80 -> 746af2bb6
NAT rule creation gives ipaddress as nat_rule.ipaddress
Signed-off-by: Prasanna Santhanam <ts...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/97eb35c8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/97eb35c8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/97eb35c8
Branch: refs/heads/master
Commit: 97eb35c82b1a5a638818391d6a1dbdcb2a9e3990
Parents: 882220e
Author: Prasanna Santhanam <ts...@apache.org>
Authored: Tue Jun 18 14:22:26 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Tue Jun 18 15:08:11 2013 +0530
----------------------------------------------------------------------
test/integration/smoke/test_network.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/97eb35c8/test/integration/smoke/test_network.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_network.py b/test/integration/smoke/test_network.py
index a75ffeb..121bda0 100644
--- a/test/integration/smoke/test_network.py
+++ b/test/integration/smoke/test_network.py
@@ -1163,7 +1163,7 @@ class TestRebootRouter(cloudstackTestCase):
self.debug("SSH into VM (ID : %s ) after reboot" % self.vm_1.id)
remoteSSHClient(
- self.nat_rule.ipaddress.ipaddress,
+ self.nat_rule.ipaddress,
self.services["natrule"]["publicport"],
self.vm_1.username,
self.vm_1.password
[2/2] git commit: updated refs/heads/master to 746af2b
Posted by ts...@apache.org.
CLOUDSTACK-3049: marvin-nose causes other plugins to fail when not enabled
enabled by default. Running regular nosetests with plugins other than
marvin will fail because of this. Failure manifests itself as nose
looking for the config file when using the marivn-nose plugin
Signed-off-by: Prasanna Santhanam <ts...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/746af2bb
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/746af2bb
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/746af2bb
Branch: refs/heads/master
Commit: 746af2bb6f5d356a0ea3fd274d192e2eb9bb83a0
Parents: 97eb35c
Author: Prasanna Santhanam <ts...@apache.org>
Authored: Tue Jun 18 15:06:46 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Tue Jun 18 15:20:58 2013 +0530
----------------------------------------------------------------------
tools/marvin/marvin/marvinPlugin.py | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/746af2bb/tools/marvin/marvin/marvinPlugin.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/marvinPlugin.py b/tools/marvin/marvin/marvinPlugin.py
index 46a8a4f..846f735 100644
--- a/tools/marvin/marvin/marvinPlugin.py
+++ b/tools/marvin/marvin/marvinPlugin.py
@@ -34,9 +34,15 @@ class MarvinPlugin(Plugin):
"""
name = "marvin"
+
def configure(self, options, config):
- self.enabled = 1
- self.enableOpt = "--with-marvin"
+ if hasattr(options,self.enableOpt):
+ if not getattr(options, self.enableOpt):
+ self.enabled = False
+ return
+ else:
+ self.enabled = True
+
self.logformat = logging.Formatter("%(asctime)s - %(levelname)s - %(name)s - %(message)s")
if options.debug_log: