git commit: updated refs/heads/master to c32b19a
Repository: cloudstack Updated Branches: refs/heads/master 2231fc892 - c32b19a07 CLOUDSTACK-7215: Make expunge=True as default parameter value while calling destroyVirtualMachine through base library Signed-off-by: Santhosh Edukulla santhosh.eduku...@gmail.com Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c32b19a0 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c32b19a0 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c32b19a0 Branch: refs/heads/master Commit: c32b19a07d0eaa6dc0195ecf1aa9b952a91dc997 Parents: 2231fc8 Author: Gaurav Aradhye gaurav.arad...@clogeny.com Authored: Thu Jul 31 20:19:15 2014 +0530 Committer: Santhosh Edukulla santhosh.eduku...@gmail.com Committed: Mon Aug 4 12:21:32 2014 +0530 -- .../component/test_advancedsg_networks.py | 2 +- .../component/test_multiple_ips_per_nic.py| 2 +- .../component/test_ps_domain_limits.py| 2 +- test/integration/component/test_ps_limits.py | 2 +- .../component/test_vpc_vm_life_cycle.py | 18 +- tools/marvin/marvin/lib/base.py | 3 ++- 6 files changed, 15 insertions(+), 14 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c32b19a0/test/integration/component/test_advancedsg_networks.py -- diff --git a/test/integration/component/test_advancedsg_networks.py b/test/integration/component/test_advancedsg_networks.py index 2794f96..85ab697 100644 --- a/test/integration/component/test_advancedsg_networks.py +++ b/test/integration/component/test_advancedsg_networks.py @@ -1911,7 +1911,7 @@ class TestNetworksInAdvancedSG_VmOperations(cloudstackTestCase): self.debug(SSH into VM: %s % vm.nic[0].ipaddress) vm.get_ssh_client(ipaddress=vm.nic[0].ipaddress) self.debug(SSH to VM successful, proceeding for %s operation % value) -vm.delete(self.api_client) +vm.delete(self.api_client, expunge=False) if value == recover: vm.recover(self.api_client) vm.start(self.api_client) http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c32b19a0/test/integration/component/test_multiple_ips_per_nic.py -- diff --git a/test/integration/component/test_multiple_ips_per_nic.py b/test/integration/component/test_multiple_ips_per_nic.py index 24b85df..58aac9f 100644 --- a/test/integration/component/test_multiple_ips_per_nic.py +++ b/test/integration/component/test_multiple_ips_per_nic.py @@ -1042,7 +1042,7 @@ class TestVmNetworkOperations(cloudstackTestCase): StaticNATRule.enable(self.apiclient, public_ip_2.ipaddress.id, virtual_machine.id, network.id, vmguestip=ipaddress_2.ipaddress) -virtual_machine.delete(self.apiclient) +virtual_machine.delete(self.apiclient, expunge=False) virtual_machine.recover(self.apiclient) retriesCount = 10 http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c32b19a0/test/integration/component/test_ps_domain_limits.py -- diff --git a/test/integration/component/test_ps_domain_limits.py b/test/integration/component/test_ps_domain_limits.py index afb0955..39add1e 100644 --- a/test/integration/component/test_ps_domain_limits.py +++ b/test/integration/component/test_ps_domain_limits.py @@ -670,7 +670,7 @@ class TestMultipleChildDomain(cloudstackTestCase): self.assertFalse(result[0], result[1]) self.assertTrue(result[2], Resource count does not match) -vm_1.delete(self.apiclient) +vm_1.delete(self.apiclient, expunge=False) result = isDomainResourceCountEqualToExpectedCount( self.apiclient, self.account.domainid, http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c32b19a0/test/integration/component/test_ps_limits.py -- diff --git a/test/integration/component/test_ps_limits.py b/test/integration/component/test_ps_limits.py index 1993e93..cbedfe7 100644 --- a/test/integration/component/test_ps_limits.py +++ b/test/integration/component/test_ps_limits.py @@ -199,7 +199,7 @@ class TestVolumeLimits(cloudstackTestCase): expectedCount = self.initialResourceCount # Stopping instance try: -self.virtualMachine.delete(self.apiclient) +self.virtualMachine.delete(self.apiclient, expunge=False) except Exception as e: self.fail(Failed to destroy instance: %s % e) response =
git commit: updated refs/heads/master to 73ac5dd
Repository: cloudstack Updated Branches: refs/heads/master c32b19a07 - 73ac5dd9d added tools/marvin/build to gitignore Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/73ac5dd9 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/73ac5dd9 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/73ac5dd9 Branch: refs/heads/master Commit: 73ac5dd9d07a8a6cea69ae37094b01f418b732f6 Parents: c32b19a Author: Rajani Karuturi rajanikaruturi@Rajani-Karuturis-MacBook-Pro.local Authored: Mon Aug 4 12:39:39 2014 +0530 Committer: Rajani Karuturi rajanikaruturi@Rajani-Karuturis-MacBook-Pro.local Committed: Mon Aug 4 12:40:27 2014 +0530 -- .gitignore | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/73ac5dd9/.gitignore -- diff --git a/.gitignore b/.gitignore index f541d41..c758961 100644 --- a/.gitignore +++ b/.gitignore @@ -48,6 +48,7 @@ tools/devcloud/devcloudbox/.vagrant tools/cli/cloudmonkey/marvin/ tools/cli/cloudmonkey/precache.py tools/marvin/marvin/cloudstackAPI/ +tools/marvin/build/ tools/cli/build/ *.jar *.war
git commit: updated refs/heads/4.4 to 8608321
Repository: cloudstack
Updated Branches:
refs/heads/4.4 a68d89868 - 86083216d
close statement
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/86083216
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/86083216
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/86083216
Branch: refs/heads/4.4
Commit: 86083216deebc4a60e8c7c8d30d28cca8eb78e6b
Parents: a68d898
Author: Daan Hoogland d...@onecht.net
Authored: Mon Aug 4 12:30:38 2014 +0200
Committer: Daan Hoogland d...@onecht.net
Committed: Mon Aug 4 12:30:38 2014 +0200
--
engine/schema/src/com/cloud/upgrade/dao/Upgrade302to40.java | 1 +
1 file changed, 1 insertion(+)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/86083216/engine/schema/src/com/cloud/upgrade/dao/Upgrade302to40.java
--
diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade302to40.java
b/engine/schema/src/com/cloud/upgrade/dao/Upgrade302to40.java
index 5ce8f36..248f33b 100644
--- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade302to40.java
+++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade302to40.java
@@ -582,6 +582,7 @@ public class Upgrade302to40 extends Upgrade30xBase
implements DbUpgrade {
pstmt.setLong(1, pNtwkId);
pstmt.executeUpdate();
+pstmt.close();
//get provider id
pstmt =
conn.prepareStatement(SELECT id FROM
`cloud`.`physical_network_service_providers`
git commit: updated refs/heads/master to b7d3f1b
Repository: cloudstack
Updated Branches:
refs/heads/master 73ac5dd9d - b7d3f1bd3
Fixed few coverity issues for resource synchronization
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b7d3f1bd
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b7d3f1bd
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b7d3f1bd
Branch: refs/heads/master
Commit: b7d3f1bd307a67b4d46dc29093d6845c3bcc333e
Parents: 73ac5dd
Author: Santhosh Edukulla santhosh.eduku...@gmail.com
Authored: Mon Aug 4 16:00:36 2014 +0530
Committer: Santhosh Edukulla santhosh.eduku...@gmail.com
Committed: Mon Aug 4 16:09:26 2014 +0530
--
.../src/com/cloud/agent/manager/AgentManagerImpl.java | 4 +---
server/src/com/cloud/resource/ResourceManagerImpl.java| 7 +++
2 files changed, 4 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b7d3f1bd/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 af2d1b9..7dd948a 100755
--- a/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java
+++ b/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java
@@ -272,15 +272,13 @@ public class AgentManagerImpl extends ManagerBase
implements AgentManager, Handl
public int registerForInitialConnects(final StartupCommandProcessor
creator, boolean priority) {
synchronized (_hostMonitors) {
_monitorId++;
-
if (priority) {
_creationMonitors.add(0, new PairInteger,
StartupCommandProcessor(_monitorId, creator));
} else {
_creationMonitors.add(new PairInteger,
StartupCommandProcessor(_monitorId, creator));
}
+return _monitorId;
}
-
-return _monitorId;
}
@Override
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b7d3f1bd/server/src/com/cloud/resource/ResourceManagerImpl.java
--
diff --git a/server/src/com/cloud/resource/ResourceManagerImpl.java
b/server/src/com/cloud/resource/ResourceManagerImpl.java
index 6f089af..5008621 100755
--- a/server/src/com/cloud/resource/ResourceManagerImpl.java
+++ b/server/src/com/cloud/resource/ResourceManagerImpl.java
@@ -1438,11 +1438,10 @@ public class ResourceManagerImpl extends ManagerBase
implements ResourceManager,
@Override
public void registerResourceStateAdapter(String name, ResourceStateAdapter
adapter) {
-if (_resourceStateAdapters.get(name) != null) {
-throw new CloudRuntimeException(name + has registered);
-}
-
synchronized (_resourceStateAdapters) {
+if (_resourceStateAdapters.get(name) != null) {
+throw new CloudRuntimeException(name + has registered);
+}
_resourceStateAdapters.put(name, adapter);
}
}
git commit: updated refs/heads/master to acffe5a
Repository: cloudstack Updated Branches: refs/heads/master b7d3f1bd3 - acffe5ac3 vGPU automation changes to make use of existing windows 8 template in the setup to deploy vGPU VMs Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/acffe5ac Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/acffe5ac Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/acffe5ac Branch: refs/heads/master Commit: acffe5ac3b77f5078164bed33c2ec897f937df7e Parents: b7d3f1b Author: sailajamada sailaja.m...@citrix.com Authored: Mon Aug 4 16:08:36 2014 +0530 Committer: sailajamada sailaja.m...@citrix.com Committed: Mon Aug 4 16:13:48 2014 +0530 -- .../component/test_deploy_vgpu_vm.py| 28 ++- tools/marvin/marvin/lib/common.py | 53 2 files changed, 69 insertions(+), 12 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/acffe5ac/test/integration/component/test_deploy_vgpu_vm.py -- diff --git a/test/integration/component/test_deploy_vgpu_vm.py b/test/integration/component/test_deploy_vgpu_vm.py index 5c507aa..fd3f374 100644 --- a/test/integration/component/test_deploy_vgpu_vm.py +++ b/test/integration/component/test_deploy_vgpu_vm.py @@ -29,7 +29,7 @@ from marvin.lib.base import Account, VirtualMachine, ServiceOffering , Template from marvin.lib.utils import cleanup_resources #common - commonly used methods for all tests are listed here -from marvin.lib.common import get_zone, get_domain, get_template, list_hosts ,list_service_offering +from marvin.lib.common import get_zone, get_domain, get_template, list_hosts ,list_service_offering, get_windows_template from marvin.sshClient import SshClient @@ -129,17 +129,20 @@ class TestvGPUWindowsVm(cloudstackTestCase): domainid=cls.domain.id ) -cls.template = Template.register( -cls.apiclient, -cls.testdata[vgpu] [templateregister1], -hypervisor = XenServer, -zoneid=cls.zone.id, -domainid=cls.account.domainid, - account=cls.account.name -) -timeout = cls.testdata[vgpu][timeout] +cls.template = get_windows_template(cls.apiclient, cls.zone.id ,ostype_desc=Windows 8 (64-bit)) + +if cls.template == FAILED: +cls.template = Template.register( + cls.apiclient, + cls.testdata[vgpu] [templateregister1], + hypervisor = XenServer, + zoneid=cls.zone.id, + domainid=cls.account.domainid, + account=cls.account.name + ) +timeout = cls.testdata[vgpu][timeout] -while True: +while True: time.sleep(cls.testdata[vgpu][sleep]) list_template_response = Template.list( cls.apiclient, @@ -219,7 +222,7 @@ class TestvGPUWindowsVm(cloudstackTestCase): serviceofferingid=vgpuofferingid, templateid=self.template.id ) -time.sleep(300) +time.sleep(600) list_vms = VirtualMachine.list(self.apiclient, id=self.virtual_machine.id) self.debug( @@ -455,3 +458,4 @@ class TestvGPUWindowsVm(cloudstackTestCase): + http://git-wip-us.apache.org/repos/asf/cloudstack/blob/acffe5ac/tools/marvin/marvin/lib/common.py -- diff --git a/tools/marvin/marvin/lib/common.py b/tools/marvin/marvin/lib/common.py index 29677d3..62d409c 100644 --- a/tools/marvin/marvin/lib/common.py +++ b/tools/marvin/marvin/lib/common.py @@ -300,6 +300,59 @@ def get_template( return list_templatesout[0] + +def get_windows_template( +apiclient, zone_id=None, ostype_desc=None, template_filter=featured, template_type='USER', +template_id=None, template_name=None, account=None, domain_id=None, project_id=None, +hypervisor=None): +''' +@Name : get_template +@Desc : Retrieves the template Information based upon inputs provided +Template is retrieved based upon either of the inputs matched +condition +@Input : returns a template +@Output : FAILED in case of any failure + template Information matching the inputs +''' +cmd = listTemplates.listTemplatesCmd() +cmd.templatefilter = template_filter +if domain_id is not None: +cmd.domainid = domain_id +if zone_id is not None: +cmd.zoneid = zone_id +if template_id is not None: +cmd.id = template_id +if template_name is not None: +cmd.name =
git commit: updated refs/heads/master to b73fe32
Repository: cloudstack
Updated Branches:
refs/heads/master acffe5ac3 - b73fe3251
Fixing Coverity Issues(2nd) in CitrixResourceBase.java
Signed-off-by: Santhosh Edukulla santhosh.eduku...@gmail.com
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b73fe325
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b73fe325
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b73fe325
Branch: refs/heads/master
Commit: b73fe325199705eaedb0b8a9a3927f7063875c0e
Parents: acffe5a
Author: Damodar damoder.re...@citrix.com
Authored: Mon Aug 4 17:24:43 2014 +0530
Committer: Santhosh Edukulla santhosh.eduku...@gmail.com
Committed: Mon Aug 4 17:30:43 2014 +0530
--
.../xenserver/resource/CitrixResourceBase.java | 166 ---
1 file changed, 107 insertions(+), 59 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b73fe325/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
--
diff --git
a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
index 775f5455..d7abab5 100644
---
a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
+++
b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
@@ -32,6 +32,7 @@ import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
+import java.util.LinkedHashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@@ -353,19 +354,21 @@ public abstract class CitrixResourceBase implements
ServerResource, HypervisorRe
Host host = Host.getByUuid(conn, _host.uuid);
MapVM, VM.Record vms = VM.getAllRecords(conn);
boolean success = true;
-for (Map.EntryVM, VM.Record entry : vms.entrySet()) {
-VM vm = entry.getKey();
-VM.Record vmRec = entry.getValue();
-if (vmRec.isATemplate || vmRec.isControlDomain) {
-continue;
-}
+if(vms != null !vms.isEmpty()) {
+for (Map.EntryVM, VM.Record entry : vms.entrySet()) {
+VM vm = entry.getKey();
+VM.Record vmRec = entry.getValue();
+if (vmRec.isATemplate || vmRec.isControlDomain) {
+continue;
+}
-if (VmPowerState.HALTED.equals(vmRec.powerState)
vmRec.affinity.equals(host) !isAlienVm(vm, conn)) {
-try {
-vm.destroy(conn);
-} catch (Exception e) {
-s_logger.warn(Catch Exception + e.getClass().getName()
+ : unable to destroy VM + vmRec.nameLabel + due to , e);
-success = false;
+if (VmPowerState.HALTED.equals(vmRec.powerState)
vmRec.affinity.equals(host) !isAlienVm(vm, conn)) {
+try {
+vm.destroy(conn);
+} catch (Exception e) {
+s_logger.warn(Catch Exception +
e.getClass().getName() + : unable to destroy VM + vmRec.nameLabel + due to
, e);
+success = false;
+}
}
}
}
@@ -1652,6 +1655,10 @@ public abstract class CitrixResourceBase implements
ServerResource, HypervisorRe
String nwNameLabel = null;
try {
nw = getNativeNetworkForTraffic(conn, TrafficType.Guest,
networkTag);
+if (nw == null) {
+ s_logger.error(Network is not configured on the backend for
pvlan + primaryPvlan);
+ throw new CloudRuntimeException(Network for the backend is not
configured correctly for pvlan primary: + primaryPvlan);
+}
nwNameLabel = nw.getNetwork().getNameLabel(conn);
} catch (XenAPIException e) {
s_logger.warn(Fail to get network, e);
@@ -2920,11 +2927,13 @@ public abstract class CitrixResourceBase implements
ServerResource, HypervisorRe
SetHost hosts = Host.getAll(conn);
Host dsthost = null;
-for (Host host : hosts) {
+if(hosts != null) {
+ for (Host host : hosts) {
if (host.getAddress(conn).equals(ipaddr)) {
-dsthost = host;
-break;
+ dsthost = host;
+ break;
}
+ }
}
if (dsthost == null) {
String msg = Migration failed due to unable to find host +
ipaddr +
git commit: updated refs/heads/master to 0c77b20
Repository: cloudstack Updated Branches: refs/heads/master b73fe3251 - 0c77b2007 CLOUDSTACK-7223: Wait for system VM agent state to be up before verification Signed-off-by: Santhosh Edukulla santhosh.eduku...@gmail.com Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0c77b200 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0c77b200 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0c77b200 Branch: refs/heads/master Commit: 0c77b2007e3918b10a8de560b2f63bd0f0f2cbdd Parents: b73fe32 Author: John Dilley john.dil...@citrix.com Authored: Mon Aug 4 14:48:43 2014 + Committer: Santhosh Edukulla santhosh.eduku...@gmail.com Committed: Mon Aug 4 20:28:56 2014 +0530 -- test/integration/smoke/test_ssvm.py | 69 +--- 1 file changed, 45 insertions(+), 24 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0c77b200/test/integration/smoke/test_ssvm.py -- diff --git a/test/integration/smoke/test_ssvm.py b/test/integration/smoke/test_ssvm.py index ac4079e..5713569 100644 --- a/test/integration/smoke/test_ssvm.py +++ b/test/integration/smoke/test_ssvm.py @@ -50,6 +50,25 @@ class TestSSVMs(cloudstackTestCase): raise Exception(Warning: Exception during cleanup : %s % e) return +def waitForSystemVMAgent(self, vmname): +timeout = self.services[timeout] + +while True: +list_host_response = list_hosts( + self.apiclient, + name=vmname +) + +if list_host_response and list_host_response[0].state == 'Up': +break + +if timeout == 0: +raise Exception(Timed out waiting for SSVM agent to be Up) + +time.sleep(self.services[sleep]) +timeout = timeout - 1 + + @attr(tags = [advanced, advancedns, smoke, basic, sg], required_hardware=false) def test_01_list_sec_storage_vm(self): Test List secondary storage VMs @@ -517,9 +536,6 @@ class TestSSVMs(cloudstackTestCase): cmd.id = ssvm.id self.apiclient.stopSystemVm(cmd) -# Sleep to ensure that VM is in proper state -time.sleep(self.services[sleep]) - timeout = self.services[timeout] while True: list_ssvm_response = list_ssvms( @@ -529,7 +545,7 @@ class TestSSVMs(cloudstackTestCase): if isinstance(list_ssvm_response, list): if list_ssvm_response[0].state == 'Running': break -elif timeout == 0: +if timeout == 0: raise Exception(List SSVM call failed!) time.sleep(self.services[sleep]) @@ -547,6 +563,9 @@ class TestSSVMs(cloudstackTestCase): 'Running', Check whether SSVM is running or not ) +# Wait for the agent to be up +self.waitForSystemVMAgent(ssvm_response.name) + # Call above tests to ensure SSVM is properly running self.test_01_list_sec_storage_vm() self.test_03_ssvm_internals() @@ -593,9 +612,6 @@ class TestSSVMs(cloudstackTestCase): cmd.id = cpvm.id self.apiclient.stopSystemVm(cmd) -# Sleep to ensure that VM is in proper state -time.sleep(self.services[sleep]) - timeout = self.services[timeout] while True: list_cpvm_response = list_ssvms( @@ -605,7 +621,7 @@ class TestSSVMs(cloudstackTestCase): if isinstance(list_cpvm_response, list): if list_cpvm_response[0].state == 'Running': break -elif timeout == 0: +if timeout == 0: raise Exception(List CPVM call failed!) time.sleep(self.services[sleep]) @@ -620,6 +636,10 @@ class TestSSVMs(cloudstackTestCase): 'Running', Check whether CPVM is running or not ) + +# Wait for the agent to be up +self.waitForSystemVMAgent(cpvm_response.name) + # Call above tests to ensure CPVM is properly running self.test_02_list_cpvm_vm() self.test_04_cpvm_internals() @@ -670,9 +690,6 @@ class TestSSVMs(cloudstackTestCase): cmd.id = ssvm_response.id self.apiclient.rebootSystemVm(cmd) -# Sleep to ensure that VM is in proper state -time.sleep(self.services[sleep]) - timeout = self.services[timeout] while True:
git commit: updated refs/heads/master to b157104
Repository: cloudstack
Updated Branches:
refs/heads/master 0c77b2007 - b15710456
devcloud: user insert on duplicate update in devcloud.sql
This commit modifies insert statements to use the insert on duplicate update
syntax to update configuration table name, values in case primary key already
exists
Signed-off-by: Rohit Yadav rohit.ya...@shapeblue.com
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b1571045
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b1571045
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b1571045
Branch: refs/heads/master
Commit: b157104563d2d30ede7bfabe2df8cf42d3dadb1d
Parents: 0c77b20
Author: Rohit Yadav rohit.ya...@shapeblue.com
Authored: Mon Aug 4 22:47:25 2014 +0200
Committer: Rohit Yadav rohit.ya...@shapeblue.com
Committed: Mon Aug 4 22:47:25 2014 +0200
--
tools/devcloud/devcloud.sql | 45 ++--
1 file changed, 30 insertions(+), 15 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b1571045/tools/devcloud/devcloud.sql
--
diff --git a/tools/devcloud/devcloud.sql b/tools/devcloud/devcloud.sql
index 88a9942..0f49b54 100644
--- a/tools/devcloud/devcloud.sql
+++ b/tools/devcloud/devcloud.sql
@@ -19,21 +19,36 @@
INSERT INTO `cloud`.`disk_offering` (id, name, uuid, display_text, created,
use_local_storage, type, disk_size, provisioning_type) VALUES (17,
'tinyOffering', UUID(), 'tinyOffering', NOW(), 1, 'Service', 0, 'thin');
INSERT INTO `cloud`.`service_offering` (id, cpu, speed, ram_size) VALUES (17,
1, 100, 100);
INSERT INTO `cloud`.`disk_offering` (id, name, uuid, display_text, created,
type, disk_size,provisioning_type) VALUES (18, 'tinyDiskOffering', UUID(),
'tinyDiskOffering', NOW(), 'Disk', 1073741824,'thin');
-INSERT INTO `cloud`.`configuration` (instance, name,value)
VALUE('DEFAULT','router.ram.size', '100');
-INSERT INTO `cloud`.`configuration` (instance, name,value)
VALUE('DEFAULT','router.cpu.mhz','100');
-INSERT INTO `cloud`.`configuration` (instance, name,value)
VALUE('DEFAULT','console.ram.size','100');
-INSERT INTO `cloud`.`configuration` (instance, name,value)
VALUE('DEFAULT','console.cpu.mhz', '100');
-INSERT INTO `cloud`.`configuration` (instance, name,value)
VALUE('DEFAULT','ssvm.ram.size','100');
-INSERT INTO `cloud`.`configuration` (instance, name,value)
VALUE('DEFAULT','ssvm.cpu.mhz','100');
-INSERT INTO `cloud`.`configuration` (instance, name, value) VALUE('DEFAULT',
'system.vm.use.local.storage', 'true');
-INSERT INTO `cloud`.`configuration` (instance, name, value) VALUE('DEFAULT',
'expunge.workers', '3');
-INSERT INTO `cloud`.`configuration` (instance, name, value) VALUE('DEFAULT',
'expunge.delay', '60');
-INSERT INTO `cloud`.`configuration` (instance, name, value) VALUE('DEFAULT',
'expunge.interval', '60');
-INSERT INTO `cloud`.`configuration` (instance, name, value) VALUE('DEFAULT',
'enable.ec2.api', 'true');
-INSERT INTO `cloud`.`configuration` (instance, name, value) VALUE('DEFAULT',
'enable.s3.api', 'true');
-INSERT INTO `cloud`.`configuration` (instance, name, value) VALUE('DEFAULT',
'host', '192.168.56.1');
-INSERT INTO `cloud`.`configuration` (instance, name, value) VALUE('DEFAULT',
'management.network.cidr', '192.168.56.0/24');
-INSERT INTO `cloud`.`configuration` (instance, name, value) VALUE('DEFAULT',
'secstorage.allowed.internal.sites', '192.168.56.0/8');
+INSERT INTO `cloud`.`configuration` (instance, name, value)
VALUE('DEFAULT','router.ram.size', '100')
+ON DUPLICATE KEY UPDATE value = '100';
+INSERT INTO `cloud`.`configuration` (instance, name, value)
VALUE('DEFAULT','router.cpu.mhz','100')
+ON DUPLICATE KEY UPDATE value = '100';
+INSERT INTO `cloud`.`configuration` (instance, name, value)
VALUE('DEFAULT','console.ram.size','100')
+ON DUPLICATE KEY UPDATE value = '100';
+INSERT INTO `cloud`.`configuration` (instance, name, value)
VALUE('DEFAULT','console.cpu.mhz', '100')
+ON DUPLICATE KEY UPDATE value = '100';
+INSERT INTO `cloud`.`configuration` (instance, name, value)
VALUE('DEFAULT','ssvm.ram.size','100')
+ON DUPLICATE KEY UPDATE value = '100';
+INSERT INTO `cloud`.`configuration` (instance, name, value)
VALUE('DEFAULT','ssvm.cpu.mhz','100')
+ON DUPLICATE KEY UPDATE value = '100';
+INSERT INTO `cloud`.`configuration` (instance, name, value) VALUE('DEFAULT',
'expunge.workers', '3')
+ON DUPLICATE KEY UPDATE value = '3';
+INSERT INTO `cloud`.`configuration` (instance, name, value) VALUE('DEFAULT',
'expunge.delay', '60')
+ON DUPLICATE KEY UPDATE value = '60';
+INSERT INTO `cloud`.`configuration` (instance, name, value) VALUE('DEFAULT',
'expunge.interval', '60')
+ON DUPLICATE KEY UPDATE value = '60';
git commit: updated refs/heads/4.4 to 9315321
Repository: cloudstack
Updated Branches:
refs/heads/4.4 86083216d - 9315321da
devcloud: user insert on duplicate update in devcloud.sql
This commit modifies insert statements to use the insert on duplicate update
syntax to update configuration table name, values in case primary key already
exists
Signed-off-by: Rohit Yadav rohit.ya...@shapeblue.com
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9315321d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9315321d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9315321d
Branch: refs/heads/4.4
Commit: 9315321dacc877e67279b3b59b6b2e08d125ddbe
Parents: 8608321
Author: Rohit Yadav rohit.ya...@shapeblue.com
Authored: Mon Aug 4 22:55:34 2014 +0200
Committer: Rohit Yadav rohit.ya...@shapeblue.com
Committed: Mon Aug 4 22:55:34 2014 +0200
--
tools/devcloud/devcloud.sql | 45 ++--
1 file changed, 30 insertions(+), 15 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9315321d/tools/devcloud/devcloud.sql
--
diff --git a/tools/devcloud/devcloud.sql b/tools/devcloud/devcloud.sql
index 009c2b5..97c3d74 100644
--- a/tools/devcloud/devcloud.sql
+++ b/tools/devcloud/devcloud.sql
@@ -19,21 +19,36 @@
INSERT INTO `cloud`.`disk_offering` (id, name, uuid, display_text, created,
use_local_storage, type, disk_size) VALUES (17, 'tinyOffering', UUID(),
'tinyOffering', NOW(), 1, 'Service', 0);
INSERT INTO `cloud`.`service_offering` (id, cpu, speed, ram_size) VALUES (17,
1, 100, 100);
INSERT INTO `cloud`.`disk_offering` (id, name, uuid, display_text, created,
type, disk_size) VALUES (18, 'tinyDiskOffering', UUID(), 'tinyDiskOffering',
NOW(), 'Disk', 1073741824);
-INSERT INTO `cloud`.`configuration` (instance, name,value)
VALUE('DEFAULT','router.ram.size', '100');
-INSERT INTO `cloud`.`configuration` (instance, name,value)
VALUE('DEFAULT','router.cpu.mhz','100');
-INSERT INTO `cloud`.`configuration` (instance, name,value)
VALUE('DEFAULT','console.ram.size','100');
-INSERT INTO `cloud`.`configuration` (instance, name,value)
VALUE('DEFAULT','console.cpu.mhz', '100');
-INSERT INTO `cloud`.`configuration` (instance, name,value)
VALUE('DEFAULT','ssvm.ram.size','100');
-INSERT INTO `cloud`.`configuration` (instance, name,value)
VALUE('DEFAULT','ssvm.cpu.mhz','100');
-INSERT INTO `cloud`.`configuration` (instance, name, value) VALUE('DEFAULT',
'system.vm.use.local.storage', 'true');
-INSERT INTO `cloud`.`configuration` (instance, name, value) VALUE('DEFAULT',
'expunge.workers', '3');
-INSERT INTO `cloud`.`configuration` (instance, name, value) VALUE('DEFAULT',
'expunge.delay', '60');
-INSERT INTO `cloud`.`configuration` (instance, name, value) VALUE('DEFAULT',
'expunge.interval', '60');
-INSERT INTO `cloud`.`configuration` (instance, name, value) VALUE('DEFAULT',
'enable.ec2.api', 'true');
-INSERT INTO `cloud`.`configuration` (instance, name, value) VALUE('DEFAULT',
'enable.s3.api', 'true');
-INSERT INTO `cloud`.`configuration` (instance, name, value) VALUE('DEFAULT',
'host', '192.168.56.1');
-INSERT INTO `cloud`.`configuration` (instance, name, value) VALUE('DEFAULT',
'management.network.cidr', '192.168.56.0/24');
-INSERT INTO `cloud`.`configuration` (instance, name, value) VALUE('DEFAULT',
'secstorage.allowed.internal.sites', '192.168.56.0/8');
+INSERT INTO `cloud`.`configuration` (instance, name, value)
VALUE('DEFAULT','router.ram.size', '100')
+ON DUPLICATE KEY UPDATE value = '100';
+INSERT INTO `cloud`.`configuration` (instance, name, value)
VALUE('DEFAULT','router.cpu.mhz','100')
+ON DUPLICATE KEY UPDATE value = '100';
+INSERT INTO `cloud`.`configuration` (instance, name, value)
VALUE('DEFAULT','console.ram.size','100')
+ON DUPLICATE KEY UPDATE value = '100';
+INSERT INTO `cloud`.`configuration` (instance, name, value)
VALUE('DEFAULT','console.cpu.mhz', '100')
+ON DUPLICATE KEY UPDATE value = '100';
+INSERT INTO `cloud`.`configuration` (instance, name, value)
VALUE('DEFAULT','ssvm.ram.size','100')
+ON DUPLICATE KEY UPDATE value = '100';
+INSERT INTO `cloud`.`configuration` (instance, name, value)
VALUE('DEFAULT','ssvm.cpu.mhz','100')
+ON DUPLICATE KEY UPDATE value = '100';
+INSERT INTO `cloud`.`configuration` (instance, name, value) VALUE('DEFAULT',
'expunge.workers', '3')
+ON DUPLICATE KEY UPDATE value = '3';
+INSERT INTO `cloud`.`configuration` (instance, name, value) VALUE('DEFAULT',
'expunge.delay', '60')
+ON DUPLICATE KEY UPDATE value = '60';
+INSERT INTO `cloud`.`configuration` (instance, name, value) VALUE('DEFAULT',
'expunge.interval', '60')
+ON DUPLICATE KEY UPDATE value = '60';
+INSERT INTO `cloud`.`configuration` (instance, name, value)
git commit: updated refs/heads/master to 0fe1d4b
Repository: cloudstack
Updated Branches:
refs/heads/master b15710456 - 0fe1d4bb2
got VBD statistics from RRD
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0fe1d4bb
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0fe1d4bb
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0fe1d4bb
Branch: refs/heads/master
Commit: 0fe1d4bb27de83f3fff4e22d0bb501bc2451e62f
Parents: b157104
Author: Anthony Xu anthony...@citrix.com
Authored: Mon Aug 4 12:19:16 2014 -0700
Committer: Anthony Xu anthony...@citrix.com
Committed: Mon Aug 4 13:57:18 2014 -0700
--
.../xenserver/resource/CitrixResourceBase.java | 66 +---
1 file changed, 15 insertions(+), 51 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0fe1d4bb/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
--
diff --git
a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
index d7abab5..67882e6 100644
---
a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
+++
b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
@@ -75,7 +75,6 @@ import com.xensource.xenapi.Types.BadServerResponse;
import com.xensource.xenapi.Types.VmPowerState;
import com.xensource.xenapi.Types.XenAPIException;
import com.xensource.xenapi.VBD;
-import com.xensource.xenapi.VBDMetrics;
import com.xensource.xenapi.VDI;
import com.xensource.xenapi.VGPU;
import com.xensource.xenapi.VIF;
@@ -2251,23 +2250,15 @@ public abstract class CitrixResourceBase implements
ServerResource, HypervisorRe
if (type.equalsIgnoreCase(host)) {
-if (param.contains(pif_eth0_rx)) {
-hostStats.setNetworkReadKBs(getDataAverage(dataNode, col,
numRows));
-}
-
-if (param.contains(pif_eth0_tx)) {
-hostStats.setNetworkWriteKBs(getDataAverage(dataNode, col,
numRows));
-}
-
-if (param.contains(memory_total_kib)) {
+if (param.matches(pif_eth0_rx)) {
+hostStats.setNetworkReadKBs(getDataAverage(dataNode, col,
numRows)/1000);
+} else if (param.matches(pif_eth0_tx)) {
+hostStats.setNetworkWriteKBs(getDataAverage(dataNode, col,
numRows)/1000);
+} else if (param.contains(memory_total_kib)) {
hostStats.setTotalMemoryKBs(getDataAverage(dataNode, col,
numRows));
-}
-
-if (param.contains(memory_free_kib)) {
+} else if (param.contains(memory_free_kib)) {
hostStats.setFreeMemoryKBs(getDataAverage(dataNode, col,
numRows));
-}
-
-if (param.contains(cpu)) {
+} else if (param.matches(cpu_avg)) {
// hostStats.setNumCpus(hostStats.getNumCpus() + 1);
hostStats.setCpuUtilization(hostStats.getCpuUtilization()
+ getDataAverage(dataNode, col, numRows));
}
@@ -2378,13 +2369,16 @@ public abstract class CitrixResourceBase implements
ServerResource, HypervisorRe
if (param.contains(cpu)) {
vmStatsAnswer.setNumCPUs(vmStatsAnswer.getNumCPUs() + 1);
vmStatsAnswer.setCPUUtilization(((vmStatsAnswer.getCPUUtilization() +
getDataAverage(dataNode, col, numRows;
-} else if (param.matches(vif_\\d_rx)) {
-
vmStatsAnswer.setNetworkReadKBs(vmStatsAnswer.getNetworkReadKBs() +
(getDataAverage(dataNode, col, numRows) / (8 * 2)));
-} else if (param.matches(vif_\\d_tx)) {
-
vmStatsAnswer.setNetworkWriteKBs(vmStatsAnswer.getNetworkWriteKBs() +
(getDataAverage(dataNode, col, numRows) / (8 * 2)));
+} else if (param.matches(vif_\\d*_rx)) {
+
vmStatsAnswer.setNetworkReadKBs(vmStatsAnswer.getNetworkReadKBs() +
(getDataAverage(dataNode, col, numRows)/1000));
+} else if (param.matches(vif_\\d*_tx)) {
+
vmStatsAnswer.setNetworkWriteKBs(vmStatsAnswer.getNetworkWriteKBs() +
(getDataAverage(dataNode, col, numRows)/1000));
+} else if (param.matches(vbd_.*_read)) {
+
vmStatsAnswer.setDiskReadKBs(vmStatsAnswer.getDiskReadKBs() +
(getDataAverage(dataNode, col, numRows)/1000));
+} else if (param.matches(vbd_.*_write)) {
+
git commit: updated refs/heads/master to 05d056b
Repository: cloudstack
Updated Branches:
refs/heads/master 0fe1d4bb2 - 05d056bb9
CLOUDSTACK-7194: deployVm Api, hypervisor parameter:
* is respected only when vm is deployed from ISO, or hypervisorType is not set
on the template record
* if parameter passed when vm is deployed from template having hypervisor info
set, validate that these 2 parameters are the same instead of silently
defaulting the final value to the one set on the template
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/05d056bb
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/05d056bb
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/05d056bb
Branch: refs/heads/master
Commit: 05d056bb90c80a42a8be087bdac5f0ed93bc3462
Parents: 0fe1d4b
Author: Alena Prokharchyk alena.prokharc...@citrix.com
Authored: Mon Aug 4 13:39:53 2014 -0700
Committer: Alena Prokharchyk alena.prokharc...@citrix.com
Committed: Mon Aug 4 14:21:52 2014 -0700
--
.../api/command/user/vm/DeployVMCmd.java| 3 +-
server/src/com/cloud/vm/UserVmManagerImpl.java | 38 ++--
2 files changed, 22 insertions(+), 19 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/05d056bb/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
--
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
b/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
index 14b703c..8ceccb9 100755
--- a/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
@@ -128,7 +128,8 @@ public class DeployVMCmd extends BaseAsyncCreateCustomIdCmd
{
@Parameter(name = ApiConstants.GROUP, type = CommandType.STRING,
description = an optional group for the virtual machine)
private String group;
-@Parameter(name = ApiConstants.HYPERVISOR, type = CommandType.STRING,
description = the hypervisor on which to deploy the virtual machine)
+@Parameter(name = ApiConstants.HYPERVISOR, type = CommandType.STRING,
description = the hypervisor on which to deploy the virtual machine.
++ The parameter is respected only when hypervisor info is not set
on the ISO/Template passed to the call)
private String hypervisor;
@Parameter(name = ApiConstants.USER_DATA, type = CommandType.STRING,
description = an optional binary data that can be sent to the virtual machine
upon a successful deployment. This binary data must be base64 encoded before
adding it to the request. Using HTTP GET (via querystring), you can send up to
2KB of data after base64 encoding. Using HTTP POST(via POST body), you can send
up to 32K of data after base64 encoding., length = 32768)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/05d056bb/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 0fa5085..a9f8efd 100755
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -2716,7 +2716,17 @@ public class UserVmManagerImpl extends ManagerBase
implements UserVmManager, Vir
}
}
-if (template.getHypervisorType() != null
template.getHypervisorType() != HypervisorType.BareMetal) {
+HypervisorType hypervisorType = null;
+if (template.getHypervisorType() == null ||
template.getHypervisorType() == HypervisorType.None) {
+hypervisorType = hypervisor;
+} else {
+if (hypervisor != null hypervisor != HypervisorType.None
hypervisor != template.getHypervisorType()) {
+throw new InvalidParameterValueException(Hypervisor passed to
the deployVm call, is different from the hypervisor type of the template);
+}
+hypervisorType = template.getHypervisorType();
+}
+
+if (hypervisorType != HypervisorType.BareMetal) {
// check if we have available pools for vm deployment
long availablePools =
_storagePoolDao.countPoolsByStatus(StoragePoolStatus.Up);
if (availablePools 1) {
@@ -2892,15 +2902,8 @@ public class UserVmManagerImpl extends ManagerBase
implements UserVmManager, Vir
checkIfHostNameUniqueInNtwkDomain(hostName, networkList);
-HypervisorType hypervisorType = null;
-if (template.getHypervisorType() == null ||
template.getHypervisorType() == HypervisorType.None) {
-hypervisorType = hypervisor;
-} else {
-hypervisorType = template.getHypervisorType();
-}
-
-
git commit: updated refs/heads/master to 5fdc8b4
Repository: cloudstack Updated Branches: refs/heads/master 05d056bb9 - 5fdc8b403 CLOUDSTACK-7211: Missing LXC mappings, reuse KVM mappings Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5fdc8b40 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5fdc8b40 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5fdc8b40 Branch: refs/heads/master Commit: 5fdc8b403d4367d8e8fedcd7ee5554c5b675f9ae Parents: 05d056b Author: amoghvk amogh.vase...@citrix.com Authored: Mon Aug 4 14:42:58 2014 -0700 Committer: amoghvk amogh.vase...@citrix.com Committed: Mon Aug 4 14:42:58 2014 -0700 -- setup/db/db/schema-440to441.sql | 146 +++ 1 file changed, 146 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5fdc8b40/setup/db/db/schema-440to441.sql -- diff --git a/setup/db/db/schema-440to441.sql b/setup/db/db/schema-440to441.sql index df12ea4..4460559 100644 --- a/setup/db/db/schema-440to441.sql +++ b/setup/db/db/schema-440to441.sql @@ -21,3 +21,149 @@ -- Disable foreign key checking SET foreign_key_checks = 0; +-- Add missing LXC mappings +INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(), 'LXC', 'default', 'CentOS 4.5', 1, now(), 0); +INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(), 'LXC', 'default', 'CentOS 4.6', 2, now(), 0); +INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(), 'LXC', 'default', 'CentOS 4.7', 3, now(), 0); +INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(), 'LXC', 'default', 'CentOS 4.8', 4, now(), 0); +INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(), 'LXC', 'default', 'CentOS 5.0', 5, now(), 0); +INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(), 'LXC', 'default', 'CentOS 5.0', 6, now(), 0); +INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(), 'LXC', 'default', 'CentOS 5.1', 7, now(), 0); +INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(), 'LXC', 'default', 'CentOS 5.1', 8, now(), 0); +INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(), 'LXC', 'default', 'CentOS 5.2', 9, now(), 0); +INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(), 'LXC', 'default', 'CentOS 5.2', 10, now(), 0); +INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(), 'LXC', 'default', 'CentOS 5.3', 11, now(), 0); +INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(), 'LXC', 'default', 'CentOS 5.3', 12, now(), 0); +INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(), 'LXC', 'default', 'CentOS 5.4', 13, now(), 0); +INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(), 'LXC', 'default', 'CentOS 5.4', 14, now(), 0); +INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(), 'LXC', 'default', 'CentOS 5.5', 111, now(), 0); +INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(), 'LXC', 'default', 'CentOS 5.5', 112, now(), 0); +INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(), 'LXC', 'default', 'Red Hat Enterprise Linux
[3/3] git commit: updated refs/heads/master to 1ee7e0c
CLOUDSTACK-6278
Baremetal Advanced Networking support
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1ee7e0c7
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1ee7e0c7
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1ee7e0c7
Branch: refs/heads/master
Commit: 1ee7e0c77e7a2a2d3a536903ecdd8f3a3bcb0af3
Parents: 44dff6c
Author: Frank.Zhang frank.zh...@citrix.com
Authored: Mon Aug 4 15:00:21 2014 -0700
Committer: Frank.Zhang frank.zh...@citrix.com
Committed: Mon Aug 4 15:00:44 2014 -0700
--
.../BaremetalKickStartServiceImpl.java | 4 +-
.../networkservice/BaremetalPxeElement.java | 5 ++
scripts/network/ping/baremetal_snat.sh | 18 ++
scripts/network/ping/prepare_pxe.sh | 58
.../deploy/DeploymentPlanningManagerImpl.java | 13 -
5 files changed, 94 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1ee7e0c7/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java
--
diff --git
a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java
b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java
index f154a46..f7d82d3 100755
---
a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java
+++
b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java
@@ -24,7 +24,6 @@ import
com.cloud.agent.api.baremetal.IpmISetBootDevCommand.BootDev;
import com.cloud.baremetal.database.BaremetalPxeDao;
import com.cloud.baremetal.database.BaremetalPxeVO;
import com.cloud.baremetal.networkservice.BaremetalPxeManager.BaremetalPxeType;
-import com.cloud.configuration.Config;
import com.cloud.dc.DataCenter;
import com.cloud.deploy.DeployDestination;
import com.cloud.exception.AgentUnavailableException;
@@ -238,7 +237,8 @@ public class BaremetalKickStartServiceImpl extends
BareMetalPxeServiceBase imple
throw new CloudRuntimeException(String.format(failed preparing
PXE in virtual router[id:%s], because %s, vr.getId(), ret.second()));
}
-String internalServerIp =
_configDao.getValue(Config.BaremetalInternalStorageServer.key());
+//String internalServerIp =
_configDao.getValue(Config.BaremetalInternalStorageServer.key());
+String internalServerIp = 10.223.110.231;
ret = SshHelper.sshExecute(mgmtNic.getIp4Address(), 3922, root,
getSystemVMKeyFile(), null,
String.format(/usr/bin/baremetal_snat.sh %s %s,
mgmtNic.getIp4Address(), internalServerIp)
);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1ee7e0c7/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeElement.java
--
diff --git
a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeElement.java
b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeElement.java
index ab8eae9..b314bdb 100755
---
a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeElement.java
+++
b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeElement.java
@@ -19,6 +19,7 @@
package com.cloud.baremetal.networkservice;
import com.cloud.baremetal.database.BaremetalPxeVO;
+import com.cloud.dc.DataCenter;
import com.cloud.dc.Pod;
import com.cloud.deploy.DeployDestination;
import com.cloud.exception.ConcurrentOperationException;
@@ -99,6 +100,10 @@ public class BaremetalPxeElement extends AdapterBase
implements NetworkElement {
@Override
public boolean implement(Network network, NetworkOffering offering,
DeployDestination dest, ReservationContext context) throws
ConcurrentOperationException,
ResourceUnavailableException, InsufficientCapacityException {
+if (dest.getDataCenter().getNetworkType() ==
DataCenter.NetworkType.Advanced){
+return true;
+}
+
if (offering.isSystemOnly() || !canHandle(dest,
offering.getTrafficType(), network.getGuestType())) {
s_logger.debug(BaremetalPxeElement can not handle network
offering: + offering.getName());
return false;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1ee7e0c7/scripts/network/ping/baremetal_snat.sh
--
diff --git a/scripts/network/ping/baremetal_snat.sh
b/scripts/network/ping/baremetal_snat.sh
new file mode 100755
index 000..4cbf20e
---
[2/3] git commit: updated refs/heads/master to 1ee7e0c
CLOUDSTACK-6278
Baremetal Advanced Networking support
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/44dff6c4
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/44dff6c4
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/44dff6c4
Branch: refs/heads/master
Commit: 44dff6c4262a98dc338a34b94f7b7062a070f441
Parents: 66fff6c
Author: Frank.Zhang frank.zh...@citrix.com
Authored: Wed Jul 30 14:33:57 2014 -0700
Committer: Frank.Zhang frank.zh...@citrix.com
Committed: Mon Aug 4 15:00:44 2014 -0700
--
.../manager/BareMetalTemplateAdapter.java | 44 ++--
.../BaremetalKickStartServiceImpl.java | 104 +++---
.../BaremetalVirtualRouterCommands.java | 106 +++
.../BaremetalVritualRouterCommands.java | 74 -
server/src/com/cloud/configuration/Config.java | 10 +-
5 files changed, 190 insertions(+), 148 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/44dff6c4/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalTemplateAdapter.java
--
diff --git
a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalTemplateAdapter.java
b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalTemplateAdapter.java
index 3115a18..1be3439 100755
---
a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalTemplateAdapter.java
+++
b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalTemplateAdapter.java
@@ -22,26 +22,11 @@
// Automatically generated by addcopyright.py at 04/03/2012
package com.cloud.baremetal.manager;
-import java.util.Date;
-import java.util.List;
-
-import javax.ejb.Local;
-import javax.inject.Inject;
-
-import org.apache.log4j.Logger;
-
-import org.apache.cloudstack.api.command.user.iso.DeleteIsoCmd;
-import org.apache.cloudstack.api.command.user.iso.RegisterIsoCmd;
-import org.apache.cloudstack.api.command.user.template.RegisterTemplateCmd;
-import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreVO;
-
import com.cloud.configuration.Resource.ResourceType;
import com.cloud.dc.DataCenterVO;
import com.cloud.event.EventTypes;
import com.cloud.event.UsageEventVO;
import com.cloud.exception.ResourceAllocationException;
-import com.cloud.host.Host;
-import com.cloud.host.HostVO;
import com.cloud.host.dao.HostDao;
import com.cloud.resource.ResourceManager;
import com.cloud.storage.TemplateProfile;
@@ -53,6 +38,16 @@ import com.cloud.template.TemplateAdapterBase;
import com.cloud.user.Account;
import com.cloud.utils.db.DB;
import com.cloud.utils.exception.CloudRuntimeException;
+import org.apache.cloudstack.api.command.user.iso.DeleteIsoCmd;
+import org.apache.cloudstack.api.command.user.iso.RegisterIsoCmd;
+import org.apache.cloudstack.api.command.user.template.RegisterTemplateCmd;
+import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreVO;
+import org.apache.log4j.Logger;
+
+import javax.ejb.Local;
+import javax.inject.Inject;
+import java.util.Date;
+import java.util.List;
@Local(value = TemplateAdapter.class)
public class BareMetalTemplateAdapter extends TemplateAdapterBase implements
TemplateAdapter {
@@ -69,24 +64,7 @@ public class BareMetalTemplateAdapter extends
TemplateAdapterBase implements Tem
@Override
public TemplateProfile prepare(RegisterTemplateCmd cmd) throws
ResourceAllocationException {
-TemplateProfile profile = super.prepare(cmd);
-
-if (profile.getZoneId() == null || profile.getZoneId() == -1) {
-ListDataCenterVO dcs = _dcDao.listAllIncludingRemoved();
-for (DataCenterVO dc : dcs) {
-ListHostVO pxeServers =
_resourceMgr.listAllHostsInOneZoneByType(Host.Type.BaremetalPxe, dc.getId());
-if (pxeServers.size() == 0) {
-throw new CloudRuntimeException(Please add PXE server
before adding baremetal template in zone + dc.getName());
-}
-}
-} else {
-ListHostVO pxeServers =
_resourceMgr.listAllHostsInOneZoneByType(Host.Type.BaremetalPxe,
profile.getZoneId());
-if (pxeServers.size() == 0) {
-throw new CloudRuntimeException(Please add PXE server before
adding baremetal template in zone + profile.getZoneId());
-}
-}
-
-return profile;
+return super.prepare(cmd);
}
@Override
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/44dff6c4/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java
--
diff --git
[1/3] git commit: updated refs/heads/master to 1ee7e0c
Repository: cloudstack
Updated Branches:
refs/heads/master 5fdc8b403 - 1ee7e0c77
CLOUDSTACK-6278
Baremetal Advanced Networking support
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/66fff6c5
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/66fff6c5
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/66fff6c5
Branch: refs/heads/master
Commit: 66fff6c5747e5f10ae25d1dc8f50ad77d82c96e2
Parents: 5fdc8b4
Author: Frank.Zhang frank.zh...@citrix.com
Authored: Wed Jul 23 17:25:11 2014 -0700
Committer: Frank.Zhang frank.zh...@citrix.com
Committed: Mon Aug 4 15:00:43 2014 -0700
--
.../BareMetalPingServiceImpl.java | 3 +-
.../BaremetalKickStartServiceImpl.java | 182 ++-
.../networkservice/BaremetalPxeElement.java | 2 +-
.../networkservice/BaremetalPxeManager.java | 2 +-
.../networkservice/BaremetalPxeManagerImpl.java | 5 +-
.../networkservice/BaremetalPxeService.java | 3 +-
.../BaremetalVritualRouterCommands.java | 74
7 files changed, 224 insertions(+), 47 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/66fff6c5/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalPingServiceImpl.java
--
diff --git
a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalPingServiceImpl.java
b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalPingServiceImpl.java
index 66bbb61..70b9b58 100755
---
a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalPingServiceImpl.java
+++
b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalPingServiceImpl.java
@@ -30,6 +30,7 @@ import java.util.Map;
import javax.ejb.Local;
import javax.inject.Inject;
+import com.cloud.network.Network;
import org.apache.log4j.Logger;
import org.apache.cloudstack.api.AddBaremetalPxeCmd;
@@ -83,7 +84,7 @@ public class BareMetalPingServiceImpl extends
BareMetalPxeServiceBase implements
BaremetalPxeDao _pxeDao;
@Override
-public boolean prepare(VirtualMachineProfile profile, NicProfile pxeNic,
DeployDestination dest, ReservationContext context) {
+public boolean prepare(VirtualMachineProfile profile, NicProfile pxeNic,
Network network, DeployDestination dest, ReservationContext context) {
QueryBuilderBaremetalPxeVO sc =
QueryBuilder.create(BaremetalPxeVO.class);
sc.and(sc.entity().getDeviceType(), Op.EQ,
BaremetalPxeType.PING.toString());
sc.and(sc.entity().getPodId(), Op.EQ, dest.getPod().getId());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/66fff6c5/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java
--
diff --git
a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java
b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java
index 62b3123..cc9fce7 100755
---
a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java
+++
b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java
@@ -20,6 +20,7 @@ package com.cloud.baremetal.networkservice;
import java.net.URI;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -27,6 +28,18 @@ import java.util.Map;
import javax.ejb.Local;
import javax.inject.Inject;
+import com.cloud.dc.DataCenter;
+import com.cloud.exception.AgentUnavailableException;
+import com.cloud.exception.OperationTimedoutException;
+import com.cloud.hypervisor.Hypervisor;
+import com.cloud.network.Network;
+import com.cloud.network.guru.ControlNetworkGuru;
+import com.cloud.network.guru.NetworkGuru;
+import com.cloud.network.router.VirtualRouter;
+import com.cloud.vm.DomainRouterVO;
+import com.cloud.vm.NicVO;
+import com.cloud.vm.dao.DomainRouterDao;
+import com.cloud.vm.dao.NicDao;
import org.apache.log4j.Logger;
import org.apache.cloudstack.api.AddBaremetalKickStartPxeCmd;
@@ -62,6 +75,8 @@ import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.vm.NicProfile;
import com.cloud.vm.ReservationContext;
import com.cloud.vm.VirtualMachineProfile;
+import org.springframework.web.client.RestTemplate;
+import org.springframework.web.util.UriComponentsBuilder;
@Local(value = BaremetalPxeService.class)
public class BaremetalKickStartServiceImpl extends BareMetalPxeServiceBase
implements BaremetalPxeService {
@@
git commit: updated refs/heads/master to 835ca8e
Repository: cloudstack
Updated Branches:
refs/heads/master 8a2163305 - 835ca8eea
CLOUDSTACK-7018: Restore VM - missing destroyed usage event for the destroyed
root volume. Also removed the resource count logic since we destroy the old
root volume and create a new one.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/835ca8ee
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/835ca8ee
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/835ca8ee
Branch: refs/heads/master
Commit: 835ca8eea86044cf66ad1d02e473257546664359
Parents: 8a21633
Author: Nitin Mehta nitin.me...@citrix.com
Authored: Mon Aug 4 16:40:28 2014 -0700
Committer: Nitin Mehta nitin.me...@citrix.com
Committed: Mon Aug 4 16:40:28 2014 -0700
--
server/src/com/cloud/vm/UserVmManagerImpl.java | 11 +--
1 file changed, 5 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/835ca8ee/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 a9f8efd..05cc183 100755
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -4732,9 +4732,8 @@ public class UserVmManagerImpl extends ManagerBase
implements UserVmManager, Vir
} else {
newVol = volumeMgr.allocateDuplicateVolume(root, null);
}
-// 1. Save usage event and update resource count for user vm volumes
-_resourceLimitMgr.incrementResourceCount(vm.getAccountId(),
ResourceType.volume);
-//2. Create Usage event for the newly created volume
+
+// Create Usage event for the newly created volume
UsageEventVO usageEvent = new
UsageEventVO(EventTypes.EVENT_VOLUME_CREATE, newVol.getAccountId(),
newVol.getDataCenterId(), newVol.getId(), newVol.getName(),
newVol.getDiskOfferingId(), templateId, newVol.getSize());
_usageEventDao.persist(usageEvent);
@@ -4742,11 +4741,11 @@ public class UserVmManagerImpl extends ManagerBase
implements UserVmManager, Vir
_volsDao.attachVolume(newVol.getId(), vmId, newVol.getDeviceId());
-/* Detach and destory the old root volume */
-
+// Detach, destroy and create the usage event for the old root volume.
_volsDao.detachVolume(root.getId());
-
volumeMgr.destroyVolume(root);
+UsageEventUtils.publishUsageEvent(EventTypes.EVENT_VOLUME_DELETE,
root.getAccountId(), root.getDataCenterId(), root.getId(), root.getName(),
+Volume.class.getName(), root.getUuid(),
root.isDisplayVolume());
// For VMware hypervisor since the old root volume is replaced by the
new root volume, force expunge old root volume if it has been created in storage
if (vm.getHypervisorType() == HypervisorType.VMware) {
git commit: updated refs/heads/master to 9bab1c8
Repository: cloudstack Updated Branches: refs/heads/master 835ca8eea - 9bab1c855 Fixing vpc distributed test cases Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9bab1c85 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9bab1c85 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9bab1c85 Branch: refs/heads/master Commit: 9bab1c8550a8fcc7f1f57ecd7d02a8f92f498fd0 Parents: 835ca8e Author: Girish Shilamkar gir...@clogeny.com Authored: Mon Aug 4 17:45:14 2014 +0530 Committer: Girish Shilamkar gir...@clogeny.com Committed: Tue Aug 5 11:09:21 2014 +0530 -- .../component/test_vpc_distributed_routing_offering.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9bab1c85/test/integration/component/test_vpc_distributed_routing_offering.py -- diff --git a/test/integration/component/test_vpc_distributed_routing_offering.py b/test/integration/component/test_vpc_distributed_routing_offering.py index cc9a191..a52855e 100644 --- a/test/integration/component/test_vpc_distributed_routing_offering.py +++ b/test/integration/component/test_vpc_distributed_routing_offering.py @@ -156,7 +156,7 @@ class TestVPCDistributedRouterOffering(cloudstackTestCase): def setUpClass(cls): testClient = super(TestVPCDistributedRouterOffering, cls).getClsTestClient() cls.apiclient = testClient.getApiClient() -cls.services = testClient.getParsedTestDataConfig() +cls.services = Services().services # Get Zone, Domain and templates cls.domain = get_domain(cls.apiclient) @@ -512,4 +512,4 @@ class TestVPCDistributedRouterOffering(cloudstackTestCase): List public Ip for network should list the Ip addr ) # TODO: Remote Access VPN is not yet supported in VPC -return \ No newline at end of file +return
git commit: updated refs/heads/master to d26e516
Repository: cloudstack Updated Branches: refs/heads/master 9bab1c855 - d26e5163d CLOUDSTACK-7244. On an upgraded setup, 'Hyperv' hypervisor type option isn't available while creating a zone. Making a fix to include 'Hyperv' hypervisor type in the global configuration during upgrades. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d26e5163 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d26e5163 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d26e5163 Branch: refs/heads/master Commit: d26e5163d4049262697b87e659bd514676eb9e9a Parents: 9bab1c8 Author: Devdeep Singh devd...@gmail.com Authored: Tue Aug 5 11:15:43 2014 +0530 Committer: Devdeep Singh devd...@gmail.com Committed: Tue Aug 5 11:15:43 2014 +0530 -- setup/db/db/schema-441to450.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d26e5163/setup/db/db/schema-441to450.sql -- diff --git a/setup/db/db/schema-441to450.sql b/setup/db/db/schema-441to450.sql index 3f78c1f..8bd4440 100644 --- a/setup/db/db/schema-441to450.sql +++ b/setup/db/db/schema-441to450.sql @@ -430,5 +430,5 @@ CREATE VIEW `cloud`.`template_view` AS and (resource_tags.resource_type = 'Template' or resource_tags.resource_type='ISO'); - +UPDATE configuration SET value='KVM,XenServer,VMware,BareMetal,Ovm,LXC,Hyperv' WHERE name='hypervisor.list'; UPDATE `cloud`.`configuration` SET description=If set to true, will set guest VM's name as it appears on the hypervisor, to its hostname. The flag is supported for VMware hypervisor only WHERE name='vm.instancename.flag';
