git commit: updated refs/heads/master to c8f2003
Updated Branches:
refs/heads/master cbbba2865 -> c8f200313
CLOUDSTACK-1862 Added vm ip address info in the list PF rules response
Signed-off-by: Abhinandan Prateek
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c8f20031
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c8f20031
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c8f20031
Branch: refs/heads/master
Commit: c8f20031380cada2782c8849fcb5fcfbb1eb41fe
Parents: cbbba28
Author: Jayapal
Authored: Wed Apr 10 12:19:06 2013 +0530
Committer: Abhinandan Prateek
Committed: Wed Apr 10 14:26:36 2013 +0530
--
.../api/response/FirewallRuleResponse.java | 12
server/src/com/cloud/api/ApiResponseHelper.java|1 +
2 files changed, 13 insertions(+), 0 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c8f20031/api/src/org/apache/cloudstack/api/response/FirewallRuleResponse.java
--
diff --git
a/api/src/org/apache/cloudstack/api/response/FirewallRuleResponse.java
b/api/src/org/apache/cloudstack/api/response/FirewallRuleResponse.java
index 08722ae..787410a 100644
--- a/api/src/org/apache/cloudstack/api/response/FirewallRuleResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/FirewallRuleResponse.java
@@ -71,6 +71,18 @@ public class FirewallRuleResponse extends BaseResponse {
@SerializedName(ApiConstants.TAGS) @Param(description="the list of
resource tags associated with the rule", responseObject =
ResourceTagResponse.class)
private List tags;
+@SerializedName(ApiConstants.VM_GUEST_IP) @Param(description="the vm ip
address for the port forwarding rule")
+private String destNatVmIp;
+
+
+public String getDestNatVmIp() {
+return destNatVmIp;
+}
+
+public void setDestNatVmIp(String destNatVmIp) {
+this.destNatVmIp = destNatVmIp;
+}
+
@Override
public String getObjectId() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c8f20031/server/src/com/cloud/api/ApiResponseHelper.java
--
diff --git a/server/src/com/cloud/api/ApiResponseHelper.java
b/server/src/com/cloud/api/ApiResponseHelper.java
index 64be7f8..93b755a 100755
--- a/server/src/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/com/cloud/api/ApiResponseHelper.java
@@ -965,6 +965,7 @@ public class ApiResponseHelper implements ResponseGenerator
{
response.setPublicIpAddress(ip.getAddress().addr());
if (ip != null && fwRule.getDestinationIpAddress() != null) {
+
response.setDestNatVmIp(fwRule.getDestinationIpAddress().toString());
UserVm vm =
ApiDBUtils.findUserVmById(fwRule.getVirtualMachineId());
if (vm != null) {
response.setVirtualMachineId(vm.getUuid());
git commit: updated refs/heads/master to 580731c
Updated Branches:
refs/heads/master cbcb83b08 -> 580731ccc
CLOUDSTACK-1534 Disable/Enable-unmanaged/manage cluster is setting CPU
overcommit and memory overcommit ratio to 1 (defalut value).
Signed-off-by: Abhinandan Prateek
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/580731cc
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/580731cc
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/580731cc
Branch: refs/heads/master
Commit: 580731ccc0b03b54dde544ead30ae44eebc8f2f5
Parents: cbcb83b
Author: Bharat Kumar
Authored: Tue Apr 9 10:27:05 2013 +0530
Committer: Abhinandan Prateek
Committed: Fri Apr 12 15:30:02 2013 +0530
--
.../command/admin/cluster/UpdateClusterCmd.java| 15 +++---
.../com/cloud/resource/ResourceManagerImpl.java| 22 +++---
2 files changed, 16 insertions(+), 21 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/580731cc/api/src/org/apache/cloudstack/api/command/admin/cluster/UpdateClusterCmd.java
--
diff --git
a/api/src/org/apache/cloudstack/api/command/admin/cluster/UpdateClusterCmd.java
b/api/src/org/apache/cloudstack/api/command/admin/cluster/UpdateClusterCmd.java
index 95728dd..c513058 100644
---
a/api/src/org/apache/cloudstack/api/command/admin/cluster/UpdateClusterCmd.java
+++
b/api/src/org/apache/cloudstack/api/command/admin/cluster/UpdateClusterCmd.java
@@ -111,14 +111,14 @@ public class UpdateClusterCmd extends BaseCmd {
if(cpuovercommitratio != null){
return Float.parseFloat(cpuovercommitratio);
}
-return 1.0f;
+return null;
}
public Float getMemoryOvercommitRaito (){
if (memoryovercommitratio != null){
return Float.parseFloat(memoryovercommitratio);
}
-return 1.0f;
+return null;
}
@Override
@@ -127,9 +127,16 @@ public class UpdateClusterCmd extends BaseCmd {
if (cluster == null) {
throw new InvalidParameterValueException("Unable to find the
cluster by id=" + getId());
}
+if (getMemoryOvercommitRaito() !=null){
+if ((getMemoryOvercommitRaito().compareTo(1f) < 0)) {
+throw new InvalidParameterValueException("Memory overcommit
ratio should be greater than or equal to one");
+}
+}
-if ((getMemoryOvercommitRaito().compareTo(1f) < 0) |
(getCpuOvercommitRatio().compareTo(1f) < 0)) {
-throw new InvalidParameterValueException("Cpu and ram overcommit
ratios should be greater than one");
+if (getCpuOvercommitRatio() !=null){
+if (getCpuOvercommitRatio().compareTo(1f) < 0) {
+throw new InvalidParameterValueException("Cpu overcommit ratio
should be greater than or equal to one");
+}
}
Cluster result = _resourceService.updateCluster(cluster,
getClusterType(), getHypervisor(), getAllocationState(), getManagedstate(),
getMemoryOvercommitRaito(), getCpuOvercommitRatio());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/580731cc/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 82bca51..c9c3f9c 100755
--- a/server/src/com/cloud/resource/ResourceManagerImpl.java
+++ b/server/src/com/cloud/resource/ResourceManagerImpl.java
@@ -1181,29 +1181,17 @@ public class ResourceManagerImpl extends ManagerBase
implements ResourceManager,
}
}
- ClusterDetailsVO memory_detail =
_clusterDetailsDao.findDetail(cluster.getId(),"memoryOvercommitRatio");
- if( memory_detail == null){
- if (memoryovercommitratio.compareTo(1f) > 0){
- memory_detail = new
ClusterDetailsVO(cluster.getId(),"memoryOvercommitRatio",Float.toString(memoryovercommitratio));
- _clusterDetailsDao.persist(memory_detail);
- }
- }
- else {
+ if (memoryovercommitratio != null) {
+ ClusterDetailsVO memory_detail =
_clusterDetailsDao.findDetail(cluster.getId(),"memoryOvercommitRatio");
memory_detail.setValue(Float.toString(memoryovercommitratio));
_clusterDetailsDao.update(memory_detail.getId(),memory_detail);
}
-ClusterDetailsVO cpu_detail =
_clusterDetailsDao.findDetail(cluster.getId(),"cpuOvercommitRatio");
-if( cpu_detail == null){
-if (cpuovercommitratio.compareTo(1f) > 0){
-cpu_detail = new
ClusterDetailsVO(cluster.getId(),"cpuOvercommitRatio",Float.toString(cpuovercommitratio));
-
git commit: updated refs/heads/master to 8b40e39
Updated Branches:
refs/heads/master 2057221f4 -> 8b40e393b
Cloudstack-701 Support for non contiguous vlan ranges.
Signed-off-by: Abhinandan Prateek
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8b40e393
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8b40e393
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8b40e393
Branch: refs/heads/master
Commit: 8b40e393b845c4c3d7ca23c8e297dc43288f6863
Parents: 2057221
Author: Bharat Kumar
Authored: Tue Apr 16 20:04:46 2013 +0530
Committer: Abhinandan Prateek
Committed: Wed Apr 17 10:14:42 2013 +0530
--
api/src/com/cloud/network/NetworkService.java |2 +-
api/src/com/cloud/network/PhysicalNetwork.java |5 +-
.../org/apache/cloudstack/api/ApiConstants.java|1 +
.../admin/network/UpdatePhysicalNetworkCmd.java|8 +-
server/src/com/cloud/api/ApiResponseHelper.java|2 +-
.../configuration/ConfigurationManagerImpl.java|2 +-
server/src/com/cloud/dc/dao/DataCenterVnetDao.java |6 +
.../com/cloud/dc/dao/DataCenterVnetDaoImpl.java| 50 +++-
.../network/ExternalFirewallDeviceManagerImpl.java | 14 +-
.../src/com/cloud/network/NetworkServiceImpl.java | 289 +++
.../com/cloud/network/dao/PhysicalNetworkVO.java | 20 +-
.../com/cloud/network/guru/GuestNetworkGuru.java | 14 +-
.../com/cloud/network/MockNetworkManagerImpl.java |2 +-
.../cloud/network/UpdatePhysicalNetworkTest.java | 68
.../test/com/cloud/vpc/MockNetworkManagerImpl.java |2 +-
test/integration/smoke/test_non_contigiousvlan.py | 125 +++
16 files changed, 512 insertions(+), 98 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8b40e393/api/src/com/cloud/network/NetworkService.java
--
diff --git a/api/src/com/cloud/network/NetworkService.java
b/api/src/com/cloud/network/NetworkService.java
index 066009b..5a6054d 100755
--- a/api/src/com/cloud/network/NetworkService.java
+++ b/api/src/com/cloud/network/NetworkService.java
@@ -79,7 +79,7 @@ public interface NetworkService {
Long startIndex, Long pageSize, String name);
PhysicalNetwork updatePhysicalNetwork(Long id, String networkSpeed,
List tags,
-String newVnetRangeString, String state);
+ String newVnetRangeString, String
state, String removeVlan);
boolean deletePhysicalNetwork(Long id);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8b40e393/api/src/com/cloud/network/PhysicalNetwork.java
--
diff --git a/api/src/com/cloud/network/PhysicalNetwork.java
b/api/src/com/cloud/network/PhysicalNetwork.java
index a2044a6..c521dc4 100644
--- a/api/src/com/cloud/network/PhysicalNetwork.java
+++ b/api/src/com/cloud/network/PhysicalNetwork.java
@@ -18,6 +18,7 @@ package com.cloud.network;
import java.util.List;
+import com.cloud.utils.Pair;
import org.apache.cloudstack.api.Identity;
import org.apache.cloudstack.api.InternalIdentity;
@@ -59,7 +60,9 @@ public interface PhysicalNetwork extends Identity,
InternalIdentity {
Long getDomainId();
-String getVnet();
+List> getVnet();
+
+String getVnetString();
String getSpeed();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8b40e393/api/src/org/apache/cloudstack/api/ApiConstants.java
--
diff --git a/api/src/org/apache/cloudstack/api/ApiConstants.java
b/api/src/org/apache/cloudstack/api/ApiConstants.java
index cb4d43e..8c32bb3 100755
--- a/api/src/org/apache/cloudstack/api/ApiConstants.java
+++ b/api/src/org/apache/cloudstack/api/ApiConstants.java
@@ -221,6 +221,7 @@ public class ApiConstants {
public static final String VIRTUAL_MACHINE_ID = "virtualmachineid";
public static final String VIRTUAL_MACHINE_IDS = "virtualmachineids";
public static final String VLAN = "vlan";
+public static final String REMOVE_VLAN="removevlan";
public static final String VLAN_ID = "vlanid";
public static final String VM_AVAILABLE = "vmavailable";
public static final String VM_LIMIT = "vmlimit";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8b40e393/api/src/org/apache/cloudstack/api/command/admin/network/UpdatePhysicalNetworkCmd.java
--
diff --git
a/api/src/org/apache/cloudstack/api/command/admin/network/UpdatePhysicalNetworkCmd.java
b/api/src/org/apache/cloudstack/api/command/admin/network/UpdatePhysicalNetworkCmd.java
index 06cf38d..6d37dd8 100644
---
a/api/src/org/apache/cloudstack/api/command/admin/network/UpdatePhysicalN
git commit: updated refs/heads/master to 0ddeb65
Updated Branches:
refs/heads/master fad55c5be -> 0ddeb65fd
CLOUDSTACK-1966: Primary Storage Limits are not validated while deploying the VM
Signed-off-by: Abhinandan Prateek
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0ddeb65f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0ddeb65f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0ddeb65f
Branch: refs/heads/master
Commit: 0ddeb65fdf155b55f53ece7ff92f4a26e3f086b5
Parents: fad55c5
Author: Sanjay Tripathi
Authored: Tue Apr 16 16:57:28 2013 +0530
Committer: Abhinandan Prateek
Committed: Wed Apr 17 11:54:18 2013 +0530
--
server/src/com/cloud/vm/UserVmManagerImpl.java |5 +
1 files changed, 5 insertions(+), 0 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0ddeb65f/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 53a57c8..3ecdf42 100755
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -2264,9 +2264,14 @@ public class UserVmManagerImpl extends ManagerBase
implements UserVmManager, Use
// check if account/domain is with in resource limits to create a new
vm
boolean isIso = Storage.ImageFormat.ISO == template.getFormat();
+long size =
_templateHostDao.findByTemplateId(template.getId()).getSize();
+if (diskOfferingId != null) {
+size += _diskOfferingDao.findById(diskOfferingId).getDiskSize();
+}
resourceLimitCheck(owner, new Long(offering.getCpu()), new
Long(offering.getRamSize()));
_resourceLimitMgr.checkResourceLimit(owner, ResourceType.volume, (isIso
|| diskOfferingId == null ? 1 : 2));
+_resourceLimitMgr.checkResourceLimit(owner,
ResourceType.primary_storage, new Long (size));
// verify security group ids
if (securityGroupIdList != null) {
git commit: updated refs/heads/master to eae22d2
Updated Branches:
refs/heads/master 81e1ba3bb -> eae22d2ff
CLOUDSTACK-741: Granular Global Parameters
Signed-off-by: Abhinandan Prateek
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/eae22d2f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/eae22d2f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/eae22d2f
Branch: refs/heads/master
Commit: eae22d2ffaee68b5d4443cf8ab1b2dfbb339dab3
Parents: 81e1ba3
Author: Harikrishna Patnala
Authored: Fri Apr 19 09:27:00 2013 +0530
Committer: Abhinandan Prateek
Committed: Fri Apr 19 10:36:52 2013 +0530
--
.../api/command/admin/config/ListCfgsByCmd.java| 24 +++-
.../api/command/admin/config/UpdateCfgCmd.java | 22 +++-
.../api/response/ConfigurationResponse.java| 12 ++
.../api/command/test/ListCfgCmdTest.java | 89 +++
.../api/command/test/UpdateCfgCmdTest.java | 116 +++
.../datastore/db/StoragePoolDetailsDao.java|1 +
server/src/com/cloud/configuration/Config.java | 54 ++-
.../cloud/configuration/ConfigurationManager.java |2 +-
.../configuration/ConfigurationManagerImpl.java| 51 +--
.../cloud/configuration/dao/ConfigurationDao.java |1 +
.../router/VirtualNetworkApplianceManagerImpl.java |5 +-
.../src/com/cloud/server/ConfigurationServer.java |5 +
.../com/cloud/server/ConfigurationServerImpl.java | 93 ++--
.../src/com/cloud/server/ManagementServerImpl.java | 24 +++-
.../storage/dao/StoragePoolDetailsDaoImpl.java |9 +
.../cloud/vpc/MockConfigurationManagerImpl.java|5 +-
test/integration/smoke/test_UpdateCfg.py | 85 +++
17 files changed, 561 insertions(+), 37 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/eae22d2f/api/src/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java
--
diff --git
a/api/src/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java
b/api/src/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java
index aabfd4a..9f34405 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java
@@ -23,8 +23,7 @@ import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListCmd;
import org.apache.cloudstack.api.Parameter;
-import org.apache.cloudstack.api.response.ConfigurationResponse;
-import org.apache.cloudstack.api.response.ListResponse;
+import org.apache.cloudstack.api.response.*;
import org.apache.log4j.Logger;
import com.cloud.configuration.Configuration;
@@ -46,6 +45,13 @@ public class ListCfgsByCmd extends BaseListCmd {
@Parameter(name = ApiConstants.NAME, type = CommandType.STRING,
description = "lists configuration by name")
private String configName;
+@Parameter(name=ApiConstants.SCOPE, type = CommandType.STRING, description
= "scope(zone/cluster/pool/account) of the parameter that needs to be updated")
+private String scope;
+
+@Parameter(name=ApiConstants.ID, type = CommandType.UUID, entityType =
{ZoneResponse.class, ClusterResponse.class, StoragePoolResponse.class,
AccountResponse.class}, description = "corresponding ID of the scope")
+private Long id;
+
+
// ///
// / Accessors ///
// ///
@@ -58,6 +64,15 @@ public class ListCfgsByCmd extends BaseListCmd {
return configName;
}
+public String getScope() {
+return scope;
+}
+
+public Long getId() {
+return id;
+}
+
+
@Override
public Long getPageSizeVal() {
Long pageSizeVal = 500L;
@@ -85,6 +100,11 @@ public class ListCfgsByCmd extends BaseListCmd {
for (Configuration cfg : result.first()) {
ConfigurationResponse cfgResponse =
_responseGenerator.createConfigurationResponse(cfg);
cfgResponse.setObjectName("configuration");
+if (scope != null) {
+cfgResponse.setScope(scope);
+} else {
+cfgResponse.setScope("global");
+}
configResponses.add(cfgResponse);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/eae22d2f/api/src/org/apache/cloudstack/api/command/admin/config/UpdateCfgCmd.java
--
diff --git
a/api/src/org/apache/cloudstack/api/command/admin/config/UpdateCfgCmd.java
b/api/src/org/apache/cloudstack/api/command/admin/config/UpdateCfgCm
[1/4] Storage motion for Xenserver changes: 1. Implemented Api findStoragePoolsForMigration. Added a new response objects to list storage pools available for migration. 2. Updated migrateVolume api fo
Updated Branches:
refs/heads/master eae22d2ff -> 21ce3befc
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/21ce3bef/setup/db/db/schema-410to420.sql
--
diff --git a/setup/db/db/schema-410to420.sql b/setup/db/db/schema-410to420.sql
index ce651a0..14aa2eb 100644
--- a/setup/db/db/schema-410to420.sql
+++ b/setup/db/db/schema-410to420.sql
@@ -23,7 +23,9 @@
SET foreign_key_checks = 0;
ALTER TABLE `cloud`.`hypervisor_capabilities` ADD COLUMN
`max_hosts_per_cluster` int unsigned DEFAULT NULL COMMENT 'Max. hosts in
cluster supported by hypervisor';
+ALTER TABLE `cloud`.`hypervisor_capabilities` ADD COLUMN
`storage_motion_supported` int(1) unsigned DEFAULT 0 COMMENT 'Is storage motion
supported';
UPDATE `cloud`.`hypervisor_capabilities` SET `max_hosts_per_cluster`=32 WHERE
`hypervisor_type`='VMware';
+INSERT IGNORE INTO `cloud`.`hypervisor_capabilities`(hypervisor_type,
hypervisor_version, max_guests_limit, security_group_enabled,
max_data_volumes_limit, storage_motion_supported) VALUES ('XenServer', '6.1.0',
50, 1, 13, 1);
INSERT IGNORE INTO `cloud`.`hypervisor_capabilities`(hypervisor_type,
hypervisor_version, max_guests_limit, security_group_enabled,
max_hosts_per_cluster) VALUES ('VMware', '5.1', 128, 0, 32);
DELETE FROM `cloud`.`configuration` where name='vmware.percluster.host.max';
INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT',
'AgentManager', 'xen.nics.max', '7', 'Maximum allowed nics for Vms created on
Xen');
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/21ce3bef/test/integration/component/test_storage_motion.py
--
diff --git a/test/integration/component/test_storage_motion.py
b/test/integration/component/test_storage_motion.py
new file mode 100644
index 000..cc55a08
--- /dev/null
+++ b/test/integration/component/test_storage_motion.py
@@ -0,0 +1,298 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+""" P1 tests for Storage motion
+"""
+#Import Local Modules
+import marvin
+from marvin.cloudstackTestCase import *
+from marvin.cloudstackAPI import *
+from marvin.remoteSSHClient import remoteSSHClient
+from marvin.integration.lib.utils import *
+from marvin.integration.lib.base import *
+from marvin.integration.lib.common import *
+from nose.plugins.attrib import attr
+#Import System modules
+import time
+
+_multiprocess_shared_ = True
+class Services:
+"""Test VM Life Cycle Services
+"""
+
+def __init__(self):
+self.services = {
+"disk_offering":{
+"displaytext": "Small",
+"name": "Small",
+"disksize": 1
+},
+"account": {
+"email": "t...@test.com",
+"firstname": "Test",
+"lastname": "User",
+"username": "test",
+# Random characters are appended in create account to
+# ensure unique username generated each time
+"password": "password",
+},
+"small":
+# Create a small virtual machine instance with disk offering
+{
+"displayname": "testserver",
+"username": "root", # VM creds for SSH
+"password": "password",
+"ssh_port": 22,
+"hypervisor": 'XenServer',
+"privateport": 22,
+"publicport": 22,
+"protocol": 'TCP',
+},
+"service_offerings":
+{
+ "small":
+{
+ # Small service offering ID to for change VM
+ # service offering from medium to small
+"name": "Small Instance",
+"displaytext": "Small Instance",
+"cpunumber": 1,
+"cpuspeed": 100,
+"memory": 256,
+}
+},
+"template": {
+"
git commit: updated refs/heads/master to b01f631
Updated Branches:
refs/heads/master f98ce5ddc -> b01f63123
CS-1879: NPE while migrating volume. The state transitions on the volume that
has to be migrated were incorrect. A volume to be migrated is in ready state
and cannot be transitioned to copying state. Similarly, the duplicated volume
is in ready state too and cannot be transitioned to creating state. Fixed it by
transitioning the volume to migrating state when a migrateVolume api call is
made. Also, a volume has to be destroyed first before it can be expunged. Fixed
that too.
Signed-off-by: Abhinandan Prateek
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b01f6312
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b01f6312
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b01f6312
Branch: refs/heads/master
Commit: b01f63123fff00fe40cdd46d741f29dec05fcc8d
Parents: f98ce5d
Author: Devdeep Singh
Authored: Fri Apr 19 14:43:55 2013 +0530
Committer: Abhinandan Prateek
Committed: Fri Apr 19 16:15:24 2013 +0530
--
.../storage/volume/VolumeServiceImpl.java |8 ++--
1 files changed, 6 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b01f6312/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
--
diff --git
a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
b/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
index e3526de..b39502b 100644
---
a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
+++
b/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
@@ -521,8 +521,8 @@ public class VolumeServiceImpl implements VolumeService {
VolumeVO destVol = duplicateVolumeOnAnotherStorage(srcVolume,
(StoragePool)destStore);
VolumeInfo destVolume = this.volFactory.getVolume(destVol.getId(),
destStore);
-destVolume.processEvent(Event.CreateOnlyRequested);
-srcVolume.processEvent(Event.CopyingRequested);
+destVolume.processEvent(Event.MigrationRequested);
+srcVolume.processEvent(Event.MigrationRequested);
CopyVolumeContext context = new
CopyVolumeContext(null, future, srcVolume,
destVolume,
@@ -550,6 +550,8 @@ public class VolumeServiceImpl implements VolumeService {
res.setResult(result.getResult());
destVolume.processEvent(Event.OperationFailed);
srcVolume.processEvent(Event.OperationFailed);
+destroyVolume(destVolume.getId());
+destVolume = this.volFactory.getVolume(destVolume.getId());
AsyncCallFuture destroyFuture =
this.expungeVolumeAsync(destVolume);
destroyFuture.get();
future.complete(res);
@@ -557,6 +559,8 @@ public class VolumeServiceImpl implements VolumeService {
}
srcVolume.processEvent(Event.OperationSuccessed);
destVolume.processEvent(Event.OperationSuccessed);
+destroyVolume(srcVolume.getId());
+srcVolume = this.volFactory.getVolume(srcVolume.getId());
AsyncCallFuture destroyFuture =
this.expungeVolumeAsync(srcVolume);
destroyFuture.get();
future.complete(res);
git commit: updated refs/heads/master to 59bee8d
Updated Branches:
refs/heads/master b01f63123 -> 59bee8d1b
CLOUDSTACK-2118 added delay for interface to come up in cloud-early-config In
cloud-early-config ifup is taking some time to setup the interface ip So in
setup_interface waiting for some time for interface to come up
Signed-off-by: Abhinandan Prateek
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/59bee8d1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/59bee8d1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/59bee8d1
Branch: refs/heads/master
Commit: 59bee8d1b4d13e7e4a00788dfcd1d8eafa2a
Parents: b01f631
Author: Jayapal
Authored: Fri Apr 19 17:31:19 2013 +0530
Committer: Abhinandan Prateek
Committed: Fri Apr 19 17:43:36 2013 +0530
--
.../debian/config/etc/init.d/cloud-early-config| 53 +++
1 files changed, 26 insertions(+), 27 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/59bee8d1/patches/systemvm/debian/config/etc/init.d/cloud-early-config
--
diff --git a/patches/systemvm/debian/config/etc/init.d/cloud-early-config
b/patches/systemvm/debian/config/etc/init.d/cloud-early-config
index 3faa1bd..b8ddaf1 100755
--- a/patches/systemvm/debian/config/etc/init.d/cloud-early-config
+++ b/patches/systemvm/debian/config/etc/init.d/cloud-early-config
@@ -27,6 +27,8 @@
# under the License.
PATH="/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin"
+#set -x
+#exec 3>&0 4>&1 > /var/log/test.log 2>&1
# Fix haproxy directory issue
mkdir -p /var/lib/haproxy
@@ -227,7 +229,29 @@ setup_interface() {
ifdown $intf
if [ "$RROUTER" != "1" -o "$1" != "2" ]
then
-ifup $intf
+ ifup $intf
+ timer=0
+ log_it "checking that $intf has IP "
+ while true
+ do
+ ip=$(ifconfig $intf | grep "inet addr:" | awk '{print $2}' | awk
-F: '{print $2}')
+ if [ -z $ip ]
+ then
+ sleep 1;
+ #waiting for the interface to setup with ip
+ log_it "waiting for $intf interface setup with ip
timer=$timer"
+ else
+ break
+ fi
+
+ if [ $timer -gt 15 ]
+ then
+ log_it "interface $intf is not set up with ip... exiting";
+ break
+ fi
+
+ timer=`expr $timer + 1`
+ done
fi
fi
}
@@ -392,33 +416,8 @@ setup_common() {
gwdev="eth0"
fi
-timer=0
-#default route add fails if we run before interface configured with ip
-log_it "checking that $gwdev has IP before setting default route to $GW"
-echo "checking that $gwdev has IP before setting default route to $GW"
-while true
-do
- ip=$(ifconfig $gwdev | grep "inet addr:" | awk '{print $2}' | awk -F:
'{print $2}')
- if [ -z $ip ]
- then
- sleep 1;
- #waiting for the interface to setup with ip
- log_it "waiting for $gwdev interface setup with ip"
- echo "waiting for $gwdev interface setup with ip"
- else
- ip route add default via $GW dev $gwdev
- break
- fi
+ip route add default via $GW dev $gwdev
- if [ $timer -gt 15 ]
- then
- log_it "interface $gwdev is not set up with ip... configuring
default route failed";
- echo "interface $gwdev is not set up with ip... configuring default
route failed"
- break
- fi
- timer=`expr $timer + 1`
-done
-
fi
# a hacking way to activate vSwitch under VMware
git commit: updated refs/heads/master to 39f772e
Updated Branches:
refs/heads/master 762977d7c -> 39f772eee
CLOUDSTACK-2161 updated cloud-early-config to copy iptables-* to rules.v4
In iptables-persistent, iptables-restore is loading config from the
/etc/iptables/rule.v4
Signed-off-by: Abhinandan Prateek
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/39f772ee
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/39f772ee
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/39f772ee
Branch: refs/heads/master
Commit: 39f772eee81863ec51fb1a2668c85e863167182f
Parents: 762977d
Author: Jayapal
Authored: Wed Apr 24 12:49:59 2013 +0530
Committer: Abhinandan Prateek
Committed: Wed Apr 24 15:25:15 2013 +0530
--
.../debian/config/etc/init.d/cloud-early-config| 12 ++--
1 files changed, 6 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/39f772ee/patches/systemvm/debian/config/etc/init.d/cloud-early-config
--
diff --git a/patches/systemvm/debian/config/etc/init.d/cloud-early-config
b/patches/systemvm/debian/config/etc/init.d/cloud-early-config
index b8ddaf1..4b3cb5f 100755
--- a/patches/systemvm/debian/config/etc/init.d/cloud-early-config
+++ b/patches/systemvm/debian/config/etc/init.d/cloud-early-config
@@ -691,7 +691,7 @@ setup_router() {
disable_rpfilter_domR
enable_fwding 1
chkconfig nfs-common off
- cp /etc/iptables/iptables-router /etc/iptables/rules
+ cp /etc/iptables/iptables-router /etc/iptables/rules.v4
setup_sshd $ETH1_IP "eth1"
}
@@ -763,7 +763,7 @@ EOF
enable_svc cloud 0
disable_rpfilter
enable_fwding 1
- cp /etc/iptables/iptables-vpcrouter /etc/iptables/rules
+ cp /etc/iptables/iptables-vpcrouter /etc/iptables/rules.v4
setup_sshd $ETH0_IP "eth0"
cp /etc/vpcdnsmasq.conf /etc/dnsmasq.conf
cp /etc/cloud-nic.rules /etc/udev/rules.d/cloud-nic.rules
@@ -789,7 +789,7 @@ setup_dhcpsrvr() {
enable_svc cloud 0
enable_fwding 0
chkconfig nfs-common off
- cp /etc/iptables/iptables-router /etc/iptables/rules
+ cp /etc/iptables/iptables-router /etc/iptables/rules.v4
if [ "$SSHONGUEST" == "true" ]
then
setup_sshd $ETH0_IP "eth0"
@@ -824,7 +824,7 @@ setup_secstorage() {
[ "$ETH2_IP" == "0.0.0.0" ] && public_ip=$ETH1_IP
echo "$public_ip $NAME" >> /etc/hosts
- cp /etc/iptables/iptables-secstorage /etc/iptables/rules
+ cp /etc/iptables/iptables-secstorage /etc/iptables/rules.v4
if [ "$hyp" == "vmware" ]; then
setup_sshd $ETH1_IP "eth1"
else
@@ -848,7 +848,7 @@ setup_console_proxy() {
[ "$ETH2_IP" == "0.0.0.0" ] && public_ip=$ETH1_IP
sed -i /gateway/d /etc/hosts
echo "$public_ip $NAME" >> /etc/hosts
- cp /etc/iptables/iptables-consoleproxy /etc/iptables/rules
+ cp /etc/iptables/iptables-consoleproxy /etc/iptables/rules.v4
if [ "$hyp" == "vmware" ]; then
setup_sshd $ETH1_IP "eth1"
else
@@ -873,7 +873,7 @@ setup_elbvm() {
[ "$ETH2_IP" == "0.0.0.0" ] || [ "$ETH2_IP" == "" ] && public_ip=$ETH0_IP
echo "$public_ip $NAME" >> /etc/hosts
- cp /etc/iptables/iptables-elbvm /etc/iptables/rules
+ cp /etc/iptables/iptables-elbvm /etc/iptables/rules.v4
if [ "$SSHONGUEST" == "true" ]
then
setup_sshd $ETH0_IP "eth0"
git commit: updated refs/heads/master to d5c3f87
Updated Branches:
refs/heads/master 1f97b528c -> d5c3f8790
CLOUDSTACK-1741 Added ip uuid into the AddIptoVmNicCmd response
Signed-off-by: Abhinandan Prateek
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d5c3f879
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d5c3f879
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d5c3f879
Branch: refs/heads/master
Commit: d5c3f87903ffa4362c9dc9688c199c10700c0ccb
Parents: 1f97b52
Author: Jayapal
Authored: Mon Apr 22 14:06:12 2013 +0530
Committer: Abhinandan Prateek
Committed: Thu Apr 25 15:16:26 2013 +0530
--
api/src/com/cloud/network/NetworkService.java |2 +-
.../apache/cloudstack/api/ResponseGenerator.java |4 +-
.../api/command/user/vm/AddIpToVmNicCmd.java |9 +--
.../api/command/test/AddIpToVmNicTest.java |6 +++-
server/src/com/cloud/api/ApiResponseHelper.java| 18 +--
.../src/com/cloud/network/NetworkServiceImpl.java | 17 +++--
.../com/cloud/network/MockNetworkManagerImpl.java |2 +-
.../test/com/cloud/vpc/MockNetworkManagerImpl.java |2 +-
8 files changed, 35 insertions(+), 25 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d5c3f879/api/src/com/cloud/network/NetworkService.java
--
diff --git a/api/src/com/cloud/network/NetworkService.java
b/api/src/com/cloud/network/NetworkService.java
index 5a6054d..6c9bebc 100755
--- a/api/src/com/cloud/network/NetworkService.java
+++ b/api/src/com/cloud/network/NetworkService.java
@@ -158,7 +158,7 @@ public interface NetworkService {
throws ResourceAllocationException,
ConcurrentOperationException, InsufficientCapacityException;
/* Requests an IP address for the guest nic */
-String allocateSecondaryGuestIP(Account account, long zoneId, Long nicId,
+NicSecondaryIp allocateSecondaryGuestIP(Account account, long zoneId, Long
nicId,
Long networkId, String ipaddress) throws
InsufficientAddressCapacityException;
boolean releaseSecondaryIpFromNic(long ipAddressId);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d5c3f879/api/src/org/apache/cloudstack/api/ResponseGenerator.java
--
diff --git a/api/src/org/apache/cloudstack/api/ResponseGenerator.java
b/api/src/org/apache/cloudstack/api/ResponseGenerator.java
index a3aa9de..cbf8bb2 100644
--- a/api/src/org/apache/cloudstack/api/ResponseGenerator.java
+++ b/api/src/org/apache/cloudstack/api/ResponseGenerator.java
@@ -20,6 +20,7 @@ import java.text.DecimalFormat;
import java.util.EnumSet;
import java.util.List;
+import com.cloud.vm.NicSecondaryIp;
import org.apache.cloudstack.affinity.AffinityGroup;
import org.apache.cloudstack.affinity.AffinityGroupResponse;
import org.apache.cloudstack.api.ApiConstants.HostDetails;
@@ -389,8 +390,7 @@ public interface ResponseGenerator {
TrafficMonitorResponse createTrafficMonitorResponse(Host trafficMonitor);
VMSnapshotResponse createVMSnapshotResponse(VMSnapshot vmSnapshot);
-NicSecondaryIpResponse createSecondaryIPToNicResponse(String ip,
-Long nicId, Long networkId);
+NicSecondaryIpResponse createSecondaryIPToNicResponse(NicSecondaryIp
result);
public NicResponse createNicResponse(Nic result);
AffinityGroupResponse createAffinityGroupResponse(AffinityGroup group);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d5c3f879/api/src/org/apache/cloudstack/api/command/user/vm/AddIpToVmNicCmd.java
--
diff --git
a/api/src/org/apache/cloudstack/api/command/user/vm/AddIpToVmNicCmd.java
b/api/src/org/apache/cloudstack/api/command/user/vm/AddIpToVmNicCmd.java
index df6b399..ae5482b 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vm/AddIpToVmNicCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vm/AddIpToVmNicCmd.java
@@ -16,6 +16,7 @@
// under the License.
package org.apache.cloudstack.api.command.user.vm;
+import com.cloud.vm.NicSecondaryIp;
import org.apache.log4j.Logger;
import org.apache.cloudstack.api.APICommand;
@@ -146,6 +147,7 @@ public class AddIpToVmNicCmd extends BaseAsyncCmd {
UserContext.current().setEventDetails("Nic Id: " + getNicId() );
String ip;
+NicSecondaryIp result;
String secondaryIp = null;
if ((ip = getIpaddress()) != null) {
if (!NetUtils.isValidIp(ip)) {
@@ -154,12 +156,13 @@ public class AddIpToVmNicCmd extends BaseAsyncCmd {
}
try {
-secondaryIp =
_networkService.allocateSecondaryGuestIP(_accountService.getAccount(getEntityOwner
git commit: updated refs/heads/master to c65ad6b
Updated Branches:
refs/heads/master c34233d5b -> c65ad6b8e
CLOUDSTACK-2161 coping /etc/iptables/iptables-* to /etc/iptables/rules to work
for old templates
In 4.2 templates iptables-persistent is looking for /etc/iptables/rules.v4 file
but the old templates 4.1 and earlier
are looking for /etc/iptables/rules.
So coping the file to both rules and rules.v4
Signed-off-by: Abhinandan Prateek
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c65ad6b8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c65ad6b8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c65ad6b8
Branch: refs/heads/master
Commit: c65ad6b8e80a90a535fded7e284dce8c74f94a98
Parents: c34233d
Author: Jayapal
Authored: Thu Apr 25 15:19:31 2013 +0530
Committer: Abhinandan Prateek
Committed: Fri Apr 26 13:43:13 2013 +0530
--
.../debian/config/etc/init.d/cloud-early-config|8
1 files changed, 8 insertions(+), 0 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c65ad6b8/patches/systemvm/debian/config/etc/init.d/cloud-early-config
--
diff --git a/patches/systemvm/debian/config/etc/init.d/cloud-early-config
b/patches/systemvm/debian/config/etc/init.d/cloud-early-config
index 187ae25..6ffd648 100755
--- a/patches/systemvm/debian/config/etc/init.d/cloud-early-config
+++ b/patches/systemvm/debian/config/etc/init.d/cloud-early-config
@@ -520,6 +520,7 @@ setup_sshd(){
local eth=$2
[ -f /etc/ssh/sshd_config ] && sed -i -e
"s/^[#]*ListenAddress.*$/ListenAddress $ip/" /etc/ssh/sshd_config
sed -i "/3922/s/eth./$eth/" /etc/iptables/rules.v4
+ sed -i "/3922/s/eth./$eth/" /etc/iptables/rules
}
@@ -692,6 +693,8 @@ setup_router() {
enable_fwding 1
chkconfig nfs-common off
cp /etc/iptables/iptables-router /etc/iptables/rules.v4
+#for old templates
+ cp /etc/iptables/iptables-router /etc/iptables/rules
setup_sshd $ETH1_IP "eth1"
}
@@ -764,6 +767,7 @@ EOF
disable_rpfilter
enable_fwding 1
cp /etc/iptables/iptables-vpcrouter /etc/iptables/rules.v4
+ cp /etc/iptables/iptables-vpcrouter /etc/iptables/rules
setup_sshd $ETH0_IP "eth0"
cp /etc/vpcdnsmasq.conf /etc/dnsmasq.conf
cp /etc/cloud-nic.rules /etc/udev/rules.d/cloud-nic.rules
@@ -790,6 +794,7 @@ setup_dhcpsrvr() {
enable_fwding 0
chkconfig nfs-common off
cp /etc/iptables/iptables-router /etc/iptables/rules.v4
+ cp /etc/iptables/iptables-router /etc/iptables/rules
if [ "$SSHONGUEST" == "true" ]
then
setup_sshd $ETH0_IP "eth0"
@@ -825,6 +830,7 @@ setup_secstorage() {
echo "$public_ip $NAME" >> /etc/hosts
cp /etc/iptables/iptables-secstorage /etc/iptables/rules.v4
+ cp /etc/iptables/iptables-secstorage /etc/iptables/rules
if [ "$hyp" == "vmware" ]; then
setup_sshd $ETH1_IP "eth1"
else
@@ -849,6 +855,7 @@ setup_console_proxy() {
sed -i /gateway/d /etc/hosts
echo "$public_ip $NAME" >> /etc/hosts
cp /etc/iptables/iptables-consoleproxy /etc/iptables/rules.v4
+ cp /etc/iptables/iptables-consoleproxy /etc/iptables/rules
if [ "$hyp" == "vmware" ]; then
setup_sshd $ETH1_IP "eth1"
else
@@ -874,6 +881,7 @@ setup_elbvm() {
echo "$public_ip $NAME" >> /etc/hosts
cp /etc/iptables/iptables-elbvm /etc/iptables/rules.v4
+ cp /etc/iptables/iptables-elbvm /etc/iptables/rules
if [ "$SSHONGUEST" == "true" ]
then
setup_sshd $ETH0_IP "eth0"
git commit: updated refs/heads/master to e31553a
Updated Branches: refs/heads/master dce425817 -> e31553aff CLOUDSTACK-2308 fixed adding route in vware for mgmt subnet Signed-off-by: Abhinandan Prateek Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e31553af Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e31553af Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e31553af Branch: refs/heads/master Commit: e31553aff827abd88e3dfa9b65bfb335e09fbd22 Parents: dce4258 Author: Jayapal Authored: Thu May 16 19:01:17 2013 +0530 Committer: Abhinandan Prateek Committed: Wed May 22 12:21:30 2013 +0530 -- .../debian/config/etc/init.d/cloud-early-config|5 - 1 files changed, 4 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e31553af/patches/systemvm/debian/config/etc/init.d/cloud-early-config -- diff --git a/patches/systemvm/debian/config/etc/init.d/cloud-early-config b/patches/systemvm/debian/config/etc/init.d/cloud-early-config index 893a245..d918670 100755 --- a/patches/systemvm/debian/config/etc/init.d/cloud-early-config +++ b/patches/systemvm/debian/config/etc/init.d/cloud-early-config @@ -757,7 +757,10 @@ EOF fi if [ -n "$MGMTNET" -a -n "$LOCAL_GW" ] then -ip route add $MGMTNET via $LOCAL_GW dev eth1 + if [ "$hyp" == "vmware" ] + then + ip route add $MGMTNET via $LOCAL_GW dev eth0 + fi fi ip route delete default
git commit: updated refs/heads/master to 704471e
Updated Branches:
refs/heads/master 2276760b3 -> 704471e6d
CLOUDSTACK-2386 Fixed srx firewall icmp rule
Signed-off-by: Abhinandan Prateek
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/704471e6
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/704471e6
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/704471e6
Branch: refs/heads/master
Commit: 704471e6deb1f72b6cc5a9fdcad15927dfc689a8
Parents: 2276760
Author: Jayapal
Authored: Mon May 20 11:00:51 2013 +0530
Committer: Abhinandan Prateek
Committed: Fri May 24 10:30:12 2013 +0530
--
.../element/JuniperSRXExternalFirewallElement.java |1 +
.../cloud/network/resource/JuniperSrxResource.java | 35 +++
.../network/ExternalFirewallDeviceManagerImpl.java |4 +-
utils/src/com/cloud/utils/net/NetUtils.java|2 +
4 files changed, 23 insertions(+), 19 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/704471e6/plugins/network-elements/juniper-srx/src/com/cloud/network/element/JuniperSRXExternalFirewallElement.java
--
diff --git
a/plugins/network-elements/juniper-srx/src/com/cloud/network/element/JuniperSRXExternalFirewallElement.java
b/plugins/network-elements/juniper-srx/src/com/cloud/network/element/JuniperSRXExternalFirewallElement.java
index a429306..c00d99a 100644
---
a/plugins/network-elements/juniper-srx/src/com/cloud/network/element/JuniperSRXExternalFirewallElement.java
+++
b/plugins/network-elements/juniper-srx/src/com/cloud/network/element/JuniperSRXExternalFirewallElement.java
@@ -242,6 +242,7 @@ PortForwardingServiceProvider,
RemoteAccessVPNServiceProvider, IpDeployer, Junip
// Set capabilities for Firewall service
Map firewallCapabilities = new HashMap();
firewallCapabilities.put(Capability.SupportedProtocols,
"tcp,udp,icmp");
+firewallCapabilities.put(Capability.SupportedEgressProtocols,
"tcp,udp,icmp,all");
firewallCapabilities.put(Capability.MultipleIps, "true");
firewallCapabilities.put(Capability.TrafficStatistics, "per public
ip");
firewallCapabilities.put(Capability.SupportedTrafficDirection,
"ingress, egress");
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/704471e6/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java
--
diff --git
a/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java
b/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java
index a0068c3..fd065d5 100644
---
a/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java
+++
b/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java
@@ -750,7 +750,7 @@ public class JuniperSrxResource implements ServerResource {
s_logger.debug(msg);
}
-private void shutdownGuestNetwork(GuestNetworkType type, long accountId,
Long publicVlanTag, String sourceNatIpAddress, long privateVlanTag, String
privateGateway, String privateSubnet, long privateCidrSize) throws
ExecutionException {
+private void shutdownGuestNetwork(GuestNetworkType type, long accountId,
Long publicVlanTag, String sourceNatIpAddress, long privateVlanTag, String
privateGateway, String privateSubnet, long privateCidrSize) throws
ExecutionException {
// Remove static and destination NAT rules for the guest network
removeStaticAndDestNatRulesInPrivateVlan(privateVlanTag,
privateGateway, privateCidrSize);
@@ -766,10 +766,10 @@ public class JuniperSrxResource implements ServerResource
{
manageSourceNatPool(SrxCommand.DELETE, sourceNatIpAddress);
manageProxyArp(SrxCommand.DELETE, publicVlanTag,
sourceNatIpAddress);
manageUsageFilter(SrxCommand.DELETE, _usageFilterIPOutput,
privateSubnet, null, genIpFilterTermName(sourceNatIpAddress));
-manageUsageFilter(SrxCommand.DELETE, _usageFilterIPInput,
sourceNatIpAddress, null, genIpFilterTermName(sourceNatIpAddress));
+manageUsageFilter(SrxCommand.DELETE, _usageFilterIPInput,
sourceNatIpAddress, null, genIpFilterTermName(sourceNatIpAddress));
} else if (type.equals(GuestNetworkType.INTERFACE_NAT)) {
manageUsageFilter(SrxCommand.DELETE, _usageFilterVlanOutput, null,
privateVlanTag, null);
-manageUsageFilter(SrxCommand.DELETE, _usageFilterVlanInput, null,
privateVlanTag, null);
+
git commit: updated refs/heads/master to 3000cb3
Updated Branches:
refs/heads/master fd79f6b60 -> 3000cb31a
CLOUDSTACK-2434: Enable irq balance on system VM
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3000cb31
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3000cb31
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3000cb31
Branch: refs/heads/master
Commit: 3000cb31af91437fae8ab64a05b1564730a6b80d
Parents: fd79f6b
Author: Abhinandan Prateek
Authored: Thu May 30 17:35:30 2013 +0530
Committer: Abhinandan Prateek
Committed: Thu May 30 17:35:30 2013 +0530
--
.../definitions/systemvmtemplate/postinstall.sh|3 +++
.../definitions/systemvmtemplate64/postinstall.sh |2 ++
2 files changed, 5 insertions(+), 0 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3000cb31/tools/appliance/definitions/systemvmtemplate/postinstall.sh
--
diff --git a/tools/appliance/definitions/systemvmtemplate/postinstall.sh
b/tools/appliance/definitions/systemvmtemplate/postinstall.sh
index f532f88..7c06796 100644
--- a/tools/appliance/definitions/systemvmtemplate/postinstall.sh
+++ b/tools/appliance/definitions/systemvmtemplate/postinstall.sh
@@ -42,6 +42,9 @@ install_packages() {
apt-get --no-install-recommends -q -y --force-yes install dnsmasq
dnsmasq-utils
# nfs client
apt-get --no-install-recommends -q -y --force-yes install nfs-common
+ # nfs irqbalance
+ apt-get --no-install-recommends -q -y --force-yes install irqbalance
+
# vpn stuff
apt-get --no-install-recommends -q -y --force-yes install xl2tpd bcrelay ppp
ipsec-tools tdb-tools
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3000cb31/tools/appliance/definitions/systemvmtemplate64/postinstall.sh
--
diff --git a/tools/appliance/definitions/systemvmtemplate64/postinstall.sh
b/tools/appliance/definitions/systemvmtemplate64/postinstall.sh
index 3ccf3ce..35a4e4a 100644
--- a/tools/appliance/definitions/systemvmtemplate64/postinstall.sh
+++ b/tools/appliance/definitions/systemvmtemplate64/postinstall.sh
@@ -42,6 +42,8 @@ install_packages() {
apt-get --no-install-recommends -q -y --force-yes install dnsmasq
dnsmasq-utils
# nfs client
apt-get --no-install-recommends -q -y --force-yes install nfs-common
+ # nfs irqbalance
+ apt-get --no-install-recommends -q -y --force-yes install irqbalance
# vpn stuff
apt-get --no-install-recommends -q -y --force-yes install xl2tpd bcrelay ppp
ipsec-tools tdb-tools
git commit: updated refs/heads/master to 723a455
Updated Branches:
refs/heads/master f714d2603 -> 723a45573
CLOUDSTACK-2434: Enabling irqbalance only on router having mutiple virtual
processors
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/723a4557
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/723a4557
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/723a4557
Branch: refs/heads/master
Commit: 723a45573123c43b9d3ecdd2b48f8911e83b8a93
Parents: f714d26
Author: Abhinandan Prateek
Authored: Mon Jun 3 13:46:43 2013 +0530
Committer: Abhinandan Prateek
Committed: Mon Jun 3 13:46:43 2013 +0530
--
.../debian/config/etc/init.d/cloud-early-config| 25 ++-
1 files changed, 24 insertions(+), 1 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/723a4557/patches/systemvm/debian/config/etc/init.d/cloud-early-config
--
diff --git a/patches/systemvm/debian/config/etc/init.d/cloud-early-config
b/patches/systemvm/debian/config/etc/init.d/cloud-early-config
index 7be8663..082d975 100755
--- a/patches/systemvm/debian/config/etc/init.d/cloud-early-config
+++ b/patches/systemvm/debian/config/etc/init.d/cloud-early-config
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash
### BEGIN INIT INFO
# Provides: cloud-early-config
# Required-Start:mountkernfs $local_fs
@@ -342,6 +342,22 @@ enable_svc() {
[ -f $cfg ] && sed -i "s/ENABLED=.*$/ENABLED=$enabled/" $cfg && return
}
+
+enable_irqbalance() {
+ local enabled=$1
+ local proc=0
+
+ $proc = $(cat /proc/cpuinfo | grep "processor" | wc -l)
+ if [ $proc -le 1 ] && [ $enabled -eq 1 ]
+ then
+enabled = 0
+ fi
+
+ log_it "Processors = $proc Enable service ${svc} = $enabled"
+ local cfg=/etc/default/irqbalance
+ [ -f $cfg ] && sed -i "s/ENABLED=.*$/ENABLED=$enabled/" $cfg && return
+}
+
disable_hvc() {
[ ! -d /proc/xen ] && sed -i 's/^vc/#vc/' /etc/inittab && telinit q
[ -d /proc/xen ] && sed -i 's/^#vc/vc/' /etc/inittab && telinit q
@@ -698,6 +714,7 @@ setup_router() {
enable_svc dnsmasq 1
enable_svc haproxy 1
+ enable_irqbalance 1
enable_svc cloud-passwd-srvr 1
enable_svc cloud 0
disable_rpfilter_domR
@@ -777,6 +794,7 @@ EOF
enable_svc dnsmasq 1
enable_svc haproxy 1
+ enable_irqbalance 1
enable_svc cloud 0
disable_rpfilter
enable_fwding 1
@@ -803,6 +821,7 @@ setup_dhcpsrvr() {
enable_svc dnsmasq 1
enable_svc haproxy 0
+ enable_irqbalance 0
enable_svc cloud-passwd-srvr 1
enable_svc cloud 0
enable_fwding 0
@@ -855,6 +874,7 @@ setup_secstorage() {
disable_rpfilter
enable_fwding 0
enable_svc haproxy 0
+ enable_irqbalance 0
enable_svc dnsmasq 0
enable_svc cloud-passwd-srvr 0
enable_svc cloud 1
@@ -879,6 +899,7 @@ setup_console_proxy() {
disable_rpfilter
enable_fwding 0
enable_svc haproxy 0
+ enable_irqbalance 0
enable_svc dnsmasq 0
enable_svc cloud-passwd-srvr 0
enable_svc cloud 1
@@ -905,6 +926,7 @@ setup_elbvm() {
enable_fwding 0
enable_svc haproxy 0
+ enable_irqbalance 0
enable_svc dnsmasq 0
enable_svc cloud-passwd-srvr 0
enable_svc cloud 0
@@ -927,6 +949,7 @@ setup_ilbvm() {
enable_fwding 0
enable_svc haproxy 1
+ enable_irqbalance 1
enable_svc dnsmasq 0
enable_svc cloud-passwd-srvr 0
enable_svc cloud 0
git commit: updated refs/heads/master to 7b0da06
Updated Branches:
refs/heads/master 6cc9162e7 -> 7b0da0623
CLOUDSTACK-2434: bad syntax
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7b0da062
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7b0da062
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7b0da062
Branch: refs/heads/master
Commit: 7b0da062380eb4fb56bde0f3c6db3272d3ff4968
Parents: 6cc9162
Author: Abhinandan Prateek
Authored: Mon Jun 3 15:35:17 2013 +0530
Committer: Abhinandan Prateek
Committed: Mon Jun 3 15:35:17 2013 +0530
--
.../debian/config/etc/init.d/cloud-early-config|2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7b0da062/patches/systemvm/debian/config/etc/init.d/cloud-early-config
--
diff --git a/patches/systemvm/debian/config/etc/init.d/cloud-early-config
b/patches/systemvm/debian/config/etc/init.d/cloud-early-config
index 082d975..d021690 100755
--- a/patches/systemvm/debian/config/etc/init.d/cloud-early-config
+++ b/patches/systemvm/debian/config/etc/init.d/cloud-early-config
@@ -350,7 +350,7 @@ enable_irqbalance() {
$proc = $(cat /proc/cpuinfo | grep "processor" | wc -l)
if [ $proc -le 1 ] && [ $enabled -eq 1 ]
then
-enabled = 0
+enabled=0
fi
log_it "Processors = $proc Enable service ${svc} = $enabled"
git commit: updated refs/heads/master to 7d51ebb
Updated Branches:
refs/heads/master cefd099c9 -> 7d51ebba9
CLOUDSTACK-2434: bad syntax
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7d51ebba
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7d51ebba
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7d51ebba
Branch: refs/heads/master
Commit: 7d51ebba9e8253f6d11a4b18e562edae5e8f74aa
Parents: cefd099
Author: Abhinandan Prateek
Authored: Mon Jun 3 16:05:19 2013 +0530
Committer: Abhinandan Prateek
Committed: Mon Jun 3 16:05:19 2013 +0530
--
.../debian/config/etc/init.d/cloud-early-config|2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7d51ebba/patches/systemvm/debian/config/etc/init.d/cloud-early-config
--
diff --git a/patches/systemvm/debian/config/etc/init.d/cloud-early-config
b/patches/systemvm/debian/config/etc/init.d/cloud-early-config
index d021690..d2e668d 100755
--- a/patches/systemvm/debian/config/etc/init.d/cloud-early-config
+++ b/patches/systemvm/debian/config/etc/init.d/cloud-early-config
@@ -347,7 +347,7 @@ enable_irqbalance() {
local enabled=$1
local proc=0
- $proc = $(cat /proc/cpuinfo | grep "processor" | wc -l)
+ $proc=$(cat /proc/cpuinfo | grep "processor" | wc -l)
if [ $proc -le 1 ] && [ $enabled -eq 1 ]
then
enabled=0
git commit: updated refs/heads/master to a9bfee1
Updated Branches:
refs/heads/master 7d51ebba9 -> a9bfee1e2
CLOUDSTACK-2434: fixed var name
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a9bfee1e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a9bfee1e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a9bfee1e
Branch: refs/heads/master
Commit: a9bfee1e22dfe30d1873ea9c531d6c8058f70184
Parents: 7d51ebb
Author: Abhinandan Prateek
Authored: Mon Jun 3 16:11:09 2013 +0530
Committer: Abhinandan Prateek
Committed: Mon Jun 3 16:11:09 2013 +0530
--
.../debian/config/etc/init.d/cloud-early-config|2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a9bfee1e/patches/systemvm/debian/config/etc/init.d/cloud-early-config
--
diff --git a/patches/systemvm/debian/config/etc/init.d/cloud-early-config
b/patches/systemvm/debian/config/etc/init.d/cloud-early-config
index d2e668d..0dcd571 100755
--- a/patches/systemvm/debian/config/etc/init.d/cloud-early-config
+++ b/patches/systemvm/debian/config/etc/init.d/cloud-early-config
@@ -347,7 +347,7 @@ enable_irqbalance() {
local enabled=$1
local proc=0
- $proc=$(cat /proc/cpuinfo | grep "processor" | wc -l)
+ proc=$(cat /proc/cpuinfo | grep "processor" | wc -l)
if [ $proc -le 1 ] && [ $enabled -eq 1 ]
then
enabled=0
git commit: updated refs/heads/master to 0a69b82
Updated Branches:
refs/heads/master e0f0e9d01 -> 0a69b8289
CLOUDSTACK-2620 [Multiple_IP_Ranges] Guest vm's nameserver is not set to VRs
guest IP address in case of multiple subnets
Signed-off-by: Abhinandan Prateek
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0a69b828
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0a69b828
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0a69b828
Branch: refs/heads/master
Commit: 0a69b828993088487876ce859e6c00e96e4b545c
Parents: e0f0e9d
Author: Bharat Kumar
Authored: Mon Jun 3 16:54:28 2013 +0530
Committer: Abhinandan Prateek
Committed: Mon Jun 3 19:09:01 2013 +0530
--
api/src/com/cloud/agent/api/to/DnsmasqTO.java | 13 ++-
.../src/com/cloud/network/DnsMasqConfigurator.java | 30 ++
.../router/VirtualNetworkApplianceManagerImpl.java | 12 -
3 files changed, 34 insertions(+), 21 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0a69b828/api/src/com/cloud/agent/api/to/DnsmasqTO.java
--
diff --git a/api/src/com/cloud/agent/api/to/DnsmasqTO.java
b/api/src/com/cloud/agent/api/to/DnsmasqTO.java
index f99878c..c7be04d 100644
--- a/api/src/com/cloud/agent/api/to/DnsmasqTO.java
+++ b/api/src/com/cloud/agent/api/to/DnsmasqTO.java
@@ -20,11 +20,14 @@ public class DnsmasqTO {
String routerIp;
String gateway;
String netmask;
+String startIpOfSubnet;
-public DnsmasqTO(String routerIp, String gateway, String netmask) {
+public DnsmasqTO(String routerIp, String gateway, String netmask, String
StartIpOfSubnet) {
this.routerIp = routerIp;
+this.startIpOfSubnet = StartIpOfSubnet;
this.gateway = gateway;
this.netmask =netmask;
+
}
public void setRouterIp(String routerIp){
@@ -39,6 +42,10 @@ public class DnsmasqTO {
this.netmask = netmask ;
}
+public void setStartIpOfSubnet( String ipOfSubNet) {
+startIpOfSubnet = ipOfSubNet;
+}
+
public String getRouterIp() {
return routerIp;
}
@@ -50,4 +57,8 @@ public class DnsmasqTO {
public String getNetmask() {
return netmask;
}
+public String getStartIpOfSubnet() {
+return startIpOfSubnet;
+}
+
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0a69b828/core/src/com/cloud/network/DnsMasqConfigurator.java
--
diff --git a/core/src/com/cloud/network/DnsMasqConfigurator.java
b/core/src/com/cloud/network/DnsMasqConfigurator.java
index ee8e5fc..dd34926 100644
--- a/core/src/com/cloud/network/DnsMasqConfigurator.java
+++ b/core/src/com/cloud/network/DnsMasqConfigurator.java
@@ -71,7 +71,7 @@ import java.util.List;
"conf-dir=/etc/dnsmasq.d\n",
"dhcp-option=tag:net1,3,ipaddress\n",
"dhcp-option=tag:net1,1,netmask\n",
-
"dhcp-option=6,10.147.28.149,8.8.8.8\n",
+
"dhcp-option=6,router_ip,external_dns\n",
"dhcp-optsfile=/etc/dhcpopts.txt\n",
@@ -85,11 +85,21 @@ import java.util.List;
String netmask="";
String domain= dnsMasqconfigcmd.getDomain();
String dnsServers="";
+ String dns_external="";
+ if (dnsMasqconfigcmd.getDns1()!= null) {
+ dns_external = dnsMasqconfigcmd.getDns1()+",";
+ }
+ if (dnsMasqconfigcmd.getDns2() != null) {
+ dns_external = dns_external+dnsMasqconfigcmd.getDns2()+",";
+ }
+ dns_external = dns_external + "*";
+ dns_external = dns_external.replace(",*","");
int i=0;
for (; i< dnsmasqTOs.size(); i++) {
- range=range +
"dhcp-range=set:range"+i+","+dnsmasqTOs.get(i).getRouterIp()+",static\n";
+ range=range +
"dhcp-range=set:range"+i+","+dnsmasqTOs.get(i).getStartIpOfSubnet()+",static\n";
gateway=gateway
+"dhcp-option=tag:range"+i+",3,"+dnsmasqTOs.get(i).getGateway()+"\n";
netmask=netmask
+"dhcp-option=tag:range"+i+",1,"+dnsmasqTOs.get(i).getNetmask()+"\n";
+
dnsServers=dnsServers+"dhcp-option=tag:range"+i+",6,"+dnsmasqTOs.get(i).getRouterIp()+","+dns_external+"\n";
}
dnsMasqconf.set(12, "domain="+domain+"\n");
dnsMasqconf.set(14, "domain="+domain+"\n");
@@ -97,21 +107,7 @@ import java.util.List;
dnsMasqconf.set(18, range);
dnsMasqconf.set(22, gateway);
dnsMasqconf.set(23, netmask);
- if (dnsMasqconfigcmd.get
git commit: updated refs/heads/master to 4891367
Updated Branches:
refs/heads/master 0a69b8289 -> 48913679e
CLOUDSTACK-2648 [Multiple_IP_Ranges] Reboot or start/stop router vm deletes the
ip alises created on VR in case of multiple subnets
Signed-off-by: Abhinandan Prateek
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/48913679
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/48913679
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/48913679
Branch: refs/heads/master
Commit: 48913679e80e50228b1bd4b3d17fe5245461626a
Parents: 0a69b82
Author: Bharat Kumar
Authored: Thu May 23 19:24:22 2013 +0530
Committer: Abhinandan Prateek
Committed: Mon Jun 3 19:22:27 2013 +0530
--
.../virtualnetwork/VirtualRoutingResource.java |2 +-
.../systemvm/debian/config/root/deleteIpAlias.sh |2 +-
.../hypervisor/vmware/resource/VmwareResource.java |2 +-
.../xen/resource/CitrixResourceBase.java |3 ++-
.../router/VirtualNetworkApplianceManagerImpl.java | 13 -
5 files changed, 13 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48913679/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
--
diff --git
a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
index 8b996d1..9e40eef 100755
---
a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
+++
b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
@@ -642,7 +642,7 @@ public class VirtualRoutingResource implements Manager {
for (IpAliasTO ipAliasTO : revokedIpAliasTOs) {
args = args +
ipAliasTO.getAlias_count()+":"+ipAliasTO.getRouterip()+":"+ipAliasTO.getNetmask()+"-";
}
-args = args + " " ;
+args = args + "- " ;
List activeIpAliasTOs = cmd.getCreateIpAliasTos();
for (IpAliasTO ipAliasTO : activeIpAliasTOs) {
args = args +
ipAliasTO.getAlias_count()+":"+ipAliasTO.getRouterip()+":"+ipAliasTO.getNetmask()+"-";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48913679/patches/systemvm/debian/config/root/deleteIpAlias.sh
--
diff --git a/patches/systemvm/debian/config/root/deleteIpAlias.sh
b/patches/systemvm/debian/config/root/deleteIpAlias.sh
index 865ff3b..cf6d4de 100755
--- a/patches/systemvm/debian/config/root/deleteIpAlias.sh
+++ b/patches/systemvm/debian/config/root/deleteIpAlias.sh
@@ -24,7 +24,7 @@ set -x
var="$1"
cert="/root/.ssh/id_rsa.cloud"
-while [ -n "$var" ]
+while [[ !( "$var" == "-" ) ]]
do
var1=$(echo $var | cut -f1 -d "-")
alias_count=$( echo $var1 | cut -f1 -d ":" )
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48913679/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
--
diff --git
a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
index 5f99a15..bcd02d4 100755
---
a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
+++
b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
@@ -1976,7 +1976,7 @@ public class VmwareResource implements
StoragePoolResource, ServerResource, Vmwa
for (IpAliasTO ipAliasTO : revokedIpAliasTOs) {
args = args +
ipAliasTO.getAlias_count()+":"+ipAliasTO.getRouterip()+":"+ipAliasTO.getNetmask()+"-";
}
-args = args + " " ;
+args = args + "- " ;
for (IpAliasTO ipAliasTO : activeIpAliasTOs) {
args = args +
ipAliasTO.getAlias_count()+":"+ipAliasTO.getRouterip()+":"+ipAliasTO.getNetmask()+"-";
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48913679/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
--
diff --git
a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
index a2cceb1..66f96ad 100644
---
a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
+++
b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
@@ -2006,7 +2006,8 @@ public abstract class CitrixResourceBase implements
ServerResource, HypervisorRe
for (IpAliasTO ipAliasTO : revoked
git commit: updated refs/heads/master to d58c0c4
Updated Branches:
refs/heads/master ba2687c23 -> d58c0c4d1
Cloudstack-2736 [Multiple_IP_Ranges] Failed to deploy vm with IP address from
new CIDR
Signed-off-by: Abhinandan Prateek
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d58c0c4d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d58c0c4d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d58c0c4d
Branch: refs/heads/master
Commit: d58c0c4d1145345ad66c73924eab8f3f5703552d
Parents: ba2687c
Author: Bharat Kumar
Authored: Tue Jun 4 12:37:06 2013 +0530
Committer: Abhinandan Prateek
Committed: Tue Jun 4 14:19:57 2013 +0530
--
.../router/VirtualNetworkApplianceManagerImpl.java |8 +++-
1 files changed, 7 insertions(+), 1 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d58c0c4d/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
--
diff --git
a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index f7e77f3..e0ff157 100755
---
a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++
b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -2796,7 +2796,13 @@ public class VirtualNetworkApplianceManagerImpl extends
ManagerBase implements V
for (VlanVO vlan : vlanList) {
vlanDbIdList.add(vlan.getId());
}
-routerPublicIP =
_networkMgr.assignPublicIpAddressFromVlans(router.getDataCenterId(),
vm.getPodIdToDeployIn(), caller, Vlan.VlanType.DirectAttached, vlanDbIdList,
nic.getNetworkId(), null, false);
+if (dc.getNetworkType() == NetworkType.Basic) {
+routerPublicIP =
_networkMgr.assignPublicIpAddressFromVlans(router.getDataCenterId(),
vm.getPodIdToDeployIn(), caller, Vlan.VlanType.DirectAttached, vlanDbIdList,
nic.getNetworkId(), null, false);
+}
+else {
+routerPublicIP =
_networkMgr.assignPublicIpAddressFromVlans(router.getDataCenterId(), null,
caller, Vlan.VlanType.DirectAttached, vlanDbIdList, nic.getNetworkId(), null,
false);
+}
+
routerAliasIp = routerPublicIP.getAddress().addr();
}
}
git commit: updated refs/heads/master to c8f143e
Updated Branches:
refs/heads/master e0fa773c8 -> c8f143e3a
bug CLOUDSTACK-2445: removed vm id from exception message
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c8f143e3
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c8f143e3
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c8f143e3
Branch: refs/heads/master
Commit: c8f143e3a74258c730fd25af5512513c5d972650
Parents: e0fa773c
Author: Abhinandan Prateek
Authored: Tue Jun 4 16:11:40 2013 +0530
Committer: Abhinandan Prateek
Committed: Tue Jun 4 16:11:40 2013 +0530
--
.../network/lb/LoadBalancingRulesManagerImpl.java |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c8f143e3/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
--
diff --git a/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
b/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
index 633357e..21e2887 100755
--- a/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
+++ b/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
@@ -973,8 +973,8 @@ public class LoadBalancingRulesManagerImpl extends
ManagerBase implements
}
if (nicInSameNetwork == null) {
-InvalidParameterValueException ex = new
InvalidParameterValueException("VM " + instanceId
-+ " cannot be added because it doesn't belong in the
same network.");
+InvalidParameterValueException ex =
+new InvalidParameterValueException("VM with id
specified cannot be added because it doesn't belong in the same network.");
ex.addProxyObject(vm.getUuid(), "instanceId");
throw ex;
}
git commit: updated refs/heads/master to 673b293
Updated Branches:
refs/heads/master 22a850828 -> 673b293d7
CLOUDSTACK-2761 Fixed PF/StaticNAT in vmware vpc
Signed-off-by: Abhinandan Prateek
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/673b293d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/673b293d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/673b293d
Branch: refs/heads/master
Commit: 673b293d75419a4b76379092db2b204cdc6160a4
Parents: 22a8508
Author: Jayapal
Authored: Wed Jun 5 19:13:03 2013 +0530
Committer: Abhinandan Prateek
Committed: Mon Jun 10 11:04:01 2013 +0530
--
.../vmware/resource/VmwareResource.java | 48 +++-
1 file changed, 47 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/673b293d/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
--
diff --git
a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
index 5944cc8..46219c3 100755
---
a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
+++
b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
@@ -811,7 +811,53 @@ public class VmwareResource implements
StoragePoolResource, ServerResource, Vmwa
return new SetFirewallRulesAnswer(cmd, true, results);
}
+protected SetStaticNatRulesAnswer
SetVPCStaticNatRules(SetStaticNatRulesCommand cmd) {
+if (s_logger.isInfoEnabled()) {
+s_logger.info("Executing resource SetVPCStaticNatRulesCommand: " +
_gson.toJson(cmd));
+}
+
+String[] results = new String[cmd.getRules().length];
+VmwareManager mgr =
getServiceContext().getStockObject(VmwareManager.CONTEXT_STOCK_NAME);
+String controlIp = getRouterSshControlIp(cmd);
+
+int i = 0;
+boolean endResult = true;
+for (StaticNatRuleTO rule : cmd.getRules()) {
+// Prepare command to be send to VPC VR
+String args = "";
+args += rule.revoked() ? " -D" : " -A";
+args += " -l " + rule.getSrcIp();
+args += " -r " + rule.getDstIp();
+
+// Invoke command on VPC VR.
+try {
+Pair result = SshHelper.sshExecute(controlIp,
DEFAULT_DOMR_SSHPORT, "root", mgr.getSystemVMKeyFile(), null,
"/opt/cloud/bin/vpc_staticnat.sh " + args);
+
+if (s_logger.isDebugEnabled())
+s_logger.debug("Executing script on domain router " +
controlIp + ": /opt/cloud/bin/vpc_staticnat.sh " + args);
+
+if (!result.first()) {
+s_logger.error("SetVPCStaticNatRulesCommand failure on
setting one rule. args: " + args);
+results[i++] = "Failed";
+endResult = false;
+} else {
+results[i++] = null;
+}
+} catch (Throwable e) {
+s_logger.error("SetVPCStaticNatRulesCommand (args: " + args +
") failed on setting one rule due to " + VmwareHelper.getExceptionMessage(e),
e);
+results[i++] = "Failed";
+endResult = false;
+}
+}
+return new SetStaticNatRulesAnswer(cmd, results, endResult);
+}
+
protected Answer execute(SetStaticNatRulesCommand cmd) {
+
+if (cmd.getVpcId() != null) {
+return SetVPCStaticNatRules(cmd);
+}
+
if (s_logger.isInfoEnabled()) {
s_logger.info("Executing resource SetFirewallRuleCommand: " +
_gson.toJson(cmd));
}
@@ -1262,7 +1308,7 @@ public class VmwareResource implements
StoragePoolResource, ServerResource, Vmwa
args += rule.revoked() ? " -D" : " -A";
args += " -P " + rule.getProtocol().toLowerCase();
args += " -l " + rule.getSrcIp();
-args += " -p " + rule.getStringSrcPortRange().replace(":", "-");
+args += " -p " + rule.getStringSrcPortRange();
args += " -r " + rule.getDstIp();
args += " -d " + rule.getStringDstPortRange().replace(":", "-");
[1/2] git commit: updated refs/heads/master to c8d607e
Updated Branches:
refs/heads/master 673b293d7 -> c8d607eae
CLOUDSTACK-2604 Fixed deleting secondary ip when no PF rules set
Signed-off-by: Abhinandan Prateek
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c1ad3b79
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c1ad3b79
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c1ad3b79
Branch: refs/heads/master
Commit: c1ad3b7974449f457a1cc4e50fe7af260d1c5bf6
Parents: 673b293
Author: Jayapal
Authored: Thu May 23 16:10:44 2013 +0530
Committer: Abhinandan Prateek
Committed: Mon Jun 10 12:13:08 2013 +0530
--
api/src/com/cloud/network/NetworkModel.java| 2 ++
.../network/rules/dao/PortForwardingRulesDao.java | 2 +-
.../network/rules/dao/PortForwardingRulesDaoImpl.java | 9 -
server/src/com/cloud/network/NetworkModelImpl.java | 5 +++--
server/src/com/cloud/network/NetworkServiceImpl.java | 13 +
.../src/com/cloud/network/rules/RulesManagerImpl.java | 2 +-
.../test/com/cloud/network/MockNetworkModelImpl.java | 5 +
server/test/com/cloud/vpc/MockNetworkModelImpl.java| 5 +
8 files changed, 34 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c1ad3b79/api/src/com/cloud/network/NetworkModel.java
--
diff --git a/api/src/com/cloud/network/NetworkModel.java
b/api/src/com/cloud/network/NetworkModel.java
index f84a8b0..05307eb 100644
--- a/api/src/com/cloud/network/NetworkModel.java
+++ b/api/src/com/cloud/network/NetworkModel.java
@@ -272,4 +272,6 @@ public interface NetworkModel {
Map getNtwkOffDetails(long offId);
Networks.IsolationType[] listNetworkIsolationMethods();
+
+Nic getNicInNetworkIncludingRemoved(long vmId, long networkId);
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c1ad3b79/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 682a941..9a1d321 100644
--- a/engine/schema/src/com/cloud/network/rules/dao/PortForwardingRulesDao.java
+++ b/engine/schema/src/com/cloud/network/rules/dao/PortForwardingRulesDao.java
@@ -43,5 +43,5 @@ public interface PortForwardingRulesDao extends
GenericDao listByAccount(long accountId);
List listByDestIpAddr(String ip4Address);
-
+PortForwardingRuleVO findByIdAndIp(long id, String secondaryIp);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c1ad3b79/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 cc780cb..c0db780 100644
---
a/engine/schema/src/com/cloud/network/rules/dao/PortForwardingRulesDaoImpl.java
+++
b/engine/schema/src/com/cloud/network/rules/dao/PortForwardingRulesDaoImpl.java
@@ -158,5 +158,12 @@ public class PortForwardingRulesDaoImpl extends
GenericDaoBase sc = AllFieldsSearch.create();
+sc.setParameters("id", id);
+sc.setParameters("dstIp", secondaryIp);
+return findOneBy(sc);
+}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c1ad3b79/server/src/com/cloud/network/NetworkModelImpl.java
--
diff --git a/server/src/com/cloud/network/NetworkModelImpl.java
b/server/src/com/cloud/network/NetworkModelImpl.java
index 21917f7..fa34d65 100755
--- a/server/src/com/cloud/network/NetworkModelImpl.java
+++ b/server/src/com/cloud/network/NetworkModelImpl.java
@@ -770,7 +770,7 @@ public class NetworkModelImpl extends ManagerBase
implements NetworkModel {
@Override
public Nic getNicInNetwork(long vmId, long networkId) {
-return _nicDao.findByInstanceIdAndNetworkIdIncludingRemoved(networkId,
vmId);
+return _nicDao.findByNtwkIdAndInstanceId(networkId, vmId);
}
@Override
@@ -1761,7 +1761,8 @@ public class NetworkModelImpl extends ManagerBase
implements NetworkModel {
return true;
}
-Nic getNicInNetworkIncludingRemoved(long vmId, long networkId) {
+@Override
+public Nic getNicInNetworkIncludingRemoved(long vmId, long networkId) {
return _nicDao.findByInstanceIdAndNetworkIdIncludingRemoved(networkId,
vmId);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c1ad3b79/server/src/com/cloud/network/Network
[2/2] git commit: updated refs/heads/master to c8d607e
CLOUDSTACK-2650 setting vm ip null in user_ip_address when static nat ip Signed-off-by: Abhinandan Prateek Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c8d607ea Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c8d607ea Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c8d607ea Branch: refs/heads/master Commit: c8d607eae5db696b20f797a3297ad5eb5c746115 Parents: c1ad3b7 Author: Jayapal Authored: Fri May 24 11:52:25 2013 +0530 Committer: Abhinandan Prateek Committed: Mon Jun 10 12:14:34 2013 +0530 -- engine/schema/src/com/cloud/network/dao/IPAddressDaoImpl.java | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c8d607ea/engine/schema/src/com/cloud/network/dao/IPAddressDaoImpl.java -- diff --git a/engine/schema/src/com/cloud/network/dao/IPAddressDaoImpl.java b/engine/schema/src/com/cloud/network/dao/IPAddressDaoImpl.java index 1839ca4..886011e 100755 --- a/engine/schema/src/com/cloud/network/dao/IPAddressDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/IPAddressDaoImpl.java @@ -155,6 +155,7 @@ public class IPAddressDaoImpl extends GenericDaoBase implemen address.setAssociatedWithNetworkId(null); address.setVpcId(null); address.setSystem(false); +address.setVmIp(null); update(ipAddressId, address); }
git commit: updated refs/heads/master to 358f3ed
Updated Branches:
refs/heads/master c12a8187a -> 358f3edc5
CLOUDSTACK-2609 Fixed accoundId, domainId for the secondary ip address for
shared networks
Signed-off-by: Abhinandan Prateek
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/358f3edc
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/358f3edc
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/358f3edc
Branch: refs/heads/master
Commit: 358f3edc575b9f5ec70010316523a8edeb540d55
Parents: c12a818
Author: Jayapal
Authored: Tue Jun 11 11:49:34 2013 +0530
Committer: Abhinandan Prateek
Committed: Wed Jun 12 10:32:04 2013 +0530
--
server/src/com/cloud/network/NetworkServiceImpl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/358f3edc/server/src/com/cloud/network/NetworkServiceImpl.java
--
diff --git a/server/src/com/cloud/network/NetworkServiceImpl.java
b/server/src/com/cloud/network/NetworkServiceImpl.java
index 407bdc2..024c969 100755
--- a/server/src/com/cloud/network/NetworkServiceImpl.java
+++ b/server/src/com/cloud/network/NetworkServiceImpl.java
@@ -670,8 +670,8 @@ public class NetworkServiceImpl extends ManagerBase
implements NetworkService {
if (network == null) {
throw new InvalidParameterValueException("Invalid network id is
given");
}
-accountId = network.getAccountId();
-domainId = network.getDomainId();
+accountId = ipOwner.getAccountId();
+domainId = ipOwner.getDomainId();
// Validate network offering
NetworkOfferingVO ntwkOff =
_networkOfferingDao.findById(network.getNetworkOfferingId());
git commit: updated refs/heads/master to 360eae3
Updated Branches:
refs/heads/master 358f3edc5 -> 360eae368
Cloudstack-2854 [Multiple_IP_Ranges] Failed to create ip alias on VR while
deploying guest vm with ip address from new CIDR
Signed-off-by: Abhinandan Prateek
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/360eae36
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/360eae36
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/360eae36
Branch: refs/heads/master
Commit: 360eae368767f374fe13d5ba2b8a9056d0ef8633
Parents: 358f3ed
Author: Bharat Kumar
Authored: Wed Jun 5 21:52:57 2013 +0530
Committer: Abhinandan Prateek
Committed: Wed Jun 12 11:15:47 2013 +0530
--
.../virtualnetwork/VirtualRoutingResource.java | 50
scripts/network/domr/call_dnsmasq.sh| 29
scripts/network/domr/createipAlias.sh | 26 ++
scripts/network/domr/deleteipAlias.sh | 25 ++
4 files changed, 109 insertions(+), 21 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360eae36/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
--
diff --git
a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
index 9e40eef..dae1c85 100755
---
a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
+++
b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
@@ -111,7 +111,7 @@ public class VirtualRoutingResource implements Manager {
private String _routerProxyPath;
private String _createIpAliasPath;
private String _deleteIpAliasPath;
-private String _configDhcpPath;
+private String _callDnsMasqPath;
private int _timeout;
private int _startTimeout;
@@ -625,7 +625,8 @@ public class VirtualRoutingResource implements Manager {
String routerIp = cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP);
final Script command = new Script(_createIpAliasPath, _timeout,
s_logger);
List ipAliasTOs = cmd.getIpAliasList();
-String args=routerIp+" ";
+String args = "";
+command.add(routerIp);
for (IpAliasTO ipaliasto : ipAliasTOs) {
args = args +
ipaliasto.getAlias_count()+":"+ipaliasto.getRouterip()+":"+ipaliasto.getNetmask()+"-";
}
@@ -637,7 +638,8 @@ public class VirtualRoutingResource implements Manager {
protected Answer execute(final DeleteIpAliasCommand cmd) {
final Script command = new Script(_deleteIpAliasPath, _timeout,
s_logger);
String routerIp = cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP);
-String args = "";
+String args ="";
+command.add(routerIp);
List revokedIpAliasTOs = cmd.getDeleteIpAliasTos();
for (IpAliasTO ipAliasTO : revokedIpAliasTOs) {
args = args +
ipAliasTO.getAlias_count()+":"+ipAliasTO.getRouterip()+":"+ipAliasTO.getNetmask()+"-";
@@ -653,32 +655,26 @@ public class VirtualRoutingResource implements Manager {
}
protected Answer execute(final DnsMasqConfigCommand cmd) {
-final Script command = new Script(_configDhcpPath, _timeout,
s_logger);
+final Script command = new Script(_callDnsMasqPath, _timeout,
s_logger);
String routerIp = cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP);
DnsMasqConfigurator configurator = new DnsMasqConfigurator();
String [] config = configurator.generateConfiguration(cmd);
-File tmpCfgFile = null;
+String cfgFileName = routerIp.replace(".","-")+"dns.cgf";
+String tmpCfgFileContents = "";
+for (int i = 0; i < config.length; i++) {
+tmpCfgFileContents += config[i];
+tmpCfgFileContents += "\n";
+}
+File permKey = new File("/root/.ssh/id_rsa.cloud");
+String cfgFilePath = "/tmp/"+cfgFileName;
try {
-String cfgFilePath = "";
-if (routerIp != null) {
-tmpCfgFile = File.createTempFile(routerIp.replace('.', '_'),
"cfg");
-final PrintWriter out
-= new PrintWriter(new BufferedWriter(new
FileWriter(tmpCfgFile)));
-for (int i=0; i < config.length; i++) {
-out.println(config[i]);
-}
-out.close();
-cfgFilePath = tmpCfgFile.getAbsolutePath();
-}
+SshHelper.scpTo(routerIp, 3922, "root", permKey, null, "/tmp/",
tmpCfgFileContents.getBytes(), cfgFileName, null);
+command.add(routerIp);
command.add(cfgFilePath);
f
git commit: updated refs/heads/master to a30f9fa
Updated Branches:
refs/heads/master 83fcba9ee -> a30f9fa64
Fix for CLOUDSTACK-1704 and CLOUDSTACK-1622
Signed-off-by: Abhinandan Prateek
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a30f9fa6
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a30f9fa6
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a30f9fa6
Branch: refs/heads/master
Commit: a30f9fa64a49acfe7d3ac57f2ef9d890473f48c4
Parents: 83fcba9
Author: Harikrishna Patnala
Authored: Mon Jun 10 14:31:03 2013 +0530
Committer: Abhinandan Prateek
Committed: Wed Jun 12 15:01:59 2013 +0530
--
.../com/cloud/capacity/dao/CapacityDaoImpl.java | 24 +---
1 file changed, 21 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a30f9fa6/engine/schema/src/com/cloud/capacity/dao/CapacityDaoImpl.java
--
diff --git a/engine/schema/src/com/cloud/capacity/dao/CapacityDaoImpl.java
b/engine/schema/src/com/cloud/capacity/dao/CapacityDaoImpl.java
index 0b9ff1a..d14ad87 100755
--- a/engine/schema/src/com/cloud/capacity/dao/CapacityDaoImpl.java
+++ b/engine/schema/src/com/cloud/capacity/dao/CapacityDaoImpl.java
@@ -116,11 +116,27 @@ public class CapacityDaoImpl extends
GenericDaoBase implements
private static final String LIST_CAPACITY_GROUP_BY_CLUSTER_TYPE_PART2 = "
GROUP BY cluster_id, capacity_type order by percent desc limit ";
private static final String UPDATE_CAPACITY_STATE = "UPDATE
`cloud`.`op_host_capacity` SET capacity_state = ? WHERE ";
+/* In the below query"LIST_CLUSTERS_CROSSING_THRESHOLD" the threshold
value is getting from the cluster_details table if not present then it gets
from the global configuration
+*
+* CASE statement works like
+* if (cluster_details table has thershold value)
+* then
+* if (value from the cluster_details table is not null)
+* then
+* query from the cluster_details table
+* else
+* query from the configuration table
+* else
+* query from the configuration table
+*
+* */
private static final String LIST_CLUSTERS_CROSSING_THRESHOLD = "SELECT
clusterList.cluster_id " +
"FROM ( SELECT cluster.cluster_id cluster_id, (
(sum(cluster.used) + sum(cluster.reserved) + ?)/sum(cluster.total) ) ratio,
cluster.configValue value " +
"FROM (SELECT capacity.cluster_id
cluster_id, capacity.used_capacity used, capacity.reserved_capacity reserved,
capacity.total_capacity total, " +
"CASE (SELECT count(*) FROM
`cloud`.`cluster_details` details WHERE details.cluster_id =
capacity.cluster_id AND details.name = ? ) " +
-"WHEN 1 THEN ( SELECT
details.value FROM `cloud`.`cluster_details` details WHERE details.cluster_id =
capacity.cluster_id AND details.name = ? ) " +
+"WHEN 1 THEN ( CASE WHEN
(SELECT details.value FROM `cloud`.`cluster_details` details WHERE
details.cluster_id = capacity.cluster_id AND details.name = ?) is NULL " +
+"THEN
(SELECT config.value FROM `cloud`.`configuration` config WHERE config.name =
?)" +
+"ELSE
(SELECT details.value FROM `cloud`.`cluster_details` details WHERE
details.cluster_id = capacity.cluster_id AND details.name = ? ) END )" +
"ELSE (SELECT
config.value FROM `cloud`.`configuration` config WHERE config.name = ?) " +
"END configValue " +
"FROM `cloud`.`op_host_capacity`
capacity " +
@@ -168,8 +184,10 @@ public class CapacityDaoImpl extends
GenericDaoBase implements
pstmt.setString(2, configName);
pstmt.setString(3, configName);
pstmt.setString(4, configName);
- pstmt.setLong(5,zoneId);
- pstmt.setShort(6,capacityType);
+ pstmt.setString(5, configName);
+ pstmt.setString(6, configName);
+ pstmt.setLong(7,zoneId);
+ pstmt.setShort(8,capacityType);
ResultSet rs = pstmt.executeQuery();
while (rs.next()) {
git commit: updated refs/heads/master to fe506d9
Updated Branches:
refs/heads/master a30f9fa64 -> fe506d9b6
CLOUDSTACK-2642: [XenServer] Add support for XenServer 6.2.0
Currently XcpServerDiscoverer.java is only allowing till XenServer 6.1.0. Added
code to support XenServer 6.2.0. Also, added support to allow the RC build
of XenSever 6.2.0.
Signed-off-by: venkataswamybabu budumuru
Signed-off-by: Abhinandan Prateek
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/fe506d9b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/fe506d9b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/fe506d9b
Branch: refs/heads/master
Commit: fe506d9b68395358457b17bd5788ed6cfbe589b7
Parents: a30f9fa
Author: venkataswamybabu budumuru
Authored: Thu May 23 15:06:29 2013 +0530
Committer: Abhinandan Prateek
Committed: Wed Jun 12 15:11:50 2013 +0530
--
.../hypervisor/xen/discoverer/XcpServerDiscoverer.java | 12 ++--
1 file changed, 10 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fe506d9b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
--
diff --git
a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
index fd49836..5b6b546 100755
---
a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
+++
b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
@@ -447,6 +447,10 @@ public class XcpServerDiscoverer extends DiscovererBase
implements Discoverer, L
return new XenServer602Resource();
else if (prodBrand.equals("XenServer") && prodVersion.equals("6.1.0"))
return new XenServer610Resource();
+else if (prodBrand.equals("XenServer") && prodVersion.equals("6.1.83"))
+return new XenServer610Resource();
+else if (prodBrand.equals("XenServer") && prodVersion.equals("6.2.0"))
+return new XenServer610Resource();
else if (prodBrand.equals("XenServer") &&
prodVersion.equals("5.6.100")) {
String prodVersionTextShort =
record.softwareVersion.get("product_version_text_short").trim();
if ("5.6 SP2".equals(prodVersionTextShort)) {
@@ -458,7 +462,7 @@ public class XcpServerDiscoverer extends DiscovererBase
implements Discoverer, L
return new XcpOssResource();
}
-String msg = "Only support XCP 1.0.0, 1.1.0, 1.4.x, 1.5 beta, 1.6.x;
XenServer 5.6, XenServer 5.6 FP1, XenServer 5.6 SP2, Xenserver 6.0, 6.0.2,
6.1.0 but this one is " + prodBrand + " " + prodVersion;
+String msg = "Only support XCP 1.0.0, 1.1.0, 1.4.x, 1.5 beta, 1.6.x;
XenServer 5.6, XenServer 5.6 FP1, XenServer 5.6 SP2, Xenserver 6.0, 6.0.2,
6.1.0, 6.1.83, 6.2.0 but this one is " + prodBrand + " " + prodVersion;
_alertMgr.sendAlert(AlertManager.ALERT_TYPE_HOST, dcId,
podId, msg, msg);
s_logger.debug(msg);
throw new RuntimeException(msg);
@@ -598,6 +602,10 @@ public class XcpServerDiscoverer extends DiscovererBase
implements Discoverer, L
resource = XenServer602Resource.class.getName();
} else if (prodBrand.equals("XenServer") &&
prodVersion.equals("6.1.0")) {
resource = XenServer610Resource.class.getName();
+} else if (prodBrand.equals("XenServer") &&
prodVersion.equals("6.1.83")) {
+resource = XenServer610Resource.class.getName();
+} else if (prodBrand.equals("XenServer") &&
prodVersion.equals("6.2.0")) {
+resource = XenServer610Resource.class.getName();
} else if (prodBrand.equals("XenServer") &&
prodVersion.equals("5.6.100")) {
String prodVersionTextShort =
details.get("product_version_text_short").trim();
if ("5.6 SP2".equals(prodVersionTextShort)) {
@@ -610,7 +618,7 @@ public class XcpServerDiscoverer extends DiscovererBase
implements Discoverer, L
}
if( resource == null ){
-String msg = "Only support XCP 1.0.0, 1.1.0, 1.4.x, 1.5 beta,
1.6.x; XenServer 5.6, 5.6 FP1, 5.6 SP2 and Xenserver 6.0 , 6.0.2, 6.1.0 but
this one is " + prodBrand + " " + prodVersion;
+String msg = "Only support XCP 1.0.0, 1.1.0, 1.4.x, 1.5 beta,
1.6.x; XenServer 5.6, 5.6 FP1, 5.6 SP2 and Xenserver 6.0 , 6.0.2, 6.1.0,
6.1.83, 6.2.0 but this one is " + prodBrand + " " + prodVersion;
s_logger.debug(msg);
throw new RuntimeException(msg);
}
git commit: updated refs/heads/master to ca13586
Updated Branches:
refs/heads/master 2ed17c793 -> ca1358633
Cloudstack-2511 Multiple_Ip_Ranges: Adding guest ip range in subset/superset to
existing CIDR is allowed Cloudstack-2651 [Shared n/w]Add IP range should ask
for gateway and netmask
Signed-off-by: Abhinandan Prateek
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ca135863
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ca135863
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ca135863
Branch: refs/heads/master
Commit: ca13586331d215b0be269fea010536106d7fa67c
Parents: 2ed17c7
Author: Bharat Kumar
Authored: Mon Jun 3 16:00:15 2013 +0530
Committer: Abhinandan Prateek
Committed: Wed Jun 12 16:27:56 2013 +0530
--
.../configuration/ConfigurationManagerImpl.java | 119 ---
.../configuration/ValidateIpRangeTest.java | 11 +-
utils/src/com/cloud/utils/net/NetUtils.java | 31 +
3 files changed, 116 insertions(+), 45 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ca135863/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
--
diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
index 59e70cf..111586d 100755
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -39,6 +39,7 @@ import javax.naming.NamingException;
import javax.naming.directory.DirContext;
import javax.naming.directory.InitialDirContext;
+import com.cloud.utils.Pair;
import org.apache.cloudstack.acl.SecurityChecker;
import org.apache.cloudstack.api.ApiConstants.LDAPParams;
import org.apache.cloudstack.api.command.admin.config.UpdateCfgCmd;
@@ -2473,7 +2474,7 @@ public class ConfigurationManagerImpl extends ManagerBase
implements Configurati
}
}
-boolean sameSubnet=false;
+Pair> sameSubnet= null;
// Can add vlan range only to the network which allows it
if (!network.getSpecifyIpRanges()) {
throw new InvalidParameterValueException("Network " + network + "
doesn't support adding ip ranges");
@@ -2508,7 +2509,7 @@ public class ConfigurationManagerImpl extends ManagerBase
implements Configurati
sameSubnet=validateIpRange(startIP,endIP,newVlanGateway,
newVlanNetmask, vlans, ipv4, ipv6, ip6Gateway, ip6Cidr, startIPv6, endIPv6,
network);
}
-if (zoneId == null || (ipv4 && (newVlanGateway == null ||
newVlanNetmask == null)) || (ipv6 && (ip6Gateway == null || ip6Cidr == null))) {
+if (zoneId == null || (ipv6 && (ip6Gateway == null || ip6Cidr ==
null))) {
throw new InvalidParameterValueException("Gateway, netmask and
zoneId have to be passed in for virtual and direct untagged networks");
}
@@ -2527,54 +2528,80 @@ public class ConfigurationManagerImpl extends
ManagerBase implements Configurati
}
Transaction txn = Transaction.currentTxn();
txn.start();
-
+if (sameSubnet.first() == false) {
+s_logger.info("adding a new subnet to the network
"+network.getId());
+}
+else {
+// if it is same subnet the user might not send the vlan and the
netmask details. so we are
+//figuring out while validation and setting them here.
+newVlanGateway = sameSubnet.second().first();
+newVlanNetmask = sameSubnet.second().second();
+}
Vlan vlan = createVlanAndPublicIpRange(zoneId, networkId,
physicalNetworkId, forVirtualNetwork, podId, startIP,
endIP, newVlanGateway, newVlanNetmask, vlanId, vlanOwner,
startIPv6, endIPv6, ip6Gateway, ip6Cidr);
//create an entry in the nic_secondary table. This will be the new
gateway that will be configured on the corresponding routervm.
-if (sameSubnet == false) {
- s_logger.info("adding a new subnet to the network
"+network.getId());
-}
+
txn.commit();
return vlan;
}
-public boolean validateIpRange(String startIP, String endIP, String
newVlanGateway, String newVlanNetmask, List vlans, boolean ipv4,
boolean ipv6, String ip6Gateway, String ip6Cidr, String startIPv6, String
endIPv6, Network network) {
-String vlanGateway;
-String vlanNetmask;
+public int checkIfSubsetOrSuperset(String newVlanGateway, String
newVlanNetmask, VlanVO vlan, String startIP, String endIP) {
+if (newVlanGateway == null && newVlanNetmask==null) {
+newVlanGateway = vlan.getVlanGateway();
+newVlanNetmask = vlan.getVlanNetmask();
+
git commit: updated refs/heads/master to 31f0e34
Updated Branches:
refs/heads/master 75d446ccf -> 31f0e3453
CLOUDSTACK-2963 Build failure due to validateIpRange test failure
Signed-off-by: Abhinandan Prateek
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/31f0e345
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/31f0e345
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/31f0e345
Branch: refs/heads/master
Commit: 31f0e3453993ea24fab2d2c4ff938c867d23c74c
Parents: 75d446c
Author: Bharat Kumar
Authored: Wed Jun 12 18:05:47 2013 +0530
Committer: Abhinandan Prateek
Committed: Wed Jun 12 18:48:46 2013 +0530
--
server/test/com/cloud/configuration/ValidateIpRangeTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/31f0e345/server/test/com/cloud/configuration/ValidateIpRangeTest.java
--
diff --git a/server/test/com/cloud/configuration/ValidateIpRangeTest.java
b/server/test/com/cloud/configuration/ValidateIpRangeTest.java
index a083cc6..ca9ef11 100644
--- a/server/test/com/cloud/configuration/ValidateIpRangeTest.java
+++ b/server/test/com/cloud/configuration/ValidateIpRangeTest.java
@@ -50,20 +50,20 @@ public class ValidateIpRangeTest {
@Test
public void SameSubnetTest() {
-Pair>
sameSubnet=configurationMgr.validateIpRange("10.147.33.104", "10.147.33.105",
"10.147.33.1", "255.255.255.128", vlanVOList, true, false, null, null, null,
null,network);
+Pair> sameSubnet =
configurationMgr.validateIpRange("10.147.33.104", "10.147.33.105",
"10.147.33.1", "255.255.255.128", vlanVOList, true, false, null, null, null,
null,network);
Assert.assertTrue(sameSubnet.first());
}
@Test
public void NewSubnetTest() {
-Pair> sameSubnet=
configurationMgr.validateIpRange("10.147.33.140", "10.147.33.145",
"10.147.33.129", "255.255.255.191", vlanVOList, true, false, null, null, null,
null,network);
+Pair> sameSubnet =
configurationMgr.validateIpRange("10.147.33.140", "10.147.33.145",
"10.147.33.130", "255.255.255.192", vlanVOList, true, false, null, null, null,
null,network);
Assert.assertTrue(!sameSubnet.first());
}
@Test
public void SuperSetTest() {
try {
-configurationMgr.validateIpRange("10.147.33.10", "10.147.33.20",
"10.147.33.21", "255.255.255.127", vlanVOList, true, false, null, null, null,
null,network);
+configurationMgr.validateIpRange("10.147.33.10", "10.147.33.20",
"10.147.33.21", "255.255.255.0", vlanVOList, true, false, null, null, null,
null,network);
} catch (Exception e) {
junit.framework.Assert.assertTrue(e.getMessage().contains("superset"));
}
git commit: updated refs/heads/master to aeb0247
Updated Branches:
refs/heads/master a1d7016b9 -> aeb024723
CLOUDSTACK-2942 Fixed issue in private gateway network acl
Signed-off-by: Abhinandan Prateek
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/aeb02472
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/aeb02472
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/aeb02472
Branch: refs/heads/master
Commit: aeb024723a34e8c8386a62e5961ad5b99852de97
Parents: a1d7016
Author: Jayapal
Authored: Thu Jun 13 14:00:48 2013 +0530
Committer: Abhinandan Prateek
Committed: Thu Jun 13 14:30:19 2013 +0530
--
.../src/com/cloud/hypervisor/vmware/resource/VmwareResource.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aeb02472/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
--
diff --git
a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
index 3123382..1f5eac2 100755
---
a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
+++
b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
@@ -1261,9 +1261,8 @@ public class VmwareResource implements
StoragePoolResource, ServerResource, Vmwa
if (!result.first()) {
String msg = "SetNetworkACLAnswer on domain router " +
routerIp + " failed. message: " + result.second();
s_logger.error(msg);
+return new SetNetworkACLAnswer(cmd, false, results);
}
-
-return new SetNetworkACLAnswer(cmd, false, results);
} else {
args="";
args += " -d " + "eth" + ethDeviceNum;
git commit: updated refs/heads/master to b72c79b
Updated Branches:
refs/heads/master aeb024723 -> b72c79b37
CLOUDSTACK-2934 Fixed not showing uuid in list firewall rules response
Signed-off-by: Abhinandan Prateek
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b72c79b3
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b72c79b3
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b72c79b3
Branch: refs/heads/master
Commit: b72c79b3702716b8202a0c592011d7e428c18160
Parents: aeb0247
Author: Jayapal
Authored: Tue Jun 11 20:01:23 2013 +0530
Committer: Abhinandan Prateek
Committed: Thu Jun 13 14:37:34 2013 +0530
--
.../org/apache/cloudstack/api/response/FirewallResponse.java | 8
server/src/com/cloud/api/ApiResponseHelper.java | 5 +++--
2 files changed, 7 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b72c79b3/api/src/org/apache/cloudstack/api/response/FirewallResponse.java
--
diff --git a/api/src/org/apache/cloudstack/api/response/FirewallResponse.java
b/api/src/org/apache/cloudstack/api/response/FirewallResponse.java
index 26d2433..13a04b6 100644
--- a/api/src/org/apache/cloudstack/api/response/FirewallResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/FirewallResponse.java
@@ -39,10 +39,10 @@ public class FirewallResponse extends BaseResponse {
private String endPort;
@SerializedName(ApiConstants.IP_ADDRESS_ID) @Param(description="the public
ip address id for the firewall rule")
-private Long publicIpAddressId;
+private String publicIpAddressId;
@SerializedName(ApiConstants.NETWORK_ID) @Param(description="the network
id of the firewall rule")
-private Long networkId;
+private String networkId;
@SerializedName(ApiConstants.IP_ADDRESS) @Param(description="the public ip
address for the firewall rule")
private String publicIpAddress;
@@ -78,7 +78,7 @@ public class FirewallResponse extends BaseResponse {
this.endPort = endPort;
}
-public void setPublicIpAddressId(Long publicIpAddressId) {
+public void setPublicIpAddressId(String publicIpAddressId) {
this.publicIpAddressId = publicIpAddressId;
}
@@ -86,7 +86,7 @@ public class FirewallResponse extends BaseResponse {
this.publicIpAddress = publicIpAddress;
}
-public void setNetworkId(Long networkId) {
+public void setNetworkId(String networkId) {
this.networkId = networkId;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b72c79b3/server/src/com/cloud/api/ApiResponseHelper.java
--
diff --git a/server/src/com/cloud/api/ApiResponseHelper.java
b/server/src/com/cloud/api/ApiResponseHelper.java
index 4f75b99..94c5d6c 100755
--- a/server/src/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/com/cloud/api/ApiResponseHelper.java
@@ -2399,11 +2399,12 @@ public class ApiResponseHelper implements
ResponseGenerator {
if (fwRule.getTrafficType() == FirewallRule.TrafficType.Ingress) {
IpAddress ip =
ApiDBUtils.findIpAddressById(fwRule.getSourceIpAddressId());
-response.setPublicIpAddressId(ip.getId());
+response.setPublicIpAddressId(ip.getUuid());
response.setPublicIpAddress(ip.getAddress().addr());
} else if (fwRule.getTrafficType() == FirewallRule.TrafficType.Egress)
{
response.setPublicIpAddress(null);
-response.setNetworkId(fwRule.getNetworkId());
+Network network =
ApiDBUtils.findNetworkById(fwRule.getNetworkId());
+response.setNetworkId(network.getUuid());
}
FirewallRule.State state = fwRule.getState();
git commit: updated refs/heads/master to b83b8eb
Updated Branches:
refs/heads/master b72c79b37 -> b83b8eb83
CLOUDSTACK-2502: Scalevm and over provisioning should respect each other
During Scale up of VM, memory/cpu calculations should consider the memory/cpu
overprovisioning factors which are set per cluster.
CLOUDSTACK-2939: CPU limit is not getting set for vm after scaleup to a
service offering which have cpu cap enabled
Signed-off-by: Abhinandan Prateek
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b83b8eb8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b83b8eb8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b83b8eb8
Branch: refs/heads/master
Commit: b83b8eb838546197151d96e99ab3b9ee68db7df8
Parents: b72c79b
Author: Harikrishna Patnala
Authored: Thu Jun 13 15:56:21 2013 +0530
Committer: Abhinandan Prateek
Committed: Thu Jun 13 16:30:56 2013 +0530
--
.../src/com/cloud/agent/api/ScaleVmCommand.java | 26 ++--
.../vmware/resource/VmwareResource.java | 4 +--
.../vmware/resource/VmwareResourceTest.java | 7 +++---
.../xen/resource/CitrixResourceBase.java| 8 +++---
.../xen/resource/CitrixResourceBaseTest.java| 12 +++--
.../cloud/hypervisor/HypervisorGuruBase.java| 2 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 9 ++-
.../cloud/vm/VirtualMachineManagerImplTest.java | 13 +-
8 files changed, 59 insertions(+), 22 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b83b8eb8/core/src/com/cloud/agent/api/ScaleVmCommand.java
--
diff --git a/core/src/com/cloud/agent/api/ScaleVmCommand.java
b/core/src/com/cloud/agent/api/ScaleVmCommand.java
index 35d22ad..b361485 100644
--- a/core/src/com/cloud/agent/api/ScaleVmCommand.java
+++ b/core/src/com/cloud/agent/api/ScaleVmCommand.java
@@ -23,7 +23,8 @@ public class ScaleVmCommand extends Command {
VirtualMachineTO vm;
String vmName;
int cpus;
-Integer speed;
+Integer minSpeed;
+Integer maxSpeed;
long minRam;
long maxRam;
@@ -40,14 +41,15 @@ public class ScaleVmCommand extends Command {
}
public ScaleVmCommand(String vmName, int cpus,
- Integer speed, long minRam, long maxRam, boolean
limitCpuUse) {
+ Integer minSpeed, Integer maxSpeed, long minRam, long
maxRam, boolean limitCpuUse) {
super();
this.vmName = vmName;
this.cpus = cpus;
- this.speed = speed;
+ this.minSpeed = minSpeed;
+this.maxSpeed = maxSpeed;
this.minRam = minRam;
this.maxRam = maxRam;
- this.vm = new VirtualMachineTO(1L, vmName, null, cpus, speed,
minRam, maxRam, null, null, false, false, null);
+ this.vm = new VirtualMachineTO(1L, vmName, null, cpus,
minSpeed, maxSpeed, minRam, maxRam, null, null, false, limitCpuUse, null);
/*vm.setName(vmName);
vm.setCpus(cpus);
vm.setRam(minRam, maxRam);*/
@@ -57,14 +59,22 @@ public class ScaleVmCommand extends Command {
this.cpus = cpus;
}
- public Integer getSpeed() {
- return speed;
+ public Integer getMinSpeed() {
+ return minSpeed;
}
- public void setSpeed(Integer speed) {
- this.speed = speed;
+ public void setMinSpeed(Integer minSpeed) {
+ this.minSpeed = minSpeed;
}
+public Integer getMaxSpeed() {
+return minSpeed;
+}
+
+public void setMaxSpeed(Integer maxSpeed) {
+this.maxSpeed = maxSpeed;
+}
+
public long getMinRam() {
return minRam;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b83b8eb8/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
--
diff --git
a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
index 1f5eac2..1af4239 100755
---
a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
+++
b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
@@ -2330,9 +2330,9 @@ public class VmwareResource implements
StoragePoolResource, ServerResource, Vmwa
VmwareHypervisorHost hyperHost = getHyperHost(context);
VirtualMachineMO vmMo =
hyperHost.findVmOnHyperHost(cmd.getVmName());
VirtualMachineConfigSpec vmConfigSpec = new
VirtualMachineConfigSpec();
-
git commit: updated refs/heads/master to 776301c
Updated Branches:
refs/heads/master e405703d5 -> 776301ce6
Change listAll to return a boolean and fix a typo
Signed-off-by: Abhinandan Prateek
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/776301ce
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/776301ce
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/776301ce
Branch: refs/heads/master
Commit: 776301ce6f124767d42fcd58f9c411a002dc310d
Parents: e405703
Author: Ian Duffy
Authored: Wed Jun 12 17:31:23 2013 +0100
Committer: Abhinandan Prateek
Committed: Mon Jun 17 10:23:48 2013 +0530
--
.../api/command/admin/ldap/LDAPConfigCmd.java | 20 +---
1 file changed, 9 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/776301ce/api/src/org/apache/cloudstack/api/command/admin/ldap/LDAPConfigCmd.java
--
diff --git
a/api/src/org/apache/cloudstack/api/command/admin/ldap/LDAPConfigCmd.java
b/api/src/org/apache/cloudstack/api/command/admin/ldap/LDAPConfigCmd.java
index 2976de4..2726f84 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/ldap/LDAPConfigCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/ldap/LDAPConfigCmd.java
@@ -43,10 +43,9 @@ public class LDAPConfigCmd extends BaseCmd {
/
API parameters /
/
-
-@Parameter(name=ApiConstants.LIST_ALL, type=CommandType.STRING,
description="Hostname or ip address of the ldap server eg: my.ldap.com")
-private String listall;
-
+@Parameter(name=ApiConstants.LIST_ALL, type=CommandType.BOOLEAN,
description="If true return current LDAP configuration")
+private Boolean listAll;
+
@Parameter(name=ApiConstants.HOST_NAME, type=CommandType.STRING,
description="Hostname or ip address of the ldap server eg: my.ldap.com")
private String hostname;
@@ -78,10 +77,10 @@ public class LDAPConfigCmd extends BaseCmd {
/// Accessors ///
/
-public String getListAll() {
-return listall == null ? "false" : listall;
+public Boolean getListAll() {
+ return listAll == null ? Boolean.FALSE : listAll;
}
-
+
public String getBindPassword() {
return bindPassword;
}
@@ -156,16 +155,15 @@ public class LDAPConfigCmd extends BaseCmd {
InsufficientCapacityException, ServerApiException,
ConcurrentOperationException, ResourceAllocationException {
try {
- if ("true".equalsIgnoreCase(getListAll())){
+ if (getListAll()){
// return the existing conf
LDAPConfigCmd cmd = _configService.listLDAPConfig(this);
- LDAPConfigResponse lr =
_responseGenerator.createLDAPConfigResponse(cmd.getHostname(), cmd.getPort(),
cmd.getUseSSL(),
- cmd.getQueryFilter(), cmd.getSearchBase(),
cmd.getBindDN());
+ LDAPConfigResponse lr =
_responseGenerator.createLDAPConfigResponse(cmd.getHostname(), cmd.getPort(),
cmd.getUseSSL(), cmd.getQueryFilter(), cmd.getSearchBase(), cmd.getBindDN());
lr.setResponseName(getCommandName());
this.setResponseObject(lr);
}
else if (getHostname()==null || getSearchBase() == null ||
getQueryFilter() == null) {
- throw new InvalidParameterValueException("You need to
provide hostname, serachbase and queryfilter to configure your LDAP server");
+ throw new InvalidParameterValueException("You need to
provide hostname, searchbase and queryfilter to configure your LDAP server");
}
else {
boolean result = _configService.updateLDAP(this);
git commit: updated refs/heads/master to d92a013
Updated Branches:
refs/heads/master 791eb601b -> d92a01336
Cloudstack-2938 [Multiple_IP_Ranges] Password Service does not work in case of
multiple subnets in a vlan
Signed-off-by: Abhinandan Prateek
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d92a0133
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d92a0133
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d92a0133
Branch: refs/heads/master
Commit: d92a01336bc41b77a8723089b1c6103678932798
Parents: 791eb60
Author: Bharat Kumar
Authored: Wed Jun 19 11:58:08 2013 +0530
Committer: Abhinandan Prateek
Committed: Thu Jun 20 10:37:24 2013 +0530
--
patches/systemvm/debian/config/root/createIpAlias.sh | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d92a0133/patches/systemvm/debian/config/root/createIpAlias.sh
--
diff --git a/patches/systemvm/debian/config/root/createIpAlias.sh
b/patches/systemvm/debian/config/root/createIpAlias.sh
index 2c79813..1db210b 100755
--- a/patches/systemvm/debian/config/root/createIpAlias.sh
+++ b/patches/systemvm/debian/config/root/createIpAlias.sh
@@ -32,4 +32,7 @@ do
netmask=$(echo $var1 | cut -f3 -d ":")
ifconfig eth0:$alias_count $routerip netmask $netmask up
var=$( echo $var | sed "s/${var1}-//" )
-done
\ No newline at end of file
+done
+#restaring the password service to enable it on the ip aliases
+/etc/init.d/cloud-passwd-srvr restart
+exit $?
\ No newline at end of file
[1/2] git commit: updated refs/heads/master to febe7d9
Updated Branches:
refs/heads/master d92a01336 -> febe7d9cf
Cloudstack-2621 [Multiple_IP_Ranges] Failed to delete guest IP range from a new
subnet
Signed-off-by: Abhinandan Prateek
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4d5c6c83
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4d5c6c83
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4d5c6c83
Branch: refs/heads/master
Commit: 4d5c6c8381679ee3fb4ac918ca04eddf09812ab5
Parents: d92a013
Author: Bharat Kumar
Authored: Mon Jun 17 14:55:13 2013 +0530
Committer: Abhinandan Prateek
Committed: Thu Jun 20 10:40:23 2013 +0530
--
.../configuration/ConfigurationManagerImpl.java | 133 ++-
.../VirtualNetworkApplianceManagerImpl.java | 3 +-
2 files changed, 72 insertions(+), 64 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4d5c6c83/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
--
diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
index e7e3f74..c117f3a 100755
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -2931,6 +2931,13 @@ public class ConfigurationManagerImpl extends
ManagerBase implements Configurati
return vlan;
}
+public boolean removeFromDb (long vlanDbId){
+if (!deletePublicIPRange(vlanDbId)) {
+return false;
+}
+return _vlanDao.expunge(vlanDbId);
+}
+
@Override
@DB
public boolean deleteVlanAndPublicIpRange(long userId, long vlanDbId,
Account caller) {
@@ -3004,49 +3011,60 @@ public class ConfigurationManagerImpl extends
ManagerBase implements Configurati
Network network =
_networkDao.findById(vlanRange.getNetworkId());
DhcpServiceProvider dhcpServiceProvider =
_networkMgr.getDhcpServiceProvider(network);
if
(!dhcpServiceProvider.getProvider().getName().equalsIgnoreCase(Provider.VirtualRouter.getName()))
{
-if (!deletePublicIPRange(vlanDbId)) {
+Transaction txn = Transaction.currentTxn();
+txn.start();
+if (!removeFromDb(vlanDbId)) {
+txn.rollback();
return false;
}
-_vlanDao.expunge(vlanDbId);
-return true;
-}
-//search if the vlan has any allocated ips.
-boolean aliasIpBelongsToThisVlan = false;
-long freeIpsInsubnet = 0;
-NicIpAliasVO ipAlias = null;
-allocIpCount =
_publicIpAddressDao.countIPs(vlanRange.getDataCenterId(), vlanDbId, true);
-if (allocIpCount > 1) {
-throw new InvalidParameterValueException ("cannot delete
this range as some of the vlans are in use.");
-}
-if (allocIpCount == 0){
-//remove the vlan range.
-if (!deletePublicIPRange(vlanDbId)) {
-return false;
+else {
+txn.commit();
}
-_vlanDao.expunge(vlanDbId);
-return true;
+txn.close();
}
-//check if this allocated ip is being used as an ipAlias on
the router.
+else {
+ return handleIpAliasDeletion(vlanRange, vlanDbId,
dhcpServiceProvider, network);
+}
+}
+}
+return true;
+}
+
+private boolean handleIpAliasDeletion(VlanVO vlanRange, long vlanDbId,
DhcpServiceProvider dhcpServiceProvider, Network network) {
+boolean result_final = false;
+Transaction txn = Transaction.currentTxn();
+txn.start();
+IPAddressVO ip = null;
+NicIpAliasVO ipAlias = null;
+try{
+Integer allocIpCount=0;
+//search if the vlan has any allocated ips.
+allocIpCount =
_publicIpAddressDao.countIPs(vlanRange.getDataCenterId(), vlanDbId, true);
+if (allocIpCount > 1) {
+throw new InvalidParameterValueException ("cannot delete this
range as some of the vlans are in use.");
+}
+if (allocIpCount == 0){
+result_final=true;
+}
+else {
ipAlias =
_nicIpAliasDao.findByGatewayAndNetworkIdAndState(vlanRange.getVlanGateway(),
vlanRange.getNetworkId(), NicIpAlias.state.acti
[2/2] git commit: updated refs/heads/master to febe7d9
Cloudstack-2621 [Multiple_IP_Ranges] Failed to delete guest IP range from a
subnet
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/febe7d9c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/febe7d9c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/febe7d9c
Branch: refs/heads/master
Commit: febe7d9cffb12879f87a0e7c675752f750c6400b
Parents: 4d5c6c8
Author: Abhinandan Prateek
Authored: Thu Jun 20 10:44:38 2013 +0530
Committer: Abhinandan Prateek
Committed: Thu Jun 20 10:44:48 2013 +0530
--
server/src/com/cloud/configuration/ConfigurationManagerImpl.java | 1 +
1 file changed, 1 insertion(+)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/febe7d9c/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
--
diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
index c117f3a..13c821e 100755
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -3015,6 +3015,7 @@ public class ConfigurationManagerImpl extends ManagerBase
implements Configurati
txn.start();
if (!removeFromDb(vlanDbId)) {
txn.rollback();
+txn.close();
return false;
}
else {
git commit: updated refs/heads/master to 7b6b8d7
Updated Branches:
refs/heads/master e420c3be8 -> 7b6b8d7a0
CLOUDSTACK-2987 Ensure XStools to be there in template inorder to enable
dynamic scaling of vm
CLOUDSTACK-3042 - handle Scaling up of vm memory/CPU based on the presence of
XS tools in the template
This also takes care of updation of VM after XS tools are installed in the vm
and set memory values accordingly to support dynamic scaling after stop start
of VM
Signed-off-by: Abhinandan Prateek
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7b6b8d7a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7b6b8d7a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7b6b8d7a
Branch: refs/heads/master
Commit: 7b6b8d7a077478620232ea1ac4ec2304289e8661
Parents: e420c3b
Author: Harikrishna Patnala
Authored: Thu Jun 20 11:06:12 2013 +0530
Committer: Abhinandan Prateek
Committed: Thu Jun 20 11:08:38 2013 +0530
--
.../com/cloud/template/VirtualMachineTemplate.java | 2 ++
api/src/com/cloud/vm/VirtualMachine.java| 2 ++
api/src/org/apache/cloudstack/api/ApiConstants.java | 1 +
.../cloudstack/api/BaseUpdateTemplateOrIsoCmd.java | 7 +++
.../api/command/user/iso/RegisterIsoCmd.java| 7 +++
.../command/user/template/RegisterTemplateCmd.java | 7 +++
.../cloudstack/api/command/user/vm/UpdateVMCmd.java | 7 +++
.../cloudstack/api/response/TemplateResponse.java | 7 +++
.../cloudstack/api/response/UserVmResponse.java | 7 +++
core/src/com/cloud/agent/api/ScaleVmCommand.java| 3 ++-
.../schema/src/com/cloud/storage/VMTemplateVO.java | 14 +-
engine/schema/src/com/cloud/vm/VMInstanceVO.java| 1 +
.../storage/image/TemplateEntityImpl.java | 6 ++
.../xen/src/com/cloud/hypervisor/XenServerGuru.java | 1 +
.../hypervisor/xen/resource/CitrixResourceBase.java | 4
.../xen/resource/XenServer56FP1Resource.java| 1 +
server/src/com/cloud/api/ApiResponseHelper.java | 4
.../com/cloud/api/query/dao/UserVmJoinDaoImpl.java | 5 +
server/src/com/cloud/api/query/vo/UserVmJoinVO.java | 11 +++
.../com/cloud/hypervisor/HypervisorGuruBase.java| 13 +
.../src/com/cloud/server/ManagementServerImpl.java | 7 ++-
server/src/com/cloud/storage/TemplateProfile.java | 12 +++-
server/src/com/cloud/template/TemplateAdapter.java | 2 +-
.../src/com/cloud/template/TemplateAdapterBase.java | 12 ++--
server/src/com/cloud/vm/UserVmManagerImpl.java | 13 +
.../src/com/cloud/vm/VirtualMachineManagerImpl.java | 14 --
.../com/cloud/vm/VirtualMachineManagerImplTest.java | 16 +---
setup/db/db/schema-410to420.sql | 15 ++-
28 files changed, 176 insertions(+), 25 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7b6b8d7a/api/src/com/cloud/template/VirtualMachineTemplate.java
--
diff --git a/api/src/com/cloud/template/VirtualMachineTemplate.java
b/api/src/com/cloud/template/VirtualMachineTemplate.java
index cedc793..114785a 100755
--- a/api/src/com/cloud/template/VirtualMachineTemplate.java
+++ b/api/src/com/cloud/template/VirtualMachineTemplate.java
@@ -92,4 +92,6 @@ public interface VirtualMachineTemplate extends
ControlledEntity, Identity, Inte
String getTemplateTag();
Map getDetails();
+
+Boolean isDynamicallyScalable();
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7b6b8d7a/api/src/com/cloud/vm/VirtualMachine.java
--
diff --git a/api/src/com/cloud/vm/VirtualMachine.java
b/api/src/com/cloud/vm/VirtualMachine.java
index ce9add6..c172fbf 100755
--- a/api/src/com/cloud/vm/VirtualMachine.java
+++ b/api/src/com/cloud/vm/VirtualMachine.java
@@ -158,6 +158,8 @@ public interface VirtualMachine extends RunningOn,
ControlledEntity, Identity, I
}
}
+public static final String IsDynamicScalingEnabled =
"enable.dynamic.scaling";
+
public enum Event {
CreateRequested,
StartRequested,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7b6b8d7a/api/src/org/apache/cloudstack/api/ApiConstants.java
--
diff --git a/api/src/org/apache/cloudstack/api/ApiConstants.java
b/api/src/org/apache/cloudstack/api/ApiConstants.java
index 12e5097..50832a3 100755
--- a/api/src/org/apache/cloudstack/api/ApiConstants.java
+++ b/api/src/org/apache/cloudstack/api/ApiConstants.java
@@ -509,6 +509,7 @@ public class ApiConstants {
public static final String DEPLOYMENT_PLANNER = "deploymentplanner";
public static final String ACL_ID =
git commit: updated refs/heads/master to f9e7094
Updated Branches:
refs/heads/master 7b6b8d7a0 -> f9e709428
Cloudstack-2644 [Multiple_IP_Ranges] user data service on VR does not work in
case of multiple subnets Cloudstack-2953 [Multiple_IP_Ranges] VM does not get
the public key from VR incase of multiple subnets per vlan Also removed some
unused code and fixed the an error in the dnsmasq config function
Signed-off-by: Abhinandan Prateek
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f9e70942
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f9e70942
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f9e70942
Branch: refs/heads/master
Commit: f9e709428298c25ea50dd77a3d227a37c326922a
Parents: 7b6b8d7
Author: Bharat Kumar
Authored: Wed Jun 19 11:53:48 2013 +0530
Committer: Abhinandan Prateek
Committed: Thu Jun 20 11:15:15 2013 +0530
--
.../debian/config/etc/init.d/cloud-early-config | 2 +
.../VirtualNetworkApplianceManagerImpl.java | 3 +-
server/src/com/cloud/vm/dao/NicIpAliasDao.java | 1 -
.../src/com/cloud/vm/dao/NicIpAliasDaoImpl.java | 9 -
setup/bindir/cloud-set-guest-sshkey.in | 39 +---
5 files changed, 14 insertions(+), 40 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f9e70942/patches/systemvm/debian/config/etc/init.d/cloud-early-config
--
diff --git a/patches/systemvm/debian/config/etc/init.d/cloud-early-config
b/patches/systemvm/debian/config/etc/init.d/cloud-early-config
index 0dcd571..b215271 100755
--- a/patches/systemvm/debian/config/etc/init.d/cloud-early-config
+++ b/patches/systemvm/debian/config/etc/init.d/cloud-early-config
@@ -540,6 +540,8 @@ setup_dnsmasq() {
NS6=${NS6%?}
[ $ETH0_IP ] && echo "dhcp-option=6,$NS" >> /etc/dnsmasq.conf
[ $ETH0_IP6 ] && echo "dhcp-option=option6:dns-server,$NS6" >>
/etc/dnsmasq.conf
+#adding the name data-server to the /etc/hosts for allowing the access to
user-data service and ssh-key reset in every subnet.
+ echo "$ETH0_IP data-server" >> /etc/hosts
}
setup_sshd(){
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f9e70942/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
--
diff --git
a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index 2e75277..c9dee9c 100755
---
a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++
b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -3430,7 +3430,7 @@ public class VirtualNetworkApplianceManagerImpl extends
ManagerBase implements V
private void configDnsMasq(VirtualRouter router, Network network, Commands
cmds) {
DataCenterVO dcVo = _dcDao.findById(router.getDataCenterId());
-List ipAliasVOList =
_nicIpAliasDao.getAliasIpForVm(router.getId());
+List ipAliasVOList =
_nicIpAliasDao.listByNetworkIdAndState(network.getId(),
NicIpAlias.state.active);
List ipList = new ArrayList();
NicVO router_guest_nic =
_nicDao.findByNtwkIdAndInstanceId(network.getId(), router.getId());
@@ -3444,6 +3444,7 @@ public class VirtualNetworkApplianceManagerImpl extends
ManagerBase implements V
for (NicIpAliasVO ipAliasVO : ipAliasVOList) {
DnsmasqTO dnsmasqTO = new DnsmasqTO(ipAliasVO.getIp4Address(),
ipAliasVO.getGateway(), ipAliasVO.getNetmask(), ipAliasVO.getStartIpOfSubnet());
ipList.add(dnsmasqTO);
+ ipAliasVO.setVmId(router.getId());
}
DataCenterVO dcvo = _dcDao.findById(router.getDataCenterId());
DnsMasqConfigCommand dnsMasqConfigCmd = new
DnsMasqConfigCommand(network.getNetworkDomain(),ipList, dcvo.getDns1(),
dcvo.getDns2(), dcvo.getInternalDns1(), dcvo.getInternalDns2());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f9e70942/server/src/com/cloud/vm/dao/NicIpAliasDao.java
--
diff --git a/server/src/com/cloud/vm/dao/NicIpAliasDao.java
b/server/src/com/cloud/vm/dao/NicIpAliasDao.java
index f1e4b8e..2a0da92 100644
--- a/server/src/com/cloud/vm/dao/NicIpAliasDao.java
+++ b/server/src/com/cloud/vm/dao/NicIpAliasDao.java
@@ -57,5 +57,4 @@ public interface NicIpAliasDao extends
GenericDao {
List listByNetworkIdAndState(long networkId,
NicIpAlias.state state);
-List listByNetworkIdAndAliasIpAndState(long networkId,
String aliasIpOfSubnet, NicIpAlias.state state);
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f9e70942/server/src/com/cloud/vm/dao/NicIpAliasDaoImp
[2/2] git commit: updated refs/heads/master to d3d6350
CLOUDSTACK-2168: removed unused commit Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d3d63502 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d3d63502 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d3d63502 Branch: refs/heads/master Commit: d3d6350219c9f02ce5d604a81a0c3c12ff700672 Parents: 576884e Author: Abhinandan Prateek Authored: Thu Jun 20 11:30:26 2013 +0530 Committer: Abhinandan Prateek Committed: Thu Jun 20 11:30:26 2013 +0530 -- .../org/apache/cloudstack/api/command/admin/ldap/LDAPConfigCmd.java | 1 - 1 file changed, 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d3d63502/api/src/org/apache/cloudstack/api/command/admin/ldap/LDAPConfigCmd.java -- diff --git a/api/src/org/apache/cloudstack/api/command/admin/ldap/LDAPConfigCmd.java b/api/src/org/apache/cloudstack/api/command/admin/ldap/LDAPConfigCmd.java index efd1c76..38f58ec 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/ldap/LDAPConfigCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/ldap/LDAPConfigCmd.java @@ -27,7 +27,6 @@ import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import org.apache.cloudstack.api.response.HypervisorCapabilitiesResponse; import org.apache.cloudstack.api.response.LDAPConfigResponse; import org.apache.cloudstack.api.response.ListResponse; import org.apache.log4j.Logger;
[1/2] git commit: updated refs/heads/master to d3d6350
Updated Branches:
refs/heads/master f9e709428 -> d3d635021
Add fix for CLOUDSTACK-2168. Changed listAll output to conform to the same
output as listconfiguration
Signed-off-by: Abhinandan Prateek
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/576884ec
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/576884ec
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/576884ec
Branch: refs/heads/master
Commit: 576884ec10b4a46b243b8138926c0fc650bcdaba
Parents: f9e7094
Author: Ian Duffy
Authored: Mon Jun 17 15:00:19 2013 +0100
Committer: Abhinandan Prateek
Committed: Thu Jun 20 11:28:22 2013 +0530
--
.../api/command/admin/ldap/LDAPConfigCmd.java | 20
1 file changed, 16 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/576884ec/api/src/org/apache/cloudstack/api/command/admin/ldap/LDAPConfigCmd.java
--
diff --git
a/api/src/org/apache/cloudstack/api/command/admin/ldap/LDAPConfigCmd.java
b/api/src/org/apache/cloudstack/api/command/admin/ldap/LDAPConfigCmd.java
index 2726f84..efd1c76 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/ldap/LDAPConfigCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/ldap/LDAPConfigCmd.java
@@ -17,6 +17,9 @@
package org.apache.cloudstack.api.command.admin.ldap;
+import java.util.ArrayList;
+import java.util.List;
+
import javax.naming.NamingException;
import org.apache.cloudstack.api.APICommand;
@@ -24,7 +27,9 @@ import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.HypervisorCapabilitiesResponse;
import org.apache.cloudstack.api.response.LDAPConfigResponse;
+import org.apache.cloudstack.api.response.ListResponse;
import org.apache.log4j.Logger;
import com.cloud.exception.ConcurrentOperationException;
@@ -158,9 +163,16 @@ public class LDAPConfigCmd extends BaseCmd {
if (getListAll()){
// return the existing conf
LDAPConfigCmd cmd = _configService.listLDAPConfig(this);
- LDAPConfigResponse lr =
_responseGenerator.createLDAPConfigResponse(cmd.getHostname(), cmd.getPort(),
cmd.getUseSSL(), cmd.getQueryFilter(), cmd.getSearchBase(), cmd.getBindDN());
- lr.setResponseName(getCommandName());
- this.setResponseObject(lr);
+ ListResponse response = new
ListResponse();
+ List responses = new
ArrayList();
+
+ if(!cmd.getHostname().equals("")) {
+
responses.add(_responseGenerator.createLDAPConfigResponse(cmd.getHostname(),
cmd.getPort(), cmd.getUseSSL(), cmd.getQueryFilter(), cmd.getSearchBase(),
cmd.getBindDN()));
+ }
+
+ response.setResponses(responses);
+ response.setResponseName(getCommandName());
+ this.setResponseObject(response);
}
else if (getHostname()==null || getSearchBase() == null ||
getQueryFilter() == null) {
throw new InvalidParameterValueException("You need to
provide hostname, searchbase and queryfilter to configure your LDAP server");
@@ -191,4 +203,4 @@ public class LDAPConfigCmd extends BaseCmd {
}
-}
+}
\ No newline at end of file
git commit: updated refs/heads/4.2 to db88038
Updated Branches:
refs/heads/4.2 8a679e7b0 -> db880381d
syncing 64 bit svm scripts
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/db880381
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/db880381
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/db880381
Branch: refs/heads/4.2
Commit: db880381d16374943df357500212d95a0922fa09
Parents: 8a679e7
Author: Abhinandan Prateek
Authored: Thu Oct 24 18:50:34 2013 +0530
Committer: Abhinandan Prateek
Committed: Thu Oct 24 18:50:34 2013 +0530
--
tools/appliance/definitions/systemvmtemplate64/postinstall.sh | 1 +
tools/appliance/definitions/systemvmtemplate64/zerodisk.sh| 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/db880381/tools/appliance/definitions/systemvmtemplate64/postinstall.sh
--
diff --git a/tools/appliance/definitions/systemvmtemplate64/postinstall.sh
b/tools/appliance/definitions/systemvmtemplate64/postinstall.sh
index 53ae2bb..a779d8c 100644
--- a/tools/appliance/definitions/systemvmtemplate64/postinstall.sh
+++ b/tools/appliance/definitions/systemvmtemplate64/postinstall.sh
@@ -167,6 +167,7 @@ EOF
fix_vhdutil() {
wget --no-check-certificate
http://download.cloud.com.s3.amazonaws.com/tools/vhd-util -O /bin/vhd-util
+ chmod a+x /bin/vhd-util
}
do_fixes() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/db880381/tools/appliance/definitions/systemvmtemplate64/zerodisk.sh
--
diff --git a/tools/appliance/definitions/systemvmtemplate64/zerodisk.sh
b/tools/appliance/definitions/systemvmtemplate64/zerodisk.sh
index 25bd8c4..b00f7ae 100644
--- a/tools/appliance/definitions/systemvmtemplate64/zerodisk.sh
+++ b/tools/appliance/definitions/systemvmtemplate64/zerodisk.sh
@@ -6,7 +6,7 @@ rm -fv .veewee_version .veewee_params .vbox_version
echo "Cleaning up"
# Zero out the free space to save space in the final image:
-for path in / /boot /usr /var /opt /tmp
+for path in / /boot /usr /var /opt /tmp /home
do
dd if=/dev/zero of=$path/zero bs=1M
sync
git commit: updated refs/heads/master to 499a8c0
Updated Branches:
refs/heads/master 059e3beb2 -> 499a8c091
syncing 64 bit svm scripts
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/499a8c09
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/499a8c09
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/499a8c09
Branch: refs/heads/master
Commit: 499a8c0915dd25b3d9c813aa1b715ba9ba865ffb
Parents: 059e3be
Author: Abhinandan Prateek
Authored: Thu Oct 24 18:50:34 2013 +0530
Committer: Abhinandan Prateek
Committed: Thu Oct 24 18:52:13 2013 +0530
--
tools/appliance/definitions/systemvm64template/postinstall.sh | 1 +
tools/appliance/definitions/systemvm64template/zerodisk.sh| 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/499a8c09/tools/appliance/definitions/systemvm64template/postinstall.sh
--
diff --git a/tools/appliance/definitions/systemvm64template/postinstall.sh
b/tools/appliance/definitions/systemvm64template/postinstall.sh
index d33b943..3755b52 100644
--- a/tools/appliance/definitions/systemvm64template/postinstall.sh
+++ b/tools/appliance/definitions/systemvm64template/postinstall.sh
@@ -167,6 +167,7 @@ EOF
fix_vhdutil() {
wget --no-check-certificate
http://download.cloud.com.s3.amazonaws.com/tools/vhd-util -O /bin/vhd-util
+ chmod a+x /bin/vhd-util
}
do_fixes() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/499a8c09/tools/appliance/definitions/systemvm64template/zerodisk.sh
--
diff --git a/tools/appliance/definitions/systemvm64template/zerodisk.sh
b/tools/appliance/definitions/systemvm64template/zerodisk.sh
index 25bd8c4..b00f7ae 100644
--- a/tools/appliance/definitions/systemvm64template/zerodisk.sh
+++ b/tools/appliance/definitions/systemvm64template/zerodisk.sh
@@ -6,7 +6,7 @@ rm -fv .veewee_version .veewee_params .vbox_version
echo "Cleaning up"
# Zero out the free space to save space in the final image:
-for path in / /boot /usr /var /opt /tmp
+for path in / /boot /usr /var /opt /tmp /home
do
dd if=/dev/zero of=$path/zero bs=1M
sync
git commit: updated refs/heads/4.2 to 79ef40c
Updated Branches:
refs/heads/4.2 fba874120 -> 79ef40c0a
Summary: Implement stored-password encryption for Stratosphere plugin
BUG-ID: CLOUDSTACK-4929
Bugfix-for:
Reviewed-by:
Reported-by:
Signed-off-by: John Kinsella 1383882870 -0800
Signed-off-by: Abhinandan Prateek
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/79ef40c0
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/79ef40c0
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/79ef40c0
Branch: refs/heads/4.2
Commit: 79ef40c0a9f7ad60bd4830977a6e556e0125b80e
Parents: fba8741
Author: John Kinsella
Authored: Thu Nov 7 19:54:30 2013 -0800
Committer: Abhinandan Prateek
Committed: Fri Nov 8 15:17:22 2013 +0530
--
.../src/org/apache/cloudstack/network/dao/SspCredentialVO.java| 3 +++
1 file changed, 3 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/79ef40c0/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/dao/SspCredentialVO.java
--
diff --git
a/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/dao/SspCredentialVO.java
b/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/dao/SspCredentialVO.java
index 1780296..d828f64 100644
---
a/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/dao/SspCredentialVO.java
+++
b/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/dao/SspCredentialVO.java
@@ -23,6 +23,8 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
+import com.cloud.utils.db.Encrypt;
+
@Entity
@Table(name="external_stratosphere_ssp_credentials")
public class SspCredentialVO {
@@ -38,6 +40,7 @@ public class SspCredentialVO {
@Column(name="username")
private String username;
+@Encrypt
@Column(name="password")
private String password;
git commit: updated refs/heads/master to ea2eafc
Updated Branches:
refs/heads/master b36ed1289 -> ea2eafcd8
Summary: Implement stored-password encryption for Stratosphere plugin
BUG-ID: CLOUDSTACK-4929
Bugfix-for:
Reviewed-by:
Reported-by:
Signed-off-by: John Kinsella 1383882870 -0800
Signed-off-by: Abhinandan Prateek
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ea2eafcd
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ea2eafcd
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ea2eafcd
Branch: refs/heads/master
Commit: ea2eafcd85da6cafb8b35563d9abb472d176799f
Parents: b36ed12
Author: John Kinsella
Authored: Thu Nov 7 19:54:30 2013 -0800
Committer: Abhinandan Prateek
Committed: Fri Nov 8 15:18:25 2013 +0530
--
.../src/org/apache/cloudstack/network/dao/SspCredentialVO.java| 3 +++
1 file changed, 3 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ea2eafcd/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/dao/SspCredentialVO.java
--
diff --git
a/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/dao/SspCredentialVO.java
b/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/dao/SspCredentialVO.java
index 1780296..d828f64 100644
---
a/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/dao/SspCredentialVO.java
+++
b/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/dao/SspCredentialVO.java
@@ -23,6 +23,8 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
+import com.cloud.utils.db.Encrypt;
+
@Entity
@Table(name="external_stratosphere_ssp_credentials")
public class SspCredentialVO {
@@ -38,6 +40,7 @@ public class SspCredentialVO {
@Column(name="username")
private String username;
+@Encrypt
@Column(name="password")
private String password;
git commit: updated refs/heads/master to dcd3c44
Updated Branches:
refs/heads/master d27c6eb9a -> dcd3c4427
CLOUDSTACK-4916: To Enable Master High Availability using mysql connector
params and mysql's 2 way replication
Signed-off-by: Abhinandan Prateek
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/dcd3c442
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/dcd3c442
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/dcd3c442
Branch: refs/heads/master
Commit: dcd3c44279478b237f8fdcb6f8f9e301b9ae3195
Parents: d27c6eb
Author: Damodar Reddy
Authored: Fri Nov 8 14:03:03 2013 +0530
Committer: Abhinandan Prateek
Committed: Fri Nov 8 16:18:14 2013 +0530
--
client/tomcatconf/db.properties.in | 24 ++-
.../com/cloud/utils/db/ConnectionConcierge.java | 6 ++-
.../db/src/com/cloud/utils/db/Merovingian2.java | 10 +++--
.../com/cloud/utils/db/TransactionLegacy.java | 45 ++--
4 files changed, 64 insertions(+), 21 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dcd3c442/client/tomcatconf/db.properties.in
--
diff --git a/client/tomcatconf/db.properties.in
b/client/tomcatconf/db.properties.in
index b0cb22b..50b8d33 100644
--- a/client/tomcatconf/db.properties.in
+++ b/client/tomcatconf/db.properties.in
@@ -32,7 +32,6 @@ db.cloud.name=cloud
db.cloud.maxActive=250
db.cloud.maxIdle=30
db.cloud.maxWait=1
-db.cloud.autoReconnect=true
db.cloud.validationQuery=SELECT 1
db.cloud.testOnBorrow=true
db.cloud.testWhileIdle=true
@@ -63,7 +62,6 @@ db.usage.name=cloud_usage
db.usage.maxActive=100
db.usage.maxIdle=30
db.usage.maxWait=1
-db.usage.autoReconnect=true
db.usage.url.params=
# awsapi database settings
@@ -84,3 +82,25 @@ db.simulator.maxIdle=30
db.simulator.maxWait=1
db.simulator.autoReconnect=true
+
+# High Availability And Cluster Properties
+db.ha.enabled=false
+# cloud stack Database
+db.cloud.slaves=localhost,localhost #Comma Separated list of slaves
+db.cloud.autoReconnect=true
+db.cloud.failOverReadOnly=false #Do not change this parameter to true
+db.cloud.reconnectAtTxEnd=true
+db.cloud.autoReconnectForPools=true
+db.cloud.secondsBeforeRetryMaster=3600
+db.cloud.queriesBeforeRetryMaster=5000
+db.cloud.initialTimeout=3600
+
+#usage Database
+db.usage.slaves=localhost,localhost #Comma Separated list of slaves
+db.usage.autoReconnect=true
+db.usage.failOverReadOnly=false #Do not change this parameter to true
+db.usage.reconnectAtTxEnd=true
+db.usage.autoReconnectForPools=true
+db.usage.secondsBeforeRetryMaster=3600
+db.usage.queriesBeforeRetryMaster=5000
+db.usage.initialTimeout=3600
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dcd3c442/framework/db/src/com/cloud/utils/db/ConnectionConcierge.java
--
diff --git a/framework/db/src/com/cloud/utils/db/ConnectionConcierge.java
b/framework/db/src/com/cloud/utils/db/ConnectionConcierge.java
index acb9cc6..bb76d0f 100644
--- a/framework/db/src/com/cloud/utils/db/ConnectionConcierge.java
+++ b/framework/db/src/com/cloud/utils/db/ConnectionConcierge.java
@@ -144,8 +144,10 @@ public class ConnectionConcierge {
PreparedStatement pstmt = null;
try {
if (conn != null) {
-pstmt = conn.prepareStatement("SELECT 1");
-pstmt.executeQuery();
+synchronized (conn) {
+pstmt = conn.prepareStatement("SELECT 1");
+pstmt.executeQuery();
+}
}
return null;
} catch (Throwable th) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dcd3c442/framework/db/src/com/cloud/utils/db/Merovingian2.java
--
diff --git a/framework/db/src/com/cloud/utils/db/Merovingian2.java
b/framework/db/src/com/cloud/utils/db/Merovingian2.java
index 8544aab..15e3d24 100644
--- a/framework/db/src/com/cloud/utils/db/Merovingian2.java
+++ b/framework/db/src/com/cloud/utils/db/Merovingian2.java
@@ -253,10 +253,12 @@ public class Merovingian2 extends StandardMBean
implements MerovingianMBean {
s_logger.info("Cleaning up locks for " + msId);
PreparedStatement pstmt = null;
try {
-pstmt = _concierge.conn().prepareStatement(CLEANUP_MGMT_LOCKS_SQL);
-pstmt.setLong(1, msId);
-int rows = pstmt.executeUpdate();
-s_logger.info("Released " + rows + " locks for " + msId);
+synchronized (_concierge.conn()) {
+pstmt =
_concierge.conn().prepareStatement(CLEANUP_MGMT_LOCKS_SQL);
+ps
git commit: updated refs/heads/master to 07b6874
Updated Branches: refs/heads/master c7fe212c3 -> 07b68742c CLOUDSTACK-4916: removing spurious comments Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/07b68742 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/07b68742 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/07b68742 Branch: refs/heads/master Commit: 07b68742c970049aaef1459f51425c5f7d6abcad Parents: c7fe212 Author: Abhinandan Prateek Authored: Fri Nov 8 16:44:32 2013 +0530 Committer: Abhinandan Prateek Committed: Fri Nov 8 16:44:32 2013 +0530 -- client/tomcatconf/db.properties.in | 8 1 file changed, 4 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/07b68742/client/tomcatconf/db.properties.in -- diff --git a/client/tomcatconf/db.properties.in b/client/tomcatconf/db.properties.in index 50b8d33..31e0803 100644 --- a/client/tomcatconf/db.properties.in +++ b/client/tomcatconf/db.properties.in @@ -86,9 +86,9 @@ db.simulator.autoReconnect=true # High Availability And Cluster Properties db.ha.enabled=false # cloud stack Database -db.cloud.slaves=localhost,localhost #Comma Separated list of slaves +db.cloud.slaves=localhost,localhost db.cloud.autoReconnect=true -db.cloud.failOverReadOnly=false #Do not change this parameter to true +db.cloud.failOverReadOnly=false db.cloud.reconnectAtTxEnd=true db.cloud.autoReconnectForPools=true db.cloud.secondsBeforeRetryMaster=3600 @@ -96,9 +96,9 @@ db.cloud.queriesBeforeRetryMaster=5000 db.cloud.initialTimeout=3600 #usage Database -db.usage.slaves=localhost,localhost #Comma Separated list of slaves +db.usage.slaves=localhost,localhost db.usage.autoReconnect=true -db.usage.failOverReadOnly=false #Do not change this parameter to true +db.usage.failOverReadOnly=false db.usage.reconnectAtTxEnd=true db.usage.autoReconnectForPools=true db.usage.secondsBeforeRetryMaster=3600
git commit: updated refs/heads/4.2 to 27ea927
Updated Branches:
refs/heads/4.2 48d9e2443 -> 27ea9274b
Template/ISO download fails cause the object to disappear from UI
Signed-off-by: Abhinandan Prateek
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/27ea9274
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/27ea9274
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/27ea9274
Branch: refs/heads/4.2
Commit: 27ea9274bdbbc876d65c6f4ed9d858794f4e
Parents: 48d9e24
Author: Harikrishna Patnala
Authored: Fri Nov 8 09:53:18 2013 +0530
Committer: Abhinandan Prateek
Committed: Fri Nov 8 17:51:35 2013 +0530
--
.../storage/datastore/ObjectInDataStoreManagerImpl.java | 9 ++---
.../src/com/cloud/template/HypervisorTemplateAdapter.java | 6 +-
2 files changed, 3 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/27ea9274/engine/storage/src/org/apache/cloudstack/storage/datastore/ObjectInDataStoreManagerImpl.java
--
diff --git
a/engine/storage/src/org/apache/cloudstack/storage/datastore/ObjectInDataStoreManagerImpl.java
b/engine/storage/src/org/apache/cloudstack/storage/datastore/ObjectInDataStoreManagerImpl.java
index 652df43..d9a5164 100644
---
a/engine/storage/src/org/apache/cloudstack/storage/datastore/ObjectInDataStoreManagerImpl.java
+++
b/engine/storage/src/org/apache/cloudstack/storage/datastore/ObjectInDataStoreManagerImpl.java
@@ -86,6 +86,7 @@ public class ObjectInDataStoreManagerImpl implements
ObjectInDataStoreManager {
public ObjectInDataStoreManagerImpl() {
stateMachines = new StateMachine2();
stateMachines.addTransition(State.Allocated,
Event.CreateOnlyRequested, State.Creating);
+stateMachines.addTransition(State.Allocated, Event.DestroyRequested,
State.Destroying);
stateMachines.addTransition(State.Creating, Event.OperationFailed,
State.Allocated);
stateMachines.addTransition(State.Creating, Event.OperationSuccessed,
State.Ready);
stateMachines.addTransition(State.Ready, Event.CopyingRequested,
State.Copying);
@@ -256,13 +257,7 @@ public class ObjectInDataStoreManagerImpl implements
ObjectInDataStoreManager {
// Image store
switch (dataObj.getType()) {
case TEMPLATE:
-TemplateDataStoreVO destTmpltStore =
templateDataStoreDao.findByStoreTemplate(dataStore.getId(), objId);
-if (destTmpltStore != null && destTmpltStore.getState() !=
ObjectInDataStoreStateMachine.State.Ready) {
-return templateDataStoreDao.remove(destTmpltStore.getId());
-} else {
-s_logger.warn("Template " + objId + " is not found on
image store " + dataStore.getId() + ", so no need to delete");
-return true;
-}
+return true;
case SNAPSHOT:
SnapshotDataStoreVO destSnapshotStore =
snapshotDataStoreDao.findByStoreSnapshot(dataStore.getRole(),
dataStore.getId(), objId);
if (destSnapshotStore != null && destSnapshotStore.getState()
!= ObjectInDataStoreStateMachine.State.Ready) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/27ea9274/server/src/com/cloud/template/HypervisorTemplateAdapter.java
--
diff --git a/server/src/com/cloud/template/HypervisorTemplateAdapter.java
b/server/src/com/cloud/template/HypervisorTemplateAdapter.java
index 00e6222..963aec9 100755
--- a/server/src/com/cloud/template/HypervisorTemplateAdapter.java
+++ b/server/src/com/cloud/template/HypervisorTemplateAdapter.java
@@ -232,11 +232,7 @@ public class HypervisorTemplateAdapter extends
TemplateAdapterBase {
CreateTemplateContext context) {
TemplateApiResult result = callback.getResult();
TemplateInfo template = context.template;
-if (result.isFailed()) {
-// failed in creating template, we need to remove those already
-// populated template entry
-_tmpltDao.remove(template.getId());
-} else {
+if (result.isSuccess()) {
VMTemplateVO tmplt = this._tmpltDao.findById(template.getId());
long accountId = tmplt.getAccountId();
if (template.getSize() != null) {
git commit: updated refs/heads/4.2 to 92aa394
Updated Branches: refs/heads/4.2 7469165da -> 92aa39478 adding version 4.2.1 to the changes Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/92aa3947 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/92aa3947 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/92aa3947 Branch: refs/heads/4.2 Commit: 92aa39478917c8abbddb6eca294a269fd0bd5929 Parents: 7469165 Author: Abhinandan Prateek Authored: Tue Nov 12 12:27:24 2013 +0530 Committer: Abhinandan Prateek Committed: Tue Nov 12 12:27:24 2013 +0530 -- CHANGES | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/92aa3947/CHANGES -- diff --git a/CHANGES b/CHANGES index 624ef90..19f19c7 100644 --- a/CHANGES +++ b/CHANGES @@ -4,12 +4,16 @@ Apache CloudStack CHANGES Full release notes for each release are located in the project's documentation website: http://cloudstack.apache.org/docs -Version 4.2.0 +Version 4.2.1 Please check the release notes for details +Version 4.2.0 + + +Please check the release notes for details Version 4.1.0
svn commit: r3483 - in /dev/cloudstack/4.2.1: ./ apache-cloudstack-4.2.1-src.tar.bz2 apache-cloudstack-4.2.1-src.tar.bz2.asc apache-cloudstack-4.2.1-src.tar.bz2.md5 apache-cloudstack-4.2.1-src.tar.bz2
Author: aprateek Date: Tue Nov 12 09:58:45 2013 New Revision: 3483 Log: Committing release candidate artifacts for 4.2.1 to dist/dev/cloudstack in preparation for release vote Added: dev/cloudstack/4.2.1/ dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2 (with props) dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.asc dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.md5 dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.sha Added: dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2 == Binary file - no diff available. Propchange: dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2 -- svn:mime-type = application/octet-stream Added: dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.asc == --- dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.asc (added) +++ dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.asc Tue Nov 12 09:58:45 2013 @@ -0,0 +1,12 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG/MacGPG2 v2.0.22 (Darwin) +Comment: GPGTools - https://gpgtools.org + +iQEcBAABCgAGBQJSgfsUAAoJEPmMhMJCRDqhVTQIAKoZfz3rT5dtMWwJ7C/UfpWS +kWgwHrOr8srU9cBUFt1Ff0l/aEhKn8P4EXS2oamMQfgztrHwi7hCmGvRxbTA2SHm +HXUiprqa1CRVluEajgqg/+XR4n9NDXG9OGGmgVXr2kkJMPfqSXiVK6BoJtKgXlr1 +lImJSZAYUiTzPOFbmOKWYF+Z98HxiB8A0OdUvd0Ac5ISICW/7U3vPlAG8zQDEoO+ +3BKuO6hfTx95eqFLETNCDWRJIpLXAynzQ5S+hGYsjkJN1v4VQyVzIajMoziAUm3B +HfjEG9Hn7v+f04JQ2ialrFVno27JWUvQcM3xzZLJWm01O7LK5iCY62WbD6Ke3YM= +=babc +-END PGP SIGNATURE- Added: dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.md5 == --- dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.md5 (added) +++ dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.md5 Tue Nov 12 09:58:45 2013 @@ -0,0 +1,6 @@ +apache-cloudstack-4.2.1-src.tar.bz2: 9C 86 8B + 8C 7F 85 + 10 80 08 + BD A6 2C + F5 81 47 + 35 Added: dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.sha == --- dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.sha (added) +++ dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.sha Tue Nov 12 09:58:45 2013 @@ -0,0 +1,8 @@ +apache-cloudstack-4.2.1-src.tar.bz2: 6E179408 1BD49DE1 + EFDC68B0 C8CB7A72 + 1F266892 81AA29D3 + 195C8073 FD12649B + AA04DA62 F8D4E32F + DDED77B9 F29B2798 + 412B9DE0 C9793EF4 + 695E9C58 24758D80
git commit: updated refs/heads/4.2 to 89f25c8
Updated Branches: refs/heads/4.2 92aa39478 -> 89f25c8e5 updating new features and fixed issues Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/89f25c8e Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/89f25c8e Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/89f25c8e Branch: refs/heads/4.2 Commit: 89f25c8e5b4fab2ec7dbead174a1a4ebcae970a1 Parents: 92aa394 Author: Abhinandan Prateek Authored: Tue Nov 12 18:26:07 2013 +0530 Committer: Abhinandan Prateek Committed: Tue Nov 12 18:26:07 2013 +0530 -- CHANGES | 12 +++- 1 file changed, 11 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/89f25c8e/CHANGES -- diff --git a/CHANGES b/CHANGES index 19f19c7..0c05c10 100644 --- a/CHANGES +++ b/CHANGES @@ -7,8 +7,18 @@ http://cloudstack.apache.org/docs Version 4.2.1 -Please check the release notes for details +New Features: + +*CLOUDSTACK-4817: Configurable option to choose single vs multipart upload for S3 API +*CLOUDSTACK-4717: Allow network with public IP Address without needing SourceNAT +*CLOUDSTACK-4649: Device Id Changes for Xen +*CLOUDSTACK-4816: Provide configurable option to choose single vs multipart upload to S3 object storage +*CLOUDSTACK-3677: Xenserver VMSnapshot +*CLOUDSTACK-723: UCS rework + +Fixed Issues Filter: +https://issues.apache.org/jira/issues/?filter=12325707 Version 4.2.0
svn commit: r3485 - in /dev/cloudstack/4.2.1-SNAPSHOT: ./ apache-cloudstack-4.2.1-SNAPSHOT-src.tar.bz2 apache-cloudstack-4.2.1-SNAPSHOT-src.tar.bz2.asc apache-cloudstack-4.2.1-SNAPSHOT-src.tar.bz2.md5
Author: aprateek Date: Tue Nov 12 13:08:32 2013 New Revision: 3485 Log: Committing release candidate artifacts for 4.2.1-SNAPSHOT to dist/dev/cloudstack in preparation for release vote Added: dev/cloudstack/4.2.1-SNAPSHOT/ dev/cloudstack/4.2.1-SNAPSHOT/apache-cloudstack-4.2.1-SNAPSHOT-src.tar.bz2 (with props) dev/cloudstack/4.2.1-SNAPSHOT/apache-cloudstack-4.2.1-SNAPSHOT-src.tar.bz2.asc dev/cloudstack/4.2.1-SNAPSHOT/apache-cloudstack-4.2.1-SNAPSHOT-src.tar.bz2.md5 dev/cloudstack/4.2.1-SNAPSHOT/apache-cloudstack-4.2.1-SNAPSHOT-src.tar.bz2.sha Added: dev/cloudstack/4.2.1-SNAPSHOT/apache-cloudstack-4.2.1-SNAPSHOT-src.tar.bz2 == Binary file - no diff available. Propchange: dev/cloudstack/4.2.1-SNAPSHOT/apache-cloudstack-4.2.1-SNAPSHOT-src.tar.bz2 -- svn:mime-type = application/octet-stream Added: dev/cloudstack/4.2.1-SNAPSHOT/apache-cloudstack-4.2.1-SNAPSHOT-src.tar.bz2.asc == --- dev/cloudstack/4.2.1-SNAPSHOT/apache-cloudstack-4.2.1-SNAPSHOT-src.tar.bz2.asc (added) +++ dev/cloudstack/4.2.1-SNAPSHOT/apache-cloudstack-4.2.1-SNAPSHOT-src.tar.bz2.asc Tue Nov 12 13:08:32 2013 @@ -0,0 +1,12 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG/MacGPG2 v2.0.22 (Darwin) +Comment: GPGTools - https://gpgtools.org + +iQEcBAABCgAGBQJSgieqAAoJEPmMhMJCRDqhgbgH/1N+j2hTX2SyQMLOlMDrWs/n +i74bCg8JwFkRuxDNNK4cNxnim7o2gfcUDCrjL8hzQT4VJoyP1RR5gaTXdtT3Zh+o +LdAWu6XO27s3wdWYTnq83nnRs/x2RUYV8A1uW58PyQMt3S5ihhLdeUovJpiVMDaT +kNm0GBoSX+lLf9nbU4Rep3WfC7XqDVPjm0QqEuVIm+ABTTNC6z1Dhe7dzt5dIVnH +MdVjBXJjGVl5Ibx4UxgBkvc4VgaHS+kB06HDgTO0YTGtkU2VbRuB+r529bmCxKG2 +eclrSNYPerUdjZHagGsiOz/a0wf3EI35dLrau0xcr5ep5zh/Ir8e3PmvqlMtZA4= +=QO2r +-END PGP SIGNATURE- Added: dev/cloudstack/4.2.1-SNAPSHOT/apache-cloudstack-4.2.1-SNAPSHOT-src.tar.bz2.md5 == --- dev/cloudstack/4.2.1-SNAPSHOT/apache-cloudstack-4.2.1-SNAPSHOT-src.tar.bz2.md5 (added) +++ dev/cloudstack/4.2.1-SNAPSHOT/apache-cloudstack-4.2.1-SNAPSHOT-src.tar.bz2.md5 Tue Nov 12 13:08:32 2013 @@ -0,0 +1,6 @@ +apache-cloudstack-4.2.1-SNAPSHOT-src.tar.bz2: +1F 62 CE 32 + DC 55 EA D6 + 3E 80 E8 + A4 48 04 C5 + 22 Added: dev/cloudstack/4.2.1-SNAPSHOT/apache-cloudstack-4.2.1-SNAPSHOT-src.tar.bz2.sha == --- dev/cloudstack/4.2.1-SNAPSHOT/apache-cloudstack-4.2.1-SNAPSHOT-src.tar.bz2.sha (added) +++ dev/cloudstack/4.2.1-SNAPSHOT/apache-cloudstack-4.2.1-SNAPSHOT-src.tar.bz2.sha Tue Nov 12 13:08:32 2013 @@ -0,0 +1,7 @@ +apache-cloudstack-4.2.1-SNAPSHOT-src.tar.bz2: +3FCE27E6 EDC66FF0 9004E532 + B69D57C5 8014F9D3 57AB8CCC + F4A8BB4E 10FB2C10 DB3D88D7 + FB9A5EC9 50E8EAD7 48BE1064 + 39CFFAB4 8D2D1AEC D3F41726 + 3ECEFF94
svn commit: r3489 - in /dev/cloudstack/4.2.1: apache-cloudstack-4.2.1-src.tar.bz2 apache-cloudstack-4.2.1-src.tar.bz2.asc apache-cloudstack-4.2.1-src.tar.bz2.md5 apache-cloudstack-4.2.1-src.tar.bz2.sh
Author: aprateek Date: Tue Nov 12 15:24:00 2013 New Revision: 3489 Log: Committing release candidate artifacts for 4.2.1 to dist/dev/cloudstack in preparation for release vote Added: dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2 (with props) dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.asc dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.md5 dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.sha Added: dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2 == Binary file - no diff available. Propchange: dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2 -- svn:mime-type = application/octet-stream Added: dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.asc == --- dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.asc (added) +++ dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.asc Tue Nov 12 15:24:00 2013 @@ -0,0 +1,12 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG/MacGPG2 v2.0.22 (Darwin) +Comment: GPGTools - https://gpgtools.org + +iQEcBAABCgAGBQJSgkdcAAoJEPmMhMJCRDqhynAH/jY4ujWE6IANb2d2biss7U0l +dV3SdFo9VN+F+OuJAPFqLiDSlH01tpsjuTFu8vKUdyYqrHuc6BBAtiHuIEXe7/gD +jyeQNpemSlKHKni+urhxCE64FGs8S0HaU4KtCe7madoQc5YUaqiK+6gp7RND1rTH +CiBcybh9s/7q21AF1kERprUP+1WkHoOE1QlLJdrGIuI+Lit03KIDwb7LQQPuDluL +dwQORysXdhqfIfeQ1dXy7UCiyS+pMcLJBlQEUlYdb8yqTibwqMNsu3vDaOqhLme+ +aSNrdIIwQnIxWoQ0TmuYL/JByAeqXdrpQ4esIcC5mAnQ82VW0+2UuJKay2383sw= +=gQcl +-END PGP SIGNATURE- Added: dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.md5 == --- dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.md5 (added) +++ dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.md5 Tue Nov 12 15:24:00 2013 @@ -0,0 +1,6 @@ +apache-cloudstack-4.2.1-src.tar.bz2: 25 7B BE + A4 A2 96 + 45 C6 EF + E4 16 5F + DB 12 D2 + 26 Added: dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.sha == --- dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.sha (added) +++ dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.sha Tue Nov 12 15:24:00 2013 @@ -0,0 +1,8 @@ +apache-cloudstack-4.2.1-src.tar.bz2: C610E7DB 1DA5CD5E + 0D8379A4 5E93DE4A + FE9B77B6 25825D39 + 6C3F3159 BEBB5688 + 179E9572 97D0F923 + 909E58B7 147CD965 + B5C72027 59D73568 + 198A768B BB574205
svn commit: r3492 - in /dev/cloudstack/4.2.1: apache-cloudstack-4.2.1-src.tar.bz2 apache-cloudstack-4.2.1-src.tar.bz2.asc apache-cloudstack-4.2.1-src.tar.bz2.md5 apache-cloudstack-4.2.1-src.tar.bz2.sh
Author: aprateek Date: Tue Nov 12 15:47:24 2013 New Revision: 3492 Log: Committing release candidate artifacts for 4.2.1 to dist/dev/cloudstack in preparation for release vote Added: dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2 (with props) dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.asc dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.md5 dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.sha Added: dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2 == Binary file - no diff available. Propchange: dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2 -- svn:mime-type = application/octet-stream Added: dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.asc == --- dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.asc (added) +++ dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.asc Tue Nov 12 15:47:24 2013 @@ -0,0 +1,12 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG/MacGPG2 v2.0.22 (Darwin) +Comment: GPGTools - https://gpgtools.org + +iQEcBAABCgAGBQJSgk0NAAoJEPmMhMJCRDqhkiMH/A1uMgIPEssUhAaAzqw2SOtt +JEqrWs07cF/8GtwQ7Zv9l+dJJgy+HXLVN4H09howc238ERNXAHKnYA5TqEVD2pJj +wLgKGjlYeF8GtbKrJgST6WnfDstWWQBOTmh8+LN56mhFe0PY7h/Xp2JrR8PWH6gT +Uy+wjc7uxlzC/pidzVZHVtKfALH7aOEP0aGTnvo4NpmIr5bp/5fsSRQPXE0buk0V +ghW9oR33wAjG3UwmNGvmxOLa1psLys+myvOmCwtC41istMiMOG1deFcpYG3NnCkc +6MiREeMGtrGRAFQrvqPjPCKpeltWsxQe+7k1cUGqUxrZWmIFpuaTRCDRnakrbZs= +=O5H8 +-END PGP SIGNATURE- Added: dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.md5 == --- dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.md5 (added) +++ dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.md5 Tue Nov 12 15:47:24 2013 @@ -0,0 +1,6 @@ +apache-cloudstack-4.2.1-src.tar.bz2: AE BF B5 + B5 91 24 + 8B 6D 27 + 6F 9D 35 + C0 C3 DD + D5 Added: dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.sha == --- dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.sha (added) +++ dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.sha Tue Nov 12 15:47:24 2013 @@ -0,0 +1,8 @@ +apache-cloudstack-4.2.1-src.tar.bz2: 160523E9 A6017D8E + 2776CF0E A73D25EE + 43892A75 B0DB5155 + E0E37E59 31935D0B + A5659C26 BCB92605 + 87AB08C5 D9FDFDAE + 97651EF5 74363C1D + D09ED176 5C1FD84D
svn commit: r3491 - in /dev/cloudstack/4.2.1: apache-cloudstack-4.2.1-src.tar.bz2 apache-cloudstack-4.2.1-src.tar.bz2.asc apache-cloudstack-4.2.1-src.tar.bz2.md5 apache-cloudstack-4.2.1-src.tar.bz2.sh
Author: aprateek Date: Tue Nov 12 15:32:22 2013 New Revision: 3491 Log: Committing release candidate artifacts for 4.2.1 to dist/dev/cloudstack in preparation for release vote Added: dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2 (with props) dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.asc dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.md5 dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.sha Added: dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2 == Binary file - no diff available. Propchange: dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2 -- svn:mime-type = application/octet-stream Added: dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.asc == --- dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.asc (added) +++ dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.asc Tue Nov 12 15:32:22 2013 @@ -0,0 +1,12 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG/MacGPG2 v2.0.22 (Darwin) +Comment: GPGTools - https://gpgtools.org + +iQEcBAABCgAGBQJSgkl4AAoJEPmMhMJCRDqheI8H+wX5rHJj5XXP11qbVi5wyhMh +bUYXdTgUeyho8DXb9eFg1KCoQQJWINW714vgnDCEsd4o3VzL6N5wVzGcR9ZtaGYw +XYirnT1PK0+2pd7qwr+QRmRvXcS336Tu+2vXf/LSTi2GOptgipQFSp/3Ub5Zav/o +ajCBw/5l7gf1UoZpy3Ql5z8EdeTgQU2ykWMQcZ8deG+VrTBYrnQr15YP6TQckRsz +JeiNNAfPgtKa1StZ/TbWkM0GkAGLfGBEbuDR+DbAmO1n6to/8jCU6HoWfSmqsPA+ +No0A4TqvsVMgqlpQyf3d8t7qv87tRcroqDjzioqGQ9mPQaT7yGlE1pDjXQ/PYDQ= +=vN/W +-END PGP SIGNATURE- Added: dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.md5 == --- dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.md5 (added) +++ dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.md5 Tue Nov 12 15:32:22 2013 @@ -0,0 +1,6 @@ +apache-cloudstack-4.2.1-src.tar.bz2: CC F4 8E + 76 0D 2C + C6 13 6F + 88 3F 23 + CE 9C 2B + 84 Added: dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.sha == --- dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.sha (added) +++ dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.sha Tue Nov 12 15:32:22 2013 @@ -0,0 +1,8 @@ +apache-cloudstack-4.2.1-src.tar.bz2: E93E20C4 4993FA02 + 5B868BDF D5B59D04 + DA54D871 FA46E365 + D289CE75 3A615B41 + 81EE06E4 F8F884D5 + D18B3FF7 4FAA1F17 + 880FB8FA E8F1A36B + 0E9F9276 8D126520
git commit: updated refs/heads/master to 67fc2f5
Updated Branches:
refs/heads/master 74153e4a7 -> 67fc2f53e
CLOUDSTACK-4916: Fixing the issue with DB HA when there are more than 2 db
nodes (Issue was mysql DriverManager was returning salve db nodes on random
basis which was causing issue)
Signed-off-by: Abhinandan Prateek
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/67fc2f53
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/67fc2f53
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/67fc2f53
Branch: refs/heads/master
Commit: 67fc2f53e2e197f2a8da3b7fc367de9dbe54bb93
Parents: 74153e4
Author: Damodar Reddy
Authored: Thu Nov 14 10:45:54 2013 +0530
Committer: Abhinandan Prateek
Committed: Thu Nov 14 11:10:48 2013 +0530
--
client/tomcatconf/db.properties.in | 1 +
framework/db/pom.xml| 5 +
.../src/com/cloud/utils/db/StaticStrategy.java | 130 +++
.../com/cloud/utils/db/TransactionLegacy.java | 8 +-
4 files changed, 140 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/67fc2f53/client/tomcatconf/db.properties.in
--
diff --git a/client/tomcatconf/db.properties.in
b/client/tomcatconf/db.properties.in
index 31e0803..b224cec 100644
--- a/client/tomcatconf/db.properties.in
+++ b/client/tomcatconf/db.properties.in
@@ -85,6 +85,7 @@ db.simulator.autoReconnect=true
# High Availability And Cluster Properties
db.ha.enabled=false
+db.ha.loadBalanceStrategy=com.cloud.utils.db.StaticStrategy
# cloud stack Database
db.cloud.slaves=localhost,localhost
db.cloud.autoReconnect=true
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/67fc2f53/framework/db/pom.xml
--
diff --git a/framework/db/pom.xml b/framework/db/pom.xml
index 5af00a0..e28628e 100644
--- a/framework/db/pom.xml
+++ b/framework/db/pom.xml
@@ -44,6 +44,11 @@
cloud-utils
${project.version}
+
+ mysql
+ mysql-connector-java
+ compile
+
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/67fc2f53/framework/db/src/com/cloud/utils/db/StaticStrategy.java
--
diff --git a/framework/db/src/com/cloud/utils/db/StaticStrategy.java
b/framework/db/src/com/cloud/utils/db/StaticStrategy.java
new file mode 100644
index 000..29e96df
--- /dev/null
+++ b/framework/db/src/com/cloud/utils/db/StaticStrategy.java
@@ -0,0 +1,130 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package com.cloud.utils.db;
+
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
+import com.mysql.jdbc.BalanceStrategy;
+import com.mysql.jdbc.Connection;
+import com.mysql.jdbc.ConnectionImpl;
+import com.mysql.jdbc.LoadBalancingConnectionProxy;
+import com.mysql.jdbc.SQLError;
+
+public class StaticStrategy implements BalanceStrategy {
+
+public StaticStrategy() {
+}
+
+public void destroy() {
+// we don't have anything to clean up
+}
+
+public void init(Connection conn, Properties props) throws SQLException {
+// we don't have anything to initialize
+}
+
+public ConnectionImpl pickConnection(LoadBalancingConnectionProxy proxy,
+List configuredHosts, Map
liveConnections, long[] responseTimes,
+int numRetries) throws SQLException {
+int numHosts = configuredHosts.size();
+
+SQLException ex = null;
+
+List whiteList = new ArrayList(numHosts);
+whiteList.addAll(configuredHosts);
+
+Map blackList = proxy.getGlobalBlacklist();
+
+whiteList.removeAll(blackList.keySet());
+
+Map whiteListMap = this.getArrayIndexMap(whiteList);
+
+
+for (int attempts = 0; attempts < numRetries;) {
+if(whiteList.size() == 0){
+
git commit: adding list of fixed issues
Updated Branches: refs/heads/master f18b6d824 -> 0bdf5c091 adding list of fixed issues Project: http://git-wip-us.apache.org/repos/asf/cloudstack-docs/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack-docs/commit/0bdf5c09 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs/tree/0bdf5c09 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs/diff/0bdf5c09 Branch: refs/heads/master Commit: 0bdf5c0911a0ac246774bb5d1d77c38ae86b9308 Parents: f18b6d8 Author: Abhinandan Prateek Authored: Wed Nov 20 16:32:05 2013 +0530 Committer: Abhinandan Prateek Committed: Wed Nov 20 16:32:41 2013 +0530 -- release-notes/en-US/Release_Notes.xml | 1142 1 file changed, 1142 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/0bdf5c09/release-notes/en-US/Release_Notes.xml -- diff --git a/release-notes/en-US/Release_Notes.xml b/release-notes/en-US/Release_Notes.xml index 39783b2..ed31de5 100644 --- a/release-notes/en-US/Release_Notes.xml +++ b/release-notes/en-US/Release_Notes.xml @@ -301,6 +301,1148 @@ under the License. For the list of issues fixed, see https://issues.apache.org/jira/issues/?filter=12325707";>Issues Fixed in 4.2.1. + +This section includes a summary of known issues were fixed in 4.2.1. Approximately 150 bugs were resolved or closed in the 4.2.1 cycle. + + + + + + + +Defect + + +Description + + + + + + + + CLOUDSTACK-3237 + + + [vmware][SM] Migrate volume is failing when there are snapshots for that volume + + + + + CLOUDSTACK-4300 + + + [upgrade][2.2.14 to 4.2][KVM] system vms are not coming up after upgrade + + + + + CLOUDSTACK-4405 + + + (Upgrade) Migrate failed between existing hosts and new hosts + + + + + CLOUDSTACK-4436 + + + Virtual Router fails to start on RHEL6.2 + + + + + CLOUDSTACK-4446 + + + AWSAPI server fails to start because of error in bean creation. + + + + + CLOUDSTACK-4464 + + + "Parallel deployment - Vmware - When deploying 30 parallel Vms , Vm fails to get deployed due to ""StartCommand failed due to Exception: javax.xml.ws.soap.SOAPFaultException""" + +
git commit: adding list of fixed issues
Updated Branches: refs/heads/4.2 ea17279a6 -> 00d19e324 adding list of fixed issues Project: http://git-wip-us.apache.org/repos/asf/cloudstack-docs/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack-docs/commit/00d19e32 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs/tree/00d19e32 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs/diff/00d19e32 Branch: refs/heads/4.2 Commit: 00d19e324fa117ed8d2debc165e6742be4aa4bd0 Parents: ea17279 Author: Abhinandan Prateek Authored: Wed Nov 20 16:32:05 2013 +0530 Committer: Abhinandan Prateek Committed: Wed Nov 20 16:34:35 2013 +0530 -- release-notes/en-US/Release_Notes.xml | 1142 1 file changed, 1142 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/00d19e32/release-notes/en-US/Release_Notes.xml -- diff --git a/release-notes/en-US/Release_Notes.xml b/release-notes/en-US/Release_Notes.xml index e3139d3..19c5810 100644 --- a/release-notes/en-US/Release_Notes.xml +++ b/release-notes/en-US/Release_Notes.xml @@ -301,6 +301,1148 @@ under the License. For the list of issues fixed, see https://issues.apache.org/jira/issues/?filter=12325707";>Issues Fixed in 4.2.1. + +This section includes a summary of known issues were fixed in 4.2.1. Approximately 150 bugs were resolved or closed in the 4.2.1 cycle. + + + + + + + +Defect + + +Description + + + + + + + + CLOUDSTACK-3237 + + + [vmware][SM] Migrate volume is failing when there are snapshots for that volume + + + + + CLOUDSTACK-4300 + + + [upgrade][2.2.14 to 4.2][KVM] system vms are not coming up after upgrade + + + + + CLOUDSTACK-4405 + + + (Upgrade) Migrate failed between existing hosts and new hosts + + + + + CLOUDSTACK-4436 + + + Virtual Router fails to start on RHEL6.2 + + + + + CLOUDSTACK-4446 + + + AWSAPI server fails to start because of error in bean creation. + + + + + CLOUDSTACK-4464 + + + "Parallel deployment - Vmware - When deploying 30 parallel Vms , Vm fails to get deployed due to ""StartCommand failed due to Exception: javax.xml.ws.soap.SOAPFaultException""" + +
[2/2] git commit: adding list of known issues to RN
adding list of known issues to RN Project: http://git-wip-us.apache.org/repos/asf/cloudstack-docs/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack-docs/commit/e567ef93 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs/tree/e567ef93 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs/diff/e567ef93 Branch: refs/heads/4.2 Commit: e567ef93ac4370388d71675c117fff8e89f69ef7 Parents: b4e421e Author: Abhinandan Prateek Authored: Wed Nov 20 19:07:42 2013 +0530 Committer: Abhinandan Prateek Committed: Wed Nov 20 19:07:42 2013 +0530 -- release-notes/en-US/Release_Notes.xml | 2588 1 file changed, 1462 insertions(+), 1126 deletions(-) --
git commit: updated refs/heads/master to ab39b65
Updated Branches:
refs/heads/master 426f56494 -> ab39b658a
added valid values for system.vm.default.hypervisor in desc
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ab39b658
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ab39b658
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ab39b658
Branch: refs/heads/master
Commit: ab39b658ad84e400a543a7b8a0c001600a603cad
Parents: 426f564
Author: Abhinandan Prateek
Authored: Thu Nov 28 09:24:32 2013 +0530
Committer: Abhinandan Prateek
Committed: Thu Nov 28 09:24:32 2013 +0530
--
server/src/com/cloud/configuration/Config.java | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ab39b658/server/src/com/cloud/configuration/Config.java
--
diff --git a/server/src/com/cloud/configuration/Config.java
b/server/src/com/cloud/configuration/Config.java
index f2debe7..1490926 100755
--- a/server/src/com/cloud/configuration/Config.java
+++ b/server/src/com/cloud/configuration/Config.java
@@ -703,7 +703,13 @@ public enum Config {
"true",
"Indicates whether or not to automatically reserver system VM
standby capacity.",
null),
-SystemVMDefaultHypervisor("Advanced", ManagementServer.class,
String.class, "system.vm.default.hypervisor", null, "Hypervisor type used to
create system vm", null),
+SystemVMDefaultHypervisor("Advanced",
+ManagementServer.class,
+String.class,
+"system.vm.default.hypervisor",
+null,
+"Hypervisor type used to create system vm, valid values are:
XenServer, KVM, VMware, Hyperv, VirtualBox, Parralels, BareMetal, Ovm, LXC,
Any",
+null),
SystemVMRandomPassword(
"Advanced",
ManagementServer.class,
git commit: updated refs/heads/master to 36201b9
Updated Branches:
refs/heads/master 6bda2739c -> 36201b977
Fix issue with sourceCidr not being passed to the VRouter on start.
Signed-off-by: Abhinandan Prateek
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/36201b97
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/36201b97
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/36201b97
Branch: refs/heads/master
Commit: 36201b9776d3e48fd7832a4dc21136f83524379f
Parents: 6bda273
Author: Hugo Trippaers
Authored: Mon Nov 25 22:55:12 2013 +0100
Committer: Abhinandan Prateek
Committed: Fri Nov 29 13:20:12 2013 +0530
--
.../network/router/VirtualNetworkApplianceManagerImpl.java | 9 -
1 file changed, 4 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/36201b97/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
--
diff --git
a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index 4bbc872..d5b9d3c 100755
---
a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++
b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -202,6 +202,7 @@ import com.cloud.network.router.VirtualRouter.Role;
import com.cloud.network.rules.FirewallRule;
import com.cloud.network.rules.FirewallRule.Purpose;
import com.cloud.network.rules.LoadBalancerContainer.Scheme;
+import com.cloud.network.rules.FirewallRuleVO;
import com.cloud.network.rules.PortForwardingRule;
import com.cloud.network.rules.RulesManager;
import com.cloud.network.rules.StaticNat;
@@ -2788,9 +2789,6 @@ public class VirtualNetworkApplianceManagerImpl extends
ManagerBase implements V
UserVmVO vm = _userVmDao.findById(profile.getId());
_userVmDao.loadDetails(vm);
-final boolean isZoneBasic = (dest.getDataCenter().getNetworkType() ==
NetworkType.Basic);
-final Long podId = isZoneBasic ? dest.getPod().getId() : null;
-
//Asuming we have only one router per network For Now.
DomainRouterVO router = routers.get(0);
if (router.getState() != State.Running) {
@@ -2820,7 +2818,7 @@ public class VirtualNetworkApplianceManagerImpl extends
ManagerBase implements V
if (ipInVmsubnet == false) {
try {
if (network.getTrafficType() == TrafficType.Guest &&
network.getGuestType() == GuestType.Shared) {
-Pod pod = _podDao.findById(vm.getPodIdToDeployIn());
+_podDao.findById(vm.getPodIdToDeployIn());
Account caller =
CallContext.current().getCallingAccount();
List vlanList =
_vlanDao.listVlansByNetworkIdAndGateway(network.getId(), nic.getGateway());
List vlanDbIdList = new ArrayList();
@@ -3471,7 +3469,7 @@ public class VirtualNetworkApplianceManagerImpl extends
ManagerBase implements V
ipList.add(DhcpTO);
ipAliasVO.setVmId(router.getId());
}
-DataCenterVO dcvo = _dcDao.findById(router.getDataCenterId());
+_dcDao.findById(router.getDataCenterId());
DnsMasqConfigCommand dnsMasqConfigCmd = new
DnsMasqConfigCommand(ipList);
dnsMasqConfigCmd.setAccessDetail(NetworkElementCommand.ROUTER_IP,
getRouterControlIp(router.getId()));
dnsMasqConfigCmd.setAccessDetail(NetworkElementCommand.ROUTER_NAME,
router.getInstanceName());
@@ -3719,6 +3717,7 @@ public class VirtualNetworkApplianceManagerImpl extends
ManagerBase implements V
}
rulesTO = new ArrayList();
for (FirewallRule rule : rules) {
+_rulesDao.loadSourceCidrs((FirewallRuleVO)rule);
FirewallRule.TrafficType traffictype = rule.getTrafficType();
if (traffictype == FirewallRule.TrafficType.Ingress) {
IpAddress sourceIp =
_networkModel.getIp(rule.getSourceIpAddressId());
git commit: updated refs/heads/4.2 to 224c48a
Updated Branches:
refs/heads/4.2 04adfe431 -> 224c48a76
Fix issue with sourceCidr not being passed to the VRouter on start
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/224c48a7
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/224c48a7
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/224c48a7
Branch: refs/heads/4.2
Commit: 224c48a76e3325598dda3d4eec95249fedfad5b3
Parents: 04adfe4
Author: Abhinandan Prateek
Authored: Fri Nov 29 14:15:12 2013 +0530
Committer: Abhinandan Prateek
Committed: Fri Nov 29 14:15:12 2013 +0530
--
.../network/router/VirtualNetworkApplianceManagerImpl.java| 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/224c48a7/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
--
diff --git
a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index 2baf35b..13dfb01 100755
---
a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++
b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -189,6 +189,7 @@ import com.cloud.network.rules.StaticNat;
import com.cloud.network.rules.StaticNatImpl;
import com.cloud.network.rules.StaticNatRule;
import com.cloud.network.rules.dao.PortForwardingRulesDao;
+import com.cloud.network.rules.FirewallRuleVO;
import com.cloud.network.vpn.Site2SiteVpnManager;
import com.cloud.offering.NetworkOffering;
import com.cloud.offering.ServiceOffering;
@@ -2794,12 +2795,11 @@ public class VirtualNetworkApplianceManagerImpl extends
ManagerBase implements V
}
@Override
-public boolean configDhcpForSubnet(Network network, final NicProfile nic,
VirtualMachineProfile profile, DeployDestination dest,
List routers) throws ResourceUnavailableException {
+public boolean configDhcpForSubnet(Network network, final NicProfile nic,
VirtualMachineProfile profile, DeployDestination dest,
List routers)
+throws ResourceUnavailableException {
_userVmDao.loadDetails((UserVmVO) profile.getVirtualMachine());
final VirtualMachineProfile updatedProfile = profile;
-final boolean isZoneBasic = (dest.getDataCenter().getNetworkType() ==
NetworkType.Basic);
-final Long podId = isZoneBasic ? dest.getPod().getId() : null;
//Asuming we have only one router per network For Now.
DomainRouterVO router = routers.get(0);
@@ -3732,6 +3732,7 @@ public class VirtualNetworkApplianceManagerImpl extends
ManagerBase implements V
}
rulesTO = new ArrayList();
for (FirewallRule rule : rules) {
+_rulesDao.loadSourceCidrs((FirewallRuleVO)rule);
FirewallRule.TrafficType traffictype = rule.getTrafficType();
if(traffictype == FirewallRule.TrafficType.Ingress){
IpAddress sourceIp =
_networkModel.getIp(rule.getSourceIpAddressId());
svn commit: r3803 - in /dev/cloudstack/4.2.1: apache-cloudstack-4.2.1-src.tar.bz2 apache-cloudstack-4.2.1-src.tar.bz2.asc apache-cloudstack-4.2.1-src.tar.bz2.md5 apache-cloudstack-4.2.1-src.tar.bz2.sh
Author: aprateek Date: Tue Dec 3 07:13:37 2013 New Revision: 3803 Log: Committing release candidate artifacts for 4.2.1 to dist/dev/cloudstack in preparation for release vote Added: dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2 (with props) dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.asc dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.md5 dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.sha Added: dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2 == Binary file - no diff available. Propchange: dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2 -- svn:mime-type = application/octet-stream Added: dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.asc == --- dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.asc (added) +++ dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.asc Tue Dec 3 07:13:37 2013 @@ -0,0 +1,12 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG/MacGPG2 v2.0.22 (Darwin) +Comment: GPGTools - https://gpgtools.org + +iQEcBAABCgAGBQJSnYMEAAoJEPmMhMJCRDqheZsH/iO8bZLJjBBLcO8RAFb1rc8N +SAKrdjGS5JunTWFoa8X8oAOhzOY+CSyy0JewY2DdebjDYZ2wkap9pHZTF5NW6x7M +fbpCmp92OKeBuhmbYIMAbbdHh14G2W5vCT4v8ktPZA6yH7WXjSEvcWJmo6HFxX26 +8JePephLTFSU6D8zgCqmk3HlE/Ou/2YsGkxyft78FB2003D2VydyVgjIY4Ek3Okm +SUmEYPLE1Kc2bws+XqghTsT4k3QKhBmFoZPGagfyuYwbFJfej1Fm6oU+5/lBUaV4 +YHmNe+2/eZ0/LHoVOh4Ov6fAWJMFzjESC61L8wcwBUieNHJS3m8gTSQ/4FySnPo= +=sY16 +-END PGP SIGNATURE- Added: dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.md5 == --- dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.md5 (added) +++ dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.md5 Tue Dec 3 07:13:37 2013 @@ -0,0 +1,6 @@ +apache-cloudstack-4.2.1-src.tar.bz2: 9A 00 CA + 87 BA 0E + B0 F7 43 + 6C FF 21 + 6D 0E 0A + 9D Added: dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.sha == --- dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.sha (added) +++ dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.sha Tue Dec 3 07:13:37 2013 @@ -0,0 +1,8 @@ +apache-cloudstack-4.2.1-src.tar.bz2: B5D8DCF3 BEFABB7C + F7BA6B95 AE1EC944 + 2D90ED39 52BDF258 + 90C5B8EB 0B6E1DC4 + 9E9C94E2 B562C69E + 577C4DCC F96F3265 + 80C5D95D 16BEA14C + 1A31F2BB DCF8106B
svn commit: r3806 - in /dev/cloudstack/4.2.1: apache-cloudstack-4.2.1-src.tar.bz2 apache-cloudstack-4.2.1-src.tar.bz2.asc apache-cloudstack-4.2.1-src.tar.bz2.md5 apache-cloudstack-4.2.1-src.tar.bz2.sh
Author: aprateek Date: Tue Dec 3 09:29:07 2013 New Revision: 3806 Log: Committing release candidate artifacts for 4.2.1 to dist/dev/cloudstack in preparation for release vote Added: dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2 (with props) dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.asc dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.md5 dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.sha Added: dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2 == Binary file - no diff available. Propchange: dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2 -- svn:mime-type = application/octet-stream Added: dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.asc == --- dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.asc (added) +++ dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.asc Tue Dec 3 09:29:07 2013 @@ -0,0 +1,12 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG/MacGPG2 v2.0.22 (Darwin) +Comment: GPGTools - https://gpgtools.org + +iQEcBAABCgAGBQJSnaLlAAoJEPmMhMJCRDqhc4YIAIsQxzRu79rZY/xi7b6PG0Aa +M8QlMU0OTP0MfVKRh9+j82QNpUzzPx2S6LnbnWp0Poefw9B9Bg8wFVP/FH3XP90Z +FqZiaW+7ynh/X4Ueu9AXZMCI8PLSdEXAmleAlyF1u+8rt/eSOppwayFrl2IFWauI +4zkaEkDstyLmk58y7beGCECpQ6Q8DhEad0bmsz8808OAuVJiBtv3Qv7ez62361G0 +4GpFwtZTvFnGTp+haczk0a+ODVY3cZzju8EePmcSkVfOGjRgTMQvAipTX32CsS/d +Q0v6FLbTpfYlVj29Ax++cl1JDzAGHPWOrcFyrBgoQDKMjk/pkAPZvSU7fz0gRdk= +=2UkR +-END PGP SIGNATURE- Added: dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.md5 == --- dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.md5 (added) +++ dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.md5 Tue Dec 3 09:29:07 2013 @@ -0,0 +1,6 @@ +apache-cloudstack-4.2.1-src.tar.bz2: 6E A4 71 + 8C 62 67 + 25 EE 47 + A8 B8 F5 + 77 87 8A + FC Added: dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.sha == --- dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.sha (added) +++ dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.sha Tue Dec 3 09:29:07 2013 @@ -0,0 +1,8 @@ +apache-cloudstack-4.2.1-src.tar.bz2: 21A3C7C9 19F46B8E + A415F830 6824E31E + C66BEAE8 2EA60A0B + 19CD1251 50270424 + 851C7C3B FC81CE79 + 3E4BCCA2 DB205757 + D66E4645 5A3F1A97 + 36AF0048 65BB0FB0
svn commit: r3816 - in /dev/cloudstack/4.2.1: apache-cloudstack-4.2.1-src.tar.bz2 apache-cloudstack-4.2.1-src.tar.bz2.asc apache-cloudstack-4.2.1-src.tar.bz2.md5 apache-cloudstack-4.2.1-src.tar.bz2.sh
Author: aprateek Date: Tue Dec 3 12:16:15 2013 New Revision: 3816 Log: Committing release candidate artifacts for 4.2.1 to dist/dev/cloudstack in preparation for release vote Added: dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2 (with props) dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.asc dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.md5 dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.sha Added: dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2 == Binary file - no diff available. Propchange: dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2 -- svn:mime-type = application/octet-stream Added: dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.asc == --- dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.asc (added) +++ dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.asc Tue Dec 3 12:16:15 2013 @@ -0,0 +1,12 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG/MacGPG2 v2.0.22 (Darwin) +Comment: GPGTools - https://gpgtools.org + +iQEcBAABCgAGBQJSncqIAAoJEPmMhMJCRDqhFakH/j8J9tSLPpuwK15E9a9pGCzf +YLrGx3yRD0g20lcuGuQbmN4tz1fIaPb5HOh+m1XEfbemYqbADjTWpyFHgdn2uxmm +aHQvLDB/1yMcNjoIkL4pww8wb6eZPFyTVe5LgxWdkmQbI0iTdjmpE9TTWHDh5G5e +YmUsorDTJ0v9ZV8+iDY6DPSHEUg3DUT9xmm4yBfQxtfFxgtNi1G18kudDwXHdw+u +Kvgs2IqqMbPTl8pzC6kleNFrfUhOgHVnxYla83WNZOS5wb/J4MQpD4MWtwqbhBzE +TvXN8kTLMeroHZWlMbDzoiKVjOeAgC1fiLIreG1qi93NveDcKhZSF1QcL/8Q8x4= +=uQaK +-END PGP SIGNATURE- Added: dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.md5 == --- dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.md5 (added) +++ dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.md5 Tue Dec 3 12:16:15 2013 @@ -0,0 +1,6 @@ +apache-cloudstack-4.2.1-src.tar.bz2: 94 47 B4 + E6 E2 6E + F5 C1 59 + F0 F1 67 + CD 35 DB + F7 Added: dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.sha == --- dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.sha (added) +++ dev/cloudstack/4.2.1/apache-cloudstack-4.2.1-src.tar.bz2.sha Tue Dec 3 12:16:15 2013 @@ -0,0 +1,8 @@ +apache-cloudstack-4.2.1-src.tar.bz2: 6D7D5B04 1B4DAAA8 + 89AEA81A 87440CA9 + 8671669A 37A80CDC + 3CC30D2B 60C5F190 + 6172C58C A84021E6 + 39E202B4 87120C36 + B2578138 B3898959 + 9978F4E7 FE5BC1F1
git commit: updated refs/heads/4.2 to 3571b2c
Updated Branches: refs/heads/4.2 3c561c6d7 -> 3571b2c6a updated the fixed issue list Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3571b2c6 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3571b2c6 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3571b2c6 Branch: refs/heads/4.2 Commit: 3571b2c6afc374e5af67646e70d28e02c0da07b7 Parents: 3c561c6 Author: Abhinandan Prateek Authored: Wed Dec 4 09:33:30 2013 +0530 Committer: Abhinandan Prateek Committed: Wed Dec 4 09:33:30 2013 +0530 -- CHANGES | 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3571b2c6/CHANGES -- diff --git a/CHANGES b/CHANGES index 0c05c10..fac4f76 100644 --- a/CHANGES +++ b/CHANGES @@ -7,7 +7,7 @@ http://cloudstack.apache.org/docs Version 4.2.1 -New Features: +Important Fixes: *CLOUDSTACK-4817: Configurable option to choose single vs multipart upload for S3 API *CLOUDSTACK-4717: Allow network with public IP Address without needing SourceNAT @@ -16,9 +16,7 @@ New Features: *CLOUDSTACK-3677: Xenserver VMSnapshot *CLOUDSTACK-723: UCS rework -Fixed Issues Filter: - -https://issues.apache.org/jira/issues/?filter=12325707 +The exhaustive list of known issues and fixes is in Release Notes. Version 4.2.0
[2/3] git commit: updated refs/heads/master-6-17-stable to b8b786d
Cloudstack-2621 [Multiple_IP_Ranges] Failed to delete guest IP range from a new
subnet
Signed-off-by: Abhinandan Prateek
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d512368f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d512368f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d512368f
Branch: refs/heads/master-6-17-stable
Commit: d512368f452fb42c1d72ce77b13815e19fed2c69
Parents: cd89ff7
Author: Bharat Kumar
Authored: Mon Jun 17 14:55:13 2013 +0530
Committer: Abhinandan Prateek
Committed: Fri Jun 21 14:23:43 2013 +0530
--
.../configuration/ConfigurationManagerImpl.java | 133 ++-
.../VirtualNetworkApplianceManagerImpl.java | 3 +-
2 files changed, 72 insertions(+), 64 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d512368f/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
--
diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
index 6dac26c..97f0d33 100755
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -2906,6 +2906,13 @@ public class ConfigurationManagerImpl extends
ManagerBase implements Configurati
return vlan;
}
+public boolean removeFromDb (long vlanDbId){
+if (!deletePublicIPRange(vlanDbId)) {
+return false;
+}
+return _vlanDao.expunge(vlanDbId);
+}
+
@Override
@DB
public boolean deleteVlanAndPublicIpRange(long userId, long vlanDbId,
Account caller) {
@@ -2979,49 +2986,60 @@ public class ConfigurationManagerImpl extends
ManagerBase implements Configurati
Network network =
_networkDao.findById(vlanRange.getNetworkId());
DhcpServiceProvider dhcpServiceProvider =
_networkMgr.getDhcpServiceProvider(network);
if
(!dhcpServiceProvider.getProvider().getName().equalsIgnoreCase(Provider.VirtualRouter.getName()))
{
-if (!deletePublicIPRange(vlanDbId)) {
+Transaction txn = Transaction.currentTxn();
+txn.start();
+if (!removeFromDb(vlanDbId)) {
+txn.rollback();
return false;
}
-_vlanDao.expunge(vlanDbId);
-return true;
-}
-//search if the vlan has any allocated ips.
-boolean aliasIpBelongsToThisVlan = false;
-long freeIpsInsubnet = 0;
-NicIpAliasVO ipAlias = null;
-allocIpCount =
_publicIpAddressDao.countIPs(vlanRange.getDataCenterId(), vlanDbId, true);
-if (allocIpCount > 1) {
-throw new InvalidParameterValueException ("cannot delete
this range as some of the vlans are in use.");
-}
-if (allocIpCount == 0){
-//remove the vlan range.
-if (!deletePublicIPRange(vlanDbId)) {
-return false;
+else {
+txn.commit();
}
-_vlanDao.expunge(vlanDbId);
-return true;
+txn.close();
}
-//check if this allocated ip is being used as an ipAlias on
the router.
+else {
+ return handleIpAliasDeletion(vlanRange, vlanDbId,
dhcpServiceProvider, network);
+}
+}
+}
+return true;
+}
+
+private boolean handleIpAliasDeletion(VlanVO vlanRange, long vlanDbId,
DhcpServiceProvider dhcpServiceProvider, Network network) {
+boolean result_final = false;
+Transaction txn = Transaction.currentTxn();
+txn.start();
+IPAddressVO ip = null;
+NicIpAliasVO ipAlias = null;
+try{
+Integer allocIpCount=0;
+//search if the vlan has any allocated ips.
+allocIpCount =
_publicIpAddressDao.countIPs(vlanRange.getDataCenterId(), vlanDbId, true);
+if (allocIpCount > 1) {
+throw new InvalidParameterValueException ("cannot delete this
range as some of the vlans are in use.");
+}
+if (allocIpCount == 0){
+result_final=true;
+}
+else {
ipAlias =
_nicIpAliasDao.findByGatewayAndNetworkIdAndState(vlanRange.getVlanGateway(),
vlanRange.getNetworkId(), NicIpAlias.state.active);
+ipAlias.setState(NicIpAlias.s
[1/3] git commit: updated refs/heads/master-6-17-stable to b8b786d
Updated Branches:
refs/heads/master-6-17-stable 20d05d684 -> b8b786d66
Cloudstack-2644 [Multiple_IP_Ranges] user data service on VR does not work in
case of multiple subnets Cloudstack-2953 [Multiple_IP_Ranges] VM does not get
the public key from VR incase of multiple subnets per vlan Also removed some
unused code and fixed the an error in the dnsmasq config function
Signed-off-by: Abhinandan Prateek
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/cd89ff72
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/cd89ff72
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/cd89ff72
Branch: refs/heads/master-6-17-stable
Commit: cd89ff72412192f847b67fa60d01ed5ef8c52a4f
Parents: 20d05d6
Author: Bharat Kumar
Authored: Wed Jun 19 11:53:48 2013 +0530
Committer: Abhinandan Prateek
Committed: Fri Jun 21 14:23:27 2013 +0530
--
.../debian/config/etc/init.d/cloud-early-config | 2 +
.../VirtualNetworkApplianceManagerImpl.java | 3 +-
server/src/com/cloud/vm/dao/NicIpAliasDao.java | 1 -
.../src/com/cloud/vm/dao/NicIpAliasDaoImpl.java | 9 -
setup/bindir/cloud-set-guest-sshkey.in | 39 +---
5 files changed, 14 insertions(+), 40 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cd89ff72/patches/systemvm/debian/config/etc/init.d/cloud-early-config
--
diff --git a/patches/systemvm/debian/config/etc/init.d/cloud-early-config
b/patches/systemvm/debian/config/etc/init.d/cloud-early-config
index 0dcd571..b215271 100755
--- a/patches/systemvm/debian/config/etc/init.d/cloud-early-config
+++ b/patches/systemvm/debian/config/etc/init.d/cloud-early-config
@@ -540,6 +540,8 @@ setup_dnsmasq() {
NS6=${NS6%?}
[ $ETH0_IP ] && echo "dhcp-option=6,$NS" >> /etc/dnsmasq.conf
[ $ETH0_IP6 ] && echo "dhcp-option=option6:dns-server,$NS6" >>
/etc/dnsmasq.conf
+#adding the name data-server to the /etc/hosts for allowing the access to
user-data service and ssh-key reset in every subnet.
+ echo "$ETH0_IP data-server" >> /etc/hosts
}
setup_sshd(){
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cd89ff72/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
--
diff --git
a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index acf73da..16e01c9 100755
---
a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++
b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -3428,7 +3428,7 @@ public class VirtualNetworkApplianceManagerImpl extends
ManagerBase implements V
private void configDnsMasq(VirtualRouter router, Network network, Commands
cmds) {
DataCenterVO dcVo = _dcDao.findById(router.getDataCenterId());
-List ipAliasVOList =
_nicIpAliasDao.getAliasIpForVm(router.getId());
+List ipAliasVOList =
_nicIpAliasDao.listByNetworkIdAndState(network.getId(),
NicIpAlias.state.active);
List ipList = new ArrayList();
NicVO router_guest_nic =
_nicDao.findByNtwkIdAndInstanceId(network.getId(), router.getId());
@@ -3442,6 +3442,7 @@ public class VirtualNetworkApplianceManagerImpl extends
ManagerBase implements V
for (NicIpAliasVO ipAliasVO : ipAliasVOList) {
DnsmasqTO dnsmasqTO = new DnsmasqTO(ipAliasVO.getIp4Address(),
ipAliasVO.getGateway(), ipAliasVO.getNetmask(), ipAliasVO.getStartIpOfSubnet());
ipList.add(dnsmasqTO);
+ ipAliasVO.setVmId(router.getId());
}
DataCenterVO dcvo = _dcDao.findById(router.getDataCenterId());
DnsMasqConfigCommand dnsMasqConfigCmd = new
DnsMasqConfigCommand(network.getNetworkDomain(),ipList, dcvo.getDns1(),
dcvo.getDns2(), dcvo.getInternalDns1(), dcvo.getInternalDns2());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cd89ff72/server/src/com/cloud/vm/dao/NicIpAliasDao.java
--
diff --git a/server/src/com/cloud/vm/dao/NicIpAliasDao.java
b/server/src/com/cloud/vm/dao/NicIpAliasDao.java
index f1e4b8e..2a0da92 100644
--- a/server/src/com/cloud/vm/dao/NicIpAliasDao.java
+++ b/server/src/com/cloud/vm/dao/NicIpAliasDao.java
@@ -57,5 +57,4 @@ public interface NicIpAliasDao extends
GenericDao {
List listByNetworkIdAndState(long networkId,
NicIpAlias.state state);
-List listByNetworkIdAndAliasIpAndState(long networkId,
String aliasIpOfSubnet, NicIpAlias.state state);
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cd89ff72/server/src/com/cloud
[3/3] git commit: updated refs/heads/master-6-17-stable to b8b786d
Cloudstack-2938 [Multiple_IP_Ranges] Password Service does not work in case of
multiple subnets in a vlan
Signed-off-by: Abhinandan Prateek
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b8b786d6
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b8b786d6
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b8b786d6
Branch: refs/heads/master-6-17-stable
Commit: b8b786d6687ed21f43bcb9c48cb2edcec416d7d9
Parents: d512368
Author: Bharat Kumar
Authored: Wed Jun 19 11:58:08 2013 +0530
Committer: Abhinandan Prateek
Committed: Fri Jun 21 14:23:55 2013 +0530
--
patches/systemvm/debian/config/root/createIpAlias.sh | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b8b786d6/patches/systemvm/debian/config/root/createIpAlias.sh
--
diff --git a/patches/systemvm/debian/config/root/createIpAlias.sh
b/patches/systemvm/debian/config/root/createIpAlias.sh
index 2c79813..1db210b 100755
--- a/patches/systemvm/debian/config/root/createIpAlias.sh
+++ b/patches/systemvm/debian/config/root/createIpAlias.sh
@@ -32,4 +32,7 @@ do
netmask=$(echo $var1 | cut -f3 -d ":")
ifconfig eth0:$alias_count $routerip netmask $netmask up
var=$( echo $var | sed "s/${var1}-//" )
-done
\ No newline at end of file
+done
+#restaring the password service to enable it on the ip aliases
+/etc/init.d/cloud-passwd-srvr restart
+exit $?
\ No newline at end of file
git commit: updated refs/heads/master to 59d7c94
Updated Branches:
refs/heads/master d22306344 -> 59d7c9424
CLOUDSTACK-3136: added Centsor 6.3 and Ubuntu 11.04 guest OS for Xen 6.1
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/59d7c942
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/59d7c942
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/59d7c942
Branch: refs/heads/master
Commit: 59d7c942470b9f07cc8abc257b739fe6a5d4f17e
Parents: d223063
Author: Abhinandan Prateek
Authored: Sat Jun 22 16:04:55 2013 +0530
Committer: Abhinandan Prateek
Committed: Sat Jun 22 16:04:55 2013 +0530
--
.../xen/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java | 4
setup/db/templates.sql | 5 +
2 files changed, 9 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/59d7c942/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java
--
diff --git
a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java
b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java
index 0f71c7b..8157de2 100644
---
a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java
+++
b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java
@@ -660,6 +660,8 @@ public class CitrixHelper {
_xenServer610GuestOsMap.put("CentOS 6.1 (64-bit)", "CentOS 6
(64-bit)");
_xenServer610GuestOsMap.put("CentOS 6.2 (32-bit)", "CentOS 6
(32-bit)");
_xenServer610GuestOsMap.put("CentOS 6.2 (64-bit)", "CentOS 6
(64-bit)");
+_xenServer610GuestOsMap.put("CentOS 6.3 (32-bit)", "CentOS 6
(32-bit)");
+_xenServer610GuestOsMap.put("CentOS 6.3 (64-bit)", "CentOS 6
(64-bit)");
_xenServer610GuestOsMap.put("Debian GNU/Linux 6(32-bit)", "Debian
Squeeze 6.0 (32-bit)");
_xenServer610GuestOsMap.put("Debian GNU/Linux 6(64-bit)", "Debian
Squeeze 6.0 (64-bit)");
_xenServer610GuestOsMap.put("Oracle Enterprise Linux 5.0 (32-bit)",
"Oracle Enterprise Linux 5 (32-bit)");
@@ -749,6 +751,8 @@ public class CitrixHelper {
_xenServer610GuestOsMap.put("Ubuntu 10.10 (64-bit)", "Ubuntu Maverick
Meerkat 10.10 (64-bit) (experimental)");
_xenServer610GuestOsMap.put("Ubuntu 12.04 (32-bit)", "Ubuntu Precise
Pangolin 12.04 (32-bit)");
_xenServer610GuestOsMap.put("Ubuntu 12.04 (64-bit)", "Ubuntu Precise
Pangolin 12.04 (64-bit)");
+_xenServer610GuestOsMap.put("Ubuntu 11.04 (32-bit)", "Other install
media");
+_xenServer610GuestOsMap.put("Ubuntu 11.04 (64-bit)", "Other install
media");
_xenServer610GuestOsMap.put("Other Linux (32-bit)", "Other install
media");
_xenServer610GuestOsMap.put("Other Linux (64-bit)", "Other install
media");
_xenServer610GuestOsMap.put("Other (32-bit)", "Other install media");
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/59d7c942/setup/db/templates.sql
--
diff --git a/setup/db/templates.sql b/setup/db/templates.sql
index 1685dce..313a68d 100755
--- a/setup/db/templates.sql
+++ b/setup/db/templates.sql
@@ -219,6 +219,11 @@ INSERT INTO `cloud`.`guest_os` (id, uuid, category_id,
display_name) VALUES (166
INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES
(167, UUID(), 6, 'Windows Server 2012 (64-bit)');
INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES
(168, UUID(), 6, 'Windows Server 8 (64-bit)');
+INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (169,
10, 'Ubuntu 11.04 (32-bit)');
+INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (170,
10, 'Ubuntu 11.04 (64-bit)');
+INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (171, 1,
'CentOS 6.3 (32-bit)');
+INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (172, 1,
'CentOS 6.3 (64-bit)');
+
INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES
(200, UUID(), 1, 'Other CentOS (32-bit)');
INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES
(201, UUID(), 1, 'Other CentOS (64-bit)');
INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES
(202, UUID(), 5, 'Other SUSE Linux(32-bit)');
git commit: updated refs/heads/master-6-17-stable to 27506cd
Updated Branches:
refs/heads/master-6-17-stable b8dec054f -> 27506cd1e
CLOUDSTACK-3136: added Centsor 6.3 and Ubuntu 11.04 guest OS for Xen 6.1
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/27506cd1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/27506cd1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/27506cd1
Branch: refs/heads/master-6-17-stable
Commit: 27506cd1e85cce642f1425f7e984860ac7552f44
Parents: b8dec05
Author: Abhinandan Prateek
Authored: Sat Jun 22 16:04:55 2013 +0530
Committer: Abhinandan Prateek
Committed: Sat Jun 22 16:11:46 2013 +0530
--
.../xen/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java | 4
setup/db/templates.sql | 5 +
2 files changed, 9 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/27506cd1/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java
--
diff --git
a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java
b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java
index 0f71c7b..8157de2 100644
---
a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java
+++
b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java
@@ -660,6 +660,8 @@ public class CitrixHelper {
_xenServer610GuestOsMap.put("CentOS 6.1 (64-bit)", "CentOS 6
(64-bit)");
_xenServer610GuestOsMap.put("CentOS 6.2 (32-bit)", "CentOS 6
(32-bit)");
_xenServer610GuestOsMap.put("CentOS 6.2 (64-bit)", "CentOS 6
(64-bit)");
+_xenServer610GuestOsMap.put("CentOS 6.3 (32-bit)", "CentOS 6
(32-bit)");
+_xenServer610GuestOsMap.put("CentOS 6.3 (64-bit)", "CentOS 6
(64-bit)");
_xenServer610GuestOsMap.put("Debian GNU/Linux 6(32-bit)", "Debian
Squeeze 6.0 (32-bit)");
_xenServer610GuestOsMap.put("Debian GNU/Linux 6(64-bit)", "Debian
Squeeze 6.0 (64-bit)");
_xenServer610GuestOsMap.put("Oracle Enterprise Linux 5.0 (32-bit)",
"Oracle Enterprise Linux 5 (32-bit)");
@@ -749,6 +751,8 @@ public class CitrixHelper {
_xenServer610GuestOsMap.put("Ubuntu 10.10 (64-bit)", "Ubuntu Maverick
Meerkat 10.10 (64-bit) (experimental)");
_xenServer610GuestOsMap.put("Ubuntu 12.04 (32-bit)", "Ubuntu Precise
Pangolin 12.04 (32-bit)");
_xenServer610GuestOsMap.put("Ubuntu 12.04 (64-bit)", "Ubuntu Precise
Pangolin 12.04 (64-bit)");
+_xenServer610GuestOsMap.put("Ubuntu 11.04 (32-bit)", "Other install
media");
+_xenServer610GuestOsMap.put("Ubuntu 11.04 (64-bit)", "Other install
media");
_xenServer610GuestOsMap.put("Other Linux (32-bit)", "Other install
media");
_xenServer610GuestOsMap.put("Other Linux (64-bit)", "Other install
media");
_xenServer610GuestOsMap.put("Other (32-bit)", "Other install media");
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/27506cd1/setup/db/templates.sql
--
diff --git a/setup/db/templates.sql b/setup/db/templates.sql
index 1685dce..313a68d 100755
--- a/setup/db/templates.sql
+++ b/setup/db/templates.sql
@@ -219,6 +219,11 @@ INSERT INTO `cloud`.`guest_os` (id, uuid, category_id,
display_name) VALUES (166
INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES
(167, UUID(), 6, 'Windows Server 2012 (64-bit)');
INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES
(168, UUID(), 6, 'Windows Server 8 (64-bit)');
+INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (169,
10, 'Ubuntu 11.04 (32-bit)');
+INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (170,
10, 'Ubuntu 11.04 (64-bit)');
+INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (171, 1,
'CentOS 6.3 (32-bit)');
+INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (172, 1,
'CentOS 6.3 (64-bit)');
+
INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES
(200, UUID(), 1, 'Other CentOS (32-bit)');
INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES
(201, UUID(), 1, 'Other CentOS (64-bit)');
INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES
(202, UUID(), 5, 'Other SUSE Linux(32-bit)');
[1/4] git commit: updated refs/heads/master to c059153
Updated Branches:
refs/heads/master ea7b4467d -> c0591531d
CLOUDSTACK-2794: Global parameter "router.template.id" should be removed The
parameter was not in use. We use zone/global coonfigutaion parameters
router.template.xenserver/vmware/hyperv/kvm/lxc to deploy router
Signed-off-by: Abhinandan Prateek
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ec2bf092
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ec2bf092
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ec2bf092
Branch: refs/heads/master
Commit: ec2bf092847a12f0f29c26a01ecfc6add90fedb2
Parents: ea7b446
Author: Harikrishna Patnala
Authored: Tue Jun 25 12:43:31 2013 +0530
Committer: Abhinandan Prateek
Committed: Wed Jun 26 15:56:40 2013 +0530
--
.../cloud/agent/manager/AgentManagerImpl.java | 23 +++-
server/src/com/cloud/configuration/Config.java | 1 -
.../com/cloud/template/TemplateManagerImpl.java | 2 --
setup/db/db/schema-410to420.sql | 1 +
4 files changed, 14 insertions(+), 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec2bf092/server/src/com/cloud/agent/manager/AgentManagerImpl.java
--
diff --git a/server/src/com/cloud/agent/manager/AgentManagerImpl.java
b/server/src/com/cloud/agent/manager/AgentManagerImpl.java
index fb857a7..b24a238 100755
--- a/server/src/com/cloud/agent/manager/AgentManagerImpl.java
+++ b/server/src/com/cloud/agent/manager/AgentManagerImpl.java
@@ -126,16 +126,19 @@ import edu.emory.mathcs.backport.java.util.Collections;
/**
* Implementation of the Agent Manager. This class controls the connection to
the agents.
*
- * @config {@table || Param Name | Description | Values | Default || || port |
port to listen on for agent connection. | Integer
- * | 8250 || || workers | # of worker threads | Integer | 5 || ||
router.template.id | default id for template | Integer
- * | 1 || || router.ram.size | default ram for router vm in mb |
Integer | 128 || || router.ip.address | ip address for
- * the router | ip | 10.1.1.1 || || wait | Time to wait for control
commands to return | seconds | 1800 || || domain |
- * domain for domain routers| String | foo.com || || alert.wait | time
to wait before alerting on a disconnected agent |
- * seconds | 1800 || || update.wait | time to wait before alerting on
a updating agent | seconds | 600 || ||
- * ping.interval | ping interval in seconds | seconds | 60 || ||
instance.name | Name of the deployment String |
- * required || || start.retry | Number of times to retry start |
Number | 2 || || ping.timeout | multiplier to
- * ping.interval before announcing an agent has timed out | float |
2.0x || || router.stats.interval | interval to
- * report router statistics | seconds | 300s || * }
+ * @config {@table || Param Name | Description | Values | Default ||
+ * || port | port to listen on for agent connection. |
Integer | 8250 ||
+ * || workers | # of worker threads | Integer | 5 || ||
router.ram.size | default ram for router vm in mb | Integer | 128 ||
+ * || router.ip.address | ip address for the router | ip |
10.1.1.1 ||
+ * || wait | Time to wait for control commands to return |
seconds | 1800 ||
+ * || domain | domain for domain routers| String | foo.com ||
+ * || alert.wait | time to wait before alerting on a
disconnected agent | seconds | 1800 ||
+ * || update.wait | time to wait before alerting on a
updating agent | seconds | 600 ||
+ * || ping.interval | ping interval in seconds | seconds | 60
||
+ * || instance.name | Name of the deployment String |
required ||
+ * || start.retry | Number of times to retry start | Number |
2 ||
+ * || ping.timeout | multiplier to ping.interval before
announcing an agent has timed out | float | 2.0x ||
+ * || router.stats.interval | interval to report router
statistics | seconds | 300s || }
**/
@Local(value = { AgentManager.class })
public class AgentManagerImpl extends ManagerBase implements AgentManager,
HandlerFactory {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec2bf092/server/src/com/cloud/configuration/Config.java
--
diff --git a/server/src/com/cloud/configuration/Config.java
b/server/src/com/cloud/configuration/Config.java
index 3a6d3aa..ba50849 100755
--- a/server/src/com/cloud/configuration/Config.java
+++ b/server/src/com/cloud/configuration/Config.java
@@ -175,7 +175,6 @@ p
[3/4] git commit: updated refs/heads/master to c059153
CLOUDSTACK-2835: VR Deployement from admin registered template is failing
because registered template type is user. Additional parameter "isrouter" in
register/update template API for the root admin. True if registered template is
of type ROUTING.
Signed-off-by: Abhinandan Prateek
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9385cf04
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9385cf04
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9385cf04
Branch: refs/heads/master
Commit: 9385cf045359c9dd844548bdc701f4f614f37c68
Parents: 0d1f512
Author: Harikrishna Patnala
Authored: Mon Jun 24 16:31:33 2013 +0530
Committer: Abhinandan Prateek
Committed: Wed Jun 26 16:00:12 2013 +0530
--
api/src/com/cloud/storage/Storage.java | 1 +
.../org/apache/cloudstack/api/ApiConstants.java | 1 +
.../api/BaseUpdateTemplateOrIsoCmd.java | 7 +
.../user/template/RegisterTemplateCmd.java | 7 +
.../user/template/UpdateTemplateCmd.java| 1 +
.../cloud/storage/dao/VMTemplateDaoImpl.java| 19 --
.../com/cloud/upgrade/dao/Upgrade410to420.java | 24 +++--
.../com/cloud/server/ManagementServerImpl.java | 20 ++-
.../src/com/cloud/storage/TemplateProfile.java | 12 -
.../src/com/cloud/template/TemplateAdapter.java | 4 ++-
.../com/cloud/template/TemplateAdapterBase.java | 27 +++-
.../com/cloud/template/TemplateManagerImpl.java | 7 -
12 files changed, 110 insertions(+), 20 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9385cf04/api/src/com/cloud/storage/Storage.java
--
diff --git a/api/src/com/cloud/storage/Storage.java
b/api/src/com/cloud/storage/Storage.java
index 16ef019..9a50ffa 100755
--- a/api/src/com/cloud/storage/Storage.java
+++ b/api/src/com/cloud/storage/Storage.java
@@ -85,6 +85,7 @@ public class Storage {
}
public static enum TemplateType {
+ROUTING, // Router template
SYSTEM, /* routing, system vm template */
BUILTIN, /* buildin template */
PERHOST, /* every host has this template, don't need to install it in
secondary storage */
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9385cf04/api/src/org/apache/cloudstack/api/ApiConstants.java
--
diff --git a/api/src/org/apache/cloudstack/api/ApiConstants.java
b/api/src/org/apache/cloudstack/api/ApiConstants.java
index 8ac7c3f..809e023 100755
--- a/api/src/org/apache/cloudstack/api/ApiConstants.java
+++ b/api/src/org/apache/cloudstack/api/ApiConstants.java
@@ -511,6 +511,7 @@ public class ApiConstants {
public static final String ACL_ID = "aclid";
public static final String NUMBER = "number";
public static final String IS_DYNAMICALLY_SCALABLE =
"isdynamicallyscalable";
+public static final String ROUTING = "isrouting";
public enum HostDetails {
all, capacity, events, stats, min;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9385cf04/api/src/org/apache/cloudstack/api/BaseUpdateTemplateOrIsoCmd.java
--
diff --git a/api/src/org/apache/cloudstack/api/BaseUpdateTemplateOrIsoCmd.java
b/api/src/org/apache/cloudstack/api/BaseUpdateTemplateOrIsoCmd.java
index b01c8d0..a4c5bfa 100644
--- a/api/src/org/apache/cloudstack/api/BaseUpdateTemplateOrIsoCmd.java
+++ b/api/src/org/apache/cloudstack/api/BaseUpdateTemplateOrIsoCmd.java
@@ -57,6 +57,9 @@ public abstract class BaseUpdateTemplateOrIsoCmd extends
BaseCmd {
@Parameter(name = ApiConstants.IS_DYNAMICALLY_SCALABLE, type =
CommandType.BOOLEAN, description = "true if template/ISO contains XS/VMWare
tools inorder to support dynamic scaling of VM cpu/memory")
private Boolean isDynamicallyScalable;
+@Parameter(name = ApiConstants.ROUTING, type = CommandType.BOOLEAN,
description = "true if the template type is routing i.e., if template is used
to deploy router")
+protected Boolean isRoutingType;
+
/
/// Accessors ///
/
@@ -96,4 +99,8 @@ public abstract class BaseUpdateTemplateOrIsoCmd extends
BaseCmd {
public Boolean isDynamicallyScalable() {
return isDynamicallyScalable;
}
+
+public Boolean isRoutingType() {
+return isRoutingType;
+}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9385cf04/api/src/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java
---
[4/4] git commit: updated refs/heads/master to c059153
CLOUDSTACK-3187: cluster.(cpu/memory).allocated.capacity.disablethreshold in
not considering overcommit factor. cluster is getting disable based on actual
use
Signed-off-by: Abhinandan Prateek
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c0591531
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c0591531
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c0591531
Branch: refs/heads/master
Commit: c0591531d8f29505f2f53c008b6d3fb9d8399b94
Parents: 9385cf0
Author: Harikrishna Patnala
Authored: Tue Jun 25 17:34:24 2013 +0530
Committer: Abhinandan Prateek
Committed: Wed Jun 26 16:02:21 2013 +0530
--
.../com/cloud/capacity/dao/CapacityDaoImpl.java | 19 ---
1 file changed, 12 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c0591531/engine/schema/src/com/cloud/capacity/dao/CapacityDaoImpl.java
--
diff --git a/engine/schema/src/com/cloud/capacity/dao/CapacityDaoImpl.java
b/engine/schema/src/com/cloud/capacity/dao/CapacityDaoImpl.java
index d14ad87..cecc145 100755
--- a/engine/schema/src/com/cloud/capacity/dao/CapacityDaoImpl.java
+++ b/engine/schema/src/com/cloud/capacity/dao/CapacityDaoImpl.java
@@ -119,7 +119,7 @@ public class CapacityDaoImpl extends
GenericDaoBase implements
/* In the below query"LIST_CLUSTERS_CROSSING_THRESHOLD" the threshold
value is getting from the cluster_details table if not present then it gets
from the global configuration
*
* CASE statement works like
-* if (cluster_details table has thershold value)
+* if (cluster_details table has threshold value)
* then
* if (value from the cluster_details table is not null)
* then
@@ -132,15 +132,15 @@ public class CapacityDaoImpl extends
GenericDaoBase implements
* */
private static final String LIST_CLUSTERS_CROSSING_THRESHOLD = "SELECT
clusterList.cluster_id " +
"FROM ( SELECT cluster.cluster_id cluster_id, (
(sum(cluster.used) + sum(cluster.reserved) + ?)/sum(cluster.total) ) ratio,
cluster.configValue value " +
-"FROM (SELECT capacity.cluster_id
cluster_id, capacity.used_capacity used, capacity.reserved_capacity reserved,
capacity.total_capacity total, " +
+"FROM (SELECT capacity.cluster_id
cluster_id, capacity.used_capacity used, capacity.reserved_capacity reserved,
capacity.total_capacity * overcommit.value total, " +
"CASE (SELECT count(*) FROM
`cloud`.`cluster_details` details WHERE details.cluster_id =
capacity.cluster_id AND details.name = ? ) " +
"WHEN 1 THEN ( CASE WHEN
(SELECT details.value FROM `cloud`.`cluster_details` details WHERE
details.cluster_id = capacity.cluster_id AND details.name = ?) is NULL " +
"THEN
(SELECT config.value FROM `cloud`.`configuration` config WHERE config.name =
?)" +
"ELSE
(SELECT details.value FROM `cloud`.`cluster_details` details WHERE
details.cluster_id = capacity.cluster_id AND details.name = ? ) END )" +
"ELSE (SELECT
config.value FROM `cloud`.`configuration` config WHERE config.name = ?) " +
"END configValue " +
-"FROM `cloud`.`op_host_capacity`
capacity " +
-"WHERE capacity.data_center_id = ? AND
capacity.capacity_type = ? AND capacity.total_capacity > 0) cluster " +
+"FROM `cloud`.`op_host_capacity`
capacity INNER JOIN `cloud`.`cluster_details` overcommit ON
overcommit.cluster_id = capacity.cluster_id " +
+"WHERE capacity.data_center_id = ? AND
capacity.capacity_type = ? AND capacity.total_capacity > 0 AND overcommit.name
= ?) cluster " +
"GROUP BY cluster.cluster_id) clusterList " +
"WHERE clusterList.ratio > clusterList.value; ";
@@ -180,14 +180,19 @@ public class CapacityDaoImpl extends
GenericDaoBase implements
// we need to check with disabled thresholds of each cluster if not
defined at cluster consider the global value
try {
pstmt = txn.prepareAutoCloseStatement(sql.toString());
- pstmt.setLong(1,compute_requested);
+ pstmt.setLong(1, compute_requested);
pstmt.setString(2, configName);
pstmt.setStrin
[2/4] git commit: updated refs/heads/master to c059153
CLOUDSTACK-3208: showing xenhost username and password details in plain text in
logs when we pefrom removehost from CS
Signed-off-by: Abhinandan Prateek
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0d1f5127
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0d1f5127
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0d1f5127
Branch: refs/heads/master
Commit: 0d1f512728f909aec296bf0e1cfbcdcaf2f563f6
Parents: ec2bf09
Author: Harikrishna Patnala
Authored: Wed Jun 26 15:25:40 2013 +0530
Committer: Abhinandan Prateek
Committed: Wed Jun 26 15:57:31 2013 +0530
--
.../com/cloud/hypervisor/xen/resource/XenServerConnectionPool.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0d1f5127/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerConnectionPool.java
--
diff --git
a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerConnectionPool.java
b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerConnectionPool.java
index e4dd675..5af1781 100644
---
a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerConnectionPool.java
+++
b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerConnectionPool.java
@@ -550,7 +550,7 @@ public class XenServerConnectionPool {
}
} catch (UuidInvalid e) {
String msg = "Host(" + hostUuid + ") doesn't belong to
pool(" + poolUuid + "), please execute 'xe pool-join master-address=" +
mConn.getIp()
-+ " master-username=" + mConn.getUsername() + "
master-password=" + mConn.getPassword();
++ " master-username=" + mConn.getUsername();
if (s_logger.isDebugEnabled()) {
s_logger.debug(msg);
}
git commit: updated refs/heads/master-6-17-stable to ea0e93a
Updated Branches:
refs/heads/master-6-17-stable 1a77cdf94 -> ea0e93ad4
CLOUDSTACK-3208: showing xenhost username and password details in plain text in
logs when we pefrom removehost from CS
Signed-off-by: Abhinandan Prateek
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ea0e93ad
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ea0e93ad
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ea0e93ad
Branch: refs/heads/master-6-17-stable
Commit: ea0e93ad4f2925082799a76aa506d1d786bf9a0d
Parents: 1a77cdf
Author: Harikrishna Patnala
Authored: Wed Jun 26 15:25:40 2013 +0530
Committer: Abhinandan Prateek
Committed: Wed Jun 26 16:18:27 2013 +0530
--
.../com/cloud/hypervisor/xen/resource/XenServerConnectionPool.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ea0e93ad/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerConnectionPool.java
--
diff --git
a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerConnectionPool.java
b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerConnectionPool.java
index e4dd675..5af1781 100644
---
a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerConnectionPool.java
+++
b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerConnectionPool.java
@@ -550,7 +550,7 @@ public class XenServerConnectionPool {
}
} catch (UuidInvalid e) {
String msg = "Host(" + hostUuid + ") doesn't belong to
pool(" + poolUuid + "), please execute 'xe pool-join master-address=" +
mConn.getIp()
-+ " master-username=" + mConn.getUsername() + "
master-password=" + mConn.getPassword();
++ " master-username=" + mConn.getUsername();
if (s_logger.isDebugEnabled()) {
s_logger.debug(msg);
}
git commit: updated refs/heads/master-6-17-stable to 1a77cdf
Updated Branches:
refs/heads/master-6-17-stable e8c97823c -> 1a77cdf94
CLOUDSTACK-3187: cluster.(cpu/memory).allocated.capacity.disablethreshold in
not considering overcommit factor. cluster is getting disable based on actual
use
Signed-off-by: Abhinandan Prateek
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1a77cdf9
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1a77cdf9
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1a77cdf9
Branch: refs/heads/master-6-17-stable
Commit: 1a77cdf94687ba93b00a09774f0c5939e30e555f
Parents: e8c9782
Author: Harikrishna Patnala
Authored: Tue Jun 25 17:34:24 2013 +0530
Committer: Abhinandan Prateek
Committed: Wed Jun 26 16:17:53 2013 +0530
--
.../com/cloud/capacity/dao/CapacityDaoImpl.java | 19 ---
1 file changed, 12 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a77cdf9/engine/schema/src/com/cloud/capacity/dao/CapacityDaoImpl.java
--
diff --git a/engine/schema/src/com/cloud/capacity/dao/CapacityDaoImpl.java
b/engine/schema/src/com/cloud/capacity/dao/CapacityDaoImpl.java
index d14ad87..cecc145 100755
--- a/engine/schema/src/com/cloud/capacity/dao/CapacityDaoImpl.java
+++ b/engine/schema/src/com/cloud/capacity/dao/CapacityDaoImpl.java
@@ -119,7 +119,7 @@ public class CapacityDaoImpl extends
GenericDaoBase implements
/* In the below query"LIST_CLUSTERS_CROSSING_THRESHOLD" the threshold
value is getting from the cluster_details table if not present then it gets
from the global configuration
*
* CASE statement works like
-* if (cluster_details table has thershold value)
+* if (cluster_details table has threshold value)
* then
* if (value from the cluster_details table is not null)
* then
@@ -132,15 +132,15 @@ public class CapacityDaoImpl extends
GenericDaoBase implements
* */
private static final String LIST_CLUSTERS_CROSSING_THRESHOLD = "SELECT
clusterList.cluster_id " +
"FROM ( SELECT cluster.cluster_id cluster_id, (
(sum(cluster.used) + sum(cluster.reserved) + ?)/sum(cluster.total) ) ratio,
cluster.configValue value " +
-"FROM (SELECT capacity.cluster_id
cluster_id, capacity.used_capacity used, capacity.reserved_capacity reserved,
capacity.total_capacity total, " +
+"FROM (SELECT capacity.cluster_id
cluster_id, capacity.used_capacity used, capacity.reserved_capacity reserved,
capacity.total_capacity * overcommit.value total, " +
"CASE (SELECT count(*) FROM
`cloud`.`cluster_details` details WHERE details.cluster_id =
capacity.cluster_id AND details.name = ? ) " +
"WHEN 1 THEN ( CASE WHEN
(SELECT details.value FROM `cloud`.`cluster_details` details WHERE
details.cluster_id = capacity.cluster_id AND details.name = ?) is NULL " +
"THEN
(SELECT config.value FROM `cloud`.`configuration` config WHERE config.name =
?)" +
"ELSE
(SELECT details.value FROM `cloud`.`cluster_details` details WHERE
details.cluster_id = capacity.cluster_id AND details.name = ? ) END )" +
"ELSE (SELECT
config.value FROM `cloud`.`configuration` config WHERE config.name = ?) " +
"END configValue " +
-"FROM `cloud`.`op_host_capacity`
capacity " +
-"WHERE capacity.data_center_id = ? AND
capacity.capacity_type = ? AND capacity.total_capacity > 0) cluster " +
+"FROM `cloud`.`op_host_capacity`
capacity INNER JOIN `cloud`.`cluster_details` overcommit ON
overcommit.cluster_id = capacity.cluster_id " +
+"WHERE capacity.data_center_id = ? AND
capacity.capacity_type = ? AND capacity.total_capacity > 0 AND overcommit.name
= ?) cluster " +
"GROUP BY cluster.cluster_id) clusterList " +
"WHERE clusterList.ratio > clusterList.value; ";
@@ -180,14 +180,19 @@ public class CapacityDaoImpl extends
GenericDaoBase implements
// we need to check with disabled thresholds of each cluster if not
defined at cluster consider the global value
try {
pstmt = txn.prepareAutoCloseStatement(sql.toString());
- pstmt.setLong(1,compute_requested);
+ pstmt.setLong(1, compute
git commit: updated refs/heads/master-6-17-stable to 74c1687
Updated Branches:
refs/heads/master-6-17-stable 6b38d1465 -> 74c168757
Cloudstack-3106 Delete all ips except ipAlias. Cloudstack-3119 Shared network
removal doesn't cleanup corresponding IP ranges
Signed-off-by: Abhinandan Prateek
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/74c16875
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/74c16875
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/74c16875
Branch: refs/heads/master-6-17-stable
Commit: 74c1687574c4589a75714eaeb5204c07a7372ca1
Parents: 6b38d14
Author: Bharat Kumar
Authored: Fri Jun 28 14:14:43 2013 +0530
Committer: Abhinandan Prateek
Committed: Fri Jun 28 14:49:29 2013 +0530
--
engine/schema/src/com/cloud/dc/VlanVO.java | 4 +
.../src/com/cloud/network/dao/IPAddressDao.java | 6 +
.../com/cloud/network/dao/IPAddressDaoImpl.java | 23 +++
.../configuration/ConfigurationManagerImpl.java | 144 ++-
.../VirtualNetworkApplianceManagerImpl.java | 2 -
5 files changed, 77 insertions(+), 102 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/74c16875/engine/schema/src/com/cloud/dc/VlanVO.java
--
diff --git a/engine/schema/src/com/cloud/dc/VlanVO.java
b/engine/schema/src/com/cloud/dc/VlanVO.java
index af6b5fc..1d28896 100644
--- a/engine/schema/src/com/cloud/dc/VlanVO.java
+++ b/engine/schema/src/com/cloud/dc/VlanVO.java
@@ -193,4 +193,8 @@ public class VlanVO implements Vlan {
public void setIp6Range(String ip6Range) {
this.ip6Range = ip6Range;
}
+
+public void setIpRange(String ipRange) {
+this.ip6Range = ipRange;
+}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/74c16875/engine/schema/src/com/cloud/network/dao/IPAddressDao.java
--
diff --git a/engine/schema/src/com/cloud/network/dao/IPAddressDao.java
b/engine/schema/src/com/cloud/network/dao/IPAddressDao.java
index fecd44a..3eba6d8 100755
--- a/engine/schema/src/com/cloud/network/dao/IPAddressDao.java
+++ b/engine/schema/src/com/cloud/network/dao/IPAddressDao.java
@@ -17,9 +17,11 @@
package com.cloud.network.dao;
import com.cloud.dc.Vlan.VlanType;
+import com.cloud.utils.db.DB;
import com.cloud.utils.db.GenericDao;
import com.cloud.utils.net.Ip;
+import java.sql.SQLException;
import java.util.List;
public interface IPAddressDao extends GenericDao {
@@ -72,4 +74,8 @@ public interface IPAddressDao extends GenericDao {
IPAddressVO findByIpAndVlanId(String ipAddress, long vlanid);
long countFreeIpsInVlan(long vlanDbId);
+
+boolean deletePublicIPRangeExceptAliasIP(long vlanDbId, String aliasIp)
throws SQLException;
+
+boolean deletePublicIPRange(long vlanDbId) throws SQLException;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/74c16875/engine/schema/src/com/cloud/network/dao/IPAddressDaoImpl.java
--
diff --git a/engine/schema/src/com/cloud/network/dao/IPAddressDaoImpl.java
b/engine/schema/src/com/cloud/network/dao/IPAddressDaoImpl.java
index 886011e..1051b69 100755
--- a/engine/schema/src/com/cloud/network/dao/IPAddressDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/dao/IPAddressDaoImpl.java
@@ -40,6 +40,7 @@ import javax.ejb.Local;
import javax.inject.Inject;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
+import java.sql.SQLException;
import java.util.Date;
import java.util.List;
@@ -365,6 +366,28 @@ public class IPAddressDaoImpl extends
GenericDaoBase implemen
}
@Override
+public boolean deletePublicIPRangeExceptAliasIP(long vlanDbId, String
aliasIp) throws SQLException {
+Transaction txn = Transaction.currentTxn();
+String deleteSql = "DELETE FROM `cloud`.`user_ip_address` WHERE
vlan_db_id = ? and public_ip_address!=?";
+
+txn.start();
+PreparedStatement stmt = txn.prepareAutoCloseStatement(deleteSql);
+stmt.setLong(1, vlanDbId);
+stmt.setString(2, aliasIp);
+stmt.executeUpdate();
+txn.commit();
+return true;
+}
+
+@Override
+public boolean deletePublicIPRange(long vlanDbId) throws SQLException{
+SearchCriteria sc = AllFieldsSearch.create();
+sc.setParameters("vlan", vlanDbId);
+remove(sc);
+return true;
+}
+
+@Override
@DB
public boolean remove(Long id) {
Transaction txn = Transaction.currentTxn();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/74c16875/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
--
diff --git
git commit: updated refs/heads/master-6-17-stable to 53b40d2
Updated Branches:
refs/heads/master-6-17-stable 74c168757 -> 53b40d233
Cloudstack-2150 DB table entries of phisical network is not proper.Shows
Duplicate entries Cloudstack-2980 Adding a VLAN range that overlaps with two
existing ranges results in inconsistent DB entries
Signed-off-by: Abhinandan Prateek
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/53b40d23
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/53b40d23
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/53b40d23
Branch: refs/heads/master-6-17-stable
Commit: 53b40d2337fe3f1ecfee982ecd99896118448fb0
Parents: 74c1687
Author: Bharat Kumar
Authored: Wed Jun 26 20:55:30 2013 +0530
Committer: Abhinandan Prateek
Committed: Fri Jun 28 14:52:54 2013 +0530
--
.../com/cloud/dc/dao/DataCenterVnetDaoImpl.java | 2 +-
.../com/cloud/network/NetworkServiceImpl.java | 85
2 files changed, 34 insertions(+), 53 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/53b40d23/engine/schema/src/com/cloud/dc/dao/DataCenterVnetDaoImpl.java
--
diff --git a/engine/schema/src/com/cloud/dc/dao/DataCenterVnetDaoImpl.java
b/engine/schema/src/com/cloud/dc/dao/DataCenterVnetDaoImpl.java
index e97f2c6..a2f7cde 100755
--- a/engine/schema/src/com/cloud/dc/dao/DataCenterVnetDaoImpl.java
+++ b/engine/schema/src/com/cloud/dc/dao/DataCenterVnetDaoImpl.java
@@ -113,7 +113,7 @@ public class DataCenterVnetDaoImpl extends
GenericDaoBasehttp://git-wip-us.apache.org/repos/asf/cloudstack/blob/53b40d23/server/src/com/cloud/network/NetworkServiceImpl.java
--
diff --git a/server/src/com/cloud/network/NetworkServiceImpl.java
b/server/src/com/cloud/network/NetworkServiceImpl.java
index f88f600..04815ff 100755
--- a/server/src/com/cloud/network/NetworkServiceImpl.java
+++ b/server/src/com/cloud/network/NetworkServiceImpl.java
@@ -2561,7 +2561,7 @@ public class NetworkServiceImpl extends ManagerBase
implements NetworkService {
if (removeVlan != null){
List tokens = processVlanRange(network,removeVlan);
-boolean result = removeVlanRange(network, tokens.get(0),
tokens.get(1));
+removeVlanRange(network, tokens.get(0), tokens.get(1));
}
if (tags != null && tags.size() > 1) {
@@ -2589,7 +2589,6 @@ public class NetworkServiceImpl extends ManagerBase
implements NetworkService {
network.setSpeed(networkSpeed);
}
-// Vnet range can be extended only
boolean AddVnet = true;
List> vnetsToAdd = new ArrayList>();
@@ -2606,7 +2605,6 @@ public class NetworkServiceImpl extends ManagerBase
implements NetworkService {
int existingStartVnet = existingRanges.get(j).first();
int existingEndVnet = existingRanges.get(j).second();
-// check if vnet is being extended
if (newStartVnet.intValue() >= existingStartVnet &
newEndVnet.intValue() <= existingEndVnet) {
throw new InvalidParameterValueException("The vlan
range you trying to add already exists.");
}
@@ -2630,80 +2628,63 @@ public class NetworkServiceImpl extends ManagerBase
implements NetworkService {
vnetsToAdd.add(new Pair(existingEndVnet+1,newEndVnet));
existingRanges.get(j).first(newStartVnet);
existingRanges.get(j).second(newEndVnet);
+AddVnet = false;
break;
}
}
}
if (AddVnet){
-vnetsToAdd.add(new Pair(newStartVnet,
newEndVnet));
-existingRanges.add(new Pair(newStartVnet,newEndVnet));
-}
-
-Map vnetMap = new HashMap(existingRanges.size());
-Map IndexMap = new HashMap(existingRanges.size());
-for (int i=0; i< existingRanges.size(); i++){
-
vnetMap.put(existingRanges.get(i).first(),existingRanges.get(i).second());
- IndexMap.put(existingRanges.get(i).first(),i);
+vnetsToAdd.add(new Pair(newStartVnet,
newEndVnet));
+existingRanges.add(new Pair(newStartVnet,newEndVnet));
+j= existingRanges.size()-1;
}
-
Integer value;
-Integer index;
String vnetString = "";
+
+Integer changed_entry_start = existingRanges.get(j).first();
+Integer changed_entry_end = existingRanges.get(j).second();
for (int i=0; i < existingRanges.size(); i++){
-
git commit: updated refs/heads/master-6-17-stable to bbc4e12
Updated Branches:
refs/heads/master-6-17-stable 69eeaf36a -> bbc4e1212
Cloudstack-3302 VM deployement failed in VMWare due to dnsmasq configuration
issue in case of multiple subnets in a vlan
Signed-off-by: Abhinandan Prateek
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/bbc4e121
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/bbc4e121
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/bbc4e121
Branch: refs/heads/master-6-17-stable
Commit: bbc4e1212b1fd2432143c2f1dc7a1c57e6512cbf
Parents: 69eeaf3
Author: Bharat Kumar
Authored: Mon Jul 1 18:26:26 2013 +0530
Committer: Abhinandan Prateek
Committed: Tue Jul 2 11:54:12 2013 +0530
--
.../com/cloud/hypervisor/vmware/resource/VmwareResource.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bbc4e121/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
--
diff --git
a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
index 2dcc72c..3325171 100755
---
a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
+++
b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
@@ -2077,7 +2077,7 @@ public class VmwareResource implements
StoragePoolResource, ServerResource, Vmwa
protected Answer execute(final DnsMasqConfigCommand cmd) {
if (s_logger.isInfoEnabled()) {
-s_logger.info("Executing deleteipAlias command: " +
_gson.toJson(cmd));
+s_logger.info("Executing dnsmasqConfig command: " +
_gson.toJson(cmd));
}
String routerIp = cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP);
String controlIp = getRouterSshControlIp(cmd);
@@ -2103,7 +2103,7 @@ public class VmwareResource implements
StoragePoolResource, ServerResource, Vmwa
try {
-Pair result = SshHelper.sshExecute(controlIp,
DEFAULT_DOMR_SSHPORT, "root", mgr.getSystemVMKeyFile(), null, "scp" +
tmpConfigFilePath + "/root/dnsmasq.sh");
+Pair result = SshHelper.sshExecute(controlIp,
DEFAULT_DOMR_SSHPORT, "root", mgr.getSystemVMKeyFile(), null, "scp" +
tmpConfigFilePath + " /root/dnsmasq.sh");
if (s_logger.isDebugEnabled()) {
s_logger.debug("Run command on domain router " + routerIp
+ ", /root/dnsmasq.sh");
}
@@ -2123,7 +2123,7 @@ public class VmwareResource implements
StoragePoolResource, ServerResource, Vmwa
return new Answer(cmd);
} catch (Throwable e) {
s_logger.error("Unexpected exception: " + e.toString(), e);
-return new Answer(cmd, false, "LoadBalancerConfigCommand failed
due to " + VmwareHelper.getExceptionMessage(e));
+return new Answer(cmd, false, " DnsmasqConfig command failed due
to " + VmwareHelper.getExceptionMessage(e));
}
}
git commit: updated refs/heads/master-6-17-stable to 1ef5343
Updated Branches:
refs/heads/master-6-17-stable bbc4e1212 -> 1ef5343e1
Cloudstack-3299 incorrect arguments sent to the script createIpalias in case of
vmware, Cloudstack-3240 corrected a mistake in the script name.
Signed-off-by: Abhinandan Prateek
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1ef5343e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1ef5343e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1ef5343e
Branch: refs/heads/master-6-17-stable
Commit: 1ef5343e1f0bdc04021d832ea8ca7f007f3cd9dc
Parents: bbc4e12
Author: Bharat Kumar
Authored: Mon Jul 1 18:08:00 2013 +0530
Committer: Abhinandan Prateek
Committed: Tue Jul 2 11:58:13 2013 +0530
--
.../vmware/resource/VmwareResource.java | 30 ++--
1 file changed, 15 insertions(+), 15 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1ef5343e/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
--
diff --git
a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
index 3325171..46e5cf9 100755
---
a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
+++
b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
@@ -1994,36 +1994,36 @@ public class VmwareResource implements
StoragePoolResource, ServerResource, Vmwa
protected Answer execute(final CreateIpAliasCommand cmd) {
if (s_logger.isInfoEnabled()) {
-s_logger.info("Executing createipAlias command: " +
_gson.toJson(cmd));
+s_logger.info("Executing createIpAlias command: " +
_gson.toJson(cmd));
}
String routerIp = cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP);
List ipAliasTOs = cmd.getIpAliasList();
-String args=routerIp+" ";
+String args="";
for (IpAliasTO ipaliasto : ipAliasTOs) {
args = args +
ipaliasto.getAlias_count()+":"+ipaliasto.getRouterip()+":"+ipaliasto.getNetmask()+"-";
}
if (s_logger.isDebugEnabled()) {
-s_logger.debug("Run command on domR " +
cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP) + ", /root/createipAlias "
+ args);
+s_logger.debug("Run command on domR " +
cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP) + ", /root/createIpAlias "
+ args);
}
try {
VmwareManager mgr =
getServiceContext().getStockObject(VmwareManager.CONTEXT_STOCK_NAME);
String controlIp = getRouterSshControlIp(cmd);
Pair result = SshHelper.sshExecute(controlIp,
DEFAULT_DOMR_SSHPORT, "root", mgr.getSystemVMKeyFile(), null,
-"/root/createipAlias.sh " + args);
+"/root/createIpAlias.sh " + args);
if (!result.first()) {
-s_logger.error("ipAlias command on domr " + controlIp + "
failed, message: " + result.second());
+s_logger.error("CreateIpAlias command on domr " + controlIp +
" failed, message: " + result.second());
return new Answer(cmd, false, "createipAlias failed due to " +
result.second());
}
if (s_logger.isInfoEnabled()) {
-s_logger.info("createipAlias command on domain router " +
controlIp + " completed");
+s_logger.info("createIpAlias command on domain router " +
controlIp + " completed");
}
} catch (Throwable e) {
-String msg = "createipAlias failed due to " +
VmwareHelper.getExceptionMessage(e);
+String msg = "createIpAlias failed due to " +
VmwareHelper.getExceptionMessage(e);
s_logger.error(msg, e);
return new Answer(cmd, false, msg);
}
@@ -2036,9 +2036,9 @@ public class VmwareResource implements
StoragePoolResource, ServerResource, Vmwa
List revokedIpAliasTOs = cmd.getDeleteIpAliasTos();
List activeIpAliasTOs = cmd.getCreateIpAliasTos();
if (s_logger.isInfoEnabled()) {
-s_logger.info("Executing deleteipAlias command: " +
_gson.toJson(cmd));
+s_logger.info("Executing deleteIpAlias command: " +
_gson.toJson(cmd));
}
-String args=routerIp+" ";
+String args="";
for (IpAliasTO ipAliasTO : revokedIpAliasTOs) {
args = args +
ipAliasTO.getAlias_count()+":"+ipAliasTO.getRouterip()+":"+ipAliasTO.getNetmask()+"-";
}
@@ -2047,27 +2047,27 @@ public class VmwareResource implements
StoragePoolResource, ServerResource, Vmwa
arg
[2/2] git commit: updated refs/heads/master to 61bc6c8
Cloudstack-3302 VM deployement failed in VMWare due to dnsmasq configuration
issue in case of multiple subnets in a vlan
Signed-off-by: Abhinandan Prateek
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/61bc6c84
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/61bc6c84
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/61bc6c84
Branch: refs/heads/master
Commit: 61bc6c8477f1efbed70e0b232d036712fef36305
Parents: 160c8f3
Author: Bharat Kumar
Authored: Mon Jul 1 18:26:26 2013 +0530
Committer: Abhinandan Prateek
Committed: Tue Jul 2 12:00:50 2013 +0530
--
.../com/cloud/hypervisor/vmware/resource/VmwareResource.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/61bc6c84/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
--
diff --git
a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
index c3cceb5..93f642d 100755
---
a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
+++
b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
@@ -2109,7 +2109,7 @@ public class VmwareResource implements
StoragePoolResource, ServerResource, Vmwa
protected Answer execute(final DnsMasqConfigCommand cmd) {
if (s_logger.isInfoEnabled()) {
-s_logger.info("Executing deleteipAlias command: " +
_gson.toJson(cmd));
+s_logger.info("Executing dnsmasqConfig command: " +
_gson.toJson(cmd));
}
String routerIp = cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP);
String controlIp = getRouterSshControlIp(cmd);
@@ -2135,7 +2135,7 @@ public class VmwareResource implements
StoragePoolResource, ServerResource, Vmwa
try {
-Pair result = SshHelper.sshExecute(controlIp,
DEFAULT_DOMR_SSHPORT, "root", mgr.getSystemVMKeyFile(), null, "scp" +
tmpConfigFilePath + "/root/dnsmasq.sh");
+Pair result = SshHelper.sshExecute(controlIp,
DEFAULT_DOMR_SSHPORT, "root", mgr.getSystemVMKeyFile(), null, "scp" +
tmpConfigFilePath + " /root/dnsmasq.sh");
if (s_logger.isDebugEnabled()) {
s_logger.debug("Run command on domain router " + routerIp
+ ", /root/dnsmasq.sh");
}
@@ -2155,7 +2155,7 @@ public class VmwareResource implements
StoragePoolResource, ServerResource, Vmwa
return new Answer(cmd);
} catch (Throwable e) {
s_logger.error("Unexpected exception: " + e.toString(), e);
-return new Answer(cmd, false, "LoadBalancerConfigCommand failed
due to " + VmwareHelper.getExceptionMessage(e));
+return new Answer(cmd, false, " DnsmasqConfig command failed due
to " + VmwareHelper.getExceptionMessage(e));
}
}
[1/2] git commit: updated refs/heads/master to 61bc6c8
Updated Branches:
refs/heads/master 54c213359 -> 61bc6c847
Cloudstack-3299 incorrect arguments sent to the script createIpalias in case of
vmware, Cloudstack-3240 corrected a mistake in the script name.
Signed-off-by: Abhinandan Prateek
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/160c8f36
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/160c8f36
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/160c8f36
Branch: refs/heads/master
Commit: 160c8f361ba0df3f6837b74262f49b2a8a58c286
Parents: 54c2133
Author: Bharat Kumar
Authored: Mon Jul 1 18:08:00 2013 +0530
Committer: Abhinandan Prateek
Committed: Tue Jul 2 12:00:30 2013 +0530
--
.../vmware/resource/VmwareResource.java | 30 ++--
1 file changed, 15 insertions(+), 15 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/160c8f36/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
--
diff --git
a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
index 286eb48..c3cceb5 100755
---
a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
+++
b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
@@ -2026,36 +2026,36 @@ public class VmwareResource implements
StoragePoolResource, ServerResource, Vmwa
protected Answer execute(final CreateIpAliasCommand cmd) {
if (s_logger.isInfoEnabled()) {
-s_logger.info("Executing createipAlias command: " +
_gson.toJson(cmd));
+s_logger.info("Executing createIpAlias command: " +
_gson.toJson(cmd));
}
String routerIp = cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP);
List ipAliasTOs = cmd.getIpAliasList();
-String args=routerIp+" ";
+String args="";
for (IpAliasTO ipaliasto : ipAliasTOs) {
args = args +
ipaliasto.getAlias_count()+":"+ipaliasto.getRouterip()+":"+ipaliasto.getNetmask()+"-";
}
if (s_logger.isDebugEnabled()) {
-s_logger.debug("Run command on domR " +
cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP) + ", /root/createipAlias "
+ args);
+s_logger.debug("Run command on domR " +
cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP) + ", /root/createIpAlias "
+ args);
}
try {
VmwareManager mgr =
getServiceContext().getStockObject(VmwareManager.CONTEXT_STOCK_NAME);
String controlIp = getRouterSshControlIp(cmd);
Pair result = SshHelper.sshExecute(controlIp,
DEFAULT_DOMR_SSHPORT, "root", mgr.getSystemVMKeyFile(), null,
-"/root/createipAlias.sh " + args);
+"/root/createIpAlias.sh " + args);
if (!result.first()) {
-s_logger.error("ipAlias command on domr " + controlIp + "
failed, message: " + result.second());
+s_logger.error("CreateIpAlias command on domr " + controlIp +
" failed, message: " + result.second());
return new Answer(cmd, false, "createipAlias failed due to " +
result.second());
}
if (s_logger.isInfoEnabled()) {
-s_logger.info("createipAlias command on domain router " +
controlIp + " completed");
+s_logger.info("createIpAlias command on domain router " +
controlIp + " completed");
}
} catch (Throwable e) {
-String msg = "createipAlias failed due to " +
VmwareHelper.getExceptionMessage(e);
+String msg = "createIpAlias failed due to " +
VmwareHelper.getExceptionMessage(e);
s_logger.error(msg, e);
return new Answer(cmd, false, msg);
}
@@ -2068,9 +2068,9 @@ public class VmwareResource implements
StoragePoolResource, ServerResource, Vmwa
List revokedIpAliasTOs = cmd.getDeleteIpAliasTos();
List activeIpAliasTOs = cmd.getCreateIpAliasTos();
if (s_logger.isInfoEnabled()) {
-s_logger.info("Executing deleteipAlias command: " +
_gson.toJson(cmd));
+s_logger.info("Executing deleteIpAlias command: " +
_gson.toJson(cmd));
}
-String args=routerIp+" ";
+String args="";
for (IpAliasTO ipAliasTO : revokedIpAliasTOs) {
args = args +
ipAliasTO.getAlias_count()+":"+ipAliasTO.getRouterip()+":"+ipAliasTO.getNetmask()+"-";
}
@@ -2079,27 +2079,27 @@ public class VmwareResource implements
StoragePoolResource, ServerResource, Vmwa
args = args +
ipAliasTO.ge
git commit: updated refs/heads/master-6-17-stable to ed4a149
Updated Branches:
refs/heads/master-6-17-stable 58e736092 -> ed4a1496b
CLOUDSTACK-3302: [Multiple_IP_Ranges][VmWare] VM deployement failed due to
dnsmasq configuration issue in case of multiple subnets in a vlan
Signed-off-by: Abhinandan Prateek
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ed4a1496
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ed4a1496
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ed4a1496
Branch: refs/heads/master-6-17-stable
Commit: ed4a1496bca35343685fff88d4831aa3f642cc88
Parents: 58e7360
Author: Harikrishna Patnala
Authored: Wed Jul 3 16:30:26 2013 +0530
Committer: Abhinandan Prateek
Committed: Wed Jul 3 16:56:58 2013 +0530
--
.../src/com/cloud/hypervisor/vmware/resource/VmwareResource.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ed4a1496/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
--
diff --git
a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
index 46e5cf9..0d3a00b 100755
---
a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
+++
b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
@@ -2103,7 +2103,7 @@ public class VmwareResource implements
StoragePoolResource, ServerResource, Vmwa
try {
-Pair result = SshHelper.sshExecute(controlIp,
DEFAULT_DOMR_SSHPORT, "root", mgr.getSystemVMKeyFile(), null, "scp" +
tmpConfigFilePath + " /root/dnsmasq.sh");
+Pair result = SshHelper.sshExecute(controlIp,
DEFAULT_DOMR_SSHPORT, "root", mgr.getSystemVMKeyFile(), null, "/root/dnsmasq.sh
" + tmpConfigFilePath);
if (s_logger.isDebugEnabled()) {
s_logger.debug("Run command on domain router " + routerIp
+ ", /root/dnsmasq.sh");
}
git commit: updated refs/heads/master to 98c5fe3
Updated Branches:
refs/heads/master 011bae7c0 -> 98c5fe3a8
CLOUDSTACK-3302: [Multiple_IP_Ranges][VmWare] VM deployement failed due to
dnsmasq configuration issue in case of multiple subnets in a vlan
Signed-off-by: Abhinandan Prateek
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/98c5fe3a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/98c5fe3a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/98c5fe3a
Branch: refs/heads/master
Commit: 98c5fe3a8d8549149dc5102f31562b9383ab45b5
Parents: 011bae7
Author: Harikrishna Patnala
Authored: Wed Jul 3 16:30:26 2013 +0530
Committer: Abhinandan Prateek
Committed: Wed Jul 3 16:59:21 2013 +0530
--
.../src/com/cloud/hypervisor/vmware/resource/VmwareResource.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/98c5fe3a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
--
diff --git
a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
index 93f642d..f60882d 100755
---
a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
+++
b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
@@ -2135,7 +2135,7 @@ public class VmwareResource implements
StoragePoolResource, ServerResource, Vmwa
try {
-Pair result = SshHelper.sshExecute(controlIp,
DEFAULT_DOMR_SSHPORT, "root", mgr.getSystemVMKeyFile(), null, "scp" +
tmpConfigFilePath + " /root/dnsmasq.sh");
+Pair result = SshHelper.sshExecute(controlIp,
DEFAULT_DOMR_SSHPORT, "root", mgr.getSystemVMKeyFile(), null, "/root/dnsmasq.sh
" + tmpConfigFilePath);
if (s_logger.isDebugEnabled()) {
s_logger.debug("Run command on domain router " + routerIp
+ ", /root/dnsmasq.sh");
}
git commit: updated refs/heads/master-6-17-stable to f927030
Updated Branches:
refs/heads/master-6-17-stable ed4a1496b -> f9270304e
CLOUDSTACK-3324: Fix/Improve upgrade system vm template 41 to 42
Signed-off-by: Abhinandan Prateek
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f9270304
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f9270304
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f9270304
Branch: refs/heads/master-6-17-stable
Commit: f9270304e00633a30f6954acd36aaeb0f2907f98
Parents: ed4a149
Author: Harikrishna Patnala
Authored: Tue Jul 2 21:42:00 2013 +0530
Committer: Abhinandan Prateek
Committed: Wed Jul 3 17:04:39 2013 +0530
--
.../com/cloud/upgrade/dao/Upgrade410to420.java | 246 +--
1 file changed, 66 insertions(+), 180 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f9270304/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
--
diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
b/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
index d465af9..b9daa6d 100644
--- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
+++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
@@ -32,6 +32,11 @@ import java.sql.Types;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.HashSet;
+
import com.cloud.network.vpc.NetworkACL;
public class Upgrade410to420 implements DbUpgrade {
@@ -117,208 +122,89 @@ public class Upgrade410to420 implements DbUpgrade {
PreparedStatement pstmt = null;
ResultSet rs = null;
-boolean xenserver = false;
-boolean kvm = false;
-boolean VMware = false;
-boolean Hyperv = false;
-boolean LXC = false;
s_logger.debug("Updating System Vm template IDs");
try{
//Get all hypervisors in use
+Set hypervisorsListInUse = new
HashSet();
try {
pstmt = conn.prepareStatement("select
distinct(hypervisor_type) from `cloud`.`cluster` where removed is null");
rs = pstmt.executeQuery();
while(rs.next()){
-if("XenServer".equals(rs.getString(1))){
-xenserver = true;
-} else if("KVM".equals(rs.getString(1))){
-kvm = true;
-} else if("VMware".equals(rs.getString(1))){
-VMware = true;
-} else if("Hyperv".equals(rs.getString(1))) {
-Hyperv = true;
-} else if("LXC".equals(rs.getString(1))) {
-LXC = true;
+switch (HypervisorType.getType(rs.getString(1))) {
+case XenServer:
hypervisorsListInUse.add(HypervisorType.XenServer);
+break;
+case KVM:
hypervisorsListInUse.add(HypervisorType.KVM);
+break;
+case VMware:
hypervisorsListInUse.add(HypervisorType.VMware);
+break;
+case Hyperv:
hypervisorsListInUse.add(HypervisorType.Hyperv);
+break;
+case LXC:
hypervisorsListInUse.add(HypervisorType.LXC);
+break;
}
}
} catch (SQLException e) {
throw new CloudRuntimeException("Error while listing
hypervisors in use", e);
}
-s_logger.debug("Updating XenSever System Vms");
-//XenServer
-try {
-//Get 4.2.0 XenServer system Vm template Id
-pstmt = conn.prepareStatement("select id from
`cloud`.`vm_template` where name like 'systemvm-xenserver-4.2' and removed is
null order by id desc limit 1");
-rs = pstmt.executeQuery();
-if(rs.next()){
-long templateId = rs.getLong(1);
-rs.close();
-pstmt.close();
-// change template type to SYSTEM
-pstmt = conn.prepareStatement("update
`cloud`.`vm_template` set type='SYSTEM' where id = ?");
-pstmt.setLong(1, templateId);
-pstmt.executeUpdate();
-pstmt.close();
-// update templete ID of system Vms
-pstmt = conn.prepareStatement("update
`cloud`.`vm_instance` set vm_template_id = ? where type <> 'U
git commit: updated refs/heads/master to e63ac55
Updated Branches:
refs/heads/master 9d07f899c -> e63ac5512
CLOUDSTACK-3324: Fix/Improve upgrade system vm template 41 to 42
Signed-off-by: Abhinandan Prateek
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e63ac551
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e63ac551
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e63ac551
Branch: refs/heads/master
Commit: e63ac5512e85217274a63996ee1e14f887c45dae
Parents: 9d07f89
Author: Harikrishna Patnala
Authored: Tue Jul 2 21:38:14 2013 +0530
Committer: Abhinandan Prateek
Committed: Wed Jul 3 17:18:25 2013 +0530
--
.../com/cloud/upgrade/dao/Upgrade410to420.java | 247 +--
1 file changed, 65 insertions(+), 182 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e63ac551/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
--
diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
b/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
index da68348..3073324 100644
--- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
+++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
@@ -20,6 +20,7 @@ package com.cloud.upgrade.dao;
import com.cloud.deploy.DeploymentPlanner;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.utils.script.Script;
+import com.cloud.hypervisor.Hypervisor.HypervisorType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreProvider;
@@ -37,6 +38,8 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.UUID;
+import java.util.Set;
+import java.util.HashSet;
import com.cloud.network.vpc.NetworkACL;
public class Upgrade410to420 implements DbUpgrade {
@@ -132,208 +135,89 @@ public class Upgrade410to420 implements DbUpgrade {
// TODO: system vm template migration after storage refactoring
PreparedStatement pstmt = null;
ResultSet rs = null;
-boolean xenserver = false;
-boolean kvm = false;
-boolean VMware = false;
-boolean Hyperv = false;
-boolean LXC = false;
s_logger.debug("Updating System Vm template IDs");
try{
//Get all hypervisors in use
-try {
+Set hypervisorsListInUse = new
HashSet();
+try {
pstmt = conn.prepareStatement("select
distinct(hypervisor_type) from `cloud`.`cluster` where removed is null");
rs = pstmt.executeQuery();
while(rs.next()){
-if("XenServer".equals(rs.getString(1))){
-xenserver = true;
-} else if("KVM".equals(rs.getString(1))){
-kvm = true;
-} else if("VMware".equals(rs.getString(1))){
-VMware = true;
-} else if("Hyperv".equals(rs.getString(1))) {
-Hyperv = true;
-} else if("LXC".equals(rs.getString(1))) {
-LXC = true;
+switch (HypervisorType.getType(rs.getString(1))) {
+case XenServer:
hypervisorsListInUse.add(HypervisorType.XenServer);
+break;
+case KVM:
hypervisorsListInUse.add(HypervisorType.KVM);
+break;
+case VMware:
hypervisorsListInUse.add(HypervisorType.VMware);
+break;
+case Hyperv:
hypervisorsListInUse.add(HypervisorType.Hyperv);
+break;
+case LXC:
hypervisorsListInUse.add(HypervisorType.LXC);
+break;
}
}
} catch (SQLException e) {
throw new CloudRuntimeException("Error while listing
hypervisors in use", e);
}
-s_logger.debug("Updating XenSever System Vms");
-//XenServer
-try {
-//Get 4.2.0 XenServer system Vm template Id
-pstmt = conn.prepareStatement("select id from
`cloud`.`vm_template` where name like 'systemvm-xenserver-4.2' and removed is
null order by id desc limit 1");
-rs = pstmt.executeQuery();
-if(rs.next()){
-long templateId = rs.getLong(1);
-rs.close();
-pstmt.close();
-// change template type to SYSTEM
-pstmt = conn.prepareS
git commit: updated refs/heads/master to d2739cd
Updated Branches:
refs/heads/master 9ba36fd17 -> d2739cde2
Fix file name in DnsMasqConfigCommand
Signed-off-by: Abhinandan Prateek
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d2739cde
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d2739cde
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d2739cde
Branch: refs/heads/master
Commit: d2739cde2ed824ee2477bcd3ac4016f84e365990
Parents: 9ba36fd
Author: Harikrishna Patnala
Authored: Wed Jul 3 18:31:16 2013 +0530
Committer: Abhinandan Prateek
Committed: Wed Jul 3 20:43:42 2013 +0530
--
.../src/com/cloud/hypervisor/vmware/resource/VmwareResource.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d2739cde/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
--
diff --git
a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
index f60882d..ab30ec7 100755
---
a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
+++
b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
@@ -2118,7 +2118,7 @@ public class VmwareResource implements
StoragePoolResource, ServerResource, Vmwa
DnsMasqConfigurator configurator = new DnsMasqConfigurator();
String [] config = configurator.generateConfiguration(cmd);
-String tmpConfigFilePath = "/tmp/"+ routerIp.replace(".","-")+".cfg";
+String tmpConfigFilePath = "/tmp/"+ routerIp.replace(".","_")+".cfg";
String tmpConfigFileContents = "";
for (int i = 0; i < config.length; i++) {
tmpConfigFileContents += config[i];
git commit: updated refs/heads/master-6-17-stable to 335294c
Updated Branches:
refs/heads/master-6-17-stable 24db8c896 -> 335294ce4
Fix file name in DnsMasqConfigCommand
Signed-off-by: Abhinandan Prateek
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/335294ce
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/335294ce
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/335294ce
Branch: refs/heads/master-6-17-stable
Commit: 335294ce408369b6d2a31ffe6cdde486f649608b
Parents: 24db8c8
Author: Harikrishna Patnala
Authored: Wed Jul 3 18:31:16 2013 +0530
Committer: Abhinandan Prateek
Committed: Wed Jul 3 20:44:32 2013 +0530
--
.../src/com/cloud/hypervisor/vmware/resource/VmwareResource.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/335294ce/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
--
diff --git
a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
index 0d3a00b..fe32cee 100755
---
a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
+++
b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
@@ -2086,7 +2086,7 @@ public class VmwareResource implements
StoragePoolResource, ServerResource, Vmwa
DnsMasqConfigurator configurator = new DnsMasqConfigurator();
String [] config = configurator.generateConfiguration(cmd);
-String tmpConfigFilePath = "/tmp/"+ routerIp.replace(".","-")+".cfg";
+String tmpConfigFilePath = "/tmp/"+ routerIp.replace(".","_")+".cfg";
String tmpConfigFileContents = "";
for (int i = 0; i < config.length; i++) {
tmpConfigFileContents += config[i];
git commit: updated refs/heads/master-6-17-stable to 58663b3
Updated Branches:
refs/heads/master-6-17-stable 335294ce4 -> 58663b326
Cloudstack-3313 Ipv6 - Not able to deploy a new VM in IPV6 network.
Signed-off-by: Abhinandan Prateek
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/58663b32
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/58663b32
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/58663b32
Branch: refs/heads/master-6-17-stable
Commit: 58663b326d310ca1295bb603f4f0045dbcb748a7
Parents: 335294c
Author: Bharat Kumar
Authored: Tue Jul 2 07:30:44 2013 +0530
Committer: Abhinandan Prateek
Committed: Wed Jul 3 20:48:10 2013 +0530
--
.../systemvm/debian/config/etc/init.d/cloud-early-config| 9 -
.../com/cloud/configuration/ConfigurationManagerImpl.java | 3 ++-
server/src/com/cloud/network/NetworkManagerImpl.java| 6 --
3 files changed, 14 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/58663b32/patches/systemvm/debian/config/etc/init.d/cloud-early-config
--
diff --git a/patches/systemvm/debian/config/etc/init.d/cloud-early-config
b/patches/systemvm/debian/config/etc/init.d/cloud-early-config
index b215271..d53cb41 100755
--- a/patches/systemvm/debian/config/etc/init.d/cloud-early-config
+++ b/patches/systemvm/debian/config/etc/init.d/cloud-early-config
@@ -541,7 +541,14 @@ setup_dnsmasq() {
[ $ETH0_IP ] && echo "dhcp-option=6,$NS" >> /etc/dnsmasq.conf
[ $ETH0_IP6 ] && echo "dhcp-option=option6:dns-server,$NS6" >>
/etc/dnsmasq.conf
#adding the name data-server to the /etc/hosts for allowing the access to
user-data service and ssh-key reset in every subnet.
- echo "$ETH0_IP data-server" >> /etc/hosts
+ if [ -n "$ETH0_IP" ]
+ then
+ echo "$ETH0_IP data-server" >> /etc/hosts
+ fi
+ if [ -n "$ETH0_IP6" ]
+ then
+ echo "$ETH0_IP6 data-server" >> /etc/hosts
+ fi
}
setup_sshd(){
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/58663b32/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
--
diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
index 27c1a51..1c973b8 100755
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -2653,6 +2653,7 @@ public class ConfigurationManagerImpl extends ManagerBase
implements Configurati
ip6Gateway = network.getIp6Gateway();
ip6Cidr = network.getIp6Cidr();
_networkModel.checkIp6Parameters(startIPv6, endIPv6,
ip6Gateway, ip6Cidr);
+sameSubnet = true;
}
}
}
@@ -2668,7 +2669,7 @@ public class ConfigurationManagerImpl extends ManagerBase
implements Configurati
vlanDetails = new Pair(newVlanGateway,
newVlanNetmask);
}
//check if the gatewayip is the part of the ip range being added.
-if (NetUtils.ipRangesOverlap(startIP, endIP, vlanDetails.first(),
vlanDetails.first())) {
+if (ipv4 && NetUtils.ipRangesOverlap(startIP, endIP,
vlanDetails.first(), vlanDetails.first())) {
throw new InvalidParameterValueException("The gateway ip should
not be the part of the ip range being added.");
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/58663b32/server/src/com/cloud/network/NetworkManagerImpl.java
--
diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java
b/server/src/com/cloud/network/NetworkManagerImpl.java
index 63e9708..708c03d 100755
--- a/server/src/com/cloud/network/NetworkManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkManagerImpl.java
@@ -1976,8 +1976,10 @@ public class NetworkManagerImpl extends ManagerBase
implements NetworkManager, L
_networkModel.isProviderSupportServiceInNetwork(network.getId(), Service.Dhcp,
element.getProvider()) &&
element instanceof DhcpServiceProvider) {
DhcpServiceProvider sp = (DhcpServiceProvider) element;
-if (!sp.configDhcpSupportForSubnet(network, profile,
vmProfile, dest, context)) {
- return false;
+if (profile.getIp6Address() == null) {
+if (!sp.configDhcpSupportForSubnet(network, profile,
vmProfile, dest, context)) {
+return false;
+}
}
sp.addDhcpEntry(network, profile, vmProfile, dest, context);
git commit: updated refs/heads/master to 968c252
Updated Branches: refs/heads/master 1e646629f -> 968c252ca CLOUDSTACK-3351: Fix add cluster API to set right hypervisor type Signed-off-by: Abhinandan Prateek Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/968c252c Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/968c252c Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/968c252c Branch: refs/heads/master Commit: 968c252ca58fe55285004355dd1060fd1ae9aeb4 Parents: 1e64662 Author: Harikrishna Patnala Authored: Thu Jul 4 11:18:35 2013 +0530 Committer: Abhinandan Prateek Committed: Thu Jul 4 14:23:08 2013 +0530 -- server/src/com/cloud/resource/ResourceManagerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/968c252c/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 054ac40..41c6ad7 100755 --- a/server/src/com/cloud/resource/ResourceManagerImpl.java +++ b/server/src/com/cloud/resource/ResourceManagerImpl.java @@ -472,7 +472,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, long clusterId = 0; ClusterVO cluster = new ClusterVO(dcId, podId, clusterName); -cluster.setHypervisorType(cmd.getHypervisor()); +cluster.setHypervisorType(hypervisorType.toString()); cluster.setClusterType(clusterType); cluster.setAllocationState(allocationState);
git commit: updated refs/heads/master to 5dd1a1d
Updated Branches:
refs/heads/master b948bbd55 -> 5dd1a1dd8
CLOUDSTACK-2987: Fixing dynamicallyScalable flag in register and update
template API Previuos commit: 7b6b8d7a077478620232ea1ac4ec2304289e8661 This fix
is due to some changes made by the merges after this commit.
Signed-off-by: Abhinandan Prateek
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5dd1a1dd
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5dd1a1dd
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5dd1a1dd
Branch: refs/heads/master
Commit: 5dd1a1dd8eec0a37db36b5c86d847fbbe4fcc41d
Parents: b948bbd
Author: Harikrishna Patnala
Authored: Fri Jul 12 13:22:41 2013 +0530
Committer: Abhinandan Prateek
Committed: Fri Jul 12 15:19:25 2013 +0530
--
.../src/com/cloud/storage/VMTemplateVO.java | 3 ++-
.../com/cloud/template/TemplateAdapterBase.java | 2 +-
.../com/cloud/template/TemplateManagerImpl.java | 21 +++-
3 files changed, 23 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5dd1a1dd/engine/schema/src/com/cloud/storage/VMTemplateVO.java
--
diff --git a/engine/schema/src/com/cloud/storage/VMTemplateVO.java
b/engine/schema/src/com/cloud/storage/VMTemplateVO.java
index 3e71191..60c1a4e 100755
--- a/engine/schema/src/com/cloud/storage/VMTemplateVO.java
+++ b/engine/schema/src/com/cloud/storage/VMTemplateVO.java
@@ -175,12 +175,13 @@ public class VMTemplateVO implements
VirtualMachineTemplate {
public VMTemplateVO(long id, String name, ImageFormat format, boolean
isPublic, boolean featured,
boolean isExtractable, TemplateType type, String url, boolean
requiresHvm, int bits, long accountId,
String cksum, String displayText, boolean enablePassword, long
guestOSId, boolean bootable,
-HypervisorType hyperType, String templateTag, Map details, boolean
sshKeyEnabled) {
+HypervisorType hyperType, String templateTag, Map details, boolean
sshKeyEnabled, boolean isDynamicallyScalable) {
this(id, name, format, isPublic, featured, isExtractable, type, url,
requiresHvm, bits, accountId, cksum,
displayText, enablePassword, guestOSId, bootable, hyperType,
details);
this.templateTag = templateTag;
this.uuid = UUID.randomUUID().toString();
this.enableSshKey = sshKeyEnabled;
+this.dynamicallyScalable = isDynamicallyScalable;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5dd1a1dd/server/src/com/cloud/template/TemplateAdapterBase.java
--
diff --git a/server/src/com/cloud/template/TemplateAdapterBase.java
b/server/src/com/cloud/template/TemplateAdapterBase.java
index fce2506..4f29fcd 100755
--- a/server/src/com/cloud/template/TemplateAdapterBase.java
+++ b/server/src/com/cloud/template/TemplateAdapterBase.java
@@ -258,7 +258,7 @@ public abstract class TemplateAdapterBase extends
AdapterBase implements Templat
profile.getFeatured(),
profile.getIsExtractable(), profile.getTemplateType(), profile.getUrl(),
profile.getRequiresHVM(),
profile.getBits(), profile.getAccountId(),
profile.getCheckSum(), profile.getDisplayText(),
profile.getPasswordEnabled(),
profile.getGuestOsId(), profile.getBootable(), profile.getHypervisorType(),
profile.getTemplateTag(),
- profile.getDetails(),
profile.getSshKeyEnabled());
+ profile.getDetails(),
profile.getSshKeyEnabled(), profile.IsDynamicallyScalable());
if (zoneId == null || zoneId.longValue() == -1) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5dd1a1dd/server/src/com/cloud/template/TemplateManagerImpl.java
--
diff --git a/server/src/com/cloud/template/TemplateManagerImpl.java
b/server/src/com/cloud/template/TemplateManagerImpl.java
index 5a54656..8dcb0ed 100755
--- a/server/src/com/cloud/template/TemplateManagerImpl.java
+++ b/server/src/com/cloud/template/TemplateManagerImpl.java
@@ -1686,6 +1686,8 @@ public class TemplateManagerImpl extends ManagerBase
implements TemplateManager,
String format = cmd.getFormat();
Long guestOSId = cmd.getOsTypeId();
Boolean passwordEnabled = cmd.isPasswordEnabled();
+Boolean isDynamicallyScalable = cmd.isDynamicallyScalable();
+Boolean isRoutingTemplate = cmd.isRoutingType();
Boolean bootable = cmd.isBootable();
Integer sortKey = cmd.getSortKey();
Account account = UserContext.curre
git commit: updated refs/heads/4.2 to 8816d41
Updated Branches:
refs/heads/4.2 b2a077dff -> 8816d41d3
CLOUDSTACK-2987: Fixing dynamicallyScalable flag in register and update
template API Previuos commit: 7b6b8d7a077478620232ea1ac4ec2304289e8661 This fix
is due to some changes made by the merges after this commit.
Signed-off-by: Abhinandan Prateek
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8816d41d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8816d41d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8816d41d
Branch: refs/heads/4.2
Commit: 8816d41d3b62fe50bbeb70e541f54f8e232c362e
Parents: b2a077d
Author: Harikrishna Patnala
Authored: Fri Jul 12 13:22:41 2013 +0530
Committer: Abhinandan Prateek
Committed: Fri Jul 12 15:27:25 2013 +0530
--
.../src/com/cloud/storage/VMTemplateVO.java | 3 ++-
.../com/cloud/template/TemplateAdapterBase.java | 2 +-
.../com/cloud/template/TemplateManagerImpl.java | 21 +++-
3 files changed, 23 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8816d41d/engine/schema/src/com/cloud/storage/VMTemplateVO.java
--
diff --git a/engine/schema/src/com/cloud/storage/VMTemplateVO.java
b/engine/schema/src/com/cloud/storage/VMTemplateVO.java
index 3e71191..60c1a4e 100755
--- a/engine/schema/src/com/cloud/storage/VMTemplateVO.java
+++ b/engine/schema/src/com/cloud/storage/VMTemplateVO.java
@@ -175,12 +175,13 @@ public class VMTemplateVO implements
VirtualMachineTemplate {
public VMTemplateVO(long id, String name, ImageFormat format, boolean
isPublic, boolean featured,
boolean isExtractable, TemplateType type, String url, boolean
requiresHvm, int bits, long accountId,
String cksum, String displayText, boolean enablePassword, long
guestOSId, boolean bootable,
-HypervisorType hyperType, String templateTag, Map details, boolean
sshKeyEnabled) {
+HypervisorType hyperType, String templateTag, Map details, boolean
sshKeyEnabled, boolean isDynamicallyScalable) {
this(id, name, format, isPublic, featured, isExtractable, type, url,
requiresHvm, bits, accountId, cksum,
displayText, enablePassword, guestOSId, bootable, hyperType,
details);
this.templateTag = templateTag;
this.uuid = UUID.randomUUID().toString();
this.enableSshKey = sshKeyEnabled;
+this.dynamicallyScalable = isDynamicallyScalable;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8816d41d/server/src/com/cloud/template/TemplateAdapterBase.java
--
diff --git a/server/src/com/cloud/template/TemplateAdapterBase.java
b/server/src/com/cloud/template/TemplateAdapterBase.java
index fce2506..4f29fcd 100755
--- a/server/src/com/cloud/template/TemplateAdapterBase.java
+++ b/server/src/com/cloud/template/TemplateAdapterBase.java
@@ -258,7 +258,7 @@ public abstract class TemplateAdapterBase extends
AdapterBase implements Templat
profile.getFeatured(),
profile.getIsExtractable(), profile.getTemplateType(), profile.getUrl(),
profile.getRequiresHVM(),
profile.getBits(), profile.getAccountId(),
profile.getCheckSum(), profile.getDisplayText(),
profile.getPasswordEnabled(),
profile.getGuestOsId(), profile.getBootable(), profile.getHypervisorType(),
profile.getTemplateTag(),
- profile.getDetails(),
profile.getSshKeyEnabled());
+ profile.getDetails(),
profile.getSshKeyEnabled(), profile.IsDynamicallyScalable());
if (zoneId == null || zoneId.longValue() == -1) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8816d41d/server/src/com/cloud/template/TemplateManagerImpl.java
--
diff --git a/server/src/com/cloud/template/TemplateManagerImpl.java
b/server/src/com/cloud/template/TemplateManagerImpl.java
index 5a54656..8dcb0ed 100755
--- a/server/src/com/cloud/template/TemplateManagerImpl.java
+++ b/server/src/com/cloud/template/TemplateManagerImpl.java
@@ -1686,6 +1686,8 @@ public class TemplateManagerImpl extends ManagerBase
implements TemplateManager,
String format = cmd.getFormat();
Long guestOSId = cmd.getOsTypeId();
Boolean passwordEnabled = cmd.isPasswordEnabled();
+Boolean isDynamicallyScalable = cmd.isDynamicallyScalable();
+Boolean isRoutingTemplate = cmd.isRoutingType();
Boolean bootable = cmd.isBootable();
Integer sortKey = cmd.getSortKey();
Account account = UserContext.current().g
git commit: updated refs/heads/master to 9d857c0
Updated Branches: refs/heads/master b3e2871e7 -> 9d857c036 fix xenserver 6.1 and 6.2 can not open vnc console Signed-off-by: Abhinandan Prateek Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9d857c03 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9d857c03 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9d857c03 Branch: refs/heads/master Commit: 9d857c03623ae4851d96c7303d4c3df002104fe1 Parents: b3e2871 Author: hongtu_zang Authored: Fri Jul 12 17:26:47 2013 +0800 Committer: Abhinandan Prateek Committed: Fri Jul 12 16:35:17 2013 +0530 -- scripts/vm/hypervisor/xenserver/vmops | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9d857c03/scripts/vm/hypervisor/xenserver/vmops -- diff --git a/scripts/vm/hypervisor/xenserver/vmops b/scripts/vm/hypervisor/xenserver/vmops index 650e955..f8c0253 100755 --- a/scripts/vm/hypervisor/xenserver/vmops +++ b/scripts/vm/hypervisor/xenserver/vmops @@ -82,7 +82,7 @@ def getvncport(session, args): path1 = "/local/domain/" + domid + "/qemu-pid" path2 = "/local/domain/" + domid + "/console/vnc-port" else: -if version[:3] == '6.0': +if version[:3] == '6.0' or version[:3] == '6.1' or version[:3] == '6.2': path1 = "/local/domain/" + domid + "/vncterm-pid" path2 = "/local/domain/" + domid + "/console/vnc-port" else:
git commit: updated refs/heads/4.2 to 4836134
Updated Branches: refs/heads/4.2 9bc105f39 -> 483613431 fix xenserver 6.1 and 6.2 can not open vnc console Signed-off-by: Abhinandan Prateek Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/48361343 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/48361343 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/48361343 Branch: refs/heads/4.2 Commit: 4836134313bea409232c3f70b62f298030817046 Parents: 9bc105f Author: hongtu_zang Authored: Fri Jul 12 17:26:47 2013 +0800 Committer: Abhinandan Prateek Committed: Fri Jul 12 16:34:22 2013 +0530 -- scripts/vm/hypervisor/xenserver/vmops | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48361343/scripts/vm/hypervisor/xenserver/vmops -- diff --git a/scripts/vm/hypervisor/xenserver/vmops b/scripts/vm/hypervisor/xenserver/vmops index 650e955..f8c0253 100755 --- a/scripts/vm/hypervisor/xenserver/vmops +++ b/scripts/vm/hypervisor/xenserver/vmops @@ -82,7 +82,7 @@ def getvncport(session, args): path1 = "/local/domain/" + domid + "/qemu-pid" path2 = "/local/domain/" + domid + "/console/vnc-port" else: -if version[:3] == '6.0': +if version[:3] == '6.0' or version[:3] == '6.1' or version[:3] == '6.2': path1 = "/local/domain/" + domid + "/vncterm-pid" path2 = "/local/domain/" + domid + "/console/vnc-port" else:
[2/3] git commit: updated refs/heads/master to 954e197
Cloudstack-2997 Make haproxy maxconn configurable
Signed-off-by: Abhinandan Prateek
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/dd33abff
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/dd33abff
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/dd33abff
Branch: refs/heads/master
Commit: dd33abffbe3b7c5b615e8f64b1824a720329dd0d
Parents: 6b54907
Author: Bharat Kumar
Authored: Tue Jun 25 18:13:31 2013 +0530
Committer: Abhinandan Prateek
Committed: Wed Jul 17 10:06:11 2013 +0530
--
api/src/com/cloud/offering/NetworkOffering.java | 1 +
.../org/apache/cloudstack/api/ApiConstants.java | 1 +
.../admin/network/CreateNetworkOfferingCmd.java | 7 +++
.../admin/network/UpdateNetworkOfferingCmd.java | 6 ++
.../api/routing/LoadBalancerConfigCommand.java | 4 +++-
.../com/cloud/network/HAProxyConfigurator.java | 5 +++--
.../com/cloud/offerings/NetworkOfferingVO.java | 10 ++
.../lb/ElasticLoadBalancerManagerImpl.java | 10 +-
.../lb/InternalLoadBalancerVMManagerImpl.java | 14 +++---
.../InternalLBVMManagerTest.java| 9 +++--
server/src/com/cloud/configuration/Config.java | 1 +
.../configuration/ConfigurationManager.java | 2 +-
.../configuration/ConfigurationManagerImpl.java | 18 --
.../com/cloud/network/NetworkManagerImpl.java | 18 +-
.../VirtualNetworkApplianceManagerImpl.java | 15 +++
.../cloud/vpc/MockConfigurationManagerImpl.java | 2 +-
.../CreateNetworkOfferingTest.java | 20 ++--
setup/db/db/schema-410to420.sql | 3 +++
18 files changed, 110 insertions(+), 36 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd33abff/api/src/com/cloud/offering/NetworkOffering.java
--
diff --git a/api/src/com/cloud/offering/NetworkOffering.java
b/api/src/com/cloud/offering/NetworkOffering.java
index 43312db..6c5573e 100644
--- a/api/src/com/cloud/offering/NetworkOffering.java
+++ b/api/src/com/cloud/offering/NetworkOffering.java
@@ -129,4 +129,5 @@ public interface NetworkOffering extends
InfrastructureEntity, InternalIdentity,
boolean getPublicLb();
boolean getEgressDefaultPolicy();
+Integer getConcurrentConnections();
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd33abff/api/src/org/apache/cloudstack/api/ApiConstants.java
--
diff --git a/api/src/org/apache/cloudstack/api/ApiConstants.java
b/api/src/org/apache/cloudstack/api/ApiConstants.java
index 83999b6..0550a39 100755
--- a/api/src/org/apache/cloudstack/api/ApiConstants.java
+++ b/api/src/org/apache/cloudstack/api/ApiConstants.java
@@ -518,6 +518,7 @@ public class ApiConstants {
public static final String NUMBER = "number";
public static final String IS_DYNAMICALLY_SCALABLE =
"isdynamicallyscalable";
public static final String ROUTING = "isrouting";
+public static final String MAX_CONNECTIONS = "maxconnections";
public enum HostDetails {
all, capacity, events, stats, min;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd33abff/api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java
--
diff --git
a/api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java
b/api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java
index 94e263c..bdad904 100644
---
a/api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java
+++
b/api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java
@@ -102,6 +102,9 @@ public class CreateNetworkOfferingCmd extends BaseCmd {
@Parameter(name=ApiConstants.EGRESS_DEFAULT_POLICY,
type=CommandType.BOOLEAN, description="true if default guest network egress
policy is allow; false if default egress policy is deny")
private Boolean egressDefaultPolicy;
+@Parameter(name=ApiConstants.MAX_CONNECTIONS, type=CommandType.INTEGER,
description="maximum number of concurrent connections supported by the network
offering")
+private Integer maxConnections;
+
/
/// Accessors ///
/
@@ -172,6 +175,10 @@ public class CreateNetworkOfferingCmd extends BaseCmd {
return egressDefaultPolicy;
}
+public Integer getMaxconnections() {
+return maxConnections;
+}
+
public Map> getServiceProviders() {
Ma
[3/3] git commit: updated refs/heads/master to 954e197
Cloudstack-3313 Cannot deploy vm in ipv6 network
Signed-off-by: Abhinandan Prateek
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6b549074
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6b549074
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6b549074
Branch: refs/heads/master
Commit: 6b549074fa239af31920b5a8e7112c8f5aa0b782
Parents: d95d55a
Author: Bharat Kumar
Authored: Tue Jul 16 11:40:01 2013 +0530
Committer: Abhinandan Prateek
Committed: Wed Jul 17 10:06:11 2013 +0530
--
.../systemvm/debian/config/etc/init.d/cloud-early-config| 9 -
.../com/cloud/configuration/ConfigurationManagerImpl.java | 3 ++-
server/src/com/cloud/network/NetworkManagerImpl.java| 6 --
3 files changed, 14 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6b549074/patches/systemvm/debian/config/etc/init.d/cloud-early-config
--
diff --git a/patches/systemvm/debian/config/etc/init.d/cloud-early-config
b/patches/systemvm/debian/config/etc/init.d/cloud-early-config
index f93c39d..5835c4d 100755
--- a/patches/systemvm/debian/config/etc/init.d/cloud-early-config
+++ b/patches/systemvm/debian/config/etc/init.d/cloud-early-config
@@ -544,7 +544,14 @@ setup_dnsmasq() {
[ $ETH0_IP ] && echo "dhcp-option=6,$NS" >> /etc/dnsmasq.conf
[ $ETH0_IP6 ] && echo "dhcp-option=option6:dns-server,$NS6" >>
/etc/dnsmasq.conf
#adding the name data-server to the /etc/hosts for allowing the access to
user-data service and ssh-key reset in every subnet.
- echo "$ETH0_IP data-server" >> /etc/hosts
+ if [ -n "$ETH0_IP" ]
+ then
+ echo "$ETH0_IP data-server" >> /etc/hosts
+ fi
+ if [ -n "$ETH0_IP6" ]
+ then
+ echo "$ETH0_IP6 data-server" >> /etc/hosts
+ fi
}
setup_sshd(){
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6b549074/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
--
diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
index fd170bd..bdb5260 100755
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -2831,6 +2831,7 @@ public class ConfigurationManagerImpl extends ManagerBase
implements Configurati
ip6Gateway = network.getIp6Gateway();
ip6Cidr = network.getIp6Cidr();
_networkModel.checkIp6Parameters(startIPv6, endIPv6,
ip6Gateway, ip6Cidr);
+sameSubnet = true;
}
}
}
@@ -2846,7 +2847,7 @@ public class ConfigurationManagerImpl extends ManagerBase
implements Configurati
vlanDetails = new Pair(newVlanGateway,
newVlanNetmask);
}
// check if the gatewayip is the part of the ip range being added.
-if (NetUtils.ipRangesOverlap(startIP, endIP, vlanDetails.first(),
vlanDetails.first())) {
+if (ipv4 && NetUtils.ipRangesOverlap(startIP, endIP,
vlanDetails.first(), vlanDetails.first())) {
throw new InvalidParameterValueException(
"The gateway ip should not be the part of the ip range
being added.");
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6b549074/server/src/com/cloud/network/NetworkManagerImpl.java
--
diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java
b/server/src/com/cloud/network/NetworkManagerImpl.java
index f6e9a0a..0e80119 100755
--- a/server/src/com/cloud/network/NetworkManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkManagerImpl.java
@@ -2004,8 +2004,10 @@ public class NetworkManagerImpl extends ManagerBase
implements NetworkManager, L
_networkModel.isProviderSupportServiceInNetwork(network.getId(), Service.Dhcp,
element.getProvider()) &&
element instanceof DhcpServiceProvider) {
DhcpServiceProvider sp = (DhcpServiceProvider) element;
-if (!sp.configDhcpSupportForSubnet(network, profile,
vmProfile, dest, context)) {
- return false;
+if (profile.getIp6Address() == null) {
+if (!sp.configDhcpSupportForSubnet(network, profile,
vmProfile, dest, context)) {
+return false;
+}
}
sp.addDhcpEntry(network, profile, vmProfile, dest, context);
}
[1/3] git commit: updated refs/heads/master to 954e197
Updated Branches:
refs/heads/master d95d55af6 -> 954e19781
Cloudstack-2997: maxconn missing param
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/954e1978
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/954e1978
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/954e1978
Branch: refs/heads/master
Commit: 954e1978130b3cfb0c73f2f1506d94440f478f01
Parents: dd33abf
Author: Abhinandan Prateek
Authored: Wed Jul 17 10:05:43 2013 +0530
Committer: Abhinandan Prateek
Committed: Wed Jul 17 10:06:11 2013 +0530
--
server/src/com/cloud/configuration/ConfigurationManagerImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/954e1978/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
--
diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
index 9498c82..801028d 100755
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -4047,7 +4047,7 @@ public class ConfigurationManagerImpl extends ManagerBase
implements Configurati
NetworkOffering offering = createNetworkOffering(name, displayText,
trafficType, tags, specifyVlan, availability, networkRate,
serviceProviderMap, false, guestType, false,
serviceOfferingId, conserveMode, serviceCapabilityMap,
-specifyIpRanges, isPersistent, details, egressDefaultPolicy);
+specifyIpRanges, isPersistent, details, egressDefaultPolicy,
maxconn);
CallContext.current().setEventDetails(" Id: " + offering.getId() + "
Name: " + name);
return offering;
}
git commit: updated refs/heads/4.2 to 664d479
Updated Branches:
refs/heads/4.2 ba4c4400b -> 664d479f8
Cloudstack-3313 Cannot deploy vm in ipv6 network
Signed-off-by: Abhinandan Prateek
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/664d479f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/664d479f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/664d479f
Branch: refs/heads/4.2
Commit: 664d479f8fe46d3c2f177b75372f45a041df456e
Parents: ba4c440
Author: Bharat Kumar
Authored: Tue Jul 16 11:40:01 2013 +0530
Committer: Abhinandan Prateek
Committed: Wed Jul 17 10:07:57 2013 +0530
--
.../systemvm/debian/config/etc/init.d/cloud-early-config| 9 -
.../com/cloud/configuration/ConfigurationManagerImpl.java | 3 ++-
server/src/com/cloud/network/NetworkManagerImpl.java| 6 --
3 files changed, 14 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/664d479f/patches/systemvm/debian/config/etc/init.d/cloud-early-config
--
diff --git a/patches/systemvm/debian/config/etc/init.d/cloud-early-config
b/patches/systemvm/debian/config/etc/init.d/cloud-early-config
index f93c39d..5835c4d 100755
--- a/patches/systemvm/debian/config/etc/init.d/cloud-early-config
+++ b/patches/systemvm/debian/config/etc/init.d/cloud-early-config
@@ -544,7 +544,14 @@ setup_dnsmasq() {
[ $ETH0_IP ] && echo "dhcp-option=6,$NS" >> /etc/dnsmasq.conf
[ $ETH0_IP6 ] && echo "dhcp-option=option6:dns-server,$NS6" >>
/etc/dnsmasq.conf
#adding the name data-server to the /etc/hosts for allowing the access to
user-data service and ssh-key reset in every subnet.
- echo "$ETH0_IP data-server" >> /etc/hosts
+ if [ -n "$ETH0_IP" ]
+ then
+ echo "$ETH0_IP data-server" >> /etc/hosts
+ fi
+ if [ -n "$ETH0_IP6" ]
+ then
+ echo "$ETH0_IP6 data-server" >> /etc/hosts
+ fi
}
setup_sshd(){
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/664d479f/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
--
diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
index 7e0bc25..b746a36 100755
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -2831,6 +2831,7 @@ public class ConfigurationManagerImpl extends ManagerBase
implements Configurati
ip6Gateway = network.getIp6Gateway();
ip6Cidr = network.getIp6Cidr();
_networkModel.checkIp6Parameters(startIPv6, endIPv6,
ip6Gateway, ip6Cidr);
+sameSubnet = true;
}
}
}
@@ -2846,7 +2847,7 @@ public class ConfigurationManagerImpl extends ManagerBase
implements Configurati
vlanDetails = new Pair(newVlanGateway,
newVlanNetmask);
}
// check if the gatewayip is the part of the ip range being added.
-if (NetUtils.ipRangesOverlap(startIP, endIP, vlanDetails.first(),
vlanDetails.first())) {
+if (ipv4 && NetUtils.ipRangesOverlap(startIP, endIP,
vlanDetails.first(), vlanDetails.first())) {
throw new InvalidParameterValueException(
"The gateway ip should not be the part of the ip range
being added.");
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/664d479f/server/src/com/cloud/network/NetworkManagerImpl.java
--
diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java
b/server/src/com/cloud/network/NetworkManagerImpl.java
index 45ff2bd..ba39caf 100755
--- a/server/src/com/cloud/network/NetworkManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkManagerImpl.java
@@ -2003,8 +2003,10 @@ public class NetworkManagerImpl extends ManagerBase
implements NetworkManager, L
_networkModel.isProviderSupportServiceInNetwork(network.getId(), Service.Dhcp,
element.getProvider()) &&
element instanceof DhcpServiceProvider) {
DhcpServiceProvider sp = (DhcpServiceProvider) element;
-if (!sp.configDhcpSupportForSubnet(network, profile,
vmProfile, dest, context)) {
- return false;
+if (profile.getIp6Address() == null) {
+if (!sp.configDhcpSupportForSubnet(network, profile,
vmProfile, dest, context)) {
+return false;
+}
}
sp.addDhcpEntry(network, profile, vmProfile, dest, context);
}
