You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ro...@apache.org on 2017/12/08 07:02:44 UTC
[cloudstack] branch debian9-systemvmtemplate updated (a50d2f7 ->
89f8607)
This is an automated email from the ASF dual-hosted git repository.
rohit pushed a change to branch debian9-systemvmtemplate
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.
from a50d2f7 fix conntrackd and keepalived conf to run in rVR
new 79e0b02 fix private_acl test and test_data urls to use openvm
new 1cd62b8 boost default ssvm offering by 2x (ram same as console proxy now)
new 89f8607 wait until 3*advert_int+skew time before checking router status
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
setup/db/db/schema-41000to41100.sql | 3 ++
systemvm/debian/opt/cloud/bin/set_redundant.py | 3 --
.../opt/cloud/templates/keepalived.conf.templ | 5 +-
test/integration/smoke/test_deploy_vm_iso.py | 2 +-
test/integration/smoke/test_privategw_acl.py | 55 +++++++++++++++-------
test/integration/smoke/test_vpc_redundant.py | 7 ++-
tools/marvin/marvin/config/test_data.py | 14 +++---
7 files changed, 57 insertions(+), 32 deletions(-)
--
To stop receiving notification emails like this one, please contact
['"commits@cloudstack.apache.org" <co...@cloudstack.apache.org>'].
[cloudstack] 03/03: wait until 3*advert_int+skew time before
checking router status
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch debian9-systemvmtemplate
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 89f860794abdc6f5df822470d41c47211dd4edb8
Author: Rohit Yadav <ro...@shapeblue.com>
AuthorDate: Fri Dec 8 12:32:02 2017 +0530
wait until 3*advert_int+skew time before checking router status
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
---
test/integration/smoke/test_vpc_redundant.py | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/test/integration/smoke/test_vpc_redundant.py b/test/integration/smoke/test_vpc_redundant.py
index 2c7f4ae..e801792 100644
--- a/test/integration/smoke/test_vpc_redundant.py
+++ b/test/integration/smoke/test_vpc_redundant.py
@@ -275,7 +275,7 @@ class TestVPCRedundancy(cloudstackTestCase):
cls.logger.setLevel(logging.DEBUG)
cls.logger.addHandler(cls.stream_handler)
- return
+ cls.advert_int = int(Configurations.list(cls.api_client, name="router.redundant.vrrp.interval")[0].value)
@classmethod
def tearDownClass(cls):
@@ -283,7 +283,6 @@ class TestVPCRedundancy(cloudstackTestCase):
cleanup_resources(cls.api_client, cls._cleanup)
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
- return
def setUp(self):
self.routers = []
@@ -348,6 +347,9 @@ class TestVPCRedundancy(cloudstackTestCase):
vals = ["MASTER", "BACKUP", "UNKNOWN"]
cnts = [0, 0, 0]
+ # Wait until 3*advert_int+skew time per keepalived spec
+ time.sleep(3 * self.advert_int + 1)
+
result = "UNKNOWN"
self.query_routers(count, showall)
for router in self.routers:
@@ -404,6 +406,7 @@ class TestVPCRedundancy(cloudstackTestCase):
self.logger.debug('Stopping router %s' % router.id)
cmd = stopRouter.stopRouterCmd()
cmd.id = router.id
+ cmd.forced = True
self.apiclient.stopRouter(cmd)
def reboot_router(self, router):
--
To stop receiving notification emails like this one, please contact
"commits@cloudstack.apache.org" <co...@cloudstack.apache.org>.
[cloudstack] 01/03: fix private_acl test and test_data urls to use
openvm
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch debian9-systemvmtemplate
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 79e0b024424823e423042788066dbd97cba9d780
Author: Rohit Yadav <ro...@shapeblue.com>
AuthorDate: Fri Dec 8 10:50:16 2017 +0530
fix private_acl test and test_data urls to use openvm
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
---
systemvm/debian/opt/cloud/bin/set_redundant.py | 3 --
.../opt/cloud/templates/keepalived.conf.templ | 5 +-
test/integration/smoke/test_deploy_vm_iso.py | 2 +-
test/integration/smoke/test_privategw_acl.py | 55 +++++++++++++++-------
tools/marvin/marvin/config/test_data.py | 14 +++---
5 files changed, 49 insertions(+), 30 deletions(-)
diff --git a/systemvm/debian/opt/cloud/bin/set_redundant.py b/systemvm/debian/opt/cloud/bin/set_redundant.py
index c0431c5..4d3ca24 100755
--- a/systemvm/debian/opt/cloud/bin/set_redundant.py
+++ b/systemvm/debian/opt/cloud/bin/set_redundant.py
@@ -38,9 +38,6 @@ logging.basicConfig(filename=config.get_logger(),
level=config.get_level(),
format=config.get_format())
-# Commented following as set_cl() is not defined
-# config.set_cl()
-
if options.enable:
config.cmdline().set_redundant("true")
if options.disable:
diff --git a/systemvm/debian/opt/cloud/templates/keepalived.conf.templ b/systemvm/debian/opt/cloud/templates/keepalived.conf.templ
index d14611d..5434ec5 100644
--- a/systemvm/debian/opt/cloud/templates/keepalived.conf.templ
+++ b/systemvm/debian/opt/cloud/templates/keepalived.conf.templ
@@ -21,11 +21,11 @@ global_defs {
vrrp_script heartbeat {
script "[RROUTER_BIN_PATH]/heartbeat.sh"
- interval 5
+ interval 4
}
vrrp_instance inside_network {
- state EQUAL
+ state BACKUP
interface eth2
virtual_router_id 51
nopreempt
@@ -44,7 +44,6 @@ vrrp_instance inside_network {
heartbeat
}
- !That's the correct path of the master.py file.
notify_backup "/opt/cloud/bin/master.py --backup"
notify_master "/opt/cloud/bin/master.py --master"
notify_fault "/opt/cloud/bin/master.py --fault"
diff --git a/test/integration/smoke/test_deploy_vm_iso.py b/test/integration/smoke/test_deploy_vm_iso.py
index 76ba2b7..5298c48 100644
--- a/test/integration/smoke/test_deploy_vm_iso.py
+++ b/test/integration/smoke/test_deploy_vm_iso.py
@@ -130,7 +130,7 @@ class TestDeployVMFromISO(cloudstackTestCase):
)
try:
# Download the ISO
- self.iso.download(self.apiclient)
+ self.iso.download(self.apiclient, retries=150)
except Exception as e:
raise Exception("Exception while downloading ISO %s: %s"
diff --git a/test/integration/smoke/test_privategw_acl.py b/test/integration/smoke/test_privategw_acl.py
index bba33eb..b86b96e 100644
--- a/test/integration/smoke/test_privategw_acl.py
+++ b/test/integration/smoke/test_privategw_acl.py
@@ -28,6 +28,8 @@ from marvin.codes import PASS
import time
import logging
+import random
+
class Services:
"""Test VPC network services - Port Forwarding Rules Test Data Class.
@@ -243,14 +245,19 @@ class TestPrivateGwACL(cloudstackTestCase):
qresultset = self.dbclient.execute(
"select vnet from op_dc_vnet_alloc where physical_network_id=\
- (select id from physical_network where uuid='%s' ) and taken is NULL and reservation_id is NULL and account_id is NULL ORDER BY id DESC;" % physical_network.id
- )
+ (select id from physical_network where uuid='%s');" % physical_network.id)
self.assertEqual(validateList(qresultset)[0],
PASS,
"Invalid sql query response"
)
- vlans = qresultset
- vlan_1 = int(vlans[0][0])
+
+ # Find all the vlans that are for dynamic vlan allocation
+ dc_vlans = sorted(map(lambda x: x[0], qresultset))
+
+ # Use VLAN id that is not in physical network vlan range for dynamic vlan allocation
+ vlan_1 = int(physical_network.vlan.split('-')[-1]) + 1
+ if vlan_1 in dc_vlans:
+ vlan_1 = dc_vlans[-1] + random.randint(1, 5)
acl = self.createACL(vpc)
self.createACLItem(acl.id)
@@ -328,14 +335,19 @@ class TestPrivateGwACL(cloudstackTestCase):
qresultset = self.dbclient.execute(
"select vnet from op_dc_vnet_alloc where physical_network_id=\
- (select id from physical_network where uuid='%s' ) and taken is NULL and reservation_id is NULL and account_id is NULL ORDER BY id DESC;" % physical_network.id
- )
+ (select id from physical_network where uuid='%s');" % physical_network.id)
self.assertEqual(validateList(qresultset)[0],
PASS,
"Invalid sql query response"
- )
- vlans = qresultset
- vlan_1 = int(vlans[0][0])
+ )
+
+ # Find all the vlans that are for dynamic vlan allocation
+ dc_vlans = sorted(map(lambda x: x[0], qresultset))
+
+ # Use VLAN id that is not in physical network vlan range for dynamic vlan allocation
+ vlan_1 = int(physical_network.vlan.split('-')[-1]) + 1
+ if vlan_1 in dc_vlans:
+ vlan_1 = dc_vlans[-1] + random.randint(1, 5)
acl1 = self.createACL(vpc_1)
self.createACLItem(acl1.id, cidr = "0.0.0.0/0")
@@ -376,13 +388,25 @@ class TestPrivateGwACL(cloudstackTestCase):
physical_network = self.get_guest_traffic_physical_network(self.apiclient, self.zone.id)
if not physical_network:
self.fail("No Physical Networks found!")
+
qresultset = self.dbclient.execute(
"select vnet from op_dc_vnet_alloc where physical_network_id=\
- (select id from physical_network where uuid='%s' ) and taken is NULL and reservation_id is NULL and account_id is NULL ORDER BY id DESC;" % physical_network.id
- )
- vlans = qresultset
- vlan_1 = int(vlans[0][0])
+ (select id from physical_network where uuid='%s');" % physical_network.id)
+ self.assertEqual(validateList(qresultset)[0],
+ PASS,
+ "Invalid sql query response"
+ )
+ # Find all the vlans that are for dynamic vlan allocation
+ dc_vlans = sorted(map(lambda x: x[0], qresultset))
+
+ # Use VLAN id that is not in physical network vlan range for dynamic vlan allocation
+ vlan_1 = int(physical_network.vlan.split('-')[-1]) + 1
+ if vlan_1 in dc_vlans:
+ vlan_1 = dc_vlans[-1] + random.randint(1, 5)
+
+ acl1 = self.createACL(vpc_1)
+ self.createACLItem(acl1.id, cidr = "0.0.0.0/0")
net_offering_no_lb = "network_offering_no_lb"
network_1 = self.createNetwork(vpc_1, gateway = '10.0.0.1')
@@ -706,18 +730,17 @@ class TestPrivateGwACL(cloudstackTestCase):
self.logger.debug("Sleeping for %s seconds in order to get the firewall applied..." % sleep_time)
time.sleep(sleep_time)
- sleep_time += sleep_time
self.logger.debug("Ping to VM inside another Network Tier")
result = str(ssh.execute(ssh_command))
- self.logger.debug("SSH result: %s; COUNT is ==> %s" % (result, result.count("3 received")))
+ self.logger.debug("SSH result: %s; COUNT is ==> %s" % (result, result.count("0% packet loss")))
except Exception as e:
self.fail("SSH Access failed for %s: %s" % \
(virtual_machine, e)
)
- succeeded_pings += result.count("3 received")
+ succeeded_pings += result.count("0% packet loss")
self.assertTrue(succeeded_pings >= minimum_vms_to_pass,
diff --git a/tools/marvin/marvin/config/test_data.py b/tools/marvin/marvin/config/test_data.py
index da74cb5..b2a969c 100644
--- a/tools/marvin/marvin/config/test_data.py
+++ b/tools/marvin/marvin/config/test_data.py
@@ -1721,24 +1721,24 @@ test_data = {
"VHD": {
"templatename": "XenUploadtemplate",
"displaytext": "XenUploadtemplate",
- "url": "http://people.apache.org/~sanjeev/centos56-x86_64.vhd.bz2",
+ "url": "http://dl.openvm.eu/cloudstack/macchinina/x86_64/macchinina-xen.vhd.bz2",
"hypervisor":"XenServer",
- "checksum": "09b08b6abb1b903fca7711d3ac8d6598",
+ "checksum": "54ebc933e6e07ae58c0dc97dfd37c824",
"ostypeid":"74affaea-c658-11e4-ad38-a6d1374244b4"
},
"OVA": {
"templatename": "VMwareUploadtemplate",
"displaytext": "VMwareUploadtemplate",
- "url": "http://people.apache.org/~sanjeev/CentOS5.3-x86_64.ova",
- "checksum": "02de0576dd3a61ab59c03fd795fc86ac",
+ "url": "http://dl.openvm.eu/cloudstack/macchinina/x86_64/macchinina-vmware.ova",
+ "checksum": "d6d97389b129c7d898710195510bf4fb",
"hypervisor":"VMware",
"ostypeid":"74affaea-c658-11e4-ad38-a6d1374244b4"
},
"QCOW2": {
"templatename": "KVMUploadtemplate",
"displaytext": "VMwareUploadtemplate",
- "url": "http://people.apache.org/~sanjeev/eec2209b-9875-3c8d-92be-c001bd8a0faf.qcow2.bz2",
- "checksum": "da997b697feaa2f1f6e0d4785b0cece2",
+ "url": "http://dl.openvm.eu/cloudstack/macchinina/x86_64/macchinina-kvm.qcow2.bz2",
+ "checksum": "ada77653dcf1e59495a9e1ac670ad95f",
"hypervisor":"KVM",
"ostypeid":"2e02e376-cdf3-11e4-beb3-8aa6272b57ef"
},
@@ -1824,7 +1824,7 @@ test_data = {
"name": "testISO",
"bootable": True,
"ispublic": False,
- "url": "http://people.apache.org/~sanjeev/CentOS-6.3-x86_64-bin-DVD1.iso",
+ "url": "http://dl.openvm.eu/cloudstack/iso/TinyCore-8.0.iso",
"ostype": 'CentOS 6.3 (64-bit)',
"mode": 'HTTP_DOWNLOAD'
},
--
To stop receiving notification emails like this one, please contact
"commits@cloudstack.apache.org" <co...@cloudstack.apache.org>.
[cloudstack] 02/03: boost default ssvm offering by 2x (ram same as
console proxy now)
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch debian9-systemvmtemplate
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 1cd62b818f9eba3d6ae3653002fd17604d35cff6
Author: Rohit Yadav <ro...@shapeblue.com>
AuthorDate: Fri Dec 8 11:44:14 2017 +0530
boost default ssvm offering by 2x (ram same as console proxy now)
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
---
setup/db/db/schema-41000to41100.sql | 3 +++
1 file changed, 3 insertions(+)
diff --git a/setup/db/db/schema-41000to41100.sql b/setup/db/db/schema-41000to41100.sql
index 5cb0348..c1703c4 100644
--- a/setup/db/db/schema-41000to41100.sql
+++ b/setup/db/db/schema-41000to41100.sql
@@ -463,3 +463,6 @@ CREATE TABLE `cloud`.`nic_extra_dhcp_options` (
-- Change monitor patch for apache2 in systemvm
UPDATE `cloud`.`monitoring_services` SET pidfile="/var/run/apache2/apache2.pid" WHERE process_name="apache2" AND service_name="apache2";
+
+-- Boost secondary storage systemvm
+UPDATE `cloud`.`service_offering` SET ram_size=1024, cpu=2 WHERE vm_type="secondarystoragevm" and cpu=1 and ram_size=512;
--
To stop receiving notification emails like this one, please contact
"commits@cloudstack.apache.org" <co...@cloudstack.apache.org>.