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/08/21 11:49:49 UTC
[1/2] git commit: updated refs/heads/4.2 to 81b5146
Updated Branches:
refs/heads/4.2 9d49fe8c0 -> 81b5146c8
CLOUDSTACK-4225: Remove additional / in the nfs path
nfs://nfs-server://export/share ->
nfs://nfs-server:/export/share
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/f056af8c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f056af8c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f056af8c
Branch: refs/heads/4.2
Commit: f056af8cbdd6bdfead0afbffbe2c10bb988ba385
Parents: 9d49fe8
Author: Prasanna Santhanam <ts...@apache.org>
Authored: Wed Aug 21 13:01:40 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Wed Aug 21 15:19:25 2013 +0530
----------------------------------------------------------------------
test/integration/component/test_snapshot_gc.py | 2 +-
test/integration/component/test_snapshot_limits.py | 2 +-
test/integration/component/test_snapshots.py | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f056af8c/test/integration/component/test_snapshot_gc.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_snapshot_gc.py b/test/integration/component/test_snapshot_gc.py
index 2300e45..3cd4194 100644
--- a/test/integration/component/test_snapshot_gc.py
+++ b/test/integration/component/test_snapshot_gc.py
@@ -257,7 +257,7 @@ class TestAccountSnapshotClean(cloudstackTestCase):
cmds = [
"mkdir -p %s" % self.services["paths"]["mount_dir"],
- "mount -t %s %s/%s %s" % (
+ "mount -t %s %s%s %s" % (
'nfs',
host,
path,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f056af8c/test/integration/component/test_snapshot_limits.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_snapshot_limits.py b/test/integration/component/test_snapshot_limits.py
index a530a04..1bc2798 100644
--- a/test/integration/component/test_snapshot_limits.py
+++ b/test/integration/component/test_snapshot_limits.py
@@ -245,7 +245,7 @@ class TestSnapshotLimit(cloudstackTestCase):
cmds = [
"mkdir -p %s" % self.services["paths"]["mount_dir"],
- "mount -t %s %s/%s %s" % (
+ "mount -t %s %s%s %s" % (
'nfs',
host,
path,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f056af8c/test/integration/component/test_snapshots.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_snapshots.py b/test/integration/component/test_snapshots.py
index 071702b..044e41a 100644
--- a/test/integration/component/test_snapshots.py
+++ b/test/integration/component/test_snapshots.py
@@ -238,7 +238,7 @@ class TestSnapshots(cloudstackTestCase):
cmds = [
"mkdir -p %s" % self.services["paths"]["mount_dir"],
- "mount -t %s %s/%s %s" % (
+ "mount -t %s %s%s %s" % (
'nfs',
host,
path,
@@ -1043,7 +1043,7 @@ class TestCreateVMSnapshotTemplate(cloudstackTestCase):
cmds = [
"mkdir -p %s" % self.services["paths"]["mount_dir"],
- "mount -t %s %s/%s %s" % (
+ "mount -t %s %s%s %s" % (
'nfs',
host,
path,
[2/2] git commit: updated refs/heads/4.2 to 81b5146
Posted by ts...@apache.org.
CLOUDSTACK-4418: allow egress access to all networks for VMs on NAT
Tests doing operations within guests post VirtualMachine.create w. default
network offering fail since the egress policy with isolated networks and
sourcenat services is DENY.
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/81b5146c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/81b5146c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/81b5146c
Branch: refs/heads/4.2
Commit: 81b5146c8ed1a590b08b71a3e3421966974b74f9
Parents: f056af8
Author: Prasanna Santhanam <ts...@apache.org>
Authored: Wed Aug 21 13:02:27 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Wed Aug 21 15:19:26 2013 +0530
----------------------------------------------------------------------
tools/marvin/marvin/integration/lib/base.py | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/81b5146c/tools/marvin/marvin/integration/lib/base.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base.py b/tools/marvin/marvin/integration/lib/base.py
index b5d086b..91cfebd 100755
--- a/tools/marvin/marvin/integration/lib/base.py
+++ b/tools/marvin/marvin/integration/lib/base.py
@@ -269,7 +269,7 @@ class VirtualMachine:
cmd.securitygroupids = [basic_mode_security_group.id]
@classmethod
- def access_ssh_over_nat(cls, apiclient, services, virtual_machine):
+ def access_ssh_over_nat(cls, apiclient, services, virtual_machine, allow_egress=False):
"""
Program NAT and PF rules to open up ssh access to deployed guest
@return:
@@ -295,6 +295,13 @@ class VirtualMachine:
services=services,
ipaddressid=public_ip.ipaddress.id
)
+ if allow_egress:
+ EgressFireWallRule.create(
+ apiclient=apiclient,
+ networkid=virtual_machine.nic[0].networkid,
+ protocol='All',
+ cidrlist='0.0.0.0/0'
+ )
virtual_machine.ssh_ip = nat_rule.ipaddress
virtual_machine.public_ip = nat_rule.ipaddress
@@ -339,6 +346,12 @@ class VirtualMachine:
cmd.networkids = networkids
elif "networkids" in services:
cmd.networkids = services["networkids"]
+ else:
+ # When no networkids are passed, network
+ # is created using the "defaultOfferingWithSourceNAT"
+ # which has an egress policy of DENY. But guests in tests
+ # need access to test network connectivity
+ allow_egress = True
if templateid:
cmd.templateid = templateid
@@ -394,7 +407,7 @@ class VirtualMachine:
#program ssh access over NAT via PF
if mode.lower() == 'advanced':
- cls.access_ssh_over_nat(apiclient, services, virtual_machine)
+ cls.access_ssh_over_nat(apiclient, services, virtual_machine, allow_egress=allow_egress)
elif mode.lower() == 'basic':
virtual_machine.ssh_ip = virtual_machine.nic[0].ipaddress
virtual_machine.public_ip = virtual_machine.nic[0].ipaddress