[2/2] git commit: updated refs/heads/master to 86bf33b
CLOUDSTACK-7544: Fixed ip addr del issues in ipassoc
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3cb6d4a4
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3cb6d4a4
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3cb6d4a4
Branch: refs/heads/master
Commit: 3cb6d4a4dffc317603def7147bfeef7340c33a93
Parents: f0e82f3
Author: Jayapal
Authored: Thu Sep 11 17:09:56 2014 +0530
Committer: Jayapal
Committed: Mon Sep 15 14:54:13 2014 +0530
--
.../patches/debian/config/opt/cloud/bin/deleteIpAlias.sh | 2 +-
systemvm/patches/debian/config/opt/cloud/bin/ipassoc.sh | 11 +++
2 files changed, 12 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3cb6d4a4/systemvm/patches/debian/config/opt/cloud/bin/deleteIpAlias.sh
--
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/deleteIpAlias.sh
b/systemvm/patches/debian/config/opt/cloud/bin/deleteIpAlias.sh
index 47edb92..8b14919 100755
--- a/systemvm/patches/debian/config/opt/cloud/bin/deleteIpAlias.sh
+++ b/systemvm/patches/debian/config/opt/cloud/bin/deleteIpAlias.sh
@@ -56,5 +56,5 @@ service apache2 restart
releaseLockFile $lock $locked
#recreating the active ip aliases
-/root/createIpAlias.sh $2
+/opt/cloud/bin/createIpAlias.sh $2
unlock_exit $? $lock $locked
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3cb6d4a4/systemvm/patches/debian/config/opt/cloud/bin/ipassoc.sh
--
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/ipassoc.sh
b/systemvm/patches/debian/config/opt/cloud/bin/ipassoc.sh
index 50f6b4d..ad50d4e 100755
--- a/systemvm/patches/debian/config/opt/cloud/bin/ipassoc.sh
+++ b/systemvm/patches/debian/config/opt/cloud/bin/ipassoc.sh
@@ -197,6 +197,7 @@ remove_snat() {
fi
local pubIp=$1
+ local ipNoMask=$(echo $1 | awk -F'/' '{print $1}')
logger -t cloud "$(basename $0):Removing SourceNAT $pubIp on interface
$ethDev"
sudo iptables -t nat -D POSTROUTING -j SNAT -o $ethDev --to-source
$ipNoMask;
return $?
@@ -262,6 +263,16 @@ remove_first_ip() {
sudo ip link set $ethDev down
return 1
fi
+
+ for ipMask in $existingIpMask
+ do
+if [ "$ipMask" == "$pubIp" ]
+then
+continue
+fi
+sudo ip addr add dev $ethDev $ipMask brd +
+ done
+
sed -i /"$ethDev "/d $IFACEGWIPFILE
remove_routing $1
sudo ip link set $ethDev down
[1/2] git commit: updated refs/heads/master to 86bf33b
Repository: cloudstack
Updated Branches:
refs/heads/master f0e82f340 -> 86bf33bfa
CLOUDSTACK-7540: Fixed NPE in check s2svpn connection status
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/86bf33bf
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/86bf33bf
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/86bf33bf
Branch: refs/heads/master
Commit: 86bf33bfabfeb84ce08dda3a3b0f8f313404db4c
Parents: 3cb6d4a
Author: Jayapal
Authored: Fri Sep 12 17:10:48 2014 +0530
Committer: Jayapal
Committed: Mon Sep 15 14:54:13 2014 +0530
--
.../src/com/cloud/agent/api/CheckS2SVpnConnectionsAnswer.java | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/86bf33bf/core/src/com/cloud/agent/api/CheckS2SVpnConnectionsAnswer.java
--
diff --git a/core/src/com/cloud/agent/api/CheckS2SVpnConnectionsAnswer.java
b/core/src/com/cloud/agent/api/CheckS2SVpnConnectionsAnswer.java
index 3ee5eac..50dfaf2 100644
--- a/core/src/com/cloud/agent/api/CheckS2SVpnConnectionsAnswer.java
+++ b/core/src/com/cloud/agent/api/CheckS2SVpnConnectionsAnswer.java
@@ -60,7 +60,12 @@ public class CheckS2SVpnConnectionsAnswer extends Answer {
public boolean isConnected(String ip) {
if (this.getResult()) {
-return ipToConnected.get(ip);
+Boolean status = ipToConnected.get(ip);
+
+if (status != null) {
+return status;
+}
+
}
return false;
}
git commit: updated refs/heads/master to 3a3e5cb
Repository: cloudstack
Updated Branches:
refs/heads/master 86bf33bfa -> 3a3e5cbbb
CLOUDSTACK-7134: Fixed test cases for basic zone, services dict was getting
overwritten which passed zone type as advanced even in basic zone setup
Signed-off-by: SrikanteswaraRao Talluri
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3a3e5cbb
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3a3e5cbb
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3a3e5cbb
Branch: refs/heads/master
Commit: 3a3e5c405854c0d77d37846e524815afe6cf
Parents: 86bf33b
Author: Gaurav Aradhye
Authored: Wed Sep 10 16:29:22 2014 +0530
Committer: SrikanteswaraRao Talluri
Committed: Mon Sep 15 14:58:15 2014 +0530
--
test/integration/component/test_reset_ssh_keypair.py | 6 +-
1 file changed, 1 insertion(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3a3e5cbb/test/integration/component/test_reset_ssh_keypair.py
--
diff --git a/test/integration/component/test_reset_ssh_keypair.py
b/test/integration/component/test_reset_ssh_keypair.py
index 204690e..20321ac 100644
--- a/test/integration/component/test_reset_ssh_keypair.py
+++ b/test/integration/component/test_reset_ssh_keypair.py
@@ -93,7 +93,7 @@ class Services:
"SSHPasswordEnabledTemplate": "SSHKeyPassword",
"sleep": 60,
"timeout": 20,
-"mode": 'advanced',
+"mode": '',
}
def wait_vm_start(apiclient, vmid, timeout, sleep):
@@ -232,7 +232,6 @@ class TestResetSSHKeypair(cloudstackTestCase):
def setUp(self):
self.apiclient = self.testClient.getApiClient()
self.dbclient = self.testClient.getDbConnection()
-self.services = Services().services
self.keypair = SSHKeyPair.create(
self.apiclient,
@@ -1047,7 +1046,6 @@ class TestResetSSHKeyUserRights(cloudstackTestCase):
def setUp(self):
self.apiclient = self.testClient.getApiClient()
self.dbclient = self.testClient.getDbConnection()
-self.services = Services().services
# Set Zones and disk offerings
self.services["virtual_machine"]["zoneid"] = self.zone.id
@@ -1090,8 +1088,6 @@ class TestResetSSHKeyUserRights(cloudstackTestCase):
self.cleanup.append(self.user_account)
self.debug("Account created: %s" % self.user_account.name)
-self.services = Services().services
-
# Spawn an instance
virtual_machine = VirtualMachine.create(
self.apiclient,
git commit: updated refs/heads/master to 4796cce
Repository: cloudstack
Updated Branches:
refs/heads/master 3a3e5cbbb -> 4796cceb3
CLOUDSTACK-7373: Incorrect Japanese keyboard mapping with CentOS CLI guestOS on
VMware.
Fixed the jp keyboard issues for VMs deployed with keyboard=jp param.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4796cceb
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4796cceb
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4796cceb
Branch: refs/heads/master
Commit: 4796cceb3464d3db8ec4cd71e334ff5b00285e1b
Parents: 3a3e5cb
Author: Sanjay Tripathi
Authored: Mon Sep 15 16:02:17 2014 +0530
Committer: Sanjay Tripathi
Committed: Mon Sep 15 16:16:45 2014 +0530
--
systemvm/js/ajaxkeys.js | 69 +++---
systemvm/js/ajaxviewer.js | 6 +++-
2 files changed, 9 insertions(+), 66 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4796cceb/systemvm/js/ajaxkeys.js
--
diff --git a/systemvm/js/ajaxkeys.js b/systemvm/js/ajaxkeys.js
index f186c1d..f992c62 100644
--- a/systemvm/js/ajaxkeys.js
+++ b/systemvm/js/ajaxkeys.js
@@ -275,76 +275,15 @@ var keyboardTables = [
{keycode: 244, entry : 0x7e, browser: "IE"},
//Caps Lock = 240
{keycode: 240, entry : 0xffe5},
- /*
- {keycode: JS_KEY_MULTIPLY,entry : [
- {type: KEY_DOWN,
code: X11_KEY_SHIFT, modifiers: 0 },
- {type: KEY_DOWN,
code: X11_KEY_ASTERISK, modifiers: 0 },
- {type: KEY_UP, code:
X11_KEY_ASTERISK, modifiers: 0 },
- {type: KEY_UP, code:
X11_KEY_SHIFT, modifiers: 0 }
- ]},
- {keycode: JS_KEY_ADD, entry : false}
- */
//[186 / 58 = "~^"]
{keycode: 186, entry : 0x22, browser: "IE"},
{keycode: 58,entry : 0x22, guestos:
"windows", browser: "Firefox"},
],
keyPress: [
- // 34 : " " "
- {keycode: 34,
entry: [{type: KEY_DOWN, code: 0x22, modifiers: 64, shift: true }]},
- {keycode: 42,
entry: 0xffaa },
- // 39 : " ' " (shift+7)
- {keycode: 39, entry: [
-
{type: KEY_DOWN, code: X11_KEY_SHIFT,
modifiers: 0, shift: false },
-
{type: KEY_DOWN, code: 0x22, modifiers: 0,
shift: false },
-
{type: KEY_UP, code: 0x22, modifiers: 0,
shift: false },
-
{type: KEY_UP, code: X11_KEY_SHIFT, modifiers:
0, shift: false },
-
{type: KEY_DOWN, code: 0x22, modifiers: 0,
shift: true },
-
{type: KEY_UP, code: 0x22, modifiers: 0,
shift: true },
-
]},
//58 : " : "
-{keycode: 58,
entry: [
-
{type: KEY_DOWN, code: X11_KEY_SHIFT,
modifiers: 0, shift: false },
-
{type: KEY_DOWN, code: 0x3a, modifiers: 0,
shift: false },
-
{type: KEY_UP, code: 0x3a, modifiers: 0,
shift: false },
-
{typ
git commit: updated refs/heads/master to 46c1c1c
Repository: cloudstack
Updated Branches:
refs/heads/master 4796cceb3 -> 46c1c1c94
CLOUDSTACK-7391: Passing virtualmachineid while retrieving suitable hosts for
migration
Signed-off-by: SrikanteswaraRao Talluri
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/46c1c1c9
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/46c1c1c9
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/46c1c1c9
Branch: refs/heads/master
Commit: 46c1c1c94969554b3c4c3867fefb64adbff45291
Parents: 4796cce
Author: Gaurav Aradhye
Authored: Thu Sep 11 15:53:11 2014 +0530
Committer: SrikanteswaraRao Talluri
Committed: Mon Sep 15 16:41:40 2014 +0530
--
.../maint/test_host_high_availability.py| 33
1 file changed, 20 insertions(+), 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/46c1c1c9/test/integration/component/maint/test_host_high_availability.py
--
diff --git a/test/integration/component/maint/test_host_high_availability.py
b/test/integration/component/maint/test_host_high_availability.py
index 4cd7fd8..ecc23f7 100644
--- a/test/integration/component/maint/test_host_high_availability.py
+++ b/test/integration/component/maint/test_host_high_availability.py
@@ -336,14 +336,16 @@ class TestHostHighAvailability(cloudstackTestCase):
""" Verify you can not migrate VMs to hosts with an ha.tag (positive)
"""
# Steps,
-#1. Create a Compute service offering with the 'Offer HA' option
selected.
-#2. Create a Guest VM with the compute service offering created above.
-#3. Select the VM and migrate VM to another host. Choose a 'Suitable'
host (i.e. host2)
+# 1. Create a Compute service offering with the 'Offer HA' option
selected.
+# 2. Create a Guest VM with the compute service offering created above.
+# 3. Select the VM and migrate VM to another host. Choose a 'Suitable'
host (i.e. host2)
# Validations
-#The option from the 'Migrate instance to another host' dialog box'
should list host3 as 'Not Suitable' for migration.
-#Confirm that the VM is migrated to the 'Suitable' host you selected
(i.e. host2)
+# The option from the 'Migrate instance to another host' dialog box'
should list host3 as 'Not Suitable' for migration.
+# Confirm that the VM is migrated to the 'Suitable' host you selected
+# (i.e. host2)
-#create and verify the virtual machine with HA enabled service offering
+# create and verify the virtual machine with HA enabled service
+# offering
virtual_machine_with_ha = VirtualMachine.create(
self.apiclient,
self.services["virtual_machine"],
@@ -374,9 +376,10 @@ class TestHostHighAvailability(cloudstackTestCase):
self.debug("Deployed VM on host: %s" % vm.hostid)
-#Find out a Suitable host for VM migration
+# Find out a Suitable host for VM migration
list_hosts_response = list_hosts(
self.apiclient,
+virtualmachineid = vm.id
)
self.assertEqual(
isinstance(list_hosts_response, list),
@@ -391,21 +394,25 @@ class TestHostHighAvailability(cloudstackTestCase):
)
suitableHost = None
for host in list_hosts_response:
-if host.suitableformigration == True and host.hostid != vm.hostid:
+if host.suitableformigration and host.hostid != vm.hostid:
suitableHost = host
break
-self.assertTrue(suitableHost is not None, "suitablehost should not be
None")
+self.assertTrue(
+suitableHost is not None,
+"suitablehost should not be None")
-#Migration of the VM to a suitable host
-self.debug("Migrating VM-ID: %s to Host: %s" % (self.vm.id,
suitableHost.id))
+# Migration of the VM to a suitable host
+self.debug(
+"Migrating VM-ID: %s to Host: %s" %
+(vm.id, suitableHost.id))
cmd = migrateVirtualMachine.migrateVirtualMachineCmd()
cmd.hostid = suitableHost.id
-cmd.virtualmachineid = self.vm.id
+cmd.virtualmachineid = vm.id
self.apiclient.migrateVirtualMachine(cmd)
-#Verify that the VM migrated to a targeted Suitable host
+# Verify that the VM migrated to a targeted Suitable host
list_vm_response = list_virtual_machines(
self.apiclient,
id=vm.id
git commit: updated refs/heads/master to 593ba55
Repository: cloudstack
Updated Branches:
refs/heads/master 46c1c1c94 -> 593ba5538
CLOUDSTACK-7135: test_baremetal.py - Tagging test case as invalid
Signed-off-by: SrikanteswaraRao Talluri
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/593ba553
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/593ba553
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/593ba553
Branch: refs/heads/master
Commit: 593ba5538a1248f799b267bc3a92cf6a6522f884
Parents: 46c1c1c
Author: Gaurav Aradhye
Authored: Fri Sep 12 11:45:22 2014 +0530
Committer: SrikanteswaraRao Talluri
Committed: Mon Sep 15 16:53:50 2014 +0530
--
test/integration/component/test_baremetal.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/593ba553/test/integration/component/test_baremetal.py
--
diff --git a/test/integration/component/test_baremetal.py
b/test/integration/component/test_baremetal.py
index 6ab9146..a27e76c 100644
--- a/test/integration/component/test_baremetal.py
+++ b/test/integration/component/test_baremetal.py
@@ -80,7 +80,7 @@ class TestBaremetal(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
return
-@attr(tags = ["baremetal", "basic"])
+@attr(tags = ["baremetal", "invalid"])
def test_baremetal(self):
self.debug("Test create baremetal network offering")
networkoffering = NetworkOffering.create(self.apiclient,
self.services["network_offering"])
git commit: updated refs/heads/4.4 to 723eaef
Repository: cloudstack
Updated Branches:
refs/heads/4.4 213bdbde3 -> 723eaefdf
CLOUDSTACK-6738: pre-seed expunge delay and interval to 60s
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/723eaefd
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/723eaefd
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/723eaefd
Branch: refs/heads/4.4
Commit: 723eaefdf9c139d920a94202962cfd691589c304
Parents: 213bdbd
Author: Rohit Yadav
Authored: Mon Sep 15 14:45:05 2014 +0200
Committer: Rohit Yadav
Committed: Mon Sep 15 14:45:05 2014 +0200
--
developer/developer-prefill.sql | 8
1 file changed, 8 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/723eaefd/developer/developer-prefill.sql
--
diff --git a/developer/developer-prefill.sql b/developer/developer-prefill.sql
index 7b423a1..e5fb4e3 100644
--- a/developer/developer-prefill.sql
+++ b/developer/developer-prefill.sql
@@ -56,6 +56,14 @@ INSERT INTO `cloud`.`configuration` (category, instance,
component, name, value)
INSERT INTO `cloud`.`configuration` (category, instance, component, name,
value)
VALUES ('Advanced', 'DEFAULT', 'management-server',
+'expunge.delay', '60');
+
+INSERT INTO `cloud`.`configuration` (category, instance, component, name,
value)
+VALUES ('Advanced', 'DEFAULT', 'management-server',
+'expunge.interval', '60');
+
+INSERT INTO `cloud`.`configuration` (category, instance, component, name,
value)
+VALUES ('Advanced', 'DEFAULT', 'management-server',
'system.vm.use.local.storage', 'true');
-- Add developer configuration entry; allows management server to be run as a
user other than "cloud"
git commit: updated refs/heads/4.3 to c45f73c
Repository: cloudstack
Updated Branches:
refs/heads/4.3 1687bcdd9 -> c45f73cc2
CLOUDSTACK-6738: Add configs in developer prefill to avoid restart mgmt server
Signed-off-by: Rohit Yadav
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c45f73cc
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c45f73cc
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c45f73cc
Branch: refs/heads/4.3
Commit: c45f73cc21a49e22a2947841b2017da380b392ef
Parents: 1687bcd
Author: Rohit Yadav
Authored: Mon Sep 15 14:47:32 2014 +0200
Committer: Rohit Yadav
Committed: Mon Sep 15 14:47:32 2014 +0200
--
developer/developer-prefill.sql | 16
1 file changed, 16 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c45f73cc/developer/developer-prefill.sql
--
diff --git a/developer/developer-prefill.sql b/developer/developer-prefill.sql
index 3724e26..e5fb4e3 100644
--- a/developer/developer-prefill.sql
+++ b/developer/developer-prefill.sql
@@ -48,8 +48,24 @@ INSERT INTO `cloud`.`configuration` (category, instance,
component, name, value)
INSERT INTO `cloud`.`configuration` (category, instance, component, name,
value)
VALUES ('Advanced', 'DEFAULT', 'management-server',
+'secstorage.allowed.internal.sites', '0.0.0.0/0');
+
+INSERT INTO `cloud`.`configuration` (category, instance, component, name,
value)
+VALUES ('Advanced', 'DEFAULT', 'management-server',
'account.cleanup.interval', '60');
+INSERT INTO `cloud`.`configuration` (category, instance, component, name,
value)
+VALUES ('Advanced', 'DEFAULT', 'management-server',
+'expunge.delay', '60');
+
+INSERT INTO `cloud`.`configuration` (category, instance, component, name,
value)
+VALUES ('Advanced', 'DEFAULT', 'management-server',
+'expunge.interval', '60');
+
+INSERT INTO `cloud`.`configuration` (category, instance, component, name,
value)
+VALUES ('Advanced', 'DEFAULT', 'management-server',
+'system.vm.use.local.storage', 'true');
+
-- Add developer configuration entry; allows management server to be run as a
user other than "cloud"
INSERT INTO `cloud`.`configuration` (category, instance, component, name,
value)
VALUES ('Advanced', 'DEFAULT', 'management-server',
git commit: updated refs/heads/master to 6379ca4
Repository: cloudstack
Updated Branches:
refs/heads/master 593ba5538 -> 6379ca454
CLOUDSTACK-6738: pre-seed expunge delay and interval to 60s
(cherry picked from commit 723eaefdf9c139d920a94202962cfd691589c304)
Signed-off-by: Rohit Yadav
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6379ca45
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6379ca45
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6379ca45
Branch: refs/heads/master
Commit: 6379ca4548b8329f2492fa7f142c4946bef8d55e
Parents: 593ba55
Author: Rohit Yadav
Authored: Mon Sep 15 14:45:05 2014 +0200
Committer: Rohit Yadav
Committed: Mon Sep 15 14:48:14 2014 +0200
--
developer/developer-prefill.sql | 8
1 file changed, 8 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6379ca45/developer/developer-prefill.sql
--
diff --git a/developer/developer-prefill.sql b/developer/developer-prefill.sql
index 5cd0a6d..7534cef 100644
--- a/developer/developer-prefill.sql
+++ b/developer/developer-prefill.sql
@@ -56,6 +56,14 @@ INSERT INTO `cloud`.`configuration` (category, instance,
component, name, value)
INSERT INTO `cloud`.`configuration` (category, instance, component, name,
value)
VALUES ('Advanced', 'DEFAULT', 'management-server',
+'expunge.delay', '60');
+
+INSERT INTO `cloud`.`configuration` (category, instance, component, name,
value)
+VALUES ('Advanced', 'DEFAULT', 'management-server',
+'expunge.interval', '60');
+
+INSERT INTO `cloud`.`configuration` (category, instance, component, name,
value)
+VALUES ('Advanced', 'DEFAULT', 'management-server',
'system.vm.use.local.storage', 'true');
-- Add developer configuration entry; allows management server to be run as a
user other than "cloud"
git commit: updated refs/heads/master to 8c671c4
Repository: cloudstack
Updated Branches:
refs/heads/master 6379ca454 -> 8c671c49b
CLOUDSTACK-7548:removeNICFromVM should check for networkId while checking for
PF rules on the nic
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8c671c49
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8c671c49
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8c671c49
Branch: refs/heads/master
Commit: 8c671c49b3a351d2f72a727bae6724fd1234e71c
Parents: 6379ca4
Author: Saksham Srivastava
Authored: Mon Sep 15 19:14:50 2014 +0530
Committer: Saksham Srivastava
Committed: Mon Sep 15 19:15:09 2014 +0530
--
.../rules/dao/PortForwardingRulesDao.java| 4 ++--
.../rules/dao/PortForwardingRulesDaoImpl.java| 4 ++--
.../cloud/network/rules/RulesManagerImpl.java| 19 ++-
3 files changed, 18 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8c671c49/engine/schema/src/com/cloud/network/rules/dao/PortForwardingRulesDao.java
--
diff --git
a/engine/schema/src/com/cloud/network/rules/dao/PortForwardingRulesDao.java
b/engine/schema/src/com/cloud/network/rules/dao/PortForwardingRulesDao.java
index 5b0e748..b89d04a 100644
--- a/engine/schema/src/com/cloud/network/rules/dao/PortForwardingRulesDao.java
+++ b/engine/schema/src/com/cloud/network/rules/dao/PortForwardingRulesDao.java
@@ -44,7 +44,7 @@ public interface PortForwardingRulesDao extends
GenericDao listByDestIpAddr(String ip4Address);
-List listByVmidAndDestIpAddr(String ip4Address,long
vmid);
-
PortForwardingRuleVO findByIdAndIp(long id, String secondaryIp);
+
+List listByNetworkAndDestIpAddr(String ip4Address,
long networkId);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8c671c49/engine/schema/src/com/cloud/network/rules/dao/PortForwardingRulesDaoImpl.java
--
diff --git
a/engine/schema/src/com/cloud/network/rules/dao/PortForwardingRulesDaoImpl.java
b/engine/schema/src/com/cloud/network/rules/dao/PortForwardingRulesDaoImpl.java
index 6bc401b..3aa6181 100644
---
a/engine/schema/src/com/cloud/network/rules/dao/PortForwardingRulesDaoImpl.java
+++
b/engine/schema/src/com/cloud/network/rules/dao/PortForwardingRulesDaoImpl.java
@@ -158,10 +158,10 @@ public class PortForwardingRulesDaoImpl extends
GenericDaoBase listByVmidAndDestIpAddr(String
ip4Address,long vmid) {
+public List listByNetworkAndDestIpAddr(String
ip4Address, long networkId) {
SearchCriteria sc = AllFieldsSearch.create();
sc.setParameters("dstIp", ip4Address);
-sc.setParameters("vmId", vmid);
+sc.setParameters("networkId", networkId);
return listBy(sc);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8c671c49/server/src/com/cloud/network/rules/RulesManagerImpl.java
--
diff --git a/server/src/com/cloud/network/rules/RulesManagerImpl.java
b/server/src/com/cloud/network/rules/RulesManagerImpl.java
index 59025f2..56a075d 100755
--- a/server/src/com/cloud/network/rules/RulesManagerImpl.java
+++ b/server/src/com/cloud/network/rules/RulesManagerImpl.java
@@ -1463,14 +1463,20 @@ public class RulesManagerImpl extends ManagerBase
implements RulesManager, Rules
@Override
public List listAssociatedRulesForGuestNic(Nic nic) {
+s_logger.debug("Checking if PF/StaticNat/LoadBalancer rules are
configured for nic " + nic.getId());
List result = new ArrayList();
// add PF rules
-
result.addAll(_portForwardingDao.listByVmidAndDestIpAddr(nic.getIp4Address(),nic.getInstanceId()));
+
result.addAll(_portForwardingDao.listByNetworkAndDestIpAddr(nic.getIp4Address(),
nic.getNetworkId()));
+if(result.size() > 0) {
+s_logger.debug("Found " + result.size() + " portforwarding rule
configured for the nic in the network " + nic.getNetworkId());
+}
// add static NAT rules
List staticNatRules =
_firewallDao.listStaticNatByVmId(nic.getInstanceId());
for (FirewallRuleVO rule : staticNatRules) {
-if (rule.getNetworkId() == nic.getNetworkId())
+if (rule.getNetworkId() == nic.getNetworkId()) {
result.add(rule);
+s_logger.debug("Found rule " + rule.getId() + " " +
rule.getPurpose() + " configured");
+}
}
List staticNatIps =
_ipAddressDao.listStaticNatPublicIps(nic.getNetworkId());
for (IpAddress ip : staticNatIps) {
@@ -1479,17 +1485,20 @@ public class RulesManagerImpl extends ManagerBase
implements RulesManager, Rules
//
git commit: updated refs/heads/4.4 to 0066b77
Repository: cloudstack Updated Branches: refs/heads/4.4 723eaefdf -> 0066b77d5 Remove the misc tests from travis as they do not exist in 4.4 Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0066b77d Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0066b77d Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0066b77d Branch: refs/heads/4.4 Commit: 0066b77d57c574925ef33495e9a81f4304d63ae9 Parents: 723eaef Author: imduffy15 Authored: Mon Sep 15 16:18:57 2014 +0100 Committer: imduffy15 Committed: Mon Sep 15 16:18:57 2014 +0100 -- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0066b77d/.travis.yml -- diff --git a/.travis.yml b/.travis.yml index 007d466..8ba3c4b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ notifications: env: - TESTS="test_affinity_groups test_deploy_vms_with_varied_deploymentplanners test_disk_offerings test_global_settings test_guest_vlan_range test_iso test_multipleips_per_nic test_network test_non_contigiousvlan test_over_provisioning" - TESTS="test_portable_publicip test_primary_storage test_privategw_acl test_public_ip_range test_pvlan test_regions test_reset_vm_on_reboot test_resource_detail test_routers" -- TESTS="test_secondary_storage test_service_offerings test_ssvm test_templates misc/test_deploy_vm test_vm_life_cycle test_volumes test_vpc_vpn" +- TESTS="test_secondary_storage test_service_offerings test_ssvm test_templates test_vm_life_cycle test_volumes test_vpc_vpn" before_install: travis_wait 30 ./tools/travis/before_install.sh install: ./tools/travis/install.sh before_script: travis_wait 30 ./tools/travis/before_script.sh
git commit: updated refs/heads/hotfix/4.4/CLOUDSTACK-7184 to b0641a7
Repository: cloudstack
Updated Branches:
refs/heads/hotfix/4.4/CLOUDSTACK-7184 f497fceab -> b0641a7d2
CLOUDSTACK-7184 timeout configuration value for host check
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b0641a7d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b0641a7d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b0641a7d
Branch: refs/heads/hotfix/4.4/CLOUDSTACK-7184
Commit: b0641a7d279734970577a3a87940abd030a6a8c2
Parents: f497fce
Author: Daan Hoogland
Authored: Mon Sep 15 17:41:01 2014 +0200
Committer: Daan Hoogland
Committed: Mon Sep 15 17:41:01 2014 +0200
--
api/src/com/cloud/ha/Investigator.java | 5 +++--
core/src/com/cloud/agent/api/CheckOnHostCommand.java | 8 ++--
.../cloudstack/api/agent/test/CheckOnHostCommandTest.java| 2 +-
.../hyperv/src/com/cloud/ha/HypervInvestigator.java | 8
.../hypervisors/kvm/src/com/cloud/ha/KVMInvestigator.java| 8
.../simulator/src/com/cloud/ha/SimulatorInvestigator.java| 6 +++---
.../vmware/src/com/cloud/ha/VmwareInvestigator.java | 4 ++--
server/src/com/cloud/configuration/Config.java | 1 +
server/src/com/cloud/ha/CheckOnAgentInvestigator.java| 4 ++--
server/src/com/cloud/ha/HighAvailabilityManagerImpl.java | 8 ++--
.../src/com/cloud/ha/ManagementIPSystemVMInvestigator.java | 4 ++--
server/src/com/cloud/ha/UserVmDomRInvestigator.java | 4 ++--
server/src/com/cloud/ha/XenServerInvestigator.java | 8
13 files changed, 40 insertions(+), 30 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0641a7d/api/src/com/cloud/ha/Investigator.java
--
diff --git a/api/src/com/cloud/ha/Investigator.java
b/api/src/com/cloud/ha/Investigator.java
index 7dd8b3f..e5b8609 100644
--- a/api/src/com/cloud/ha/Investigator.java
+++ b/api/src/com/cloud/ha/Investigator.java
@@ -26,8 +26,9 @@ public interface Investigator extends Adapter {
* Returns if the vm is still alive.
*
* @param vm to work on.
+ * @param wait TODO
*/
-public Boolean isVmAlive(VirtualMachine vm, Host host);
+public Boolean isVmAlive(VirtualMachine vm, Host host, int wait);
-public Status isAgentAlive(Host agent);
+public Status isAgentAlive(Host agent, int wait);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0641a7d/core/src/com/cloud/agent/api/CheckOnHostCommand.java
--
diff --git a/core/src/com/cloud/agent/api/CheckOnHostCommand.java
b/core/src/com/cloud/agent/api/CheckOnHostCommand.java
index be05bd4..8229bc3 100644
--- a/core/src/com/cloud/agent/api/CheckOnHostCommand.java
+++ b/core/src/com/cloud/agent/api/CheckOnHostCommand.java
@@ -25,9 +25,13 @@ public class CheckOnHostCommand extends Command {
protected CheckOnHostCommand() {
}
-public CheckOnHostCommand(Host host) {
+protected CheckOnHostCommand(Host host) {
+this(host,20);
+}
+
+public CheckOnHostCommand(Host host, int wait) {
this.host = new HostTO(host);
-setWait(20);
+setWait(wait);
}
public HostTO getHost() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0641a7d/core/test/org/apache/cloudstack/api/agent/test/CheckOnHostCommandTest.java
--
diff --git
a/core/test/org/apache/cloudstack/api/agent/test/CheckOnHostCommandTest.java
b/core/test/org/apache/cloudstack/api/agent/test/CheckOnHostCommandTest.java
index 9edbf10..c220268 100644
--- a/core/test/org/apache/cloudstack/api/agent/test/CheckOnHostCommandTest.java
+++ b/core/test/org/apache/cloudstack/api/agent/test/CheckOnHostCommandTest.java
@@ -257,7 +257,7 @@ public class CheckOnHostCommandTest {
};
};
-CheckOnHostCommand cohc = new CheckOnHostCommand(host);
+CheckOnHostCommand cohc = new CheckOnHostCommand(host,20);
@Test
public void testGetHost() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0641a7d/plugins/hypervisors/hyperv/src/com/cloud/ha/HypervInvestigator.java
--
diff --git
a/plugins/hypervisors/hyperv/src/com/cloud/ha/HypervInvestigator.java
b/plugins/hypervisors/hyperv/src/com/cloud/ha/HypervInvestigator.java
index 01d75fa..3ff2aba 100644
--- a/plugins/hypervisors/hyperv/src/com/cloud/ha/HypervInvestigator.java
+++ b/plugins/hypervisors/hyperv/src/com/cloud/ha/HypervInvestigator.java
@@ -42,8 +42,8 @@ public class HypervInvestigator extends AdapterBase
implements Investigator {
@Inject ResourceManager _resou
git commit: updated refs/heads/master to 0a4ab32
Repository: cloudstack
Updated Branches:
refs/heads/master 8c671c49b -> 0a4ab3251
CLOUDSTACK-7513: listServiceOfferings API when called with VM's id also returns
offerings to which it cant be upgraded. Adding the logic that when vmid is
passed it looks for compatible offerngs using the storage type (local/shares),
storage tags and also compute (cpu,speed, memory) in case the vm is running.
Also changed the scaleVm API to upgrade only when the destination offering has
storage tags as a subset of current offering tags.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0a4ab325
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0a4ab325
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0a4ab325
Branch: refs/heads/master
Commit: 0a4ab3251a4974317e6a4597cbd9cb3ee2be3666
Parents: 8c671c4
Author: Nitin Mehta
Authored: Mon Sep 15 11:02:34 2014 -0700
Committer: Nitin Mehta
Committed: Mon Sep 15 11:02:34 2014 -0700
--
.../com/cloud/vm/VirtualMachineManagerImpl.java | 8 ++--
.../com/cloud/api/query/QueryManagerImpl.java | 48 +++-
2 files changed, 41 insertions(+), 15 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0a4ab325/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
--
diff --git
a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
index 0e12bcb..f7adcf8 100755
--- a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -2764,12 +2764,12 @@ public class VirtualMachineManagerImpl extends
ManagerBase implements VirtualMac
newServiceOffering.getCpu() + " cpu(s) at " +
newServiceOffering.getSpeed() + " Mhz, and " + newServiceOffering.getRamSize()
+ " MB of memory");
}
-// Check that the service offering being upgraded to has all the tags
of the current service offering
+// Check that the service offering being upgraded to has storage tags
subset of the current service offering storage tags, since volume is not
migrated.
List currentTags =
StringUtils.csvTagsToList(currentServiceOffering.getTags());
List newTags =
StringUtils.csvTagsToList(newServiceOffering.getTags());
-if (!newTags.containsAll(currentTags)) {
-throw new InvalidParameterValueException("Unable to upgrade
virtual machine; the new service offering " + "does not have all the tags of
the " +
-"current service offering. Current service offering tags:
" + currentTags + "; " + "new service " + "offering tags: " + newTags);
+if (!currentTags.containsAll(newTags)) {
+throw new InvalidParameterValueException("Unable to upgrade
virtual machine; the new service offering " + " should have tags as subset of "
+
+"current service offering tags. Current service offering
tags: " + currentTags + "; " + "new service " + "offering tags: " + newTags);
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0a4ab325/server/src/com/cloud/api/query/QueryManagerImpl.java
--
diff --git a/server/src/com/cloud/api/query/QueryManagerImpl.java
b/server/src/com/cloud/api/query/QueryManagerImpl.java
index 2156b0f..4f775fc 100644
--- a/server/src/com/cloud/api/query/QueryManagerImpl.java
+++ b/server/src/com/cloud/api/query/QueryManagerImpl.java
@@ -26,6 +26,7 @@ import java.util.Set;
import javax.ejb.Local;
import javax.inject.Inject;
+import com.cloud.utils.StringUtils;
import org.apache.cloudstack.acl.ControlledEntity.ACLType;
import org.apache.cloudstack.affinity.AffinityGroupDomainMapVO;
import org.apache.cloudstack.affinity.AffinityGroupResponse;
@@ -2507,9 +2508,25 @@ public class QueryManagerImpl extends ManagerBase
implements QueryService {
return _diskOfferingJoinDao.searchAndCount(sc, searchFilter);
}
+private List
filterOfferingsOnCurrentTags(List offerings,
ServiceOfferingVO currentVmOffering){
+if(currentVmOffering == null) return offerings;
+List currentTagsList =
StringUtils.csvTagsToList(currentVmOffering.getTags());
+
+// New offerings should be a subset of existing storage tags. Discard
offerings who are not.
+List filteredOfferings = new ArrayList<>();
+for (ServiceOfferingJoinVO offering : offerings){
+List tags = StringUtils.csvTagsToList(offering.getTags());
+if(currentTagsList.containsAll(tags)){
+filteredOfferings.add(offering);
+}
+
git commit: updated refs/heads/master to 7d14161
Repository: cloudstack
Updated Branches:
refs/heads/master 0a4ab3251 -> 7d141617f
Fix ip6gateway parameter comments in CreateNetworkCmd
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7d141617
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7d141617
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7d141617
Branch: refs/heads/master
Commit: 7d141617f33d33a3e8ee3876a32a3ae57ede161c
Parents: 0a4ab32
Author: Sheng Yang
Authored: Mon Sep 15 11:26:48 2014 -0700
Committer: Sheng Yang
Committed: Mon Sep 15 11:26:48 2014 -0700
--
.../cloudstack/api/command/user/network/CreateNetworkCmd.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7d141617/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkCmd.java
--
diff --git
a/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkCmd.java
b/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkCmd.java
index c16514b..e030163 100644
---
a/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkCmd.java
+++
b/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkCmd.java
@@ -128,8 +128,7 @@ public class CreateNetworkCmd extends BaseCmd {
@Parameter(name = ApiConstants.END_IPV6, type = CommandType.STRING,
description = "the ending IPv6 address in the IPv6 network range")
private String endIpv6;
-@Parameter(name = ApiConstants.IP6_GATEWAY, type = CommandType.STRING,
description = "the gateway of the IPv6 network. Required "
-+ "for Shared networks and Isolated networks when it belongs to VPC")
+@Parameter(name = ApiConstants.IP6_GATEWAY, type = CommandType.STRING,
description = "the gateway of the IPv6 network. Required for Shared networks")
private String ip6Gateway;
@Parameter(name = ApiConstants.IP6_CIDR, type = CommandType.STRING,
description = "the CIDR of IPv6 network, must be at least /64")
git commit: updated refs/heads/master to b04cc75
Repository: cloudstack
Updated Branches:
refs/heads/master 7d141617f -> b04cc7506
CLOUDSTACK-7526: Fix missing localization on 'add' button
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b04cc750
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b04cc750
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b04cc750
Branch: refs/heads/master
Commit: b04cc750652642e8e2593128c7c0f5de3ef6b0d7
Parents: 7d14161
Author: Brian Federle
Authored: Mon Sep 15 13:02:27 2014 -0700
Committer: Brian Federle
Committed: Mon Sep 15 13:02:27 2014 -0700
--
ui/scripts/ui/widgets/tagger.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b04cc750/ui/scripts/ui/widgets/tagger.js
--
diff --git a/ui/scripts/ui/widgets/tagger.js b/ui/scripts/ui/widgets/tagger.js
index 3ffd80b..a77d6c5 100644
--- a/ui/scripts/ui/widgets/tagger.js
+++ b/ui/scripts/ui/widgets/tagger.js
@@ -42,7 +42,7 @@
var $valueField = $('').addClass('field value');
var $valueLabel = $('').attr('for',
'value').html(_l('label.value') + ':');
var $value = $('').addClass('value
disallowSpecialCharacters').attr('name', 'value');
-var $submit = $('').attr('type', 'submit').val('label.add');
+var $submit = $('').attr('type',
'submit').val(_l('label.add'));
$keyField.append($keyLabel, $key);
$valueField.append($valueLabel, $value);
git commit: updated refs/heads/master to e6b8aed
Repository: cloudstack
Updated Branches:
refs/heads/master b04cc7506 -> e6b8aedc5
CLOUDSTACK-6412: Fix localization for 'isdedicated' field
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e6b8aedc
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e6b8aedc
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e6b8aedc
Branch: refs/heads/master
Commit: e6b8aedc5434556b2746dd43f8fd4cb5dec99bce
Parents: b04cc75
Author: Brian Federle
Authored: Mon Sep 15 13:13:32 2014 -0700
Committer: Brian Federle
Committed: Mon Sep 15 13:13:32 2014 -0700
--
ui/scripts/system.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e6b8aedc/ui/scripts/system.js
--
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 54aafe2..71118ff 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -16074,12 +16074,12 @@
var hostItem =
json.listdedicatedhostsresponse.dedicatedhost[0];
if (hostItem.domainid
!= null) {
$.extend(item,
hostItem, {
-isdedicated:
'label.yes'
+isdedicated:
_l('label.yes')
});
}
} else
$.extend(item, {
-isdedicated: 'label.no'
+isdedicated:
_l('label.no')
})
},
error: function (json) {
git commit: updated refs/heads/master to d5a8f1d
Repository: cloudstack
Updated Branches:
refs/heads/master e6b8aedc5 -> d5a8f1d87
CLOUDSTACK-7553: Clean up cached agentMap and pingMap in case of agents
connecting back to a different MS.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d5a8f1d8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d5a8f1d8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d5a8f1d8
Branch: refs/heads/master
Commit: d5a8f1d875667dcab6130b214029f2ec74603db0
Parents: e6b8aed
Author: Min Chen
Authored: Mon Sep 15 17:37:51 2014 -0700
Committer: Min Chen
Committed: Mon Sep 15 17:37:51 2014 -0700
--
.../com/cloud/agent/manager/AgentManagerImpl.java | 16
.../agent/manager/ClusteredAgentManagerImpl.java| 12 +---
2 files changed, 25 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d5a8f1d8/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java
--
diff --git
a/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java
b/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java
index f1f6eb9..2d5eb2b 100755
--- a/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java
+++ b/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java
@@ -1387,6 +1387,22 @@ public class AgentManagerImpl extends ManagerBase
implements AgentManager, Handl
_executor.submit(new DisconnectTask(attache, event, true));
}
+protected boolean isHostOwnerSwitched(final long hostId) {
+HostVO host = _hostDao.findById(hostId);
+if (host == null) {
+s_logger.warn("Can't find the host " + hostId);
+return false;
+}
+return isHostOwnerSwitched(host);
+}
+
+protected boolean isHostOwnerSwitched(HostVO host) {
+if (host.getStatus() == Status.Up && host.getManagementServerId() !=
null && host.getManagementServerId() != _nodeId) {
+return true;
+}
+return false;
+}
+
private void disconnectInternal(final long hostId, final Status.Event
event, boolean invstigate) {
AgentAttache attache = findAttache(hostId);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d5a8f1d8/engine/orchestration/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
--
diff --git
a/engine/orchestration/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
b/engine/orchestration/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
index 5c6319d..bf28e2b 100755
---
a/engine/orchestration/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
+++
b/engine/orchestration/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
@@ -254,7 +254,10 @@ public class ClusteredAgentManagerImpl extends
AgentManagerImpl implements Clust
_agents.put(id, attache);
}
if (old != null) {
-old.disconnect(Status.Removed);
+if (s_logger.isDebugEnabled()) {
+s_logger.debug("Remove stale agent attache from current
management server");
+}
+removeAgent(old, Status.Removed);
}
return attache;
}
@@ -547,8 +550,11 @@ public class ClusteredAgentManagerImpl extends
AgentManagerImpl implements Clust
}
AgentAttache agent = findAttache(hostId);
-if (agent == null) {
-if (host.getStatus() == Status.Up && (host.getManagementServerId()
!= null && host.getManagementServerId() != _nodeId)) {
+if (agent == null || !agent.forForward()) {
+if (isHostOwnerSwitched(host)) {
+if (s_logger.isDebugEnabled()) {
+s_logger.debug("Host " + hostId + " has switched to
another management server, need to update agent map with a forwarding agent
attache");
+}
agent = createAttache(hostId);
}
}
git commit: updated refs/heads/pytest to 9610685
Repository: cloudstack
Updated Branches:
refs/heads/pytest c15035874 -> 9610685f4
add mark.tags
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9610685f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9610685f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9610685f
Branch: refs/heads/pytest
Commit: 9610685f454eea4abaf36103caa1b10bdb3262d0
Parents: c150358
Author: Edison Su
Authored: Mon Sep 15 18:29:30 2014 -0700
Committer: Edison Su
Committed: Mon Sep 15 18:29:30 2014 -0700
--
setup/dev/advanced.cfg | 2 +-
test/integration/smoke/test_CS-18306.py | 2 +-
test/integration/smoke/test_affinity_groups.py | 3 +-
.../smoke/test_deploy_vgpu_enabled_vm.py| 5 +-
.../smoke/test_deploy_vm_root_resize.py | 9 ++--
.../smoke/test_deploy_vm_with_userdata.py | 7 +--
...deploy_vms_with_varied_deploymentplanners.py | 8 ++--
test/integration/smoke/test_disk_offerings.py | 15 +++---
test/integration/smoke/test_global_settings.py | 4 +-
test/integration/smoke/test_guest_vlan_range.py | 4 +-
test/integration/smoke/test_hosts.py| 4 +-
test/integration/smoke/test_internal_lb.py | 4 +-
test/integration/smoke/test_iso.py | 16 +++
test/integration/smoke/test_loadbalance.py | 8 ++--
.../smoke/test_multipleips_per_nic.py | 4 +-
test/integration/smoke/test_network.py | 25 +-
test/integration/smoke/test_network_acl.py | 4 +-
test/integration/smoke/test_nic.py | 4 +-
.../smoke/test_non_contigiousvlan.py| 4 +-
.../integration/smoke/test_over_provisioning.py | 4 +-
.../integration/smoke/test_portable_publicip.py | 6 +--
test/integration/smoke/test_primary_storage.py | 6 +--
test/integration/smoke/test_privategw_acl.py| 4 +-
test/integration/smoke/test_public_ip_range.py | 4 +-
test/integration/smoke/test_pvlan.py| 4 +-
test/integration/smoke/test_regions.py | 4 +-
.../smoke/test_reset_vm_on_reboot.py| 6 +--
test/integration/smoke/test_resource_detail.py | 5 +-
test/integration/smoke/test_routers.py | 20
test/integration/smoke/test_scale_vm.py | 5 +-
.../integration/smoke/test_secondary_storage.py | 6 +--
.../integration/smoke/test_service_offerings.py | 10 ++--
test/integration/smoke/test_snapshots.py| 4 +-
test/integration/smoke/test_ssvm.py | 22 -
test/integration/smoke/test_templates.py| 18 +++
test/integration/smoke/test_vm_life_cycle.py| 49 +++-
test/integration/smoke/test_vm_snapshots.py | 8 ++--
test/integration/smoke/test_volumes.py | 20
test/integration/smoke/test_vpc_vpn.py | 6 +--
tools/marvin/marvin/config/test_data.py | 2 +-
.../marvin/pytest/pytest_marvin_plugin.py | 40 ++--
41 files changed, 211 insertions(+), 174 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9610685f/setup/dev/advanced.cfg
--
diff --git a/setup/dev/advanced.cfg b/setup/dev/advanced.cfg
index 18dee31..6eb9b4e 100644
--- a/setup/dev/advanced.cfg
+++ b/setup/dev/advanced.cfg
@@ -172,7 +172,7 @@
},
{
"name": "account.cleanup.interval",
-"value": "600"
+"value": "60"
},
{
"name": "guest.domain.suffix",
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9610685f/test/integration/smoke/test_CS-18306.py
--
diff --git a/test/integration/smoke/test_CS-18306.py
b/test/integration/smoke/test_CS-18306.py
index 457f2b7..416cb5e 100644
--- a/test/integration/smoke/test_CS-18306.py
+++ b/test/integration/smoke/test_CS-18306.py
@@ -17,6 +17,6 @@
# under the License.
import pytest
-@pytest.mark.attr(tags=["advanced"], required_hardware=True)
+@pytest.mark.tags(tags=["advanced"], required_hardware="false")
def test_01_create_disk_offering(vm):
assert vm is not None
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9610685f/test/integration/smoke/test_affinity_groups.py
--
diff --git a/test/integration/smoke/test_affinity_groups.py
b/test/integration/smoke/test_affinity_groups.py
index c1c5d5b..a01beba 100644
--- a/test/integration/smoke/test_affinity_groups.py
+++ b/test/integration/smoke/test_affinity_groups.py
@@ -24,6 +24,7 @@ from marvin.lib.base import *
from marvin.lib.common import *
from marvin.sshClient import SshClient
from nose.plugins.attrib import attr
+import pytest
class
git commit: updated refs/heads/master to 15a3bb3
Repository: cloudstack
Updated Branches:
refs/heads/master d5a8f1d87 -> 15a3bb318
When deploying a VM with startvm=false, the root volume is in Allocated state,
the root volume is not created in primary storage yet.
need to handle restoreVM for VM which is above status.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/15a3bb31
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/15a3bb31
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/15a3bb31
Branch: refs/heads/master
Commit: 15a3bb318f83399f67a4654869f8e06b43dde9ae
Parents: d5a8f1d
Author: Anthony Xu
Authored: Mon Sep 15 18:47:05 2014 -0700
Committer: Anthony Xu
Committed: Mon Sep 15 18:49:15 2014 -0700
--
server/src/com/cloud/vm/UserVmManagerImpl.java | 247 ++--
1 file changed, 128 insertions(+), 119 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/15a3bb31/server/src/com/cloud/vm/UserVmManagerImpl.java
--
diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java
b/server/src/com/cloud/vm/UserVmManagerImpl.java
index 0ea2a89..8f6699e 100755
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -4669,161 +4669,170 @@ public class UserVmManagerImpl extends ManagerBase
implements UserVmManager, Vir
ex.addProxyObject(vm.getUuid(), "vmId");
throw ex;
}
-
-VolumeVO root = rootVols.get(0);
-Long templateId = root.getTemplateId();
-boolean isISO = false;
-if (templateId == null) {
-// Assuming that for a vm deployed using ISO, template ID is set to
NULL
-isISO = true;
-templateId = vm.getIsoId();
-}
-
-// If target VM has associated VM snapshots then don't allow restore
of VM
-List vmSnapshots = _vmSnapshotDao.findByVm(vmId);
-if (vmSnapshots.size() > 0 && vm.getHypervisorType() ==
HypervisorType.VMware) {
-throw new InvalidParameterValueException("Unable to restore VM,
please specify a VM that does not have VM snapshots");
+if (rootVols.size() > 1) {
+InvalidParameterValueException ex = new
InvalidParameterValueException("There are " + rootVols.size() + " root volumes
for VM " + vm.getUuid());
+ex.addProxyObject(vm.getUuid(), "vmId");
+throw ex;
}
-
-VMTemplateVO template = null;
-//newTemplateId can be either template or ISO id. In the following
snippet based on the vm deployment (from template or ISO) it is handled
accordingly
-if (newTemplateId != null) {
-template = _templateDao.findById(newTemplateId);
-_accountMgr.checkAccess(caller, null, true, template);
-if (isISO) {
-if (!template.getFormat().equals(ImageFormat.ISO)) {
-throw new InvalidParameterValueException("Invalid ISO id
provided to restore the VM ");
+VolumeVO root = rootVols.get(0);
+if ( !Volume.State.Allocated.equals(root.getState()) || newTemplateId
!= null ){
+Long templateId = root.getTemplateId();
+boolean isISO = false;
+if (templateId == null) {
+// Assuming that for a vm deployed using ISO, template ID is
set to NULL
+isISO = true;
+ templateId = vm.getIsoId();
+}
+
+// If target VM has associated VM snapshots then don't allow
restore of VM
+List vmSnapshots = _vmSnapshotDao.findByVm(vmId);
+if (vmSnapshots.size() > 0 && vm.getHypervisorType() ==
HypervisorType.VMware) {
+throw new InvalidParameterValueException("Unable to restore
VM, please specify a VM that does not have VM snapshots");
+}
+
+VMTemplateVO template = null;
+//newTemplateId can be either template or ISO id. In the following
snippet based on the vm deployment (from template or ISO) it is handled
accordingly
+if (newTemplateId != null) {
+template = _templateDao.findById(newTemplateId);
+_accountMgr.checkAccess(caller, null, true, template);
+if (isISO) {
+if (!template.getFormat().equals(ImageFormat.ISO)) {
+throw new InvalidParameterValueException("Invalid ISO
id provided to restore the VM ");
+}
+} else {
+if (template.getFormat().equals(ImageFormat.ISO)) {
+throw new InvalidParameterValueException("Invalid
template id provided to restore the VM ");
+}
}
} else {
-
git commit: updated refs/heads/master to f5ff789
Repository: cloudstack
Updated Branches:
refs/heads/master 15a3bb318 -> f5ff78947
CLOUDSTACK-7441: Fixed template registration issue in test_resource_limits.py
Signed-off-by: SrikanteswaraRao Talluri
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f5ff7894
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f5ff7894
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f5ff7894
Branch: refs/heads/master
Commit: f5ff78947e81b6929ba1223abd84906793d38ece
Parents: 15a3bb3
Author: Gaurav Aradhye
Authored: Thu Sep 11 14:55:40 2014 +0530
Committer: SrikanteswaraRao Talluri
Committed: Tue Sep 16 11:22:18 2014 +0530
--
test/integration/component/test_resource_limits.py | 16 ++--
1 file changed, 10 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f5ff7894/test/integration/component/test_resource_limits.py
--
diff --git a/test/integration/component/test_resource_limits.py
b/test/integration/component/test_resource_limits.py
index 35128b4..f7fecb0 100644
--- a/test/integration/component/test_resource_limits.py
+++ b/test/integration/component/test_resource_limits.py
@@ -1270,6 +1270,10 @@ class TestResourceLimitsDomain(cloudstackTestCase):
#appropriate error and an alert should be generated.
try:
+userapiclient = self.testClient.getUserApiClient(
+ UserName=self.account.name,
+ DomainName=self.account.domain)
+
# Set usage_vm=1 for Account 1
update_resource_limit(
self.apiclient,
@@ -1286,7 +1290,7 @@ class TestResourceLimitsDomain(cloudstackTestCase):
max=2
)
virtual_machine_1 = VirtualMachine.create(
-self.apiclient,
+userapiclient,
self.services["server"],
templateid=self.template.id,
accountid=self.account.name,
@@ -1300,10 +1304,10 @@ class TestResourceLimitsDomain(cloudstackTestCase):
'Running',
"Check VM state is Running or not"
)
-virtual_machine_1.stop(self.apiclient)
+virtual_machine_1.stop(userapiclient)
# Get the Root disk of VM
volumes = list_volumes(
-self.apiclient,
+userapiclient,
virtualmachineid=virtual_machine_1.id,
type='ROOT',
listall=True
@@ -1318,7 +1322,7 @@ class TestResourceLimitsDomain(cloudstackTestCase):
self.debug("Creating template from volume: %s" % volume.id)
# Create a template from the ROOTDISK
template_1 = Template.create(
-self.apiclient,
+userapiclient,
self.services["template"],
volumeid=volume.id,
account=self.account.name,
@@ -1335,7 +1339,7 @@ class TestResourceLimitsDomain(cloudstackTestCase):
self.debug("Creating template from volume: %s" % volume.id)
# Create a template from the ROOTDISK
template_2 = Template.create(
-self.apiclient,
+userapiclient,
self.services["template"],
volumeid=volume.id,
account=self.account.name,
@@ -1355,7 +1359,7 @@ class TestResourceLimitsDomain(cloudstackTestCase):
# Exception should be raised for second template
with self.assertRaises(Exception):
Template.create(
-self.apiclient,
+userapiclient,
self.services["template"],
volumeid=volume.id,
account=self.account.name,
git commit: updated refs/heads/master to 13357cf
Repository: cloudstack
Updated Branches:
refs/heads/master f5ff78947 -> 13357cff7
CLOUDSTACK-7516: Fixed resource permission issue in test_snapshots.py, account
was using template registered with other account
Signed-off-by: SrikanteswaraRao Talluri
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/13357cff
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/13357cff
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/13357cff
Branch: refs/heads/master
Commit: 13357cff7d15d439f1393b18558776831260a1bd
Parents: f5ff789
Author: Gaurav Aradhye
Authored: Tue Sep 9 12:16:47 2014 +0530
Committer: SrikanteswaraRao Talluri
Committed: Tue Sep 16 11:30:33 2014 +0530
--
test/integration/component/test_snapshots.py | 37 ++-
1 file changed, 23 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/13357cff/test/integration/component/test_snapshots.py
--
diff --git a/test/integration/component/test_snapshots.py
b/test/integration/component/test_snapshots.py
index 8a5c7ff..0811eb1 100644
--- a/test/integration/component/test_snapshots.py
+++ b/test/integration/component/test_snapshots.py
@@ -18,7 +18,7 @@
"""
#Import Local Modules
from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
from marvin.lib.base import (Snapshot,
Template,
@@ -734,6 +734,10 @@ class TestSnapshots(cloudstackTestCase):
#5. Login to newly created virtual machine
#6. Compare data in the root disk with the one that was written on the
volume, it should match
+userapiclient = self.testClient.getUserApiClient(
+UserName=self.account.name,
+DomainName=self.account.domain)
+
random_data_0 = random_gen(size=100)
random_data_1 = random_gen(size=100)
@@ -788,7 +792,7 @@ class TestSnapshots(cloudstackTestCase):
ssh_client.execute(c)
volumes = list_volumes(
-self.apiclient,
+userapiclient,
virtualmachineid=self.virtual_machine.id,
type='ROOT',
listall=True
@@ -803,7 +807,7 @@ class TestSnapshots(cloudstackTestCase):
#Create a snapshot of volume
snapshot = Snapshot.create(
- self.apiclient,
+ userapiclient,
volume.id,
account=self.account.name,
domainid=self.account.domainid
@@ -812,7 +816,7 @@ class TestSnapshots(cloudstackTestCase):
self.debug("Snapshot created from volume ID: %s" % volume.id)
# Generate template from the snapshot
template = Template.create_from_snapshot(
-self.apiclient,
+userapiclient,
snapshot,
self.services["templates"]
)
@@ -821,7 +825,7 @@ class TestSnapshots(cloudstackTestCase):
# Verify created template
templates = list_templates(
-self.apiclient,
+userapiclient,
templatefilter=\
self.services["templates"]["templatefilter"],
id=template.id
@@ -841,7 +845,7 @@ class TestSnapshots(cloudstackTestCase):
# Deploy new virtual machine using template
new_virtual_machine = VirtualMachine.create(
-self.apiclient,
+userapiclient,
self.services["server_without_disk"],
templateid=template.id,
accountid=self.account.name,
@@ -995,8 +999,13 @@ class TestCreateVMSnapshotTemplate(cloudstackTestCase):
#State of this VM should be Running.
#Create Virtual Machine
+
+userapiclient = self.testClient.getUserApiClient(
+UserName=self.account.name,
+DomainName=self.account.domain)
+
self.virtual_machine = VirtualMachine.create(
-self.apiclient,
+userapiclient,
sel
git commit: updated refs/heads/master to 1b14fa6
Repository: cloudstack
Updated Branches:
refs/heads/master 13357cff7 -> 1b14fa6ab
CLOUDSTACK-7387: Corrected code related to adding host tags
Signed-off-by: SrikanteswaraRao Talluri
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1b14fa6a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1b14fa6a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1b14fa6a
Branch: refs/heads/master
Commit: 1b14fa6abef5811079eeb7cbd26ab718f6f69405
Parents: 13357cf
Author: Gaurav Aradhye
Authored: Mon Sep 15 14:03:49 2014 +0530
Committer: SrikanteswaraRao Talluri
Committed: Tue Sep 16 11:33:13 2014 +0530
--
.../maint/test_vpc_host_maintenance.py | 43
1 file changed, 35 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1b14fa6a/test/integration/component/maint/test_vpc_host_maintenance.py
--
diff --git a/test/integration/component/maint/test_vpc_host_maintenance.py
b/test/integration/component/maint/test_vpc_host_maintenance.py
index 83ba271..73adee7 100644
--- a/test/integration/component/maint/test_vpc_host_maintenance.py
+++ b/test/integration/component/maint/test_vpc_host_maintenance.py
@@ -18,13 +18,24 @@
""" Component tests VM life cycle in VPC network functionality
"""
#Import Local Modules
-import marvin
from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import *
-from marvin.cloudstackAPI import *
-from marvin.lib.utils import *
-from marvin.lib.base import *
-from marvin.lib.common import *
+from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackAPI import migrateSystemVm
+from marvin.lib.utils import cleanup_resources
+from marvin.lib.base import (Host,
+ VirtualMachine,
+ ServiceOffering,
+ VPC,
+ VpcOffering,
+ Router,
+ Network,
+ NetworkOffering,
+ Cluster,
+ Account)
+from marvin.lib.common import (get_domain,
+ get_zone,
+ get_template,
+ wait_for_cleanup)
class Services:
@@ -55,7 +66,7 @@ class Services:
"cpunumber": 1,
"cpuspeed": 100,
"memory": 64,
-"tags": "HOST_TAGS_HERE"
+"hosttags": "hosttag1"
},
"service_offering_2": {
"name": "Tiny Instance- tagged host 2",
@@ -63,7 +74,7 @@ class Services:
"cpunumber": 1,
"cpuspeed": 100,
"memory": 64,
-"tags": "HOST_TAGS_HERE"
+"hosttags": "hosttag2"
},
"network_offering": {
"name": 'VPC Network offering',
@@ -203,6 +214,19 @@ class TestVMLifeCycleHostmaintenance(cloudstackTestCase):
cls.services["virtual_machine"]["zoneid"] = cls.zone.id
cls.services["virtual_machine"]["template"] = cls.template.id
+clusterWithSufficientHosts = None
+clusters = Cluster.list(cls.api_client, zoneid=cls.zone.id)
+for cluster in clusters:
+cls.hosts = Host.list(cls.api_client, clusterid=cluster.id)
+if len(cls.hosts) >= 2:
+clusterWithSufficientHosts = cluster
+
+if clusterWithSufficientHosts is None:
+raise unittest.SkipTest("No Cluster with 2 hosts found")
+
+Host.update(cls.api_client, id=cls.hosts[0].id, hosttags="hosttag1")
+Host.update(cls.api_client, id=cls.hosts[1].id, hosttags="hosttag2")
+
cls.service_offering_1 = ServiceOffering.create(
cls.api_client,
cls.services["service_offering_1"]
@@ -325,6 +349,9 @@ class TestVMLifeCycleHostmaintenance(cloudstackTestCase):
@classmethod
def tearDownClass(cls):
try:
+#Delete the host tags
+Host.update(cls.api_client, id=cls.hosts[0].id,
hosttags="hosttag1")
+Host.update(cls.api_client, id=cls.hosts[1].id,
hosttags="hosttag2")
cls.account.delete(cls.api_client)
wait_for_cleanup(cls.api_client, ["account.cle
git commit: updated refs/heads/master to 8567701
Repository: cloudstack
Updated Branches:
refs/heads/master 1b14fa6ab -> 8567701f0
CLOUDSTACK-7552: In hyper-v additional data disks will be mapped to /dev/sdb
Made changes to test_volumes.py accordingly
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8567701f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8567701f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8567701f
Branch: refs/heads/master
Commit: 8567701f07a3bf43a4f7532745e967d029229589
Parents: 1b14fa6
Author: sanjeev
Authored: Tue Sep 16 11:56:01 2014 +0530
Committer: sanjeev
Committed: Tue Sep 16 11:59:12 2014 +0530
--
test/integration/smoke/test_volumes.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8567701f/test/integration/smoke/test_volumes.py
--
diff --git a/test/integration/smoke/test_volumes.py
b/test/integration/smoke/test_volumes.py
index 1e429ec..a638799 100644
--- a/test/integration/smoke/test_volumes.py
+++ b/test/integration/smoke/test_volumes.py
@@ -31,7 +31,7 @@ from marvin.lib.base import (ServiceOffering,
Volume,
Host,
DiskOffering,
- StoragePool)
+ StoragePool,)
from marvin.lib.common import (get_domain,
get_zone,
get_template)
@@ -228,6 +228,8 @@ class TestCreateVolume(cloudstackTestCase):
volume_name = "/dev/vd" + chr(ord('a') +
int(list_volume_response[0].deviceid))
self.debug(" Using KVM volume_name: %s" % (volume_name))
ret =
checkVolumeSize(ssh_handle=ssh,volume_name=volume_name,size_to_verify=vol_sz)
+elif list_volume_response[0].hypervisor.lower() == "hyperv":
+ret =
checkVolumeSize(ssh_handle=ssh,volume_name="/dev/sdb",size_to_verify=vol_sz)
else:
ret = checkVolumeSize(ssh_handle=ssh,size_to_verify=vol_sz)
self.debug(" Volume Size Expected %s Actual :%s" %(vol_sz,ret[1]))
git commit: updated refs/heads/master to 50990c4
Repository: cloudstack Updated Branches: refs/heads/master 8567701f0 -> 50990c404 CLOUDSTACK-7554 : Fixed the script - /component/test_templates.py - User Account now has permissions to the Template created by Admin Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/50990c40 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/50990c40 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/50990c40 Branch: refs/heads/master Commit: 50990c40423062ed0b724472c95a1d3120b8b66d Parents: 8567701 Author: Chandan Purushothama Authored: Mon Sep 15 21:12:26 2014 -0700 Committer: sanjeev Committed: Tue Sep 16 12:11:48 2014 +0530 -- test/integration/component/test_templates.py | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/50990c40/test/integration/component/test_templates.py -- diff --git a/test/integration/component/test_templates.py b/test/integration/component/test_templates.py index 01f331e..769848d 100644 --- a/test/integration/component/test_templates.py +++ b/test/integration/component/test_templates.py @@ -95,6 +95,8 @@ class Services: "name": "Cent OS Template", "ostype": 'CentOS 5.3 (64-bit)', "templatefilter": 'self', +"isfeatured": True, +"ispublic": True, }, "templatefilter": 'self', "ostype": 'CentOS 5.3 (64-bit)',
