You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by hu...@apache.org on 2014/03/14 14:57:58 UTC
[01/50] [abbrv] Merge branch 'master' into rbac.
Repository: cloudstack
Updated Branches:
refs/heads/4.4 3ee1fc28d -> 48f8a95b0
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99bdc8d8/server/src/com/cloud/network/as/AutoScaleManagerImpl.java
----------------------------------------------------------------------
diff --cc server/src/com/cloud/network/as/AutoScaleManagerImpl.java
index e07e502,2fa3821..755fc54
--- a/server/src/com/cloud/network/as/AutoScaleManagerImpl.java
+++ b/server/src/com/cloud/network/as/AutoScaleManagerImpl.java
@@@ -59,8 -54,11 +59,9 @@@ import org.apache.cloudstack.config.Api
import org.apache.cloudstack.context.CallContext;
import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
-import org.apache.log4j.Logger;
-
import com.cloud.api.ApiDBUtils;
- import com.cloud.api.ApiDispatcher;
+ import com.cloud.api.dispatch.DispatchChainFactory;
+ import com.cloud.api.dispatch.DispatchTask;
import com.cloud.configuration.ConfigurationManager;
import com.cloud.dc.DataCenter;
import com.cloud.dc.DataCenter.NetworkType;
@@@ -126,9 -124,14 +127,11 @@@ import com.cloud.vm.UserVmService
@Local(value = {AutoScaleService.class, AutoScaleManager.class})
public class AutoScaleManagerImpl<Type> extends ManagerBase implements AutoScaleManager, AutoScaleService {
private static final Logger s_logger = Logger.getLogger(AutoScaleManagerImpl.class);
- private final ScheduledExecutorService _executor = Executors.newScheduledThreadPool(1);
+ private ScheduledExecutorService _executor = Executors.newScheduledThreadPool(1);
- @Inject()
+ @Inject
+ protected DispatchChainFactory dispatchChainFactory = null;
+ @Inject
EntityManager _entityMgr;
@Inject
AccountDao _accountDao;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99bdc8d8/server/src/com/cloud/network/vpc/VpcManagerImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99bdc8d8/server/src/com/cloud/resource/ResourceManagerImpl.java
----------------------------------------------------------------------
diff --cc server/src/com/cloud/resource/ResourceManagerImpl.java
index 689a0d7,2625885..f9a59ba
--- a/server/src/com/cloud/resource/ResourceManagerImpl.java
+++ b/server/src/com/cloud/resource/ResourceManagerImpl.java
@@@ -821,70 -836,73 +836,73 @@@ public class ResourceManagerImpl extend
@Override
public void doInTransactionWithoutResult(TransactionStatus status) {
- _dcDao.releasePrivateIpAddress(host.getPrivateIpAddress(), host.getDataCenterId(), null);
- _agentMgr.disconnectWithoutInvestigation(hostId, Status.Event.Remove);
+ _dcDao.releasePrivateIpAddress(host.getPrivateIpAddress(), host.getDataCenterId(), null);
+ _agentMgr.disconnectWithoutInvestigation(hostId, Status.Event.Remove);
- // delete host details
- _hostDetailsDao.deleteDetails(hostId);
+ // delete host details
+ _hostDetailsDao.deleteDetails(hostId);
+ // if host is GPU enabled, delete GPU entries
+ _hostGpuGroupsDao.deleteGpuEntries(hostId);
+
- host.setGuid(null);
- Long clusterId = host.getClusterId();
- host.setClusterId(null);
- _hostDao.update(host.getId(), host);
+ host.setGuid(null);
+ Long clusterId = host.getClusterId();
+ host.setClusterId(null);
+ _hostDao.update(host.getId(), host);
- _hostDao.remove(hostId);
- if (clusterId != null) {
- List<HostVO> hosts = listAllHostsInCluster(clusterId);
- if (hosts.size() == 0) {
- ClusterVO cluster = _clusterDao.findById(clusterId);
- cluster.setGuid(null);
- _clusterDao.update(clusterId, cluster);
- }
- }
-
- try {
- resourceStateTransitTo(host, ResourceState.Event.DeleteHost, _nodeId);
- } catch (NoTransitionException e) {
- s_logger.debug("Cannot transmit host " + host.getId() + "to Enabled state", e);
- }
+ _hostDao.remove(hostId);
+ if (clusterId != null) {
+ List<HostVO> hosts = listAllHostsInCluster(clusterId);
+ if (hosts.size() == 0) {
+ ClusterVO cluster = _clusterDao.findById(clusterId);
+ cluster.setGuid(null);
+ _clusterDao.update(clusterId, cluster);
+ }
+ }
- // Delete the associated entries in host ref table
- _storagePoolHostDao.deletePrimaryRecordsForHost(hostId);
+ try {
+ resourceStateTransitTo(host, ResourceState.Event.DeleteHost, _nodeId);
+ } catch (NoTransitionException e) {
+ s_logger.debug("Cannot transmit host " + host.getId() + "to Enabled state", e);
+ }
- // Make sure any VMs that were marked as being on this host are cleaned up
- List<VMInstanceVO> vms = _vmDao.listByHostId(hostId);
- for (VMInstanceVO vm : vms) {
- // this is how VirtualMachineManagerImpl does it when it syncs VM states
- vm.setState(State.Stopped);
- vm.setHostId(null);
- _vmDao.persist(vm);
- }
+ // Delete the associated entries in host ref table
+ _storagePoolHostDao.deletePrimaryRecordsForHost(hostId);
- // For pool ids you got, delete local storage host entries in pool table
- // where
- for (StoragePoolHostVO pool : pools) {
- Long poolId = pool.getPoolId();
- StoragePoolVO storagePool = _storagePoolDao.findById(poolId);
- if (storagePool.isLocal() && isForceDeleteStorage) {
- storagePool.setUuid(null);
- storagePool.setClusterId(null);
- _storagePoolDao.update(poolId, storagePool);
- _storagePoolDao.remove(poolId);
- s_logger.debug("Local storage id=" + poolId + " is removed as a part of host removal id=" + hostId);
- }
- }
-
- // delete the op_host_capacity entry
- Object[] capacityTypes = {Capacity.CAPACITY_TYPE_CPU, Capacity.CAPACITY_TYPE_MEMORY};
- SearchCriteria<CapacityVO> hostCapacitySC = _capacityDao.createSearchCriteria();
- hostCapacitySC.addAnd("hostOrPoolId", SearchCriteria.Op.EQ, hostId);
- hostCapacitySC.addAnd("capacityType", SearchCriteria.Op.IN, capacityTypes);
- _capacityDao.remove(hostCapacitySC);
- // remove from dedicated resources
- DedicatedResourceVO dr = _dedicatedDao.findByHostId(hostId);
- if (dr != null) {
- _dedicatedDao.remove(dr.getId());
- }
+ // Make sure any VMs that were marked as being on this host are cleaned up
+ List<VMInstanceVO> vms = _vmDao.listByHostId(hostId);
+ for (VMInstanceVO vm : vms) {
+ // this is how VirtualMachineManagerImpl does it when it syncs VM states
+ vm.setState(State.Stopped);
+ vm.setHostId(null);
+ _vmDao.persist(vm);
+ }
+
+ // For pool ids you got, delete local storage host entries in pool table
+ // where
+ for (StoragePoolHostVO pool : pools) {
+ Long poolId = pool.getPoolId();
+ StoragePoolVO storagePool = _storagePoolDao.findById(poolId);
+ if (storagePool.isLocal() && isForceDeleteStorage) {
+ storagePool.setUuid(null);
+ storagePool.setClusterId(null);
+ _storagePoolDao.update(poolId, storagePool);
+ _storagePoolDao.remove(poolId);
+ s_logger.debug("Local storage id=" + poolId + " is removed as a part of host removal id=" + hostId);
+ }
+ }
+
+ // delete the op_host_capacity entry
+ Object[] capacityTypes = {Capacity.CAPACITY_TYPE_CPU, Capacity.CAPACITY_TYPE_MEMORY};
+ SearchCriteria<CapacityVO> hostCapacitySC = _capacityDao.createSearchCriteria();
+ hostCapacitySC.addAnd("hostOrPoolId", SearchCriteria.Op.EQ, hostId);
+ hostCapacitySC.addAnd("capacityType", SearchCriteria.Op.IN, capacityTypes);
+ _capacityDao.remove(hostCapacitySC);
+ // remove from dedicated resources
+ DedicatedResourceVO dr = _dedicatedDao.findByHostId(hostId);
+ if (dr != null) {
+ _dedicatedDao.remove(dr.getId());
+ }
}
});
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99bdc8d8/server/src/com/cloud/server/ManagementServerImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99bdc8d8/server/src/com/cloud/storage/VolumeApiServiceImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99bdc8d8/server/src/com/cloud/user/AccountManagerImpl.java
----------------------------------------------------------------------
diff --cc server/src/com/cloud/user/AccountManagerImpl.java
index d5e4afc,c48e9b5..04d3e23
--- a/server/src/com/cloud/user/AccountManagerImpl.java
+++ b/server/src/com/cloud/user/AccountManagerImpl.java
@@@ -2433,51 -2323,55 +2433,97 @@@ public class AccountManagerImpl extend
}
@Override
- public UserAccount getUserByApiKey(String apiKey) {
- return _userAccountDao.getUserByApiKey(apiKey);
+ public void buildACLViewSearchCriteria(SearchCriteria<? extends ControlledEntity> sc, SearchCriteria<? extends ControlledEntity> aclSc, boolean isRecursive,
+ List<Long> permittedDomains,
+ List<Long> permittedAccounts, List<Long> permittedResources, ListProjectResourcesCriteria listProjectResourcesCriteria) {
+
+ if (listProjectResourcesCriteria != null) {
+ // add criteria for project or not
+ if (listProjectResourcesCriteria == ListProjectResourcesCriteria.SkipProjectResources) {
+ sc.addAnd("accountType", SearchCriteria.Op.NEQ, Account.ACCOUNT_TYPE_PROJECT);
+ } else if (listProjectResourcesCriteria == ListProjectResourcesCriteria.ListProjectResourcesOnly) {
+ sc.addAnd("accountType", SearchCriteria.Op.EQ, Account.ACCOUNT_TYPE_PROJECT);
+ }
+ }
+
+ if (permittedDomains.isEmpty() && permittedAccounts.isEmpty() && permittedResources.isEmpty())
+ // can access everything
+ return;
+
+ // Note that this may have limitations on number of permitted domains, accounts, or resource ids are allowed due to sql package size limitation
+ if (!permittedDomains.isEmpty()) {
+ if (isRecursive) {
+ for (int i = 0; i < permittedDomains.size(); i++) {
+ Domain domain = _domainDao.findById(permittedDomains.get(i));
+ aclSc.addOr("domainPath", SearchCriteria.Op.LIKE, domain.getPath() + "%");
+ }
+ } else {
+ aclSc.addOr("domainId", SearchCriteria.Op.IN, permittedDomains.toArray());
+ }
+ }
+ if (!permittedAccounts.isEmpty()) {
+ aclSc.addOr("accountId", SearchCriteria.Op.IN, permittedAccounts.toArray());
+ }
+ if (!permittedResources.isEmpty()) {
+ aclSc.addOr("id", SearchCriteria.Op.IN, permittedResources.toArray());
+ }
+
+ sc.addAnd("accountId", SearchCriteria.Op.SC, aclSc);
+ }
+
+ @Override
+ public List<String> listAclGroupsByAccount(Long accountId) {
+ if (_querySelectors == null || _querySelectors.size() == 0)
+ return new ArrayList<String>();
+
+ QuerySelector qs = _querySelectors.get(0);
+ return qs.listAclGroupsByAccount(accountId);
}
+ @Override
+ public Long finalyzeAccountId(final String accountName, final Long domainId, final Long projectId, final boolean enabledOnly) {
+ if (accountName != null) {
+ if (domainId == null) {
+ throw new InvalidParameterValueException("Account must be specified with domainId parameter");
+ }
+
+ final Domain domain = _domainMgr.getDomain(domainId);
+ if (domain == null) {
+ throw new InvalidParameterValueException("Unable to find domain by id");
+ }
+
+ final Account account = getActiveAccountByName(accountName, domainId);
+ if (account != null && account.getType() != Account.ACCOUNT_TYPE_PROJECT) {
+ if (!enabledOnly || account.getState() == Account.State.enabled) {
+ return account.getId();
+ } else {
+ throw new PermissionDeniedException("Can't add resources to the account id=" + account.getId() + " in state=" + account.getState() +
+ " as it's no longer active");
+ }
+ } else {
+ // idList is not used anywhere, so removed it now
+ // List<IdentityProxy> idList = new ArrayList<IdentityProxy>();
+ // idList.add(new IdentityProxy("domain", domainId, "domainId"));
+ throw new InvalidParameterValueException("Unable to find account by name " + accountName + " in domain with specified id");
+ }
+ }
+
+ if (projectId != null) {
+ final Project project = _projectMgr.getProject(projectId);
+ if (project != null) {
+ if (!enabledOnly || project.getState() == Project.State.Active) {
+ return project.getProjectAccountId();
+ } else {
+ final PermissionDeniedException ex =
+ new PermissionDeniedException("Can't add resources to the project with specified projectId in state=" + project.getState() +
+ " as it's no longer active");
+ ex.addProxyObject(project.getUuid(), "projectId");
+ throw ex;
+ }
+ } else {
+ throw new InvalidParameterValueException("Unable to find project by id");
+ }
+ }
+ return null;
+ }
-
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99bdc8d8/server/src/com/cloud/vm/UserVmManagerImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99bdc8d8/server/test/com/cloud/user/MockAccountManagerImpl.java
----------------------------------------------------------------------
diff --cc server/test/com/cloud/user/MockAccountManagerImpl.java
index fa786bf,5a44800..b411b18
--- a/server/test/com/cloud/user/MockAccountManagerImpl.java
+++ b/server/test/com/cloud/user/MockAccountManagerImpl.java
@@@ -345,10 -322,9 +345,15 @@@ public class MockAccountManagerImpl ext
}
@Override
+ public void checkAccess(Account account, AccessType accessType, boolean sameOwner, String apiName,
+ ControlledEntity... entities) throws PermissionDeniedException {
+ // TODO Auto-generated method stub
++ }
+
++ @Override
+ public Long finalyzeAccountId(String accountName, Long domainId, Long projectId, boolean enabledOnly) {
+ // TODO Auto-generated method stub
+ return null;
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99bdc8d8/setup/db/db/schema-430to440.sql
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99bdc8d8/tools/marvin/marvin/integration/lib/base.py
----------------------------------------------------------------------
[45/50] [abbrv] git commit: updated refs/heads/4.4 to 48f8a95
Posted by hu...@apache.org.
fix RAT check failure
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/81f6e668
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/81f6e668
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/81f6e668
Branch: refs/heads/4.4
Commit: 81f6e668084b732c78989d79f6b4ee22f9355a40
Parents: 9a97ba76
Author: Murali Reddy <mu...@gmail.com>
Authored: Fri Mar 14 16:26:52 2014 +0530
Committer: Murali Reddy <mu...@gmail.com>
Committed: Fri Mar 14 16:56:39 2014 +0530
----------------------------------------------------------------------
.../network/ovs/OvsNetworkTopologyGuruImpl.java | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/81f6e668/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsNetworkTopologyGuruImpl.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsNetworkTopologyGuruImpl.java b/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsNetworkTopologyGuruImpl.java
index ab08d26..402a9c8 100644
--- a/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsNetworkTopologyGuruImpl.java
+++ b/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsNetworkTopologyGuruImpl.java
@@ -1,3 +1,20 @@
+// 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.
+
package com.cloud.network.ovs;
import com.cloud.network.Network;
[31/50] [abbrv] git commit: updated refs/heads/4.4 to 48f8a95
Posted by hu...@apache.org.
CLOUDSTACK-6090: Virtual Router Service Failure Alerting
Fixed a missing license header
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f293c94b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f293c94b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f293c94b
Branch: refs/heads/4.4
Commit: f293c94bc0198f162c80ff807ca81459150354a5
Parents: f733752
Author: Koushik Das <ko...@apache.org>
Authored: Fri Mar 14 15:45:54 2014 +0530
Committer: Koushik Das <ko...@apache.org>
Committed: Fri Mar 14 15:45:54 2014 +0530
----------------------------------------------------------------------
.../network/dao/OpRouterMonitorServiceVO.java | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f293c94b/engine/schema/src/com/cloud/network/dao/OpRouterMonitorServiceVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/OpRouterMonitorServiceVO.java b/engine/schema/src/com/cloud/network/dao/OpRouterMonitorServiceVO.java
index c70bba3..c2882fc 100644
--- a/engine/schema/src/com/cloud/network/dao/OpRouterMonitorServiceVO.java
+++ b/engine/schema/src/com/cloud/network/dao/OpRouterMonitorServiceVO.java
@@ -1,3 +1,20 @@
+// 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.
+
package com.cloud.network.dao;
import org.apache.cloudstack.api.InternalIdentity;
[36/50] [abbrv] git commit: updated refs/heads/4.4 to 48f8a95
Posted by hu...@apache.org.
Scripts that use ovs-vsctl and ovs-ofctl to setup a bridge for VPC in
distributed routing mode, and setup flows appropriatley
script to handle the VPC topology sent from management server in JSOn
format. From the JSON file, reqired configuration (tunnel setup and flow
rules setup) is setup on the bridge
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/100df924
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/100df924
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/100df924
Branch: refs/heads/4.4
Commit: 100df9245599bb53636d955e658f9821566a9bd1
Parents: 32ac021
Author: Murali Reddy <mu...@gmail.com>
Authored: Mon Mar 10 11:58:37 2014 +0530
Committer: Murali Reddy <mu...@gmail.com>
Committed: Fri Mar 14 16:56:36 2014 +0530
----------------------------------------------------------------------
.../xenserver/cloudstack_pluginlib.py | 154 +++++++++++++++++++
.../vm/hypervisor/xenserver/ovs-vif-flows.py | 128 +++++++++++----
scripts/vm/hypervisor/xenserver/ovstunnel | 114 +++++++++++++-
3 files changed, 362 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/100df924/scripts/vm/hypervisor/xenserver/cloudstack_pluginlib.py
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/xenserver/cloudstack_pluginlib.py b/scripts/vm/hypervisor/xenserver/cloudstack_pluginlib.py
index 422111f..d2b95dc 100644
--- a/scripts/vm/hypervisor/xenserver/cloudstack_pluginlib.py
+++ b/scripts/vm/hypervisor/xenserver/cloudstack_pluginlib.py
@@ -21,6 +21,7 @@ import ConfigParser
import logging
import os
import subprocess
+import json
from time import localtime, asctime
@@ -176,6 +177,7 @@ def _build_flow_expr(**kwargs):
dl_dst = 'dl_dst' in kwargs and ",dl_dst=%s" % kwargs['dl_dst'] or ''
nw_src = 'nw_src' in kwargs and ",nw_src=%s" % kwargs['nw_src'] or ''
nw_dst = 'nw_dst' in kwargs and ",nw_dst=%s" % kwargs['nw_dst'] or ''
+ table = 'table' in kwargs and ",table=%s" % kwargs['table'] or ''
proto = 'proto' in kwargs and ",%s" % kwargs['proto'] or ''
ip = ('nw_src' in kwargs or 'nw_dst' in kwargs) and ',ip' or ''
flow = (flow + in_port + dl_type + dl_src + dl_dst +
@@ -219,3 +221,155 @@ def del_all_flows(bridge):
def del_port(bridge, port):
delPort = [VSCTL_PATH, "del-port", bridge, port]
do_cmd(delPort)
+
+def get_network_id_for_vif(vif_name):
+ domain_id, device_id = vif_name[3:len(vif_name)].split(".")
+ dom_uuid = do_cmd([XE_PATH, "vm-list", "dom-id=%s" % domain_id, "--minimal"])
+ vif_uuid = do_cmd([XE_PATH, "vif-list", "vm-uuid=%s" % dom_uuid, "device=%s" % device_id, "--minimal"])
+ vnet = do_cmd([XE_PATH, "vif-param-get", "uuid=%s" % vif_uuid, "param-name=other-config",
+ "param-key=cloudstack-network-id"])
+ return vnet
+
+def get_network_id_for_tunnel_port(tunnelif_name):
+ vnet = do_cmd([VSCTL_PATH, "get", "interface", tunnelif_name, "options:cloudstack-network-id"])
+ return vnet
+
+def clear_flooding_rules_for_port(bridge, ofport):
+ del_flows(bridge, in_port=ofport, table=2)
+
+def add_flooding_rules_for_port(bridge, in_ofport, out_ofports):
+ action = "".join("output:%s," %ofport for ofport in out_ofports)[:-1]
+ add_flow(bridge, priority=1100, in_port=in_ofport, table=1, actions=action)
+
+def get_ofport_for_vif(vif_name):
+ return do_cmd([VSCTL_PATH, "get", "interface", vif_name, "ofport"])
+
+def get_macaddress_of_vif(vif_name):
+ domain_id, device_id = vif_name[3:len(vif_name)].split(".")
+ dom_uuid = do_cmd([XE_PATH, "vm-list", "dom-id=%s" % domain_id, "--minimal"])
+ vif_uuid = do_cmd([XE_PATH, "vif-list", "vm-uuid=%s" % dom_uuid, "device=%s" % device_id, "--minimal"])
+ mac = do_cmd([XE_PATH, "vif-param-get", "uuid=%s" % vif_uuid, "param-name=MAC"])
+ return mac
+
+def get_vif_name_from_macaddress(macaddress):
+ vif_uuid = do_cmd([XE_PATH, "vif-list", "MAC=%s" % macaddress, "--minimal"])
+ vif_device_id = do_cmd([XE_PATH, "vif-param-get", "uuid=%s" % vif_uuid, "param-name=device"])
+ vm_uuid = do_cmd([XE_PATH, "vif-param-get", "uuid=%s" % vif_uuid, "param-name=vm-uuid"])
+ vm_domain_id = do_cmd([XE_PATH, "vm-param-get", "uuid=%s" % vm_uuid, "param-name=dom-id"])
+ return "vif"+vm_domain_id+"."+vif_device_id
+
+def add_mac_lookup_table_entry(bridge, mac_address, out_of_port):
+ add_flow(bridge, priority=1100, dl_dst=mac_address, table=1, actions="output:%s" % out_of_port)
+
+def delete_mac_lookup_table_entry(bridge, mac_address):
+ del_flows(bridge, dl_dst=mac_address, table=1)
+
+def add_ip_lookup_table_entry(bridge, ip, dst_tier_gateway_mac, dst_vm_mac):
+ action_str = "mod_dl_sr:%s" % dst_tier_gateway_mac + ",mod_dl_dst:%s" % dst_vm_mac +",resubmit(,5)"
+ addflow = [OFCTL_PATH, "add-flow", bridge, "table=4", "nw_dst=%s" % ip, "actions=%s" %action_str]
+ do_cmd(addflow)
+
+def get_vms_on_host(vpc, host_id):
+ all_vms = vpc.vms
+ vms_on_host = []
+ for vm in all_vms:
+ if vm.hostid == host_id:
+ vms_on_host.append(vm)
+ return vms_on_host
+
+def get_network_details(vpc, network_uuid):
+ tiers = vpc.tiers
+ for tier in tiers:
+ if tier.networkuuid == network_uuid:
+ return tier
+ return None
+
+class jsonLoader(object):
+ def __init__(self, obj):
+ for k in obj:
+ v = obj[k]
+ if isinstance(v, dict):
+ setattr(self, k, jsonLoader(v))
+ elif isinstance(v, (list, tuple)):
+ if len(v) > 0 and isinstance(v[0], dict):
+ setattr(self, k, [jsonLoader(elem) for elem in v])
+ else:
+ setattr(self, k, v)
+ else:
+ setattr(self, k, v)
+
+ def __getattr__(self, val):
+ if val in self.__dict__:
+ return self.__dict__[val]
+ else:
+ return None
+
+ def __repr__(self):
+ return '{%s}' % str(', '.join('%s : %s' % (k, repr(v)) for (k, v)
+ in self.__dict__.iteritems()))
+
+ def __str__(self):
+ return '{%s}' % str(', '.join('%s : %s' % (k, repr(v)) for (k, v)
+ in self.__dict__.iteritems()))
+
+def configure_bridge_for_topology(bridge, this_host_id, json_config):
+ vpconfig = jsonLoader(json.loads(json_config)).vpc
+
+ if vpconfig is None:
+ logging.debug("WARNING:Can't find VPC info in json config file")
+ return "FAILURE:IMPROPER_JSON_CONFG_FILE"
+
+ # get the list of Vm's in the VPC from the JSON config
+ this_host_vms = get_vms_on_host(vpconfig, this_host_id)
+
+ for vm in this_host_vms:
+ for nic in vm.nics:
+ mac_addr = nic.macaddress
+ ip = nic.ipaddress
+ vif_name = get_vif_name_from_macaddress(mac_addr)
+ of_port = get_ofport_for_vif(vif_name)
+ network = get_network_details(vpconfig, nic.networkuuid)
+
+ # Add flow rule in L2 look up table, if the destination mac = MAC of the nic send packet on the found OFPORT
+ add_mac_lookup_table_entry(bridge, mac_addr, of_port)
+
+ # Add flow rule in L3 look up table: if the destination IP = VM's IP then modify the packet
+ # to set DST MAC = VM's MAC, SRC MAC=tier gateway MAC and send to egress table
+ add_ip_lookup_table_entry(bridge, ip, network.gatewaymac, mac_addr)
+
+ # Add flow entry to send with intra tier traffic from the NIC to L2 lookup path)
+ addflow = [OFCTL_PATH, "add-flow", bridge, "table=0", "in_port=%s" % of_port,
+ "nw_dst=%s" %network.cidr, "actions=resubmit(,1)"]
+ do_cmd(addflow)
+
+ #add flow entry to send inter-tier traffic from the NIC to egress ACL table(to L3 lookup path)
+ addflow = [OFCTL_PATH, "add-flow", bridge, "table=0", "in_port=%s" % of_port,
+ "dl_dst=%s" %network.gatewaymac, "nw_dst=%s" %vpconfig.cidr, "actions=resubmit(,3)"]
+ do_cmd(addflow)
+
+ # get the list of hosts on which VPC spans from the JSON config
+ vpc_spanning_hosts = vpconfig.hosts
+
+ for host in vpc_spanning_hosts:
+ if this_host_id == host.hostid:
+ continue
+ other_host_vms = get_vms_on_host(vpconfig, host.hostid)
+ for vm in other_host_vms:
+ for nic in vm.nics:
+ mac_addr = nic.macaddress
+ ip = nic.ipaddress
+ network = get_network_details(vpconfig, nic.networkuuid)
+ gre_key = network.grekey
+
+ # generate tunnel name from tunnel naming convention
+ tunnel_name = "t%s-%s-%s" % (gre_key, this_host_id, host.hostid)
+ of_port = get_ofport_for_vif(tunnel_name)
+
+ # Add flow rule in L2 look up table, if the destination mac = MAC of the nic send packet tunnel port
+ add_mac_lookup_table_entry(bridge, mac_addr, of_port)
+
+ # Add flow tule in L3 look up table: if the destination IP = VM's IP then modify the packet
+ # set DST MAC = VM's MAC, SRC MAC=tier gateway MAC and send to egress table
+ add_ip_lookup_table_entry(bridge, ip, network.gatewaymac, mac_addr)
+
+ return "SUCCESS: successfully configured bridge as per the VPC toplogy"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/100df924/scripts/vm/hypervisor/xenserver/ovs-vif-flows.py
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/xenserver/ovs-vif-flows.py b/scripts/vm/hypervisor/xenserver/ovs-vif-flows.py
index 8452dae..ae37525 100644
--- a/scripts/vm/hypervisor/xenserver/ovs-vif-flows.py
+++ b/scripts/vm/hypervisor/xenserver/ovs-vif-flows.py
@@ -18,6 +18,7 @@
# A simple script for enabling and disabling per-vif rules for explicitly
# allowing broadcast/multicast traffic on the port where the VIF is attached
+import copy
import os
import sys
@@ -65,7 +66,6 @@ def clear_rules(vif):
except:
pass
-
def main(command, vif_raw):
if command not in ('online', 'offline'):
return
@@ -86,38 +86,110 @@ def main(command, vif_raw):
# find xs network for this bridge, verify is used for ovs tunnel network
xs_nw_uuid = pluginlib.do_cmd([pluginlib.XE_PATH, "network-list",
"bridge=%s" % bridge, "--minimal"])
- result = pluginlib.do_cmd([pluginlib.XE_PATH,"network-param-get",
+ ovs_tunnel_network = pluginlib.do_cmd([pluginlib.XE_PATH,"network-param-get",
"uuid=%s" % xs_nw_uuid,
"param-name=other-config",
"param-key=is-ovs-tun-network", "--minimal"])
- if result != 'True':
- return
-
- vlan = pluginlib.do_cmd([pluginlib.VSCTL_PATH, 'br-to-vlan', bridge])
- if vlan != '0':
- # We need the REAL bridge name
- bridge = pluginlib.do_cmd([pluginlib.VSCTL_PATH,
- 'br-to-parent', bridge])
-
- vsctl_output = pluginlib.do_cmd([pluginlib.VSCTL_PATH,
- 'list-ports', bridge])
- vifs = vsctl_output.split('\n')
- vif_ofports = []
- for vif in vifs:
- vif_ofport = pluginlib.do_cmd([pluginlib.VSCTL_PATH, 'get',
- 'Interface', vif, 'ofport'])
- if this_vif == vif:
- this_vif_ofport = vif_ofport
- if vif.startswith('vif'):
- vif_ofports.append(vif_ofport)
-
- if command == 'offline':
- clear_flows(bridge, this_vif_ofport, vif_ofports)
-
- if command == 'online':
- apply_flows(bridge, this_vif_ofport, vif_ofports)
+ ovs_vpc_distributed_vr_network = pluginlib.do_cmd([pluginlib.XE_PATH,"network-param-get",
+ "uuid=%s" % xs_nw_uuid,
+ "param-name=other-config",
+ "param-key=is-ovs_vpc_distributed_vr_network", "--minimal"])
+
+ if ovs_tunnel_network == 'True':
+ vlan = pluginlib.do_cmd([pluginlib.VSCTL_PATH, 'br-to-vlan', bridge])
+ if vlan != '0':
+ # We need the REAL bridge name
+ bridge = pluginlib.do_cmd([pluginlib.VSCTL_PATH,
+ 'br-to-parent', bridge])
+ vsctl_output = pluginlib.do_cmd([pluginlib.VSCTL_PATH,
+ 'list-ports', bridge])
+ vifs = vsctl_output.split('\n')
+ vif_ofports = []
+ for vif in vifs:
+ vif_ofport = pluginlib.do_cmd([pluginlib.VSCTL_PATH, 'get',
+ 'Interface', vif, 'ofport'])
+ if this_vif == vif:
+ this_vif_ofport = vif_ofport
+ if vif.startswith('vif'):
+ vif_ofports.append(vif_ofport)
+ if command == 'offline':
+ clear_flows(bridge, this_vif_ofport, vif_ofports)
+
+ if command == 'online':
+ apply_flows(bridge, this_vif_ofport, vif_ofports)
+
+
+ if ovs_vpc_distributed_vr_network == 'True':
+ vlan = pluginlib.do_cmd([pluginlib.VSCTL_PATH, 'br-to-vlan', bridge])
+ if vlan != '0':
+ # We need the REAL bridge name
+ bridge = pluginlib.do_cmd([pluginlib.VSCTL_PATH,
+ 'br-to-parent', bridge])
+ vsctl_output = pluginlib.do_cmd([pluginlib.VSCTL_PATH,
+ 'list-ports', bridge])
+ vif_network_id = pluginlib.get_network_id_for_vif(this_vif)
+ vnet_vif_ofports = []
+ vnet_tunnelif_ofports = []
+ vnet_all_ofports = []
+
+ ports = vsctl_output.split('\n')
+ for port in ports:
+ if_ofport = pluginlib.do_cmd([pluginlib.VSCTL_PATH, 'get', 'Interface', vif, 'ofport'])
+ if vif.startswith('vif'):
+ # check VIF is in same network as that of plugged vif
+ if vif_network_id != pluginlib.get_network_id_for_vif(port):
+ continue
+ vnet_vif_ofports.append(if_ofport)
+ vnet_all_ofports.append(if_ofport)
+
+ if vif.startswith('t'):
+ # check tunnel port is in same network as that of plugged vif
+ if vif_network_id != pluginlib.get_network_id_for_tunnel_port(port):
+ continue
+ vnet_tunnelif_ofports.append(if_ofport)
+ vnet_all_ofports.append(if_ofport)
+
+ if command == 'online':
+ for port in vnet_all_ofports:
+ pluginlib.clear_flooding_rules_for_port(bridge, port)
+
+ # for a packet arrived from tunnel port, flood only on VIF ports
+ for port in vnet_tunnelif_ofports:
+ pluginlib.add_flooding_rules_for_port(bridge, port, vnet_vif_ofports)
+
+ # send on all VIF and tunnel port excluding the port on which packet arrived
+ for port in vnet_vif_ofports:
+ vnet_all_ofports_copy = copy.copy(vnet_all_ofports)
+ vnet_all_ofports_copy.remove(port)
+ pluginlib.add_flooding_rules_for_port(bridge, port, vnet_all_ofports_copy)
+
+ #learn that MAC is reachable through the VIF port
+ mac = pluginlib.get_macaddress_of_vif(this_vif)
+ pluginlib.add_mac_lookup_table_entry(bridge, mac, this_vif_ofport)
+
+ if command == 'offline':
+ for port in vnet_all_ofports:
+ pluginlib.clear_flooding_rules_for_port(bridge, port)
+ vnet_all_ofports.remove(this_vif_ofport)
+ vnet_vif_ofports.remove(this_vif_ofport)
+
+ # for a packet arrived from tunnel port, flood only on VIF ports
+ for port in vnet_tunnelif_ofports:
+ pluginlib.add_flooding_rules_for_port(bridge, port, vnet_vif_ofports)
+
+ # for a packet from VIF port send on all VIF's and tunnel ports excluding the port on which packet arrived
+ for port in vnet_vif_ofports:
+ vnet_all_ofports_copy = copy.copy(vnet_all_ofports)
+ vnet_all_ofports_copy.remove(port)
+ pluginlib.add_flooding_rules_for_port(bridge, port, vnet_all_ofports_copy)
+
+ #un-learn that MAC is reachable through the VIF port
+ mac = pluginlib.get_macaddress_of_vif(this_vif)
+ pluginlib.delete_mac_lookup_table_entry(bridge, mac)
+
+ return
if __name__ == "__main__":
if len(sys.argv) != 3:
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/100df924/scripts/vm/hypervisor/xenserver/ovstunnel
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/xenserver/ovstunnel b/scripts/vm/hypervisor/xenserver/ovstunnel
index 106be04..d558e97 100755
--- a/scripts/vm/hypervisor/xenserver/ovstunnel
+++ b/scripts/vm/hypervisor/xenserver/ovstunnel
@@ -124,6 +124,75 @@ def setup_ovs_bridge(session, args):
logging.debug("Setup_ovs_bridge completed with result:%s" % result)
return result
+@echo
+def setup_ovs_bridge_for_distributed_routing(session, args):
+ bridge = args.pop("bridge")
+ key = args.pop("key")
+ xs_nw_uuid = args.pop("xs_nw_uuid")
+ cs_host_id = args.pop("cs_host_id")
+
+ res = lib.check_switch()
+ if res != "SUCCESS":
+ return "FAILURE:%s" % res
+
+ logging.debug("About to manually create the bridge:%s" % bridge)
+ # create a bridge with the same name as the xapi network
+ res = lib.do_cmd([lib.VSCTL_PATH, "--", "--may-exist", "add-br", bridge,
+ "--", "set", "bridge", bridge])
+ logging.debug("Bridge has been manually created:%s" % res)
+ # TODO: Make sure xs-network-uuid is set into external_ids
+ lib.do_cmd([lib.VSCTL_PATH, "set", "Bridge", bridge,
+ "external_ids:xs-network-uuid=%s" % xs_nw_uuid])
+
+ # Non empty result means something went wrong
+ if res:
+ result = "FAILURE:%s" % res
+ else:
+ # Verify the bridge actually exists, with the gre_key properly set
+ res = lib.do_cmd([lib.VSCTL_PATH, "get", "bridge",
+ bridge, "other_config:gre_key"])
+ if key in res:
+ result = "SUCCESS:%s" % bridge
+ else:
+ result = "FAILURE:%s" % res
+ # Finally note in the xenapi network object that the network has
+ # been configured
+ xs_nw_uuid = lib.do_cmd([lib.XE_PATH, "network-list",
+ "bridge=%s" % bridge, "--minimal"])
+ lib.do_cmd([lib.XE_PATH, "network-param-set", "uuid=%s" % xs_nw_uuid,
+ "other-config:is-ovs_vpc_distributed_vr_network=True"])
+ conf_hosts = lib.do_cmd([lib.XE_PATH, "network-param-get",
+ "uuid=%s" % xs_nw_uuid,
+ "param-name=other-config",
+ "param-key=ovs-host-setup", "--minimal"])
+ conf_hosts = cs_host_id + (conf_hosts and ',%s' % conf_hosts or '')
+ lib.do_cmd([lib.XE_PATH, "network-param-set", "uuid=%s" % xs_nw_uuid,
+ "other-config:ovs-host-setup=%s" % conf_hosts])
+
+ # add a default flow rule to send broadcast and multi-cast packets to L2 flooding table
+ lib.add_flow(bridge, priority=1000, dl_dst='ff:ff:ff:ff:ff:ff', table=0, actions='resubmit(,2)')
+ lib.add_flow(bridge, priority=1000, nw_dst='224.0.0.0/24', table=0, actions='resubmit(,2)')
+
+ # add a default flow rule to send uni-cast traffic to L2 lookup table
+ lib.add_flow(bridge, priority=0, table=0, actions='resubmit(,1)')
+
+ # add a default rule to send unknown mac address to L2 flooding table
+ lib.add_flow(bridge, priority=0, table=1, actions='resubmit(,2)')
+
+ # add a default rule in L2 flood table to drop packet
+ lib.add_flow(bridge, priority=0, table=2, actions='drop')
+
+ # add a default rule in egress table to forward packet to L3 lookup table
+ lib.add_flow(bridge, priority=0, table=3, actions='resubmit(,4)')
+
+ # add a default rule in L3 lookup table to forward packet to L2 lookup table
+ lib.add_flow(bridge, priority=0, table=4, actions='resubmit(,1)')
+
+ # add a default rule in egress table to forward packet to L3 lookup table
+ lib.add_flow(bridge, priority=0, table=5, actions='drop')
+
+ logging.debug("Setup_ovs_bridge completed with result:%s" % result)
+ return result
@echo
def destroy_ovs_bridge(session, args):
@@ -220,13 +289,36 @@ def create_tunnel(session, args):
# Ensure no trailing LF
if tun_ofport.endswith('\n'):
tun_ofport = tun_ofport[:-1]
- # add flow entryies for dropping broadcast coming in from gre tunnel
- lib.add_flow(bridge, priority=1000, in_port=tun_ofport,
+ # find xs network for this bridge, verify is used for ovs tunnel network
+ xs_nw_uuid = lib.do_cmd([lib.XE_PATH, "network-list",
+ "bridge=%s" % bridge, "--minimal"])
+ ovs_tunnel_network = lib.do_cmd([lib.XE_PATH,"network-param-get",
+ "uuid=%s" % xs_nw_uuid,
+ "param-name=other-config",
+ "param-key=is-ovs-tun-network", "--minimal"])
+ ovs_vpc_distributed_vr_network = lib.do_cmd([lib.XE_PATH,"network-param-get",
+ "uuid=%s" % xs_nw_uuid,
+ "param-name=other-config",
+ "param-key=is-ovs_vpc_distributed_vr_network", "--minimal"])
+ if ovs_tunnel_network == 'True':
+ # add flow entryies for dropping broadcast coming in from gre tunnel
+ lib.add_flow(bridge, priority=1000, in_port=tun_ofport,
dl_dst='ff:ff:ff:ff:ff:ff', actions='drop')
- lib.add_flow(bridge, priority=1000, in_port=tun_ofport,
+ lib.add_flow(bridge, priority=1000, in_port=tun_ofport,
nw_dst='224.0.0.0/24', actions='drop')
- drop_flow_setup = True
- logging.debug("Broadcast drop rules added")
+ drop_flow_setup = True
+ logging.debug("Broadcast drop rules added")
+
+ if ovs_vpc_distributed_vr_network == 'True':
+ # add flow rules for dropping broadcast coming in from tunnel ports
+ lib.add_flow(bridge, priority=1000, in_port=tun_ofport, table=0,
+ dl_dst='ff:ff:ff:ff:ff:ff', actions='drop')
+ lib.add_flow(bridge, priority=1000, in_port=tun_ofport, table=0,
+ nw_dst='224.0.0.0/24', actions='drop')
+
+ # add flow rule to send the traffic from tunnel ports to L2 switching table only
+ lib.add_flow(bridge, priority=1000, in_port=tun_ofport, table=0, actions='resubmit(,1)')
+
return "SUCCESS:%s" % name
except:
logging.debug("An unexpected error occured. Rolling back")
@@ -293,10 +385,20 @@ def getLabel(session, args):
return label
return False
+@echo
+def configure_ovs_bridge_for_network_topology(session, args):
+ bridge = args.pop("bridge")
+ json_config = args.pop("config")
+ this_host_id = args.pop("host-id")
+
+ return lib.configure_bridge_for_topology(bridge, this_host_id, json_config)
+
if __name__ == "__main__":
XenAPIPlugin.dispatch({"create_tunnel": create_tunnel,
"destroy_tunnel": destroy_tunnel,
"setup_ovs_bridge": setup_ovs_bridge,
"destroy_ovs_bridge": destroy_ovs_bridge,
"is_xcp": is_xcp,
- "getLabel": getLabel})
+ "getLabel": getLabel,
+ "setup_ovs_bridge_for_distributed_routing": setup_ovs_bridge_for_distributed_routing,
+ "configure_ovs_bridge_for_network_topology": configure_ovs_bridge_for_network_topology})
[35/50] [abbrv] git commit: updated refs/heads/4.4 to 48f8a95
Posted by hu...@apache.org.
-add check to ensure 'Connectivity' service provider specified in
createVpcOffering actually supports 'DistributedRouter' capability
- enable OVS to support 'DistributedRouter' capability
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e3ec12e5
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e3ec12e5
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e3ec12e5
Branch: refs/heads/4.4
Commit: e3ec12e5d051d7faa6ea12c1bc6f1d1d1d2daf3e
Parents: 7c4443e
Author: Murali Reddy <mu...@gmail.com>
Authored: Tue Mar 4 17:17:18 2014 +0530
Committer: Murali Reddy <mu...@gmail.com>
Committed: Fri Mar 14 16:56:35 2014 +0530
----------------------------------------------------------------------
.../com/cloud/network/element/OvsElement.java | 5 +-
.../com/cloud/network/vpc/VpcManagerImpl.java | 52 ++++++++++++++++++++
2 files changed, 56 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e3ec12e5/plugins/network-elements/ovs/src/com/cloud/network/element/OvsElement.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/ovs/src/com/cloud/network/element/OvsElement.java b/plugins/network-elements/ovs/src/com/cloud/network/element/OvsElement.java
index 03eeedd..05e81a1 100644
--- a/plugins/network-elements/ovs/src/com/cloud/network/element/OvsElement.java
+++ b/plugins/network-elements/ovs/src/com/cloud/network/element/OvsElement.java
@@ -246,7 +246,10 @@ StaticNatServiceProvider, IpDeployer {
Map<Service, Map<Capability, String>> capabilities = new HashMap<Service, Map<Capability, String>>();
// L2 Support : SDN provisioning
- capabilities.put(Service.Connectivity, null);
+ Map<Capability, String> connectivityCapabilities = new HashMap<Capability, String>();
+ connectivityCapabilities.put(Capability.DistributedRouter, null);
+ capabilities.put(Service.Connectivity, connectivityCapabilities);
+
// L3 Support : Port Forwarding
capabilities.put(Service.PortForwarding, null);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e3ec12e5/server/src/com/cloud/network/vpc/VpcManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpc/VpcManagerImpl.java b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
index 8c7b5fb..16a8399 100644
--- a/server/src/com/cloud/network/vpc/VpcManagerImpl.java
+++ b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
@@ -65,6 +65,7 @@ import com.cloud.exception.PermissionDeniedException;
import com.cloud.exception.ResourceAllocationException;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
+import com.cloud.network.element.NetworkElement;
import com.cloud.network.IpAddress;
import com.cloud.network.IpAddressManager;
import com.cloud.network.Network;
@@ -376,6 +377,7 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis
}
}
+ validateConnectivtyServiceCapablitlies(svcProviderMap.get(Service.Connectivity), serviceCapabilitystList);
boolean supportsDistributedRouter = isVpcOfferingSupportsDistributedRouter(serviceCapabilitystList);
VpcOffering offering = createVpcOffering(name, displayText, svcProviderMap, false, null,
@@ -460,6 +462,56 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis
return supportsDistributedRouter;
}
+ private void validateConnectivtyServiceCapablitlies(Set<Provider> providers, Map serviceCapabilitystList) {
+
+ if (serviceCapabilitystList != null && !serviceCapabilitystList.isEmpty()) {
+ Collection serviceCapabilityCollection = serviceCapabilitystList.values();
+ Iterator iter = serviceCapabilityCollection.iterator();
+ Map<Network.Capability, String> capabilityMap = null;
+
+ while (iter.hasNext()) {
+ HashMap<String, String> svcCapabilityMap = (HashMap<String, String>)iter.next();
+ Network.Capability capability = null;
+ String svc = svcCapabilityMap.get("service");
+ String capabilityName = svcCapabilityMap.get("capabilitytype");
+ String capabilityValue = svcCapabilityMap.get("capabilityvalue");
+ if (capabilityName != null) {
+ capability = Network.Capability.getCapability(capabilityName);
+ }
+
+ if ((capability == null) || (capabilityName == null) || (capabilityValue == null)) {
+ throw new InvalidParameterValueException("Invalid capability:" + capabilityName + " capability value:" + capabilityValue);
+ }
+
+ if (!svc.equalsIgnoreCase(Service.Connectivity.getName())) {
+ throw new InvalidParameterValueException("Invalid Service:" + svc + " specified. Only for 'Connectivity' service capabilities can be specified");
+ }
+
+ if (!capabilityName.equalsIgnoreCase("DistributedRouter")) {
+ throw new InvalidParameterValueException("Invalid Capability:" + capabilityName + " specified. Only 'DistributedRouter' capability can be specified.");
+ }
+
+ if (!capabilityValue.equalsIgnoreCase("true") && capabilityValue.equalsIgnoreCase("false")) {
+ throw new InvalidParameterValueException("Invalid Capability value:" + capabilityValue + " specified.");
+ }
+ }
+
+ if (providers != null && !providers.isEmpty()) {
+ for (Provider provider: providers) {
+ NetworkElement element = _ntwkModel.getElementImplementingProvider(provider.getName());
+ Map<Service, Map<Network.Capability, String>> capabilities = element.getCapabilities();
+ if (capabilities != null && !capabilities.isEmpty()) {
+ Map<Network.Capability, String> connectivityCapabilities = capabilities.get(Service.Connectivity);
+ if (connectivityCapabilities == null || (connectivityCapabilities != null && !connectivityCapabilities.keySet().contains(Network.Capability.DistributedRouter))) {
+ throw new InvalidParameterValueException("Provider: " + provider.getName() + " does not support "
+ + Network.Capability.DistributedRouter.getName() + " capability.");
+ }
+ }
+ }
+ }
+ }
+ }
+
@Override
public Vpc getActiveVpc(long vpcId) {
return _vpcDao.getActiveVpcById(vpcId);
[13/50] [abbrv] git commit: updated refs/heads/4.4 to 48f8a95
Posted by hu...@apache.org.
Fix VM deploy failure bug introduced by commit
39e5b768e8fcae9622e01b2ca72a49675eb6d3fb.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d3fd66e9
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d3fd66e9
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d3fd66e9
Branch: refs/heads/4.4
Commit: d3fd66e9f555616530e483d1eacf2525556bf14e
Parents: 36c0a4e
Author: Min Chen <mi...@citrix.com>
Authored: Thu Mar 13 16:37:26 2014 -0700
Committer: Min Chen <mi...@citrix.com>
Committed: Thu Mar 13 16:37:26 2014 -0700
----------------------------------------------------------------------
api/src/org/apache/cloudstack/api/ApiConstants.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d3fd66e9/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 3a90afc..239b8cd 100755
--- a/api/src/org/apache/cloudstack/api/ApiConstants.java
+++ b/api/src/org/apache/cloudstack/api/ApiConstants.java
@@ -59,7 +59,7 @@ public class ApiConstants {
public static final String CTX_ACCOUNT_ID = "ctxaccountid";
public static final String CTX_USER_ID = "ctxuserid";
public static final String CTXSTARTEVENTID = "ctxstarteventid";
- public static final String CTX_START_EVENT_ID = "ctxstarteventid";
+ public static final String CTX_START_EVENT_ID = "ctxStartEventId";
public static final String CUSTOMIZED = "customized";
public static final String CUSTOMIZED_IOPS = "customizediops";
public static final String CUSTOM_ID = "customid";
[39/50] [abbrv] git commit: updated refs/heads/4.4 to 48f8a95
Posted by hu...@apache.org.
adds hypervisor script to convert JSON routing polcies (ACL) config in
to flow rules and applies them on the bridge
add event subscriber in OvsTunnelManager, that listens to
replaceNetworkAcl events. On event sends the updated policy info to all
the hosts in the VPC
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/423a7488
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/423a7488
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/423a7488
Branch: refs/heads/4.4
Commit: 423a7488075398524d513ac2b22654b393b63a66
Parents: 2c77869
Author: Murali Reddy <mu...@gmail.com>
Authored: Tue Mar 11 04:07:13 2014 +0530
Committer: Murali Reddy <mu...@gmail.com>
Committed: Fri Mar 14 16:56:37 2014 +0530
----------------------------------------------------------------------
.../xen/resource/CitrixResourceBase.java | 24 +++-
.../api/OvsVpcLogicalTopologyConfigCommand.java | 33 -----
.../OvsVpcPhysicalTopologyConfigCommand.java | 6 +-
.../api/OvsVpcRoutingPolicyConfigCommand.java | 124 +++++++++++++++++++
.../cloud/network/ovs/OvsTunnelManagerImpl.java | 104 ++++++++++++++--
.../xenserver/cloudstack_pluginlib.py | 76 +++++++++++-
scripts/vm/hypervisor/xenserver/ovstunnel | 14 ++-
.../network/vpc/NetworkACLManagerImpl.java | 12 +-
8 files changed, 336 insertions(+), 57 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/423a7488/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 8752921..a281002 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
@@ -16,7 +16,6 @@
// under the License.
package com.cloud.hypervisor.xen.resource;
-
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
@@ -89,6 +88,7 @@ import org.apache.cloudstack.storage.to.TemplateObjectTO;
import org.apache.cloudstack.storage.to.VolumeObjectTO;
import com.cloud.agent.IAgentControl;
+
import com.cloud.agent.api.Answer;
import com.cloud.agent.api.AttachIsoCommand;
import com.cloud.agent.api.AttachVolumeAnswer;
@@ -510,6 +510,8 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
return execute((OvsDeleteFlowCommand)cmd);
} else if (clazz == OvsVpcPhysicalTopologyConfigCommand.class) {
return execute((OvsVpcPhysicalTopologyConfigCommand) cmd);
+ } else if (clazz == OvsVpcRoutingPolicyConfigCommand.class) {
+ return execute((OvsVpcRoutingPolicyConfigCommand) cmd);
} else if (clazz == CleanupNetworkRulesCmd.class) {
return execute((CleanupNetworkRulesCmd)cmd);
} else if (clazz == NetworkRulesSystemVmCommand.class) {
@@ -533,7 +535,7 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
} else if (clazz == PlugNicCommand.class) {
return execute((PlugNicCommand)cmd);
} else if (clazz == UnPlugNicCommand.class) {
- return execute((UnPlugNicCommand)cmd);
+ return execute((UnPlugNicCommand) cmd);
} else if (cmd instanceof StorageSubSystemCommand) {
return storageHandler.handleStorageCommands((StorageSubSystemCommand) cmd);
} else if (clazz == CreateVMSnapshotCommand.class) {
@@ -5283,8 +5285,24 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
Connection conn = getConnection();
try {
String result = callHostPlugin(conn, "ovstunnel", "configure_ovs_bridge_for_network_topology", "bridge",
+ cmd.getBridgeName(), "config", cmd.getVpcConfigInJson());
+ if (result.equalsIgnoreCase("SUCCESS")) {
+ return new Answer(cmd, true, result);
+ } else {
+ return new Answer(cmd, false, result);
+ }
+ } catch (Exception e) {
+ s_logger.warn("caught exception while updating host with latest routing polcies", e);
+ return new Answer(cmd, false, e.getMessage());
+ }
+ }
+
+ public Answer execute(OvsVpcRoutingPolicyConfigCommand cmd) {
+ Connection conn = getConnection();
+ try {
+ String result = callHostPlugin(conn, "ovstunnel", "configure_ovs_bridge_for_routing_policies", "bridge",
cmd.getBridgeName(), "host-id", ((Long)cmd.getHostId()).toString(), "config",
- cmd.getjsonVpcConfig());
+ cmd.getVpcConfigInJson());
if (result.equalsIgnoreCase("SUCCESS")) {
return new Answer(cmd, true, result);
} else {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/423a7488/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsVpcLogicalTopologyConfigCommand.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsVpcLogicalTopologyConfigCommand.java b/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsVpcLogicalTopologyConfigCommand.java
deleted file mode 100644
index 2fafb6e..0000000
--- a/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsVpcLogicalTopologyConfigCommand.java
+++ /dev/null
@@ -1,33 +0,0 @@
-// 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.
-package com.cloud.agent.api;
-
-/**
- * This command represents view of how a VPC is laid out (on which hosts, which VM is on which host etc)
- * on the physical infrastructure.
- */
-public class OvsVpcLogicalTopologyConfigCommand extends Command {
-
- public OvsVpcLogicalTopologyConfigCommand() {
-
- }
-
- @Override
- public boolean executeInSequence() {
- return false;
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/423a7488/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsVpcPhysicalTopologyConfigCommand.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsVpcPhysicalTopologyConfigCommand.java b/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsVpcPhysicalTopologyConfigCommand.java
index e6f4383..17299d3 100644
--- a/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsVpcPhysicalTopologyConfigCommand.java
+++ b/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsVpcPhysicalTopologyConfigCommand.java
@@ -20,8 +20,8 @@ import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
/**
- * This command represents physical view of how a VPC is laid out on the physical infrastructure.
- * - on which hypervisor hosts VPC spans (host is running in at least one VM from the VPC)
+ * This command represents physical view of how a VPC is laid out on the physical infrastructure. Contains information:
+ * - on which hypervisor hosts VPC spans (host running at least one VM from the VPC)
* - information of tiers, so we can figure how one VM can talk to a different VM in same tier or different tier
* - information on all the VM's in the VPC.
* - information of NIC's of each VM in the VPC
@@ -102,7 +102,7 @@ public class OvsVpcPhysicalTopologyConfigCommand extends Command {
vpcConfig = new VpcConfig(vpc);
}
- public String getjsonVpcConfig() {
+ public String getVpcConfigInJson() {
Gson gson = new GsonBuilder().create();
return gson.toJson(vpcConfig).toLowerCase();
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/423a7488/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsVpcRoutingPolicyConfigCommand.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsVpcRoutingPolicyConfigCommand.java b/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsVpcRoutingPolicyConfigCommand.java
new file mode 100644
index 0000000..8e4d5d1
--- /dev/null
+++ b/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsVpcRoutingPolicyConfigCommand.java
@@ -0,0 +1,124 @@
+// 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.
+package com.cloud.agent.api;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import java.util.UUID;
+
+/**
+ * This command represents logical view of VM's connectivity in VPC.
+ */
+public class OvsVpcRoutingPolicyConfigCommand extends Command {
+
+ VpcConfig vpcConfig =null;
+ long hostId;
+ String bridgeName;
+
+ public static class AclItem {
+ int number;
+ String uuid;
+ String action;
+ String direction;
+ String sourcePortStart;
+ String sourcePortEnd;
+ String protocol;
+ String[] sourceCidrs;
+ public AclItem(int number, String uuid, String action, String direction, String sourcePortStart,
+ String sourcePortEnd, String protocol, String[] sourceCidrs) {
+ this.number = number;
+ this.uuid =uuid;
+ this.action = action;
+ this.direction = direction;
+ this.sourceCidrs = sourceCidrs;
+ this.sourcePortStart = sourcePortStart;
+ this.sourcePortEnd = sourcePortEnd;
+ this.protocol = protocol;
+ }
+ }
+
+ public static class Acl {
+ String id;
+ AclItem[] aclItems;
+ public Acl(String uuid, AclItem[] aclItems) {
+ this.id = uuid;
+ this.aclItems = aclItems;
+ }
+ }
+
+ public static class Tier {
+ String id;
+ String cidr;
+ String aclId;
+ public Tier(String uuid, String cidr, String aclId) {
+ this.id = uuid;
+ this.cidr = cidr;
+ this.aclId = aclId;
+ }
+ }
+
+ public class Vpc {
+ String cidr;
+ String id;
+ Acl[] acls;
+ Tier[] tiers;
+ public Vpc(String id, String cidr, Acl[] acls, Tier[] tiers) {
+ this.id = id;
+ this.cidr = cidr;
+ this.acls = acls;
+ this.tiers = tiers;
+ }
+ }
+
+ public static class VpcConfig {
+ Vpc vpc;
+ public VpcConfig(Vpc vpc) {
+ this.vpc = vpc;
+ }
+ }
+
+ public OvsVpcRoutingPolicyConfigCommand(String id, String cidr, Acl[] acls, Tier[] tiers) {
+ Vpc vpc = new Vpc(id, cidr, acls, tiers);
+ vpcConfig = new VpcConfig(vpc);
+ }
+
+ public String getVpcConfigInJson() {
+ Gson gson = new GsonBuilder().create();
+ return gson.toJson(vpcConfig).toLowerCase();
+ }
+
+ public void setHostId(long hostId) {
+ this.hostId = hostId;
+ }
+
+ public long getHostId() {
+ return hostId;
+ }
+
+ public String getBridgeName() {
+ return bridgeName;
+ }
+
+ public void setBridgeName(String bridgeName) {
+ this.bridgeName = bridgeName;
+ }
+
+ @Override
+ public boolean executeInSequence() {
+ return false;
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/423a7488/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java b/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java
index 82dbfed..35b0035 100644
--- a/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java
+++ b/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java
@@ -16,8 +16,12 @@
// under the License.
package com.cloud.network.ovs;
+import com.amazonaws.services.ec2.model.NetworkAcl;
+import com.cloud.agent.api.*;
import com.cloud.network.dao.NetworkDao;
-import com.cloud.network.vpc.VpcManager;
+import com.cloud.network.dao.NetworkVO;
+import com.cloud.network.vpc.*;
+import com.cloud.network.vpc.dao.NetworkACLDao;
import com.cloud.vm.dao.VMInstanceDao;
import com.cloud.vm.Nic;
import com.cloud.vm.NicVO;
@@ -33,22 +37,14 @@ import javax.inject.Inject;
import javax.naming.ConfigurationException;
import javax.persistence.EntityExistsException;
+import org.apache.cloudstack.framework.messagebus.MessageBus;
+import org.apache.cloudstack.framework.messagebus.MessageSubscriber;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
import com.cloud.agent.AgentManager;
-import com.cloud.agent.api.Answer;
-import com.cloud.agent.api.Command;
-import com.cloud.agent.api.OvsCreateTunnelAnswer;
-import com.cloud.agent.api.OvsCreateTunnelCommand;
-import com.cloud.agent.api.OvsDestroyBridgeCommand;
-import com.cloud.agent.api.OvsDestroyTunnelCommand;
-import com.cloud.agent.api.OvsFetchInterfaceAnswer;
-import com.cloud.agent.api.OvsFetchInterfaceCommand;
-import com.cloud.agent.api.OvsSetupBridgeCommand;
-import com.cloud.agent.api.OvsVpcPhysicalTopologyConfigCommand;
import com.cloud.agent.manager.Commands;
import com.cloud.configuration.Config;
import com.cloud.exception.AgentUnavailableException;
@@ -68,7 +64,6 @@ import com.cloud.network.ovs.dao.OvsTunnelNetworkDao;
import com.cloud.network.ovs.dao.OvsTunnelNetworkVO;
import com.cloud.network.ovs.dao.OvsTunnel;
import com.cloud.network.vpc.dao.VpcDao;
-import com.cloud.network.vpc.VpcVO;
import com.cloud.utils.component.ManagerBase;
import com.cloud.utils.concurrency.NamedThreadFactory;
import com.cloud.utils.db.DB;
@@ -112,6 +107,12 @@ public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManage
protected VMInstanceDao _vmInstanceDao;
@Inject
NetworkDao _networkDao;
+ @Inject
+ MessageBus _messageBus;
+ @Inject
+ NetworkACLDao _networkACLDao;
+ @Inject
+ NetworkACLItemDao _networkACLItemDao;
@Override
public boolean configure(String name, Map<String, Object> params)
@@ -119,6 +120,7 @@ public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManage
_executorPool = Executors.newScheduledThreadPool(10, new NamedThreadFactory("OVS"));
_cleanupExecutor = Executors.newScheduledThreadPool(1, new NamedThreadFactory("OVS-Cleanup"));
+ _messageBus.subscribe("Network_ACL_Replaced", new NetworkAclEventsSubscriber());
return true;
}
@@ -725,4 +727,82 @@ public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManage
}
}
}
+
+ // Subscriber to ACL replace events. On acl replace event, if the vpc is enabled for distributed routing
+ // send the ACL update to all the hosts on which VPC spans
+ public class NetworkAclEventsSubscriber implements MessageSubscriber {
+ @Override
+ public void onPublishMessage(String senderAddress, String subject, Object args) {
+ NetworkVO network = (NetworkVO) args;
+ String bridgeName=generateBridgeNameForVpc(network.getVpcId());
+ if (network.getVpcId() != null & isVpcEnabledForDistributedRouter(network.getVpcId())) {
+ long vpcId = network.getVpcId();
+ OvsVpcRoutingPolicyConfigCommand cmd = prepareVpcRoutingPolicyUpdate(vpcId);
+ List<Long> vpcSpannedHostIds = _ovsNetworkToplogyGuru.getVpcSpannedHosts(vpcId);
+ for (Long id: vpcSpannedHostIds) {
+ if (!sendVpcRoutingPolicyChangeUpdate(cmd, id, bridgeName)) {
+ s_logger.debug("Failed to send VPC routing policy change update to host : " + id +
+ ". Moving on with rest of the host updates.");
+ }
+ }
+ }
+ }
+ }
+
+ OvsVpcRoutingPolicyConfigCommand prepareVpcRoutingPolicyUpdate(long vpcId) {
+ VpcVO vpc = _vpcDao.findById(vpcId);
+ assert (vpc != null): "invalid vpc id";
+ List<OvsVpcRoutingPolicyConfigCommand.Acl> acls = new ArrayList<>();
+ List<OvsVpcRoutingPolicyConfigCommand.Tier> tiers = new ArrayList<>();
+
+ List<? extends Network> vpcNetworks = _vpcMgr.getVpcNetworks(vpcId);
+ for (Network network : vpcNetworks) {
+ Long networkAclId = network.getNetworkACLId();
+ NetworkACLVO networkAcl = _networkACLDao.findById(networkAclId);
+
+ List<OvsVpcRoutingPolicyConfigCommand.AclItem> aclItems = new ArrayList<>();
+ List<NetworkACLItemVO> aclItemVos = _networkACLItemDao.listByACL(networkAclId);
+ for (NetworkACLItemVO aclItem : aclItemVos) {
+ String[] sourceCidrs = aclItem.getSourceCidrList().toArray(new String[aclItem.getSourceCidrList().size()]);
+ aclItems.add(new OvsVpcRoutingPolicyConfigCommand.AclItem(
+ aclItem.getNumber(), aclItem.getUuid(), aclItem.getAction().name(),
+ aclItem.getTrafficType().name(),
+ aclItem.getSourcePortStart().toString(), aclItem.getSourcePortEnd().toString(),
+ aclItem.getProtocol(), sourceCidrs));
+ }
+
+ OvsVpcRoutingPolicyConfigCommand.Acl acl = new OvsVpcRoutingPolicyConfigCommand.Acl(networkAcl.getUuid(),
+ aclItems.toArray(new OvsVpcRoutingPolicyConfigCommand.AclItem[aclItems.size()]));
+ acls.add(acl);
+
+ OvsVpcRoutingPolicyConfigCommand.Tier tier = new OvsVpcRoutingPolicyConfigCommand.Tier(network.getUuid(),
+ network.getCidr(), networkAcl.getUuid());
+ tiers.add(tier);
+ }
+
+ OvsVpcRoutingPolicyConfigCommand cmd = new OvsVpcRoutingPolicyConfigCommand(vpc.getUuid(), vpc.getCidr(),
+ acls.toArray(new OvsVpcRoutingPolicyConfigCommand.Acl[acls.size()]),
+ tiers.toArray(new OvsVpcRoutingPolicyConfigCommand.Tier[tiers.size()]));
+ return cmd;
+ }
+
+
+ public boolean sendVpcRoutingPolicyChangeUpdate(OvsVpcRoutingPolicyConfigCommand updateCmd, long hostId, String bridgeName) {
+ try {
+ s_logger.debug("Sending VPC routing policy change update to the host " + hostId);
+ updateCmd.setHostId(hostId);
+ updateCmd.setBridgeName(bridgeName);
+ Answer ans = _agentMgr.send(hostId, updateCmd);
+ if (ans.getResult()) {
+ s_logger.debug("Successfully updated the host " + hostId + " with latest VPC routing policies." );
+ return true;
+ } else {
+ s_logger.debug("Failed to update the host " + hostId + " with latest routing policy." );
+ return false;
+ }
+ } catch (Exception e) {
+ s_logger.debug("Failed to updated the host " + hostId + " with latest routing policy." );
+ return false;
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/423a7488/scripts/vm/hypervisor/xenserver/cloudstack_pluginlib.py
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/xenserver/cloudstack_pluginlib.py b/scripts/vm/hypervisor/xenserver/cloudstack_pluginlib.py
index dbcc288..ac8a11d 100644
--- a/scripts/vm/hypervisor/xenserver/cloudstack_pluginlib.py
+++ b/scripts/vm/hypervisor/xenserver/cloudstack_pluginlib.py
@@ -312,7 +312,7 @@ class jsonLoader(object):
return '{%s}' % str(', '.join('%s : %s' % (k, repr(v)) for (k, v)
in self.__dict__.iteritems()))
-def configure_bridge_for_topology(bridge, this_host_id, json_config):
+def configure_bridge_for_network_topology(bridge, this_host_id, json_config):
vpconfig = jsonLoader(json.loads(json_config)).vpc
if vpconfig is None:
@@ -372,4 +372,76 @@ def configure_bridge_for_topology(bridge, this_host_id, json_config):
# set DST MAC = VM's MAC, SRC MAC=tier gateway MAC and send to egress table
add_ip_lookup_table_entry(bridge, ip, network.gatewaymac, mac_addr)
- return "SUCCESS: successfully configured bridge as per the VPC toplogy"
\ No newline at end of file
+ return "SUCCESS: successfully configured bridge as per the VPC topology"
+
+def get_acl(vpcconfig, required_acl_id):
+ acls = vpcconfig.acls
+ for acl in acls:
+ if acl.id == required_acl_id:
+ return acl
+ return None
+
+def configure_ovs_bridge_for_routing_policies(bridge, json_config):
+ vpconfig = jsonLoader(json.loads(json_config)).vpc
+
+ if vpconfig is None:
+ logging.debug("WARNING:Can't find VPC info in json config file")
+ return "FAILURE:IMPROPER_JSON_CONFG_FILE"
+
+ # First flush current egress ACL's before re-applying the ACL's
+ del_flows(bridge, table=3)
+
+ egress_rules_added = False
+ ingress_rules_added = False
+
+ tiers = vpconfig.tiers
+ for tier in tiers:
+ tier_cidr = tier.cidr
+ acl = get_acl(vpconfig, tier.aclid)
+ acl_items = acl.aclitems
+
+ for acl_item in acl_items:
+ number = acl_item.number
+ action = acl_item.action
+ direction = acl_item.direction
+ source_port_start = acl_item.sourceportstart
+ source_port_end = acl_item.sourceportend
+ protocol = acl_item.protocol
+ source_cidrs = acl_item.sourcecidrs
+ acl_priority = 1000 + number
+ for source_cidr in source_cidrs:
+ if direction is "ingress":
+ ingress_rules_added = True
+ # add flow rule to do action (allow/deny) for flows where source IP of the packet is in
+ # source_cidr and destination ip is in tier_cidr
+ port = source_port_start
+ while (port < source_port_end):
+ if action is "deny":
+ add_flow(bridge, priority= acl_priority, table=5, nw_src=source_cidr, nw_dst=tier_cidr, tp_dst=port,
+ nw_proto=protocol, actions='drop')
+ if action is "allow":
+ add_flow(bridge, priority= acl_priority,table=5, nw_src=source_cidr, nw_dst=tier_cidr, tp_dst=port,
+ nw_proto=protocol, actions='resubmit(,1)')
+ port = port + 1
+
+ elif direction in "egress":
+ egress_rules_added = True
+ # add flow rule to do action (allow/deny) for flows where destination IP of the packet is in
+ # source_cidr and source ip is in tier_cidr
+ port = source_port_start
+ while (port < source_port_end):
+ if action is "deny":
+ add_flow(bridge, priority= acl_priority, table=5, nw_src=tier_cidr, nw_dst=source_cidr, tp_dst=port,
+ nw_proto=protocol, actions='drop')
+ if action is "allow":
+ add_flow(bridge, priority= acl_priority, table=5, nw_src=tier_cidr, nw_dst=source_cidr, tp_dst=port,
+ nw_proto=protocol, actions='resubmit(,1)')
+ port = port + 1
+
+ if egress_rules_added is False:
+ # add a default rule in egress table to forward packet to L3 lookup table
+ add_flow(bridge, priority=0, table=3, actions='resubmit(,4)')
+
+ if ingress_rules_added is False:
+ # add a default rule in egress table drop packets
+ add_flow(bridge, priority=0, table=5, actions='drop')
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/423a7488/scripts/vm/hypervisor/xenserver/ovstunnel
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/xenserver/ovstunnel b/scripts/vm/hypervisor/xenserver/ovstunnel
index 9ef0f7b..98a9d0b 100755
--- a/scripts/vm/hypervisor/xenserver/ovstunnel
+++ b/scripts/vm/hypervisor/xenserver/ovstunnel
@@ -184,7 +184,7 @@ def setup_ovs_bridge_for_distributed_routing(session, args):
# add a default rule in L3 lookup table to forward packet to L2 lookup table
lib.add_flow(bridge, priority=0, table=4, actions='resubmit(,1)')
- # add a default rule in egress table to forward packet to L3 lookup table
+ # add a default rule in ingress table to drop in bound packets
lib.add_flow(bridge, priority=0, table=5, actions='drop')
result = "SUCCESS: successfully setup bridge with flow rules"
@@ -391,7 +391,14 @@ def configure_ovs_bridge_for_network_topology(session, args):
json_config = args.pop("config")
this_host_id = args.pop("host-id")
- return lib.configure_bridge_for_topology(bridge, this_host_id, json_config)
+ return lib.configure_bridge_for_network_topology(bridge, this_host_id, json_config)
+
+@echo
+def configure_ovs_bridge_for_routing_policies(session, args):
+ bridge = args.pop("bridge")
+ json_config = args.pop("config")
+
+ return lib.configure_ovs_bridge_for_router_policies(bridge, json_config)
if __name__ == "__main__":
XenAPIPlugin.dispatch({"create_tunnel": create_tunnel,
@@ -401,4 +408,5 @@ if __name__ == "__main__":
"is_xcp": is_xcp,
"getLabel": getLabel,
"setup_ovs_bridge_for_distributed_routing": setup_ovs_bridge_for_distributed_routing,
- "configure_ovs_bridge_for_network_topology": configure_ovs_bridge_for_network_topology})
+ "configure_ovs_bridge_for_network_topology": configure_ovs_bridge_for_network_topology,
+ "configure_ovs_bridge_for_routing_policies": "configure_ovs_bridge_for_routing_policies"})
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/423a7488/server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java b/server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
index 82f1216..ad47df1 100644
--- a/server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
+++ b/server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
@@ -23,6 +23,8 @@ import javax.ejb.Local;
import javax.inject.Inject;
import org.apache.cloudstack.context.CallContext;
+import org.apache.cloudstack.framework.messagebus.MessageBus;
+import org.apache.cloudstack.framework.messagebus.PublishScope;
import org.apache.log4j.Logger;
import com.cloud.configuration.ConfigurationManager;
@@ -82,6 +84,8 @@ public class NetworkACLManagerImpl extends ManagerBase implements NetworkACLMana
EntityManager _entityMgr;
@Inject
VpcService _vpcSvc;
+ @Inject
+ MessageBus _messageBus;
@Override
public NetworkACL createNetworkACL(String name, String description, long vpcId, Boolean forDisplay) {
@@ -210,7 +214,13 @@ public class NetworkACLManagerImpl extends ManagerBase implements NetworkACLMana
if (_networkDao.update(network.getId(), network)) {
s_logger.debug("Updated network: " + network.getId() + " with Network ACL Id: " + acl.getId() + ", Applying ACL items");
//Apply ACL to network
- return applyACLToNetwork(network.getId());
+ Boolean result = applyACLToNetwork(network.getId());
+ if (result) {
+ // public message on message bus, so that network elements implementing distributed routing capability
+ // can act on the event
+ _messageBus.publish(_name, "Network_ACL_Replaced", PublishScope.LOCAL, network);
+ }
+ return result;
}
return false;
}
[29/50] [abbrv] git commit: updated refs/heads/4.4 to 48f8a95
Posted by hu...@apache.org.
CLOUDSTACK-6238: NPE in HostStatsCollector.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6a5d3e96
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6a5d3e96
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6a5d3e96
Branch: refs/heads/4.4
Commit: 6a5d3e96c96c0cd5ec9e1ec1e1c4ed42dc73f84f
Parents: 2869744
Author: Sanjay Tripathi <sa...@citrix.com>
Authored: Fri Mar 14 13:35:22 2014 +0530
Committer: Sanjay Tripathi <sa...@citrix.com>
Committed: Fri Mar 14 13:37:19 2014 +0530
----------------------------------------------------------------------
server/src/com/cloud/server/StatsCollector.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6a5d3e96/server/src/com/cloud/server/StatsCollector.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/server/StatsCollector.java b/server/src/com/cloud/server/StatsCollector.java
index 067ed00..50aa93c 100755
--- a/server/src/com/cloud/server/StatsCollector.java
+++ b/server/src/com/cloud/server/StatsCollector.java
@@ -343,7 +343,9 @@ public class StatsCollector extends ManagerBase implements ComponentMethodInterc
}
for (HostVO host : gpuEnabledHosts) {
HashMap<String, HashMap<String, Long>> groupDetails = _resourceMgr.getGPUStatistics(host);
- _resourceMgr.updateGPUDetails(host.getId(), groupDetails);
+ if (groupDetails != null) {
+ _resourceMgr.updateGPUDetails(host.getId(), groupDetails);
+ }
}
hostIds = _hostGpuGroupsDao.listHostIds();
} catch (Throwable t) {
[10/50] [abbrv] git commit: updated refs/heads/4.4 to 48f8a95
Posted by hu...@apache.org.
Merge branch 'master' into rbac
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/84a528fa
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/84a528fa
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/84a528fa
Branch: refs/heads/4.4
Commit: 84a528fad6979ed6745ad9eb9806d6b9a9fdb0f4
Parents: fa80c63 90c485e
Author: Min Chen <mi...@citrix.com>
Authored: Thu Mar 13 14:52:37 2014 -0700
Committer: Min Chen <mi...@citrix.com>
Committed: Thu Mar 13 14:52:37 2014 -0700
----------------------------------------------------------------------
api/src/com/cloud/domain/Domain.java | 3 -
.../org/apache/cloudstack/api/ApiConstants.java | 2 +-
.../org/apache/cloudstack/api/BaseListCmd.java | 2 +-
.../api/command/user/vm/DeployVMCmd.java | 7 +
.../api/command/user/vm/StartVMCmd.java | 11 +-
.../src/com/cloud/vm/VirtualMachineManager.java | 2 +-
.../cloud/entity/api/VirtualMachineEntity.java | 3 +-
.../cloud/deploy/DeploymentPlanningManager.java | 4 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 20 +-
.../src/com/cloud/vm/VmWorkStart.java | 12 +-
.../cloud/entity/api/VMEntityManager.java | 3 +-
.../cloud/entity/api/VMEntityManagerImpl.java | 19 +-
.../entity/api/VirtualMachineEntityImpl.java | 4 +-
.../security/dao/VmRulesetLogDaoImpl.java | 2 +-
.../src/com/cloud/projects/ProjectVO.java | 5 +
.../cloud/entity/api/db/VMReservationVO.java | 11 +
.../jobs/impl/JobSerializerHelper.java | 5 +-
.../mom/rabbitmq/RabbitMQEventBus.java | 18 +-
.../lb/InternalLoadBalancerVMManagerImpl.java | 2 +-
.../allocator/impl/FirstFitAllocator.java | 29 +--
.../dispatch/ParamGenericValidationWorker.java | 3 +
.../src/com/cloud/dc/DedicatedResourceVO.java | 7 +
.../deploy/DeploymentPlanningManagerImpl.java | 31 ++-
.../src/com/cloud/deploy/FirstFitPlanner.java | 3 +-
.../com/cloud/network/IpAddressManagerImpl.java | 4 +-
.../cloud/network/as/AutoScaleManagerImpl.java | 4 +-
.../com/cloud/server/ManagementServerImpl.java | 217 +------------------
server/src/com/cloud/vm/UserVmManager.java | 2 +-
server/src/com/cloud/vm/UserVmManagerImpl.java | 35 ++-
.../ParamGenericValidationWorkerTest.java | 24 ++
setup/db/db/schema-430to440.sql | 2 +
31 files changed, 175 insertions(+), 321 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84a528fa/api/src/org/apache/cloudstack/api/ApiConstants.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84a528fa/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84a528fa/api/src/org/apache/cloudstack/api/command/user/vm/StartVMCmd.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/command/user/vm/StartVMCmd.java
index 4e91c7b,f55aa59..13b7442
--- a/api/src/org/apache/cloudstack/api/command/user/vm/StartVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vm/StartVMCmd.java
@@@ -16,18 -16,13 +16,19 @@@
// under the License.
package org.apache.cloudstack.api.command.user.vm;
- import org.apache.cloudstack.api.BaseAsyncVMCmd;
+import org.apache.log4j.Logger;
+
+import org.apache.cloudstack.acl.IAMEntityType;
+ import org.apache.cloudstack.acl.RoleType;
+import org.apache.cloudstack.acl.SecurityChecker.AccessType;
+import org.apache.cloudstack.api.ACL;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
+ import org.apache.cloudstack.api.BaseAsyncVMCmd;
import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ResponseObject.ResponseView;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.HostResponse;
import org.apache.cloudstack.api.response.UserVmResponse;
@@@ -70,6 -68,6 +74,7 @@@ public class StartVMCmd extends BaseAsy
// ///////////////// Accessors ///////////////////////
// ///////////////////////////////////////////////////
++ @Override
public Long getId() {
return id;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84a528fa/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
----------------------------------------------------------------------
diff --cc server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
index c1f336c,5312e15..9cbbb10
--- a/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
+++ b/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
@@@ -1,57 -1,56 +1,56 @@@
-// 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.
-package com.cloud.deploy;
-
-import java.util.ArrayList;
+// 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.
+package com.cloud.deploy;
+
+import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Comparator;
-import java.util.HashMap;
+import java.util.Comparator;
+import java.util.HashMap;
import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
+import java.util.List;
+import java.util.Map;
import java.util.Set;
-import java.util.Timer;
-import java.util.TreeSet;
-
-import javax.ejb.Local;
-import javax.inject.Inject;
-import javax.naming.ConfigurationException;
-
-import org.apache.cloudstack.affinity.AffinityGroupProcessor;
-import org.apache.cloudstack.affinity.AffinityGroupService;
+import java.util.Timer;
+import java.util.TreeSet;
+
+import javax.ejb.Local;
+import javax.inject.Inject;
+import javax.naming.ConfigurationException;
+
- import org.apache.log4j.Logger;
-
+import org.apache.cloudstack.affinity.AffinityGroupProcessor;
+import org.apache.cloudstack.affinity.AffinityGroupService;
import org.apache.cloudstack.affinity.AffinityGroupVMMapVO;
-import org.apache.cloudstack.affinity.AffinityGroupVO;
-import org.apache.cloudstack.affinity.dao.AffinityGroupDao;
-import org.apache.cloudstack.affinity.dao.AffinityGroupVMMapDao;
-import org.apache.cloudstack.engine.cloud.entity.api.db.VMReservationVO;
-import org.apache.cloudstack.engine.cloud.entity.api.db.dao.VMReservationDao;
-import org.apache.cloudstack.engine.subsystem.api.storage.DataStore;
-import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager;
-import org.apache.cloudstack.engine.subsystem.api.storage.StoragePoolAllocator;
-import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
-import org.apache.cloudstack.framework.messagebus.MessageBus;
-import org.apache.cloudstack.framework.messagebus.MessageSubscriber;
-import org.apache.cloudstack.managed.context.ManagedContextTimerTask;
-import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
-import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
-import org.apache.cloudstack.utils.identity.ManagementServerNode;
+import org.apache.cloudstack.affinity.AffinityGroupVO;
+import org.apache.cloudstack.affinity.dao.AffinityGroupDao;
+import org.apache.cloudstack.affinity.dao.AffinityGroupVMMapDao;
+import org.apache.cloudstack.engine.cloud.entity.api.db.VMReservationVO;
+import org.apache.cloudstack.engine.cloud.entity.api.db.dao.VMReservationDao;
+import org.apache.cloudstack.engine.subsystem.api.storage.DataStore;
+import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager;
+import org.apache.cloudstack.engine.subsystem.api.storage.StoragePoolAllocator;
+import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
+import org.apache.cloudstack.framework.messagebus.MessageBus;
+import org.apache.cloudstack.framework.messagebus.MessageSubscriber;
+import org.apache.cloudstack.managed.context.ManagedContextTimerTask;
+import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
+import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
+import org.apache.cloudstack.utils.identity.ManagementServerNode;
+ import org.apache.log4j.Logger;
-
+
import com.cloud.agent.AgentManager;
import com.cloud.agent.Listener;
import com.cloud.agent.api.AgentControlAnswer;
@@@ -230,99 -229,94 +229,94 @@@ public class DeploymentPlanningManagerI
public void setPlanners(List<DeploymentPlanner> planners) {
_planners = planners;
- }
+ }
+
+ protected List<AffinityGroupProcessor> _affinityProcessors;
- protected List<AffinityGroupProcessor> _affinityProcessors;
+ public List<AffinityGroupProcessor> getAffinityGroupProcessors() {
+ return _affinityProcessors;
+ }
- public List<AffinityGroupProcessor> getAffinityGroupProcessors() {
- return _affinityProcessors;
- }
-
- public void setAffinityGroupProcessors(List<AffinityGroupProcessor> affinityProcessors) {
+ public void setAffinityGroupProcessors(List<AffinityGroupProcessor> affinityProcessors) {
_affinityProcessors = affinityProcessors;
- }
-
- @Override
+ }
+
+ @Override
public DeployDestination planDeployment(VirtualMachineProfile vmProfile, DeploymentPlan plan, ExcludeList avoids, DeploymentPlanner planner)
throws InsufficientServerCapacityException, AffinityConflictException {
-
- // call affinitygroup chain
- VirtualMachine vm = vmProfile.getVirtualMachine();
- long vmGroupCount = _affinityGroupVMMapDao.countAffinityGroupsForVm(vm.getId());
+
+ // call affinitygroup chain
+ VirtualMachine vm = vmProfile.getVirtualMachine();
+ long vmGroupCount = _affinityGroupVMMapDao.countAffinityGroupsForVm(vm.getId());
DataCenter dc = _dcDao.findById(vm.getDataCenterId());
-
- if (vmGroupCount > 0) {
- for (AffinityGroupProcessor processor : _affinityProcessors) {
- processor.process(vmProfile, plan, avoids);
- }
+
+ if (vmGroupCount > 0) {
+ for (AffinityGroupProcessor processor : _affinityProcessors) {
+ processor.process(vmProfile, plan, avoids);
+ }
+ }
+
+ if (vm.getType() == VirtualMachine.Type.User) {
+ checkForNonDedicatedResources(vmProfile, dc, avoids);
}
-
- if (vm.getType() == VirtualMachine.Type.User) {
- checkForNonDedicatedResources(vmProfile, dc, avoids);
- }
- if (s_logger.isDebugEnabled()) {
+ if (s_logger.isDebugEnabled()) {
s_logger.debug("Deploy avoids pods: " + avoids.getPodsToAvoid() + ", clusters: " + avoids.getClustersToAvoid() + ", hosts: " + avoids.getHostsToAvoid());
- }
-
- // call planners
+ }
+
+ // call planners
//DataCenter dc = _dcDao.findById(vm.getDataCenterId());
- // check if datacenter is in avoid set
- if (avoids.shouldAvoid(dc)) {
- if (s_logger.isDebugEnabled()) {
+ // check if datacenter is in avoid set
+ if (avoids.shouldAvoid(dc)) {
+ if (s_logger.isDebugEnabled()) {
s_logger.debug("DataCenter id = '" + dc.getId() + "' provided is in avoid set, DeploymentPlanner cannot allocate the VM, returning.");
- }
- return null;
- }
-
- ServiceOffering offering = vmProfile.getServiceOffering();
+ }
+ return null;
+ }
+
+ ServiceOffering offering = vmProfile.getServiceOffering();
if(planner == null){
- String plannerName = offering.getDeploymentPlanner();
- if (plannerName == null) {
- if (vm.getHypervisorType() == HypervisorType.BareMetal) {
- plannerName = "BareMetalPlanner";
- } else {
- plannerName = _configDao.getValue(Config.VmDeploymentPlanner.key());
- }
- }
+ String plannerName = offering.getDeploymentPlanner();
+ if (plannerName == null) {
+ if (vm.getHypervisorType() == HypervisorType.BareMetal) {
+ plannerName = "BareMetalPlanner";
+ } else {
+ plannerName = _configDao.getValue(Config.VmDeploymentPlanner.key());
+ }
+ }
- for (DeploymentPlanner plannerInList : _planners) {
- if (plannerName.equals(plannerInList.getName())) {
- planner = plannerInList;
- break;
- }
- }
+ planner = getDeploymentPlannerByName(plannerName);
}
-
- int cpu_requested = offering.getCpu() * offering.getSpeed();
- long ram_requested = offering.getRamSize() * 1024L * 1024L;
-
- if (s_logger.isDebugEnabled()) {
- s_logger.debug("DeploymentPlanner allocation algorithm: " + planner);
-
+
+ int cpu_requested = offering.getCpu() * offering.getSpeed();
+ long ram_requested = offering.getRamSize() * 1024L * 1024L;
+
+ if (s_logger.isDebugEnabled()) {
+ s_logger.debug("DeploymentPlanner allocation algorithm: " + planner);
+
s_logger.debug("Trying to allocate a host and storage pools from dc:" + plan.getDataCenterId() + ", pod:" + plan.getPodId() + ",cluster:" +
plan.getClusterId() + ", requested cpu: " + cpu_requested + ", requested ram: " + ram_requested);
-
+
s_logger.debug("Is ROOT volume READY (pool already allocated)?: " + (plan.getPoolId() != null ? "Yes" : "No"));
- }
-
+ }
+
String haVmTag = (String)vmProfile.getParameter(VirtualMachineProfile.Param.HaTag);
-
- if (plan.getHostId() != null && haVmTag == null) {
- Long hostIdSpecified = plan.getHostId();
- if (s_logger.isDebugEnabled()) {
+
+ if (plan.getHostId() != null && haVmTag == null) {
+ Long hostIdSpecified = plan.getHostId();
+ if (s_logger.isDebugEnabled()) {
s_logger.debug("DeploymentPlan has host_id specified, choosing this host and making no checks on this host: " + hostIdSpecified);
- }
- HostVO host = _hostDao.findById(hostIdSpecified);
- if (host == null) {
- s_logger.debug("The specified host cannot be found");
- } else if (avoids.shouldAvoid(host)) {
- s_logger.debug("The specified host is in avoid set");
- } else {
- if (s_logger.isDebugEnabled()) {
+ }
+ HostVO host = _hostDao.findById(hostIdSpecified);
+ if (host == null) {
+ s_logger.debug("The specified host cannot be found");
+ } else if (avoids.shouldAvoid(host)) {
+ s_logger.debug("The specified host is in avoid set");
+ } else {
+ if (s_logger.isDebugEnabled()) {
s_logger.debug("Looking for suitable pools for this host under zone: " + host.getDataCenterId() + ", pod: " + host.getPodId() + ", cluster: " +
host.getClusterId());
- }
-
- // search for storage under the zone, pod, cluster of the host.
+ }
+
+ // search for storage under the zone, pod, cluster of the host.
DataCenterDeployment lastPlan =
new DataCenterDeployment(host.getDataCenterId(), host.getPodId(), host.getClusterId(), hostIdSpecified, plan.getPoolId(), null,
plan.getReservationContext());
@@@ -440,100 -434,114 +434,114 @@@
} else {
s_logger.debug("The last host of this VM is not UP or is not enabled, host status is: " + host.getStatus().name() + ", host resource state is: " +
host.getResourceState());
- }
- }
- s_logger.debug("Cannot choose the last host to deploy this VM ");
- }
-
- DeployDestination dest = null;
- List<Long> clusterList = null;
-
- if (planner != null && planner.canHandle(vmProfile, plan, avoids)) {
- while (true) {
- if (planner instanceof DeploymentClusterPlanner) {
-
+ }
+ }
+ s_logger.debug("Cannot choose the last host to deploy this VM ");
+ }
+
+ DeployDestination dest = null;
+ List<Long> clusterList = null;
+
+ if (planner != null && planner.canHandle(vmProfile, plan, avoids)) {
+ while (true) {
-
+ if (planner instanceof DeploymentClusterPlanner) {
+
ExcludeList plannerAvoidInput =
new ExcludeList(avoids.getDataCentersToAvoid(), avoids.getPodsToAvoid(), avoids.getClustersToAvoid(), avoids.getHostsToAvoid(),
- avoids.getPoolsToAvoid());
-
+ avoids.getPoolsToAvoid());
+
clusterList = ((DeploymentClusterPlanner)planner).orderClusters(vmProfile, plan, avoids);
-
- if (clusterList != null && !clusterList.isEmpty()) {
- // planner refactoring. call allocators to list hosts
+
+ if (clusterList != null && !clusterList.isEmpty()) {
+ // planner refactoring. call allocators to list hosts
ExcludeList plannerAvoidOutput =
new ExcludeList(avoids.getDataCentersToAvoid(), avoids.getPodsToAvoid(), avoids.getClustersToAvoid(), avoids.getHostsToAvoid(),
- avoids.getPoolsToAvoid());
-
- resetAvoidSet(plannerAvoidOutput, plannerAvoidInput);
-
+ avoids.getPoolsToAvoid());
+
+ resetAvoidSet(plannerAvoidOutput, plannerAvoidInput);
+
dest =
checkClustersforDestination(clusterList, vmProfile, plan, avoids, dc, getPlannerUsage(planner, vmProfile, plan, avoids), plannerAvoidOutput);
- if (dest != null) {
- return dest;
- }
- // reset the avoid input to the planners
- resetAvoidSet(avoids, plannerAvoidOutput);
-
- } else {
- return null;
- }
- } else {
- dest = planner.plan(vmProfile, plan, avoids);
- if (dest != null) {
- long hostId = dest.getHost().getId();
- avoids.addHost(dest.getHost().getId());
-
- if (checkIfHostFitsPlannerUsage(hostId, DeploymentPlanner.PlannerResourceUsage.Shared)) {
- // found destination
- return dest;
- } else {
- // find another host - seems some concurrent
- // deployment picked it up for dedicated access
- continue;
- }
- } else {
- return null;
- }
- }
- }
- }
-
- return dest;
- }
-
+ if (dest != null) {
+ return dest;
+ }
+ // reset the avoid input to the planners
+ resetAvoidSet(avoids, plannerAvoidOutput);
+
+ } else {
+ return null;
+ }
+ } else {
+ dest = planner.plan(vmProfile, plan, avoids);
+ if (dest != null) {
+ long hostId = dest.getHost().getId();
+ avoids.addHost(dest.getHost().getId());
+
+ if (checkIfHostFitsPlannerUsage(hostId, DeploymentPlanner.PlannerResourceUsage.Shared)) {
+ // found destination
+ return dest;
+ } else {
+ // find another host - seems some concurrent
+ // deployment picked it up for dedicated access
+ continue;
+ }
+ } else {
+ return null;
+ }
+ }
+ }
+ }
+
+ return dest;
+ }
+
+ @Override
+ public DeploymentPlanner getDeploymentPlannerByName(String plannerName) {
+ if (plannerName != null) {
+ for (DeploymentPlanner plannerInList : _planners) {
+ if (plannerName != null) {
+ }
+ if (plannerName.equalsIgnoreCase(plannerInList.getName())) {
+ return plannerInList;
+ }
+ }
+ }
+
+ return null;
+ }
+
private void checkForNonDedicatedResources(VirtualMachineProfile vmProfile, DataCenter dc, ExcludeList avoids) {
- boolean isExplicit = false;
- VirtualMachine vm = vmProfile.getVirtualMachine();
-
- // check if zone is dedicated. if yes check if vm owner has acess to it.
- DedicatedResourceVO dedicatedZone = _dedicatedDao.findByZoneId(dc.getId());
- if (dedicatedZone != null && !_accountMgr.isRootAdmin(vmProfile.getOwner().getType())) {
- long accountDomainId = vmProfile.getOwner().getDomainId();
- long accountId = vmProfile.getOwner().getAccountId();
-
- // If a zone is dedicated to an account then all hosts in this zone
- // will be explicitly dedicated to
- // that account. So there won't be any shared hosts in the zone, the
- // only way to deploy vms from that
- // account will be to use explicit dedication affinity group.
- if (dedicatedZone.getAccountId() != null) {
- if (dedicatedZone.getAccountId().equals(accountId)) {
- return;
- } else {
+ boolean isExplicit = false;
+ VirtualMachine vm = vmProfile.getVirtualMachine();
+
+ // check if zone is dedicated. if yes check if vm owner has acess to it.
+ DedicatedResourceVO dedicatedZone = _dedicatedDao.findByZoneId(dc.getId());
+ if (dedicatedZone != null && !_accountMgr.isRootAdmin(vmProfile.getOwner().getId())) {
+ long accountDomainId = vmProfile.getOwner().getDomainId();
+ long accountId = vmProfile.getOwner().getAccountId();
+
+ // If a zone is dedicated to an account then all hosts in this zone
+ // will be explicitly dedicated to
+ // that account. So there won't be any shared hosts in the zone, the
+ // only way to deploy vms from that
+ // account will be to use explicit dedication affinity group.
+ if (dedicatedZone.getAccountId() != null) {
+ if (dedicatedZone.getAccountId().equals(accountId)) {
+ return;
+ } else {
throw new CloudRuntimeException("Failed to deploy VM, Zone " + dc.getName() + " not available for the user account " + vmProfile.getOwner());
- }
- }
-
- // if zone is dedicated to a domain. Check owner's access to the
- // domain level dedication group
+ }
+ }
+
+ // if zone is dedicated to a domain. Check owner's access to the
+ // domain level dedication group
if (!_affinityGroupService.isAffinityGroupAvailableInDomain(dedicatedZone.getAffinityGroupId(), accountDomainId)) {
throw new CloudRuntimeException("Failed to deploy VM, Zone " + dc.getName() + " not available for the user domain " + vmProfile.getOwner());
- }
-
- }
-
- // check affinity group of type Explicit dedication exists. If No put
+ }
+
+ }
+
+ // check affinity group of type Explicit dedication exists. If No put
// dedicated pod/cluster/host in avoid list
List<AffinityGroupVMMapVO> vmGroupMappings = _affinityGroupVMMapDao.findByVmIdType(vm.getId(), "ExplicitDedication");
@@@ -1302,111 -1310,114 +1310,114 @@@
avoid.getPoolsToAvoid().addAll(poolsToAvoidOutput);
}
- if (suitableVolumeStoragePools.isEmpty()) {
- s_logger.debug("No suitable pools found");
- }
-
- return new Pair<Map<Volume, List<StoragePool>>, List<Volume>>(suitableVolumeStoragePools, readyAndReusedVolumes);
- }
-
- private boolean isEnabledForAllocation(long zoneId, Long podId, Long clusterId) {
- // Check if the zone exists in the system
- DataCenterVO zone = _dcDao.findById(zoneId);
- if (zone != null && Grouping.AllocationState.Disabled == zone.getAllocationState()) {
- s_logger.info("Zone is currently disabled, cannot allocate to this zone: " + zoneId);
- return false;
- }
-
- Pod pod = _podDao.findById(podId);
- if (pod != null && Grouping.AllocationState.Disabled == pod.getAllocationState()) {
- s_logger.info("Pod is currently disabled, cannot allocate to this pod: " + podId);
- return false;
- }
-
- Cluster cluster = _clusterDao.findById(clusterId);
- if (cluster != null && Grouping.AllocationState.Disabled == cluster.getAllocationState()) {
- s_logger.info("Cluster is currently disabled, cannot allocate to this cluster: " + clusterId);
- return false;
- }
-
- return true;
- }
-
- private boolean isRootAdmin(ReservationContext reservationContext) {
- if (reservationContext != null) {
- if (reservationContext.getAccount() != null) {
- return _accountMgr.isRootAdmin(reservationContext.getAccount().getType());
- } else {
- return false;
- }
- }
- return false;
- }
-
- @DB
- @Override
+ if (suitableVolumeStoragePools.isEmpty()) {
+ s_logger.debug("No suitable pools found");
+ }
+
+ return new Pair<Map<Volume, List<StoragePool>>, List<Volume>>(suitableVolumeStoragePools, readyAndReusedVolumes);
+ }
+
+ private boolean isEnabledForAllocation(long zoneId, Long podId, Long clusterId) {
+ // Check if the zone exists in the system
+ DataCenterVO zone = _dcDao.findById(zoneId);
+ if (zone != null && Grouping.AllocationState.Disabled == zone.getAllocationState()) {
+ s_logger.info("Zone is currently disabled, cannot allocate to this zone: " + zoneId);
+ return false;
+ }
+
+ Pod pod = _podDao.findById(podId);
+ if (pod != null && Grouping.AllocationState.Disabled == pod.getAllocationState()) {
+ s_logger.info("Pod is currently disabled, cannot allocate to this pod: " + podId);
+ return false;
+ }
+
+ Cluster cluster = _clusterDao.findById(clusterId);
+ if (cluster != null && Grouping.AllocationState.Disabled == cluster.getAllocationState()) {
+ s_logger.info("Cluster is currently disabled, cannot allocate to this cluster: " + clusterId);
+ return false;
+ }
+
+ return true;
+ }
+
+ private boolean isRootAdmin(ReservationContext reservationContext) {
+ if (reservationContext != null) {
+ if (reservationContext.getAccount() != null) {
+ return _accountMgr.isRootAdmin(reservationContext.getAccount().getId());
+ } else {
+ return false;
+ }
+ }
+ return false;
+ }
+
+ @DB
+ @Override
- public String finalizeReservation(final DeployDestination plannedDestination, final VirtualMachineProfile vmProfile, DeploymentPlan plan, ExcludeList avoids)
+ public String finalizeReservation(final DeployDestination plannedDestination, final VirtualMachineProfile vmProfile, DeploymentPlan plan, ExcludeList avoids, final DeploymentPlanner planner)
- throws InsufficientServerCapacityException, AffinityConflictException {
-
- final VirtualMachine vm = vmProfile.getVirtualMachine();
- final long vmGroupCount = _affinityGroupVMMapDao.countAffinityGroupsForVm(vm.getId());
-
- return Transaction.execute(new TransactionCallback<String>() {
- @Override
- public String doInTransaction(TransactionStatus status) {
- boolean saveReservation = true;
-
- if (vmGroupCount > 0) {
- List<Long> groupIds = _affinityGroupVMMapDao.listAffinityGroupIdsByVmId(vm.getId());
- SearchCriteria<AffinityGroupVO> criteria = _affinityGroupDao.createSearchCriteria();
- criteria.addAnd("id", SearchCriteria.Op.IN, groupIds.toArray(new Object[groupIds.size()]));
- List<AffinityGroupVO> groups = _affinityGroupDao.lockRows(criteria, null, true);
-
- for (AffinityGroupProcessor processor : _affinityProcessors) {
- if (!processor.check(vmProfile, plannedDestination)) {
- saveReservation = false;
- break;
- }
- }
- }
-
- if (saveReservation) {
+ throws InsufficientServerCapacityException, AffinityConflictException {
+
+ final VirtualMachine vm = vmProfile.getVirtualMachine();
+ final long vmGroupCount = _affinityGroupVMMapDao.countAffinityGroupsForVm(vm.getId());
+
+ return Transaction.execute(new TransactionCallback<String>() {
+ @Override
+ public String doInTransaction(TransactionStatus status) {
+ boolean saveReservation = true;
+
+ if (vmGroupCount > 0) {
+ List<Long> groupIds = _affinityGroupVMMapDao.listAffinityGroupIdsByVmId(vm.getId());
+ SearchCriteria<AffinityGroupVO> criteria = _affinityGroupDao.createSearchCriteria();
+ criteria.addAnd("id", SearchCriteria.Op.IN, groupIds.toArray(new Object[groupIds.size()]));
+ List<AffinityGroupVO> groups = _affinityGroupDao.lockRows(criteria, null, true);
+
+ for (AffinityGroupProcessor processor : _affinityProcessors) {
+ if (!processor.check(vmProfile, plannedDestination)) {
+ saveReservation = false;
+ break;
+ }
+ }
+ }
+
+ if (saveReservation) {
VMReservationVO vmReservation =
new VMReservationVO(vm.getId(), plannedDestination.getDataCenter().getId(), plannedDestination.getPod().getId(), plannedDestination.getCluster()
.getId(), plannedDestination.getHost().getId());
+ if (planner != null) {
+ vmReservation.setDeploymentPlanner(planner.getName());
+ }
- Map<Long, Long> volumeReservationMap = new HashMap<Long, Long>();
-
- if (vm.getHypervisorType() != HypervisorType.BareMetal) {
- for (Volume vo : plannedDestination.getStorageForDisks().keySet()) {
- volumeReservationMap.put(vo.getId(), plannedDestination.getStorageForDisks().get(vo).getId());
- }
- vmReservation.setVolumeReservation(volumeReservationMap);
- }
- _reservationDao.persist(vmReservation);
- return vmReservation.getUuid();
- }
-
- return null;
- }
- });
- }
-
- @Override
+ Map<Long, Long> volumeReservationMap = new HashMap<Long, Long>();
+
+ if (vm.getHypervisorType() != HypervisorType.BareMetal) {
+ for (Volume vo : plannedDestination.getStorageForDisks().keySet()) {
+ volumeReservationMap.put(vo.getId(), plannedDestination.getStorageForDisks().get(vo).getId());
+ }
+ vmReservation.setVolumeReservation(volumeReservationMap);
+ }
+ _reservationDao.persist(vmReservation);
+ return vmReservation.getUuid();
+ }
+
+ return null;
+ }
+ });
+ }
+
+ @Override
public boolean preStateTransitionEvent(State oldState, Event event, State newState, VirtualMachine vo, boolean status, Object opaque) {
- return true;
- }
-
- @Override
+ return true;
+ }
+
+ @Override
public boolean postStateTransitionEvent(State oldState, Event event, State newState, VirtualMachine vo, boolean status, Object opaque) {
- if (!status) {
- return false;
- }
- if ((oldState == State.Starting) && (newState != State.Starting)) {
- // cleanup all VM reservation entries
- SearchCriteria<VMReservationVO> sc = _reservationDao.createSearchCriteria();
- sc.addAnd("vmId", SearchCriteria.Op.EQ, vo.getId());
- _reservationDao.expunge(sc);
- }
- return true;
- }
-}
+ if (!status) {
+ return false;
+ }
+ if ((oldState == State.Starting) && (newState != State.Starting)) {
+ // cleanup all VM reservation entries
+ SearchCriteria<VMReservationVO> sc = _reservationDao.createSearchCriteria();
+ sc.addAnd("vmId", SearchCriteria.Op.EQ, vo.getId());
+ _reservationDao.expunge(sc);
+ }
+ return true;
+ }
+}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84a528fa/server/src/com/cloud/deploy/FirstFitPlanner.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84a528fa/server/src/com/cloud/network/IpAddressManagerImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84a528fa/server/src/com/cloud/network/as/AutoScaleManagerImpl.java
----------------------------------------------------------------------
diff --cc server/src/com/cloud/network/as/AutoScaleManagerImpl.java
index 755fc54,61b7f4b..99189fe
--- a/server/src/com/cloud/network/as/AutoScaleManagerImpl.java
+++ b/server/src/com/cloud/network/as/AutoScaleManagerImpl.java
@@@ -1375,18 -1366,18 +1375,18 @@@ public class AutoScaleManagerImpl<Type
return sdf.format(current);
}
- private boolean startNewVM(final long vmId) {
+ private boolean startNewVM(long vmId) {
try {
CallContext.current().setEventDetails("Vm Id: " + vmId);
- _userVmManager.startVirtualMachine(vmId, null, null);
- } catch (ResourceUnavailableException ex) {
+ _userVmManager.startVirtualMachine(vmId, null, null, null);
+ } catch (final ResourceUnavailableException ex) {
s_logger.warn("Exception: ", ex);
throw new ServerApiException(ApiErrorCode.RESOURCE_UNAVAILABLE_ERROR, ex.getMessage());
- } catch (final ConcurrentOperationException ex) {
+ } catch (ConcurrentOperationException ex) {
s_logger.warn("Exception: ", ex);
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, ex.getMessage());
- } catch (final InsufficientCapacityException ex) {
- final StringBuilder message = new StringBuilder(ex.getMessage());
+ } catch (InsufficientCapacityException ex) {
+ StringBuilder message = new StringBuilder(ex.getMessage());
if (ex instanceof InsufficientServerCapacityException) {
if (((InsufficientServerCapacityException)ex).isAffinityApplied()) {
message.append(", Please check the affinity groups provided, there may not be sufficient capacity to follow them");
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84a528fa/server/src/com/cloud/server/ManagementServerImpl.java
----------------------------------------------------------------------
diff --cc server/src/com/cloud/server/ManagementServerImpl.java
index 09823d7,2b63ae9..073cf47
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@@ -40,11 -40,7 +40,10 @@@ import javax.crypto.spec.SecretKeySpec
import javax.inject.Inject;
import javax.naming.ConfigurationException;
+import org.apache.commons.codec.binary.Base64;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.acl.ControlledEntity;
- import org.apache.cloudstack.acl.SecurityChecker.AccessType;
import org.apache.cloudstack.affinity.AffinityGroupProcessor;
import org.apache.cloudstack.affinity.dao.AffinityGroupVMMapDao;
import org.apache.cloudstack.api.ApiConstants;
@@@ -735,10 -723,7 +726,9 @@@ public class ManagementServerImpl exten
@Inject
private UserVmManager _userVmMgr;
@Inject
+ private AccountService _accountService;
+ @Inject
private ServiceOfferingDao _offeringDao;
-
@Inject
private DeploymentPlanningManager _dpMgr;
@@@ -1708,210 -1692,108 +1697,6 @@@
return new Pair<List<? extends Configuration>, Integer>(result.first(), result.second());
}
-- /* TODO: this method should go away. Keep here just in case that our latest refactoring using template_store_ref missed anything
-- * in handling Swift or S3.
-- private Set<Pair<Long, Long>> listTemplates(Long templateId, String name, String keyword, TemplateFilter templateFilter, boolean isIso,
-- Boolean bootable, Long pageSize, Long startIndex, Long zoneId, HypervisorType hyperType, boolean showDomr, boolean onlyReady,
-- List<Account> permittedAccounts, Account caller, ListProjectResourcesCriteria listProjectResourcesCriteria, Map<String, String> tags, String zoneType) {
--
-- VMTemplateVO template = null;
-- if (templateId != null) {
-- template = _templateDao.findById(templateId);
-- if (template == null) {
-- throw new InvalidParameterValueException("Please specify a valid template ID.");
-- }// If ISO requested then it should be ISO.
-- if (isIso && template.getFormat() != ImageFormat.ISO) {
-- s_logger.error("Template Id " + templateId + " is not an ISO");
-- InvalidParameterValueException ex = new InvalidParameterValueException("Specified Template Id is not an ISO");
-- ex.addProxyObject(template.getUuid(), "templateId");
-- throw ex;
-- }// If ISO not requested then it shouldn't be an ISO.
-- if (!isIso && template.getFormat() == ImageFormat.ISO) {
-- s_logger.error("Incorrect format of the template id " + templateId);
-- InvalidParameterValueException ex = new InvalidParameterValueException("Incorrect format " + template.getFormat()
-- + " of the specified template id");
-- ex.addProxyObject(template.getUuid(), "templateId");
-- throw ex;
-- }
-- }
--
-- DomainVO domain = null;
-- if (!permittedAccounts.isEmpty()) {
-- domain = _domainDao.findById(permittedAccounts.get(0).getDomainId());
-- } else {
-- domain = _domainDao.findById(DomainVO.ROOT_DOMAIN);
-- }
--
-- List<HypervisorType> hypers = null;
-- if (!isIso) {
-- hypers = _resourceMgr.listAvailHypervisorInZone(null, null);
-- }
-- Set<Pair<Long, Long>> templateZonePairSet = new HashSet<Pair<Long, Long>>();
-- if (_swiftMgr.isSwiftEnabled()) {
-- if (template == null) {
-- templateZonePairSet = _templateDao.searchSwiftTemplates(name, keyword, templateFilter, isIso, hypers, bootable, domain, pageSize,
-- startIndex, zoneId, hyperType, onlyReady, showDomr, permittedAccounts, caller, tags);
-- Set<Pair<Long, Long>> templateZonePairSet2 = new HashSet<Pair<Long, Long>>();
-- templateZonePairSet2 = _templateDao.searchTemplates(name, keyword, templateFilter, isIso, hypers, bootable, domain, pageSize,
-- startIndex, zoneId, hyperType, onlyReady, showDomr, permittedAccounts, caller, listProjectResourcesCriteria, tags, zoneType);
--
-- for (Pair<Long, Long> tmpltPair : templateZonePairSet2) {
-- if (!templateZonePairSet.contains(new Pair<Long, Long>(tmpltPair.first(), -1L))) {
-- templateZonePairSet.add(tmpltPair);
-- }
-- }
--
-- } else {
-- // if template is not public, perform permission check here
-- if (!template.isPublicTemplate() && caller.getType() != Account.ACCOUNT_TYPE_ADMIN) {
-- Account owner = _accountMgr.getAccount(template.getAccountId());
-- _accountMgr.checkAccess(caller, null, true, owner);
-- }
-- templateZonePairSet.add(new Pair<Long, Long>(template.getId(), zoneId));
-- }
-- } else if (_s3Mgr.isS3Enabled()) {
-- if (template == null) {
-- templateZonePairSet = _templateDao.searchSwiftTemplates(name, keyword, templateFilter, isIso,
-- hypers, bootable, domain, pageSize, startIndex, zoneId, hyperType, onlyReady, showDomr,
-- permittedAccounts, caller, tags);
-- Set<Pair<Long, Long>> templateZonePairSet2 = new HashSet<Pair<Long, Long>>();
-- templateZonePairSet2 = _templateDao.searchTemplates(name, keyword, templateFilter, isIso, hypers,
-- bootable, domain, pageSize, startIndex, zoneId, hyperType, onlyReady, showDomr,
-- permittedAccounts, caller, listProjectResourcesCriteria, tags, zoneType);
--
-- for (Pair<Long, Long> tmpltPair : templateZonePairSet2) {
-- if (!templateZonePairSet.contains(new Pair<Long, Long>(tmpltPair.first(), -1L))) {
-- templateZonePairSet.add(tmpltPair);
-- }
-- }
-- } else {
-- // if template is not public, perform permission check here
-- if (!template.isPublicTemplate() && caller.getType() != Account.ACCOUNT_TYPE_ADMIN) {
-- Account owner = _accountMgr.getAccount(template.getAccountId());
-- _accountMgr.checkAccess(caller, null, true, owner);
-- }
-- templateZonePairSet.add(new Pair<Long, Long>(template.getId(), zoneId));
-- }
-- } else {
-- if (template == null) {
-- templateZonePairSet = _templateDao.searchTemplates(name, keyword, templateFilter, isIso, hypers, bootable, domain, pageSize,
-- startIndex, zoneId, hyperType, onlyReady, showDomr, permittedAccounts, caller, listProjectResourcesCriteria, tags, zoneType);
-- } else {
-- // if template is not public, perform permission check here
-- if (!template.isPublicTemplate() && caller.getType() != Account.ACCOUNT_TYPE_ADMIN) {
-- Account owner = _accountMgr.getAccount(template.getAccountId());
-- _accountMgr.checkAccess(caller, null, true, owner);
-- }
-- templateZonePairSet.add(new Pair<Long, Long>(template.getId(), zoneId));
-- }
-- }
--
-- return templateZonePairSet;
-- }
-- */
--
- private VMTemplateVO updateTemplateOrIso(BaseUpdateTemplateOrIsoCmd cmd) {
- Long id = cmd.getId();
- String name = cmd.getTemplateName();
- String displayText = cmd.getDisplayText();
- String format = cmd.getFormat();
- Long guestOSId = cmd.getOsTypeId();
- Boolean passwordEnabled = cmd.isPasswordEnabled();
- Boolean bootable = cmd.isBootable();
- Integer sortKey = cmd.getSortKey();
- Boolean isDynamicallyScalable = cmd.isDynamicallyScalable();
- Boolean isRoutingTemplate = cmd.isRoutingType();
- Account account = CallContext.current().getCallingAccount();
-
- // verify that template exists
- VMTemplateVO template = _templateDao.findById(id);
- if (template == null || template.getRemoved() != null) {
- InvalidParameterValueException ex = new InvalidParameterValueException("unable to find template/iso with specified id");
- ex.addProxyObject(id.toString(), "templateId");
- throw ex;
- }
-
- // Don't allow to modify system template
- if (id.equals(Long.valueOf(1))) {
- InvalidParameterValueException ex = new InvalidParameterValueException("Unable to update template/iso of specified id");
- ex.addProxyObject(template.getUuid(), "templateId");
- throw ex;
- }
-
- // do a permission check
- _accountMgr.checkAccess(account, AccessType.OperateEntry, true, template);
-
- if(cmd.isRoutingType() != null){
- if (!_accountService.isRootAdmin(account.getId())) {
- throw new PermissionDeniedException("Parameter isrouting can only be specified by a Root Admin, permission denied");
- }
- }
- boolean updateNeeded = !(name == null && displayText == null && format == null && guestOSId == null && passwordEnabled == null && bootable == null && sortKey == null
- && isDynamicallyScalable == null && isRoutingTemplate == null);
- if (!updateNeeded) {
- return template;
- }
-
- template = _templateDao.createForUpdate(id);
-
- if (name != null) {
- template.setName(name);
- }
-
- if (displayText != null) {
- template.setDisplayText(displayText);
- }
-
- if (sortKey != null) {
- template.setSortKey(sortKey);
- }
-
- ImageFormat imageFormat = null;
- if (format != null) {
- try {
- imageFormat = ImageFormat.valueOf(format.toUpperCase());
- } catch (IllegalArgumentException e) {
- throw new InvalidParameterValueException("Image format: " + format + " is incorrect. Supported formats are " + EnumUtils.listValues(ImageFormat.values()));
- }
-
- template.setFormat(imageFormat);
- }
-
- if (guestOSId != null) {
- GuestOSVO guestOS = _guestOSDao.findById(guestOSId);
-
- if (guestOS == null) {
- throw new InvalidParameterValueException("Please specify a valid guest OS ID.");
- } else {
- template.setGuestOSId(guestOSId);
- }
- }
-
- if (passwordEnabled != null) {
- template.setEnablePassword(passwordEnabled);
- }
-
- if (bootable != null) {
- template.setBootable(bootable);
- }
-
- if (isDynamicallyScalable != null) {
- template.setDynamicallyScalable(isDynamicallyScalable);
- }
-
- if (isRoutingTemplate != null) {
- if (isRoutingTemplate) {
- template.setTemplateType(TemplateType.ROUTING);
- } else {
- template.setTemplateType(TemplateType.USER);
- }
- }
-
- _templateDao.update(id, template);
-
- return _templateDao.findById(id);
- }
-
@Override
public Pair<List<? extends IpAddress>, Integer> searchForIPAddresses(ListPublicIpAddressesCmd cmd) {
Object keyword = cmd.getKeyword();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84a528fa/server/src/com/cloud/vm/UserVmManager.java
----------------------------------------------------------------------
diff --cc server/src/com/cloud/vm/UserVmManager.java
index 0e48414,11b110f..afe1002
--- a/server/src/com/cloud/vm/UserVmManager.java
+++ b/server/src/com/cloud/vm/UserVmManager.java
@@@ -88,7 -92,23 +88,7 @@@ public interface UserVmManager extends
boolean expunge(UserVmVO vm, long callerUserId, Account caller);
- Pair<UserVmVO, Map<VirtualMachineProfile.Param, Object>> startVirtualMachine(long vmId, Long hostId, Map<VirtualMachineProfile.Param, Object> additionalParams)
- /**
- * Obtains a list of virtual machines by the specified search criteria.
- * Can search by: "userId", "name", "state", "dataCenterId", "podId", "hostId"
- * @param c
- * @param caller TODO
- * @param domainId TODO
- * @param isRecursive TODO
- * @param permittedAccounts TODO
- * @param listAll TODO
- * @param listProjectResourcesCriteria TODO
- * @param tags TODO
- * @return List of UserVMs + count
- */
- Pair<List<UserVmJoinVO>, Integer> searchForUserVMs(Criteria c, Account caller, Long domainId, boolean isRecursive, List<Long> permittedAccounts, boolean listAll,
- ListProjectResourcesCriteria listProjectResourcesCriteria, Map<String, String> tags);
-
+ Pair<UserVmVO, Map<VirtualMachineProfile.Param, Object>> startVirtualMachine(long vmId, Long hostId, Map<VirtualMachineProfile.Param, Object> additionalParams, String deploymentPlannerToUse)
throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException;
boolean upgradeVirtualMachine(Long id, Long serviceOfferingId, Map<String, String> customParameters) throws ResourceUnavailableException,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84a528fa/server/src/com/cloud/vm/UserVmManagerImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84a528fa/setup/db/db/schema-430to440.sql
----------------------------------------------------------------------
[40/50] [abbrv] git commit: updated refs/heads/4.4 to 48f8a95
Posted by hu...@apache.org.
some bug fixes
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2c778699
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2c778699
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2c778699
Branch: refs/heads/4.4
Commit: 2c7786992f1900daca1ef8c093ceca6e7b735050
Parents: e045883
Author: Murali Reddy <mu...@gmail.com>
Authored: Mon Mar 10 22:16:46 2014 +0530
Committer: Murali Reddy <mu...@gmail.com>
Committed: Fri Mar 14 16:56:37 2014 +0530
----------------------------------------------------------------------
.../xen/resource/CitrixResourceBase.java | 14 ++-
.../api/OvsVpcLogicalTopologyConfigCommand.java | 33 +++++
.../OvsVpcPhysicalTopologyConfigCommand.java | 7 +-
.../com/cloud/network/element/OvsElement.java | 18 ---
.../cloud/network/guru/OvsGuestNetworkGuru.java | 2 +-
.../network/ovs/OvsNetworkTopologyGuru.java | 10 ++
.../network/ovs/OvsNetworkTopologyGuruImpl.java | 126 ++++++++++++++++++-
.../cloud/network/ovs/OvsTunnelManagerImpl.java | 125 ++++++++++++------
.../xenserver/cloudstack_pluginlib.py | 4 +-
scripts/vm/hypervisor/xenserver/ovstunnel | 14 +--
.../network/guru/ExternalGuestNetworkGuru.java | 4 +
11 files changed, 279 insertions(+), 78 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2c778699/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 3e7dfaf..8752921 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
@@ -999,7 +999,7 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
/**
* This method creates a XenServer network and configures it for being used as a L2-in-L3 tunneled network
*/
- private synchronized Network configureTunnelNetwork(Connection conn, long networkId, long hostId, String bridgeName) {
+ private synchronized Network configureTunnelNetwork(Connection conn, Long networkId, long hostId, String bridgeName) {
try {
Network nw = findOrCreateTunnelNetwork(conn, bridgeName);
String nwName = bridgeName;
@@ -1038,7 +1038,7 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
String[] res = result.split(":");
if (res.length != 2 || !res[0].equalsIgnoreCase("SUCCESS")) {
//TODO: Should make this error not fatal?
- throw new CloudRuntimeException("Unable to pre-configure OVS bridge " + bridge + " for network ID:" + networkId + " - " + res);
+ throw new CloudRuntimeException("Unable to pre-configure OVS bridge " + bridge );
}
}
return nw;
@@ -1090,7 +1090,7 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
_isOvs = true;
return setupvSwitchNetwork(conn);
} else {
- return findOrCreateTunnelNetwork(conn, getOvsTunnelNetworkName(BroadcastDomainType.getValue(uri)));
+ return findOrCreateTunnelNetwork(conn, getOvsTunnelNetworkName(uri.getAuthority()));
}
} else if (type == BroadcastDomainType.Storage) {
if (uri == null) {
@@ -1114,7 +1114,7 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
private String getOvsTunnelNetworkName(String broadcastUri) {
if (broadcastUri.contains(".")) {
- String[] parts = broadcastUri.split(".");
+ String[] parts = broadcastUri.split("\\.");
return "OVS-DR-VPC-Bridge"+parts[0];
} else {
try {
@@ -5266,7 +5266,8 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
}
String bridge = nw.getBridge(conn);
- String result = callHostPlugin(conn, "ovstunnel", "configure_ovs_bridge_for_network_topology", "bridge", bridge, "in_port", cmd.getInPortName());
+ String result = callHostPlugin(conn, "ovstunnel", "destroy_tunnel", "bridge", bridge, "in_port", cmd.getInPortName());
+
if (result.equalsIgnoreCase("SUCCESS")) {
return new Answer(cmd, true, result);
} else {
@@ -5282,7 +5283,8 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
Connection conn = getConnection();
try {
String result = callHostPlugin(conn, "ovstunnel", "configure_ovs_bridge_for_network_topology", "bridge",
- cmd.getBridgeName(), "host-id", ((Long)cmd.getHostId()).toString());
+ cmd.getBridgeName(), "host-id", ((Long)cmd.getHostId()).toString(), "config",
+ cmd.getjsonVpcConfig());
if (result.equalsIgnoreCase("SUCCESS")) {
return new Answer(cmd, true, result);
} else {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2c778699/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsVpcLogicalTopologyConfigCommand.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsVpcLogicalTopologyConfigCommand.java b/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsVpcLogicalTopologyConfigCommand.java
new file mode 100644
index 0000000..2fafb6e
--- /dev/null
+++ b/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsVpcLogicalTopologyConfigCommand.java
@@ -0,0 +1,33 @@
+// 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.
+package com.cloud.agent.api;
+
+/**
+ * This command represents view of how a VPC is laid out (on which hosts, which VM is on which host etc)
+ * on the physical infrastructure.
+ */
+public class OvsVpcLogicalTopologyConfigCommand extends Command {
+
+ public OvsVpcLogicalTopologyConfigCommand() {
+
+ }
+
+ @Override
+ public boolean executeInSequence() {
+ return false;
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2c778699/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsVpcPhysicalTopologyConfigCommand.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsVpcPhysicalTopologyConfigCommand.java b/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsVpcPhysicalTopologyConfigCommand.java
index 35d4c6e..e6f4383 100644
--- a/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsVpcPhysicalTopologyConfigCommand.java
+++ b/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsVpcPhysicalTopologyConfigCommand.java
@@ -20,8 +20,11 @@ import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
/**
- * This command represents view of how a VPC is laid out (on which hosts, which VM is on which host etc)
- * on the physical infrastructure.
+ * This command represents physical view of how a VPC is laid out on the physical infrastructure.
+ * - on which hypervisor hosts VPC spans (host is running in at least one VM from the VPC)
+ * - information of tiers, so we can figure how one VM can talk to a different VM in same tier or different tier
+ * - information on all the VM's in the VPC.
+ * - information of NIC's of each VM in the VPC
*/
public class OvsVpcPhysicalTopologyConfigCommand extends Command {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2c778699/plugins/network-elements/ovs/src/com/cloud/network/element/OvsElement.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/ovs/src/com/cloud/network/element/OvsElement.java b/plugins/network-elements/ovs/src/com/cloud/network/element/OvsElement.java
index c28d908..036c319 100644
--- a/plugins/network-elements/ovs/src/com/cloud/network/element/OvsElement.java
+++ b/plugins/network-elements/ovs/src/com/cloud/network/element/OvsElement.java
@@ -75,7 +75,6 @@ import com.cloud.vm.NicProfile;
import com.cloud.vm.ReservationContext;
import com.cloud.vm.VirtualMachineProfile;
import com.cloud.vm.dao.DomainRouterDao;
-import com.cloud.vm.UserVmVO;
import com.cloud.vm.VirtualMachine;
@Local(value = {NetworkElement.class, ConnectivityProvider.class,
@@ -205,23 +204,6 @@ StaticNatServiceProvider, IpDeployer {
return false;
}
- List<UserVmVO> userVms = _userVmDao.listByAccountIdAndHostId(vm.getVirtualMachine().getAccountId(),
- vm.getVirtualMachine().getHostId());
- if (vm.getType() == VirtualMachine.Type.User) {
- if (userVms.size() > 1) {
- return true;
- }
-
- List<DomainRouterVO> routers = _routerDao.findByNetwork(network.getId());
- for (DomainRouterVO router : routers) {
- if (router.getHostId().equals(vm.getVirtualMachine().getHostId())) {
- return true;
- }
- }
- } else if (vm.getType() == VirtualMachine.Type.DomainRouter && userVms.size() != 0) {
- return true;
- }
-
HostVO host = _hostDao.findById(vm.getVirtualMachine().getHostId());
_ovsTunnelMgr.checkAndRemoveHostFromTunnelNetwork(network, host);
return true;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2c778699/plugins/network-elements/ovs/src/com/cloud/network/guru/OvsGuestNetworkGuru.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/ovs/src/com/cloud/network/guru/OvsGuestNetworkGuru.java b/plugins/network-elements/ovs/src/com/cloud/network/guru/OvsGuestNetworkGuru.java
index 2814c2a..9d2efe6 100644
--- a/plugins/network-elements/ovs/src/com/cloud/network/guru/OvsGuestNetworkGuru.java
+++ b/plugins/network-elements/ovs/src/com/cloud/network/guru/OvsGuestNetworkGuru.java
@@ -154,7 +154,7 @@ public class OvsGuestNetworkGuru extends GuestNetworkGuru {
if (network.getVpcId() != null && isVpcEnabledForDistributedRouter(network.getVpcId())) {
String keyStr = BroadcastDomainType.getValue(implemented.getBroadcastUri());
Long vpcid= network.getVpcId();
- implemented.setBroadcastUri(BroadcastDomainType.Vswitch.toUri(vpcid.toString()+keyStr));
+ implemented.setBroadcastUri(BroadcastDomainType.Vswitch.toUri(vpcid.toString() + "." + keyStr));
}
return implemented;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2c778699/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsNetworkTopologyGuru.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsNetworkTopologyGuru.java b/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsNetworkTopologyGuru.java
index c410d10..122175c 100644
--- a/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsNetworkTopologyGuru.java
+++ b/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsNetworkTopologyGuru.java
@@ -38,6 +38,11 @@ public interface OvsNetworkTopologyGuru extends Manager {
public List<Long> getVpcOnHost(long hostId);
/**
+ * get the list of all active Vm id's in a network
+ */
+ public List<Long> getAllActiveVmsInNetwork(long networkId);
+
+ /**
* get the list of all active Vm id's in the VPC for all ther tiers
*/
public List<Long> getAllActiveVmsInVpc(long vpcId);
@@ -46,4 +51,9 @@ public interface OvsNetworkTopologyGuru extends Manager {
* get the list of all Vm id's in the VPC for all the tiers that are running on the host
*/
public List<Long> getActiveVmsInVpcOnHost(long vpcId, long hostId);
+
+ /**
+ * get the list of all Vm id's in the network that are running on the host
+ */
+ public List<Long> getActiveVmsInNetworkOnHost(long vpcId, long hostId);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2c778699/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsNetworkTopologyGuruImpl.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsNetworkTopologyGuruImpl.java b/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsNetworkTopologyGuruImpl.java
index 7560e35..7715641 100644
--- a/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsNetworkTopologyGuruImpl.java
+++ b/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsNetworkTopologyGuruImpl.java
@@ -1,14 +1,24 @@
package com.cloud.network.ovs;
+import com.cloud.network.Network;
+import com.cloud.network.Networks;
+import com.cloud.network.dao.NetworkDao;
+import com.cloud.network.vpc.VpcManager;
import com.cloud.utils.component.ManagerBase;
import com.cloud.vm.DomainRouterVO;
import com.cloud.vm.UserVmVO;
import com.cloud.vm.VMInstanceVO;
import com.cloud.vm.VirtualMachine;
+import com.cloud.vm.NicVO;
+import com.cloud.vm.Nic;
import com.cloud.vm.dao.DomainRouterDao;
+import com.cloud.vm.dao.NicDao;
import com.cloud.vm.dao.UserVmDao;
+import com.cloud.vm.dao.VMInstanceDao;
import java.util.ArrayList;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
import javax.ejb.Local;
import javax.inject.Inject;
import org.springframework.stereotype.Component;
@@ -21,6 +31,14 @@ public class OvsNetworkTopologyGuruImpl extends ManagerBase implements OvsNetwor
UserVmDao _userVmDao;
@Inject
DomainRouterDao _routerDao;
+ @Inject
+ VpcManager _vpcMgr;
+ @Inject
+ VMInstanceDao _vmInstanceDao;
+ @Inject
+ NicDao _nicDao;
+ @Inject
+ NetworkDao _networkDao;
/**
* get the list of hypervisor hosts on which VM's belonging to a network currently spans
@@ -52,23 +70,121 @@ public class OvsNetworkTopologyGuruImpl extends ManagerBase implements OvsNetwor
return hostIds;
}
+ /**
+ * get the list of hypervisor hosts on which VM's belonging to a VPC currently spans
+ */
@Override
- public List<Long> getVpcSpannedHosts(long vpId) {
- return null;
+ public List<Long> getVpcSpannedHosts(long vpcId) {
+ List<? extends Network> vpcNetworks = _vpcMgr.getVpcNetworks(vpcId);
+ List<Long> vpcHostIds = new ArrayList<>();
+ for (Network vpcNetwork : vpcNetworks) {
+ List<Long> networkHostIds = new ArrayList<Long>();
+ networkHostIds = getNetworkSpanedHosts(vpcNetwork.getId());
+ if (networkHostIds != null && !networkHostIds.isEmpty()) {
+ for (Long hostId : networkHostIds) {
+ if (!vpcHostIds.contains(hostId)) {
+ vpcHostIds.add(hostId);
+ }
+ }
+ }
+ }
+ return vpcHostIds;
}
@Override
public List<Long> getVpcOnHost(long hostId) {
- return null;
+ List<Long> vpcIds = new ArrayList<>();
+ List<VMInstanceVO> vmInstances = _vmInstanceDao.listByHostId(hostId);
+ for (VMInstanceVO instance : vmInstances) {
+ List<NicVO> nics = _nicDao.listByVmId(instance.getId());
+ for (Nic nic: nics) {
+ Network network = _networkDao.findById(nic.getNetworkId());
+ if (network.getTrafficType() == Networks.TrafficType.Guest && network.getVpcId() != null) {
+ if (!vpcIds.contains(network.getVpcId())) {
+ vpcIds.add(network.getVpcId());
+ }
+ }
+ }
+ }
+ return vpcIds;
+ }
+
+ @Override
+ public List<Long> getAllActiveVmsInNetwork(long networkId) {
+ List <Long> vmIds = new ArrayList<>();
+ List<UserVmVO> vms = _userVmDao.listByNetworkIdAndStates(networkId,
+ VirtualMachine.State.Running, VirtualMachine.State.Starting, VirtualMachine.State.Stopping, VirtualMachine.State.Unknown,
+ VirtualMachine.State.Migrating);
+ // Find routers for the network
+ List<DomainRouterVO> routers = _routerDao.findByNetwork(networkId);
+ List<VMInstanceVO> ins = new ArrayList<VMInstanceVO>();
+
+ if (vms != null) {
+ for (UserVmVO vm : vms) {
+ vmIds.add(vm.getId());
+ }
+ }
+ if (routers.size() != 0) {
+ for (DomainRouterVO router: routers) {
+ vmIds.add(router.getId());
+ }
+ }
+ return vmIds;
}
@Override
public List<Long> getAllActiveVmsInVpc(long vpcId) {
- return null;
+
+ Set<Long> vmIdsSet = new HashSet<>();
+ List<? extends Network> vpcNetworks = _vpcMgr.getVpcNetworks(vpcId);
+ for (Network network : vpcNetworks) {
+ List<Long> networkVmIds = getAllActiveVmsInNetwork(network.getId());
+ if (networkVmIds != null && !networkVmIds.isEmpty()) {
+ vmIdsSet.addAll(networkVmIds);
+ }
+ }
+ List<Long> vmIds = new ArrayList<>();
+ vmIds.addAll(vmIdsSet);
+ return vmIds;
}
@Override
public List<Long> getActiveVmsInVpcOnHost(long vpcId, long hostId) {
- return null;
+ Set<Long> vmIdsSet = new HashSet<>();
+ List<? extends Network> vpcNetworks = _vpcMgr.getVpcNetworks(vpcId);
+ for (Network network : vpcNetworks) {
+ List<Long> networkVmIds = getActiveVmsInNetworkOnHost(network.getId(), hostId);
+ if (networkVmIds != null && !networkVmIds.isEmpty()) {
+ vmIdsSet.addAll(networkVmIds);
+ }
+ }
+ List<Long> vmIds = new ArrayList<>();
+ vmIds.addAll(vmIdsSet);
+ return vmIds;
+ }
+
+ @Override
+ public List<Long> getActiveVmsInNetworkOnHost(long networkId, long hostId) {
+ List <Long> vmIds = new ArrayList<>();
+ List<UserVmVO> vms = _userVmDao.listByNetworkIdAndStates(networkId,
+ VirtualMachine.State.Running, VirtualMachine.State.Starting, VirtualMachine.State.Stopping, VirtualMachine.State.Unknown,
+ VirtualMachine.State.Migrating);
+ // Find routers for the network
+ List<DomainRouterVO> routers = _routerDao.findByNetwork(networkId);
+ List<VMInstanceVO> ins = new ArrayList<VMInstanceVO>();
+
+ if (vms != null) {
+ for (UserVmVO vm : vms) {
+ if (vm.getHostId() == hostId)
+ vmIds.add(vm.getId());
+ }
+ }
+ if (routers.size() != 0) {
+ for (DomainRouterVO router: routers) {
+ if (router.getHostId() == hostId)
+ vmIds.add(router.getId());
+ }
+ }
+ return vmIds;
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2c778699/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java b/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java
index ae37095..82dbfed 100644
--- a/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java
+++ b/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java
@@ -18,10 +18,10 @@ package com.cloud.network.ovs;
import com.cloud.network.dao.NetworkDao;
import com.cloud.network.vpc.VpcManager;
+import com.cloud.vm.dao.VMInstanceDao;
import com.cloud.vm.Nic;
import com.cloud.vm.NicVO;
import com.cloud.vm.VirtualMachine;
-import com.cloud.vm.dao.VMInstanceDao;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -260,9 +260,9 @@ public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManage
int key = 0;
try {
//The GRE key is actually in the host part of the URI
- String keyStr = BroadcastDomainType.getValue(network.getBroadcastUri());
+ String keyStr = network.getBroadcastUri().getAuthority();
if (keyStr.contains(".")) {
- String[] parts = keyStr.split(".");
+ String[] parts = keyStr.split("\\.");
key = Integer.parseInt(parts[1]);
} else {
key = Integer.parseInt(keyStr);
@@ -445,34 +445,72 @@ public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManage
@Override
public void checkAndRemoveHostFromTunnelNetwork(Network nw, Host host) {
- try {
- /* Now we are last one on host, destroy the bridge with all
- * the tunnels for this network */
- int key = getGreKey(nw);
- String bridgeName = generateBridgeName(nw, key);
- Command cmd = new OvsDestroyBridgeCommand(nw.getId(), bridgeName);
- s_logger.debug("Destroying bridge for network " + nw.getId() + " on host:" + host.getId());
- Answer ans = _agentMgr.send(host.getId(), cmd);
- handleDestroyBridgeAnswer(ans, host.getId(), nw.getId());
-
- /* Then ask hosts have peer tunnel with me to destroy them */
- List<OvsTunnelNetworkVO> peers =
- _tunnelNetworkDao.listByToNetwork(host.getId(),
- nw.getId());
- for (OvsTunnelNetworkVO p : peers) {
- // If the tunnel was not successfully created don't bother to remove it
- if (p.getState().equals(OvsTunnel.State.Established.name())) {
- cmd = new OvsDestroyTunnelCommand(p.getNetworkId(), bridgeName,
- p.getPortName());
- s_logger.debug("Destroying tunnel to " + host.getId() +
- " from " + p.getFrom());
- ans = _agentMgr.send(p.getFrom(), cmd);
- handleDestroyTunnelAnswer(ans, p.getFrom(),
- p.getTo(), p.getNetworkId());
+ if (nw.getVpcId() != null && isVpcEnabledForDistributedRouter(nw.getVpcId())) {
+ List<Long> vmIds = _ovsNetworkToplogyGuru.getActiveVmsInVpcOnHost(nw.getVpcId(), host.getId());
+ if (vmIds != null && !vmIds.isEmpty()) {
+ return;
+ }
+ List<? extends Network> vpcNetworks = _vpcMgr.getVpcNetworks(nw.getVpcId());
+ try {
+ for (Network network: vpcNetworks) {
+ int key = getGreKey(nw);
+ String bridgeName = generateBridgeName(nw, key);
+ /* Then ask hosts have peer tunnel with me to destroy them */
+ List<OvsTunnelNetworkVO> peers = _tunnelNetworkDao.listByToNetwork(host.getId(),nw.getId());
+ for (OvsTunnelNetworkVO p : peers) {
+ // If the tunnel was not successfully created don't bother to remove it
+ if (p.getState().equals(OvsTunnel.State.Established.name())) {
+ Command cmd= new OvsDestroyTunnelCommand(p.getNetworkId(), bridgeName,
+ p.getPortName());
+ s_logger.debug("Destroying tunnel to " + host.getId() +
+ " from " + p.getFrom());
+ Answer ans = _agentMgr.send(p.getFrom(), cmd);
+ handleDestroyTunnelAnswer(ans, p.getFrom(), p.getTo(), p.getNetworkId());
+ }
+ }
}
+
+ Command cmd = new OvsDestroyBridgeCommand(nw.getId(), generateBridgeNameForVpc(nw.getVpcId()));
+ s_logger.debug("Destroying bridge for network " + nw.getId() + " on host:" + host.getId());
+ Answer ans = _agentMgr.send(host.getId(), cmd);
+ handleDestroyBridgeAnswer(ans, host.getId(), nw.getId());
+ } catch (Exception e) {
+
+ }
+ } else {
+ List<Long> vmIds = _ovsNetworkToplogyGuru.getActiveVmsInNetworkOnHost(nw.getId(), host.getId());
+ if (vmIds != null && !vmIds.isEmpty()) {
+ return;
+ }
+ try {
+ /* Now we are last one on host, destroy the bridge with all
+ * the tunnels for this network */
+ int key = getGreKey(nw);
+ String bridgeName = generateBridgeName(nw, key);
+ Command cmd = new OvsDestroyBridgeCommand(nw.getId(), bridgeName);
+ s_logger.debug("Destroying bridge for network " + nw.getId() + " on host:" + host.getId());
+ Answer ans = _agentMgr.send(host.getId(), cmd);
+ handleDestroyBridgeAnswer(ans, host.getId(), nw.getId());
+
+ /* Then ask hosts have peer tunnel with me to destroy them */
+ List<OvsTunnelNetworkVO> peers =
+ _tunnelNetworkDao.listByToNetwork(host.getId(),
+ nw.getId());
+ for (OvsTunnelNetworkVO p : peers) {
+ // If the tunnel was not successfully created don't bother to remove it
+ if (p.getState().equals(OvsTunnel.State.Established.name())) {
+ cmd = new OvsDestroyTunnelCommand(p.getNetworkId(), bridgeName,
+ p.getPortName());
+ s_logger.debug("Destroying tunnel to " + host.getId() +
+ " from " + p.getFrom());
+ ans = _agentMgr.send(p.getFrom(), cmd);
+ handleDestroyTunnelAnswer(ans, p.getFrom(),
+ p.getTo(), p.getNetworkId());
+ }
+ }
+ } catch (Exception e) {
+ s_logger.warn(String.format("Destroy tunnel failed", e));
}
- } catch (Exception e) {
- s_logger.warn(String.format("Destroy tunnel failed", e));
}
}
@@ -514,9 +552,9 @@ public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManage
List<Long> hostIds = _ovsNetworkToplogyGuru.getVpcSpannedHosts(vpcId);
List<Long> vmIds = _ovsNetworkToplogyGuru.getAllActiveVmsInVpc(vpcId);
- List<OvsVpcPhysicalTopologyConfigCommand.Host> hosts = new ArrayList<OvsVpcPhysicalTopologyConfigCommand.Host>();
- List<OvsVpcPhysicalTopologyConfigCommand.Tier> tiers = new ArrayList<OvsVpcPhysicalTopologyConfigCommand.Tier>();
- List<OvsVpcPhysicalTopologyConfigCommand.Vm> vms = new ArrayList<OvsVpcPhysicalTopologyConfigCommand.Vm>();
+ List<OvsVpcPhysicalTopologyConfigCommand.Host> hosts = new ArrayList<>();
+ List<OvsVpcPhysicalTopologyConfigCommand.Tier> tiers = new ArrayList<>();
+ List<OvsVpcPhysicalTopologyConfigCommand.Vm> vms = new ArrayList<>();
for (Long hostId : hostIds) {
HostVO hostDetails = _hostDao.findById(hostId);
@@ -533,10 +571,10 @@ public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManage
}
for (Network network: vpcNetworks) {
- String key = BroadcastDomainType.getValue(network.getBroadcastUri());
+ String key = network.getBroadcastUri().getAuthority();
long gre_key;
if (key.contains(".")) {
- String[] parts = key.split(".");
+ String[] parts = key.split("\\.");
gre_key = Long.parseLong(parts[1]);
} else {
try {
@@ -580,6 +618,7 @@ public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManage
List<? extends Network> vpcNetworks = _vpcMgr.getVpcNetworks(vpcId);
List<Long> vpcSpannedHostIds = _ovsNetworkToplogyGuru.getVpcSpannedHosts(vpcId);
String bridgeName=generateBridgeNameForVpc(vpcId);
+ boolean bridgeNotSetup = true;
for (Network vpcNetwork: vpcNetworks) {
int key = getGreKey(vpcNetwork);
@@ -643,7 +682,7 @@ public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManage
+ " to create gre tunnel to " + i);
Answer[] answers = _agentMgr.send(hostId, cmds);
handleCreateTunnelAnswer(answers);
- noHost = false;
+ bridgeNotSetup = false;
}
for (Long i : fromHostIds) {
@@ -656,7 +695,7 @@ public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManage
+ hostId);
Answer[] answers = _agentMgr.send(i, cmds);
handleCreateTunnelAnswer(answers);
- noHost = false;
+ bridgeNotSetup = false;
}
} catch (GreTunnelException | OperationTimedoutException | AgentUnavailableException e) {
// I really thing we should do a better handling of these exceptions
@@ -664,6 +703,20 @@ public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManage
}
}
+ // If no tunnels have been configured, perform the bridge setup
+ // anyway. This will ensure VIF rules will be triggered
+ if (bridgeNotSetup) {
+ try {
+ Commands cmds = new Commands(new OvsSetupBridgeCommand(bridgeName, hostId, null));
+ s_logger.debug("Ask host " + hostId + " to configure bridge for vpc");
+ Answer[] answers = _agentMgr.send(hostId, cmds);
+ handleSetupBridgeAnswer(answers);
+ } catch (OperationTimedoutException | AgentUnavailableException e) {
+ // I really thing we should do a better handling of these exceptions
+ s_logger.warn("Ovs Tunnel network created tunnel failed", e);
+ }
+ }
+
OvsVpcPhysicalTopologyConfigCommand topologyConfigCommand = prepareVpcTopologyUpdate(vpcId);
for (Long id: vpcSpannedHostIds) {
if (!sendVpcTopologyChangeUpdate(topologyConfigCommand, id, bridgeName)) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2c778699/scripts/vm/hypervisor/xenserver/cloudstack_pluginlib.py
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/xenserver/cloudstack_pluginlib.py b/scripts/vm/hypervisor/xenserver/cloudstack_pluginlib.py
index d2b95dc..dbcc288 100644
--- a/scripts/vm/hypervisor/xenserver/cloudstack_pluginlib.py
+++ b/scripts/vm/hypervisor/xenserver/cloudstack_pluginlib.py
@@ -21,7 +21,7 @@ import ConfigParser
import logging
import os
import subprocess
-import json
+import simplejson as json
from time import localtime, asctime
@@ -181,7 +181,7 @@ def _build_flow_expr(**kwargs):
proto = 'proto' in kwargs and ",%s" % kwargs['proto'] or ''
ip = ('nw_src' in kwargs or 'nw_dst' in kwargs) and ',ip' or ''
flow = (flow + in_port + dl_type + dl_src + dl_dst +
- (ip or proto) + nw_src + nw_dst)
+ (ip or proto) + nw_src + nw_dst + table)
return flow
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2c778699/scripts/vm/hypervisor/xenserver/ovstunnel
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/xenserver/ovstunnel b/scripts/vm/hypervisor/xenserver/ovstunnel
index 64a2d36..9ef0f7b 100755
--- a/scripts/vm/hypervisor/xenserver/ovstunnel
+++ b/scripts/vm/hypervisor/xenserver/ovstunnel
@@ -137,8 +137,8 @@ def setup_ovs_bridge_for_distributed_routing(session, args):
logging.debug("About to manually create the bridge:%s" % bridge)
# create a bridge with the same name as the xapi network
- res = lib.do_cmd([lib.VSCTL_PATH, "--", "--may-exist", "add-br", bridge,
- "--", "set", "bridge", bridge])
+ res = lib.do_cmd([lib.VSCTL_PATH, "--", "--may-exist", "add-br", bridge])
+
logging.debug("Bridge has been manually created:%s" % res)
# TODO: Make sure xs-network-uuid is set into external_ids
lib.do_cmd([lib.VSCTL_PATH, "set", "Bridge", bridge,
@@ -149,12 +149,8 @@ def setup_ovs_bridge_for_distributed_routing(session, args):
result = "FAILURE:%s" % res
else:
# Verify the bridge actually exists, with the gre_key properly set
- res = lib.do_cmd([lib.VSCTL_PATH, "get", "bridge",
- bridge, "other_config:gre_key"])
- if key in res:
- result = "SUCCESS:%s" % bridge
- else:
- result = "FAILURE:%s" % res
+ res = lib.do_cmd([lib.VSCTL_PATH, "list", "bridge", bridge])
+
# Finally note in the xenapi network object that the network has
# been configured
xs_nw_uuid = lib.do_cmd([lib.XE_PATH, "network-list",
@@ -191,6 +187,8 @@ def setup_ovs_bridge_for_distributed_routing(session, args):
# add a default rule in egress table to forward packet to L3 lookup table
lib.add_flow(bridge, priority=0, table=5, actions='drop')
+ result = "SUCCESS: successfully setup bridge with flow rules"
+
logging.debug("Setup_ovs_bridge completed with result:%s" % result)
return result
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2c778699/server/src/com/cloud/network/guru/ExternalGuestNetworkGuru.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/guru/ExternalGuestNetworkGuru.java b/server/src/com/cloud/network/guru/ExternalGuestNetworkGuru.java
index 414eb7b..13246a7 100644
--- a/server/src/com/cloud/network/guru/ExternalGuestNetworkGuru.java
+++ b/server/src/com/cloud/network/guru/ExternalGuestNetworkGuru.java
@@ -107,6 +107,10 @@ public class ExternalGuestNetworkGuru extends GuestNetworkGuru {
@Override
public Network design(NetworkOffering offering, DeploymentPlan plan, Network userSpecified, Account owner) {
+ if (_networkModel.areServicesSupportedByNetworkOffering(offering.getId(), Network.Service.Connectivity)) {
+ return null;
+ }
+
NetworkVO config = (NetworkVO)super.design(offering, plan, userSpecified, owner);
if (config == null) {
return null;
[20/50] [abbrv] git commit: updated refs/heads/4.4 to 48f8a95
Posted by hu...@apache.org.
Seperate job executor pools to avoid thread starvation situation.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8e27120b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8e27120b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8e27120b
Branch: refs/heads/4.4
Commit: 8e27120be40725c7e89db8a69b6a976cade8e917
Parents: 6ad245e
Author: Kelven Yang <ke...@gmail.com>
Authored: Thu Mar 6 10:36:39 2014 -0800
Committer: Kelven Yang <ke...@gmail.com>
Committed: Thu Mar 13 16:59:56 2014 -0700
----------------------------------------------------------------------
.../framework/jobs/AsyncJobManager.java | 3 ++-
.../jobs/impl/AsyncJobManagerImpl.java | 21 ++++++++++++++------
.../framework/jobs/impl/AsyncJobMonitor.java | 2 +-
3 files changed, 18 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8e27120b/framework/jobs/src/org/apache/cloudstack/framework/jobs/AsyncJobManager.java
----------------------------------------------------------------------
diff --git a/framework/jobs/src/org/apache/cloudstack/framework/jobs/AsyncJobManager.java b/framework/jobs/src/org/apache/cloudstack/framework/jobs/AsyncJobManager.java
index 67733ed..fe5c067 100644
--- a/framework/jobs/src/org/apache/cloudstack/framework/jobs/AsyncJobManager.java
+++ b/framework/jobs/src/org/apache/cloudstack/framework/jobs/AsyncJobManager.java
@@ -27,7 +27,8 @@ import com.cloud.utils.component.Manager;
public interface AsyncJobManager extends Manager {
- public static final String JOB_POOL_THREAD_PREFIX = "Job-Executor";
+ public static final String API_JOB_POOL_THREAD_PREFIX = "API-Job-Executor";
+ public static final String WORK_JOB_POOL_THREAD_PREFIX = "Work-Job-Executor";
AsyncJobVO getAsyncJob(long jobId);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8e27120b/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java
----------------------------------------------------------------------
diff --git a/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java b/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java
index b9246aa..9b9460c 100644
--- a/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java
+++ b/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java
@@ -117,7 +117,8 @@ public class AsyncJobManagerImpl extends ManagerBase implements AsyncJobManager,
private volatile long _executionRunNumber = 1;
private final ScheduledExecutorService _heartbeatScheduler = Executors.newScheduledThreadPool(1, new NamedThreadFactory("AsyncJobMgr-Heartbeat"));
- private ExecutorService _executor;
+ private ExecutorService _apiJobExecutor;
+ private ExecutorService _workerJobExecutor;
@Override
public String getConfigComponentName() {
@@ -390,7 +391,10 @@ public class AsyncJobManagerImpl extends ManagerBase implements AsyncJobManager,
if (executeInContext) {
runnable.run();
} else {
- _executor.submit(runnable);
+ if (job.getDispatcher() == null || job.getDispatcher().equalsIgnoreCase("ApiAsyncJobDispatcher"))
+ _apiJobExecutor.submit(runnable);
+ else
+ _workerJobExecutor.submit(runnable);
}
}
@@ -855,10 +859,14 @@ public class AsyncJobManagerImpl extends ManagerBase implements AsyncJobManager,
final Properties dbProps = DbProperties.getDbProperties();
final int cloudMaxActive = Integer.parseInt(dbProps.getProperty("db.cloud.maxActive"));
- int poolSize = (cloudMaxActive * 2) / 3;
+ int apiPoolSize = cloudMaxActive / 2;
+ int workPoolSize = (cloudMaxActive * 2) / 3;
- s_logger.info("Start AsyncJobManager thread pool in size " + poolSize);
- _executor = Executors.newFixedThreadPool(poolSize, new NamedThreadFactory(AsyncJobManager.JOB_POOL_THREAD_PREFIX));
+ s_logger.info("Start AsyncJobManager API executor thread pool in size " + apiPoolSize);
+ _apiJobExecutor = Executors.newFixedThreadPool(apiPoolSize, new NamedThreadFactory(AsyncJobManager.API_JOB_POOL_THREAD_PREFIX));
+
+ s_logger.info("Start AsyncJobManager Work executor thread pool in size " + workPoolSize);
+ _workerJobExecutor = Executors.newFixedThreadPool(workPoolSize, new NamedThreadFactory(AsyncJobManager.WORK_JOB_POOL_THREAD_PREFIX));
} catch (final Exception e) {
throw new ConfigurationException("Unable to load db.properties to configure AsyncJobManagerImpl");
}
@@ -941,7 +949,8 @@ public class AsyncJobManagerImpl extends ManagerBase implements AsyncJobManager,
@Override
public boolean stop() {
_heartbeatScheduler.shutdown();
- _executor.shutdown();
+ _apiJobExecutor.shutdown();
+ _workerJobExecutor.shutdown();
return true;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8e27120b/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobMonitor.java
----------------------------------------------------------------------
diff --git a/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobMonitor.java b/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobMonitor.java
index 0b6f7a5..b1cac3e 100644
--- a/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobMonitor.java
+++ b/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobMonitor.java
@@ -115,7 +115,7 @@ public class AsyncJobMonitor extends ManagerBase {
assert (_activeTasks.get(runNumber) == null);
long threadId = Thread.currentThread().getId();
- boolean fromPoolThread = Thread.currentThread().getName().contains(AsyncJobManager.JOB_POOL_THREAD_PREFIX);
+ boolean fromPoolThread = Thread.currentThread().getName().contains(AsyncJobManager.API_JOB_POOL_THREAD_PREFIX);
ActiveTaskRecord record = new ActiveTaskRecord(jobId, threadId, fromPoolThread);
_activeTasks.put(runNumber, record);
if (fromPoolThread)
[04/50] [abbrv] git commit: updated refs/heads/4.4 to 48f8a95
Posted by hu...@apache.org.
Removed unused imports and instance vars from FirstFitAllocator
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/df852119
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/df852119
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/df852119
Branch: refs/heads/4.4
Commit: df8521194569668a923443767e783cd87ab5ea0c
Parents: 39e5b76
Author: Alena Prokharchyk <al...@citrix.com>
Authored: Thu Mar 13 11:05:37 2014 -0700
Committer: Alena Prokharchyk <al...@citrix.com>
Committed: Thu Mar 13 11:05:37 2014 -0700
----------------------------------------------------------------------
.../allocator/impl/FirstFitAllocator.java | 29 ++++----------------
1 file changed, 6 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/df852119/server/src/com/cloud/agent/manager/allocator/impl/FirstFitAllocator.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/agent/manager/allocator/impl/FirstFitAllocator.java b/server/src/com/cloud/agent/manager/allocator/impl/FirstFitAllocator.java
index 8abb5cd..3736884 100755
--- a/server/src/com/cloud/agent/manager/allocator/impl/FirstFitAllocator.java
+++ b/server/src/com/cloud/agent/manager/allocator/impl/FirstFitAllocator.java
@@ -48,7 +48,6 @@ import com.cloud.offering.ServiceOffering;
import com.cloud.org.Cluster;
import com.cloud.resource.ResourceManager;
import com.cloud.service.ServiceOfferingDetailsVO;
-import com.cloud.service.dao.ServiceOfferingDao;
import com.cloud.service.dao.ServiceOfferingDetailsDao;
import com.cloud.storage.GuestOSCategoryVO;
import com.cloud.storage.GuestOSVO;
@@ -56,14 +55,9 @@ import com.cloud.storage.VMTemplateVO;
import com.cloud.storage.dao.GuestOSCategoryDao;
import com.cloud.storage.dao.GuestOSDao;
import com.cloud.user.Account;
-import com.cloud.utils.NumbersUtil;
import com.cloud.utils.component.AdapterBase;
import com.cloud.vm.VirtualMachine;
import com.cloud.vm.VirtualMachineProfile;
-import com.cloud.vm.dao.ConsoleProxyDao;
-import com.cloud.vm.dao.DomainRouterDao;
-import com.cloud.vm.dao.SecondaryStorageVmDao;
-import com.cloud.vm.dao.UserVmDao;
import com.cloud.vm.dao.VMInstanceDao;
/**
@@ -74,20 +68,10 @@ import com.cloud.vm.dao.VMInstanceDao;
public class FirstFitAllocator extends AdapterBase implements HostAllocator {
private static final Logger s_logger = Logger.getLogger(FirstFitAllocator.class);
@Inject
- HostDao _hostDao = null;
+ protected HostDao _hostDao = null;
@Inject
HostDetailsDao _hostDetailsDao = null;
@Inject
- UserVmDao _vmDao = null;
- @Inject
- ServiceOfferingDao _offeringDao = null;
- @Inject
- DomainRouterDao _routerDao = null;
- @Inject
- ConsoleProxyDao _consoleProxyDao = null;
- @Inject
- SecondaryStorageVmDao _secStorgaeVmDao = null;
- @Inject
ConfigurationDao _configDao = null;
@Inject
GuestOSDao _guestOSDao = null;
@@ -96,19 +80,20 @@ public class FirstFitAllocator extends AdapterBase implements HostAllocator {
@Inject
VMInstanceDao _vmInstanceDao = null;
@Inject
- ResourceManager _resourceMgr;
+ protected ResourceManager _resourceMgr;
@Inject
ClusterDao _clusterDao;
@Inject
ClusterDetailsDao _clusterDetailsDao;
@Inject
ServiceOfferingDetailsDao _serviceOfferingDetailsDao;
- float _factor = 1;
- boolean _checkHvm = true;
- protected String _allocationAlgorithm = "random";
@Inject
CapacityManager _capacityMgr;
+ boolean _checkHvm = true;
+ protected String _allocationAlgorithm = "random";
+
+
@Override
public List<Host> allocateTo(VirtualMachineProfile vmProfile, DeploymentPlan plan, Type type, ExcludeList avoid, int returnUpTo) {
return allocateTo(vmProfile, plan, type, avoid, returnUpTo, true);
@@ -489,8 +474,6 @@ public class FirstFitAllocator extends AdapterBase implements HostAllocator {
public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
if (_configDao != null) {
Map<String, String> configs = _configDao.getConfiguration(params);
- String opFactor = configs.get("cpu.overprovisioning.factor");
- _factor = NumbersUtil.parseFloat(opFactor, 1);
String allocationAlgorithm = configs.get("vm.allocation.algorithm");
if (allocationAlgorithm != null) {
[41/50] [abbrv] git commit: updated refs/heads/4.4 to 48f8a95
Posted by hu...@apache.org.
adding distributed routing support for KVM OVS
some check style error fixes
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/36541a2f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/36541a2f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/36541a2f
Branch: refs/heads/4.4
Commit: 36541a2f4ca3216e58b835cb1bb33d38bc39692b
Parents: 423a748
Author: Murali Reddy <mu...@gmail.com>
Authored: Tue Mar 11 13:05:03 2014 +0530
Committer: Murali Reddy <mu...@gmail.com>
Committed: Fri Mar 14 16:56:38 2014 +0530
----------------------------------------------------------------------
.../kvm/resource/LibvirtComputingResource.java | 47 ++++
.../xen/resource/CitrixResourceBase.java | 2 +-
.../api/OvsVpcRoutingPolicyConfigCommand.java | 1 -
.../cloud/network/ovs/OvsTunnelManagerImpl.java | 21 +-
scripts/vm/network/vnet/cloudstack_pluginlib.py | 226 +++++++++++++++++++
scripts/vm/network/vnet/ovstunnel.py | 86 ++++++-
6 files changed, 373 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/36541a2f/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
index c1a7721..ec8bc11 100755
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
@@ -78,6 +78,8 @@ import com.cloud.agent.api.OvsDestroyTunnelCommand;
import com.cloud.agent.api.OvsFetchInterfaceAnswer;
import com.cloud.agent.api.OvsFetchInterfaceCommand;
import com.cloud.agent.api.OvsSetupBridgeCommand;
+import com.cloud.agent.api.OvsVpcPhysicalTopologyConfigCommand;
+import com.cloud.agent.api.OvsVpcRoutingPolicyConfigCommand;
import com.cloud.agent.api.PingCommand;
import com.cloud.agent.api.PingRoutingCommand;
import com.cloud.agent.api.PingRoutingWithNwGroupsCommand;
@@ -1360,6 +1362,10 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
return execute((OvsCreateTunnelCommand)cmd);
} else if (cmd instanceof OvsDestroyTunnelCommand) {
return execute((OvsDestroyTunnelCommand)cmd);
+ } else if (cmd instanceof OvsVpcPhysicalTopologyConfigCommand) {
+ return execute((OvsVpcPhysicalTopologyConfigCommand) cmd);
+ } else if (cmd instanceof OvsVpcRoutingPolicyConfigCommand) {
+ return execute((OvsVpcRoutingPolicyConfigCommand) cmd);
} else {
s_logger.warn("Unsupported command ");
return Answer.createUnsupportedCommandAnswer(cmd);
@@ -1401,6 +1407,47 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
return new Answer(cmd, true, null);
}
+ public Answer execute(OvsVpcPhysicalTopologyConfigCommand cmd) {
+
+ String bridge = cmd.getBridgeName();
+ try {
+ Script command = new Script(_ovsTunnelPath, _timeout, s_logger);
+ command.add("configure_ovs_bridge_for_network_topology");
+ command.add("--bridge", bridge);
+ command.add("--config", cmd.getVpcConfigInJson());
+
+ String result = command.execute();
+ if (result.equalsIgnoreCase("SUCCESS")) {
+ return new Answer(cmd, true, result);
+ } else {
+ return new Answer(cmd, false, result);
+ }
+ } catch (Exception e) {
+ s_logger.warn("caught exception while updating host with latest routing polcies", e);
+ return new Answer(cmd, false, e.getMessage());
+ }
+ }
+
+ public Answer execute(OvsVpcRoutingPolicyConfigCommand cmd) {
+
+ try {
+ Script command = new Script(_ovsTunnelPath, _timeout, s_logger);
+ command.add("configure_ovs_bridge_for_routing_policies");
+ command.add("--bridge", cmd.getBridgeName());
+ command.add("--config", cmd.getVpcConfigInJson());
+
+ String result = command.execute();
+ if (result.equalsIgnoreCase("SUCCESS")) {
+ return new Answer(cmd, true, result);
+ } else {
+ return new Answer(cmd, false, result);
+ }
+ } catch (Exception e) {
+ s_logger.warn("caught exception while updating host with latest VPC topology", e);
+ return new Answer(cmd, false, e.getMessage());
+ }
+ }
+
private synchronized void destroyTunnelNetwork(String bridge) {
try {
findOrCreateTunnelNetwork(bridge);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/36541a2f/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 a281002..273c08c 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
@@ -88,7 +88,6 @@ import org.apache.cloudstack.storage.to.TemplateObjectTO;
import org.apache.cloudstack.storage.to.VolumeObjectTO;
import com.cloud.agent.IAgentControl;
-
import com.cloud.agent.api.Answer;
import com.cloud.agent.api.AttachIsoCommand;
import com.cloud.agent.api.AttachVolumeAnswer;
@@ -149,6 +148,7 @@ import com.cloud.agent.api.OvsSetTagAndFlowAnswer;
import com.cloud.agent.api.OvsSetTagAndFlowCommand;
import com.cloud.agent.api.OvsSetupBridgeCommand;
import com.cloud.agent.api.OvsVpcPhysicalTopologyConfigCommand;
+import com.cloud.agent.api.OvsVpcRoutingPolicyConfigCommand;
import com.cloud.agent.api.PerformanceMonitorAnswer;
import com.cloud.agent.api.PerformanceMonitorCommand;
import com.cloud.agent.api.PingCommand;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/36541a2f/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsVpcRoutingPolicyConfigCommand.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsVpcRoutingPolicyConfigCommand.java b/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsVpcRoutingPolicyConfigCommand.java
index 8e4d5d1..50f1fdd 100644
--- a/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsVpcRoutingPolicyConfigCommand.java
+++ b/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsVpcRoutingPolicyConfigCommand.java
@@ -18,7 +18,6 @@ package com.cloud.agent.api;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
-import java.util.UUID;
/**
* This command represents logical view of VM's connectivity in VPC.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/36541a2f/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java b/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java
index 35b0035..eeb22b1 100644
--- a/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java
+++ b/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java
@@ -16,11 +16,25 @@
// under the License.
package com.cloud.network.ovs;
-import com.amazonaws.services.ec2.model.NetworkAcl;
-import com.cloud.agent.api.*;
+import com.cloud.agent.api.Answer;
+import com.cloud.agent.api.Command;
+import com.cloud.agent.api.OvsCreateTunnelAnswer;
+import com.cloud.agent.api.OvsCreateTunnelCommand;
+import com.cloud.agent.api.OvsDestroyBridgeCommand;
+import com.cloud.agent.api.OvsDestroyTunnelCommand;
+import com.cloud.agent.api.OvsFetchInterfaceAnswer;
+import com.cloud.agent.api.OvsFetchInterfaceCommand;
+import com.cloud.agent.api.OvsSetupBridgeCommand;
+import com.cloud.agent.api.OvsVpcPhysicalTopologyConfigCommand;
+import com.cloud.agent.api.OvsVpcRoutingPolicyConfigCommand;
import com.cloud.network.dao.NetworkDao;
import com.cloud.network.dao.NetworkVO;
-import com.cloud.network.vpc.*;
+import com.cloud.network.vpc.NetworkACLVO;
+import com.cloud.network.vpc.NetworkACLItemDao;
+import com.cloud.network.vpc.NetworkACLItemVO;
+import com.cloud.network.vpc.dao.VpcDao;
+import com.cloud.network.vpc.VpcManager;
+import com.cloud.network.vpc.VpcVO;
import com.cloud.network.vpc.dao.NetworkACLDao;
import com.cloud.vm.dao.VMInstanceDao;
import com.cloud.vm.Nic;
@@ -63,7 +77,6 @@ import com.cloud.network.ovs.dao.OvsTunnelInterfaceVO;
import com.cloud.network.ovs.dao.OvsTunnelNetworkDao;
import com.cloud.network.ovs.dao.OvsTunnelNetworkVO;
import com.cloud.network.ovs.dao.OvsTunnel;
-import com.cloud.network.vpc.dao.VpcDao;
import com.cloud.utils.component.ManagerBase;
import com.cloud.utils.concurrency.NamedThreadFactory;
import com.cloud.utils.db.DB;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/36541a2f/scripts/vm/network/vnet/cloudstack_pluginlib.py
----------------------------------------------------------------------
diff --git a/scripts/vm/network/vnet/cloudstack_pluginlib.py b/scripts/vm/network/vnet/cloudstack_pluginlib.py
index f886aa3..6c24917 100755
--- a/scripts/vm/network/vnet/cloudstack_pluginlib.py
+++ b/scripts/vm/network/vnet/cloudstack_pluginlib.py
@@ -174,6 +174,7 @@ def _build_flow_expr(**kwargs):
dl_dst = 'dl_dst' in kwargs and ",dl_dst=%s" % kwargs['dl_dst'] or ''
nw_src = 'nw_src' in kwargs and ",nw_src=%s" % kwargs['nw_src'] or ''
nw_dst = 'nw_dst' in kwargs and ",nw_dst=%s" % kwargs['nw_dst'] or ''
+ table = 'table' in kwargs and ",table=%s" % kwargs['table'] or ''
proto = 'proto' in kwargs and ",%s" % kwargs['proto'] or ''
ip = ('nw_src' in kwargs or 'nw_dst' in kwargs) and ',ip' or ''
flow = (flow + in_port + dl_type + dl_src + dl_dst +
@@ -217,3 +218,228 @@ def del_all_flows(bridge):
def del_port(bridge, port):
delPort = [VSCTL_PATH, "del-port", bridge, port]
do_cmd(delPort)
+
+
+def get_network_id_for_vif(vif_name):
+ domain_id, device_id = vif_name[3:len(vif_name)].split(".")
+ dom_uuid = do_cmd([XE_PATH, "vm-list", "dom-id=%s" % domain_id, "--minimal"])
+ vif_uuid = do_cmd([XE_PATH, "vif-list", "vm-uuid=%s" % dom_uuid, "device=%s" % device_id, "--minimal"])
+ vnet = do_cmd([XE_PATH, "vif-param-get", "uuid=%s" % vif_uuid, "param-name=other-config",
+ "param-key=cloudstack-network-id"])
+ return vnet
+
+def get_network_id_for_tunnel_port(tunnelif_name):
+ vnet = do_cmd([VSCTL_PATH, "get", "interface", tunnelif_name, "options:cloudstack-network-id"])
+ return vnet
+
+def clear_flooding_rules_for_port(bridge, ofport):
+ del_flows(bridge, in_port=ofport, table=2)
+
+def add_flooding_rules_for_port(bridge, in_ofport, out_ofports):
+ action = "".join("output:%s," %ofport for ofport in out_ofports)[:-1]
+ add_flow(bridge, priority=1100, in_port=in_ofport, table=1, actions=action)
+
+def get_ofport_for_vif(vif_name):
+ return do_cmd([VSCTL_PATH, "get", "interface", vif_name, "ofport"])
+
+def get_macaddress_of_vif(vif_name):
+ domain_id, device_id = vif_name[3:len(vif_name)].split(".")
+ dom_uuid = do_cmd([XE_PATH, "vm-list", "dom-id=%s" % domain_id, "--minimal"])
+ vif_uuid = do_cmd([XE_PATH, "vif-list", "vm-uuid=%s" % dom_uuid, "device=%s" % device_id, "--minimal"])
+ mac = do_cmd([XE_PATH, "vif-param-get", "uuid=%s" % vif_uuid, "param-name=MAC"])
+ return mac
+
+def get_vif_name_from_macaddress(macaddress):
+ vif_uuid = do_cmd([XE_PATH, "vif-list", "MAC=%s" % macaddress, "--minimal"])
+ vif_device_id = do_cmd([XE_PATH, "vif-param-get", "uuid=%s" % vif_uuid, "param-name=device"])
+ vm_uuid = do_cmd([XE_PATH, "vif-param-get", "uuid=%s" % vif_uuid, "param-name=vm-uuid"])
+ vm_domain_id = do_cmd([XE_PATH, "vm-param-get", "uuid=%s" % vm_uuid, "param-name=dom-id"])
+ return "vif"+vm_domain_id+"."+vif_device_id
+
+def add_mac_lookup_table_entry(bridge, mac_address, out_of_port):
+ add_flow(bridge, priority=1100, dl_dst=mac_address, table=1, actions="output:%s" % out_of_port)
+
+def delete_mac_lookup_table_entry(bridge, mac_address):
+ del_flows(bridge, dl_dst=mac_address, table=1)
+
+def add_ip_lookup_table_entry(bridge, ip, dst_tier_gateway_mac, dst_vm_mac):
+ action_str = "mod_dl_sr:%s" % dst_tier_gateway_mac + ",mod_dl_dst:%s" % dst_vm_mac +",resubmit(,5)"
+ addflow = [OFCTL_PATH, "add-flow", bridge, "table=4", "nw_dst=%s" % ip, "actions=%s" %action_str]
+ do_cmd(addflow)
+
+def get_vms_on_host(vpc, host_id):
+ all_vms = vpc.vms
+ vms_on_host = []
+ for vm in all_vms:
+ if vm.hostid == host_id:
+ vms_on_host.append(vm)
+ return vms_on_host
+
+def get_network_details(vpc, network_uuid):
+ tiers = vpc.tiers
+ for tier in tiers:
+ if tier.networkuuid == network_uuid:
+ return tier
+ return None
+
+class jsonLoader(object):
+ def __init__(self, obj):
+ for k in obj:
+ v = obj[k]
+ if isinstance(v, dict):
+ setattr(self, k, jsonLoader(v))
+ elif isinstance(v, (list, tuple)):
+ if len(v) > 0 and isinstance(v[0], dict):
+ setattr(self, k, [jsonLoader(elem) for elem in v])
+ else:
+ setattr(self, k, v)
+ else:
+ setattr(self, k, v)
+
+ def __getattr__(self, val):
+ if val in self.__dict__:
+ return self.__dict__[val]
+ else:
+ return None
+
+ def __repr__(self):
+ return '{%s}' % str(', '.join('%s : %s' % (k, repr(v)) for (k, v)
+ in self.__dict__.iteritems()))
+
+ def __str__(self):
+ return '{%s}' % str(', '.join('%s : %s' % (k, repr(v)) for (k, v)
+ in self.__dict__.iteritems()))
+
+def configure_bridge_for_network_topology(bridge, this_host_id, json_config):
+ vpconfig = jsonLoader(json.loads(json_config)).vpc
+
+ if vpconfig is None:
+ logging.debug("WARNING:Can't find VPC info in json config file")
+ return "FAILURE:IMPROPER_JSON_CONFG_FILE"
+
+ # get the list of Vm's in the VPC from the JSON config
+ this_host_vms = get_vms_on_host(vpconfig, this_host_id)
+
+ for vm in this_host_vms:
+ for nic in vm.nics:
+ mac_addr = nic.macaddress
+ ip = nic.ipaddress
+ vif_name = get_vif_name_from_macaddress(mac_addr)
+ of_port = get_ofport_for_vif(vif_name)
+ network = get_network_details(vpconfig, nic.networkuuid)
+
+ # Add flow rule in L2 look up table, if the destination mac = MAC of the nic send packet on the found OFPORT
+ add_mac_lookup_table_entry(bridge, mac_addr, of_port)
+
+ # Add flow rule in L3 look up table: if the destination IP = VM's IP then modify the packet
+ # to set DST MAC = VM's MAC, SRC MAC=tier gateway MAC and send to egress table
+ add_ip_lookup_table_entry(bridge, ip, network.gatewaymac, mac_addr)
+
+ # Add flow entry to send with intra tier traffic from the NIC to L2 lookup path)
+ addflow = [OFCTL_PATH, "add-flow", bridge, "table=0", "in_port=%s" % of_port,
+ "nw_dst=%s" %network.cidr, "actions=resubmit(,1)"]
+ do_cmd(addflow)
+
+ #add flow entry to send inter-tier traffic from the NIC to egress ACL table(to L3 lookup path)
+ addflow = [OFCTL_PATH, "add-flow", bridge, "table=0", "in_port=%s" % of_port,
+ "dl_dst=%s" %network.gatewaymac, "nw_dst=%s" %vpconfig.cidr, "actions=resubmit(,3)"]
+ do_cmd(addflow)
+
+ # get the list of hosts on which VPC spans from the JSON config
+ vpc_spanning_hosts = vpconfig.hosts
+
+ for host in vpc_spanning_hosts:
+ if this_host_id == host.hostid:
+ continue
+ other_host_vms = get_vms_on_host(vpconfig, host.hostid)
+ for vm in other_host_vms:
+ for nic in vm.nics:
+ mac_addr = nic.macaddress
+ ip = nic.ipaddress
+ network = get_network_details(vpconfig, nic.networkuuid)
+ gre_key = network.grekey
+
+ # generate tunnel name from tunnel naming convention
+ tunnel_name = "t%s-%s-%s" % (gre_key, this_host_id, host.hostid)
+ of_port = get_ofport_for_vif(tunnel_name)
+
+ # Add flow rule in L2 look up table, if the destination mac = MAC of the nic send packet tunnel port
+ add_mac_lookup_table_entry(bridge, mac_addr, of_port)
+
+ # Add flow tule in L3 look up table: if the destination IP = VM's IP then modify the packet
+ # set DST MAC = VM's MAC, SRC MAC=tier gateway MAC and send to egress table
+ add_ip_lookup_table_entry(bridge, ip, network.gatewaymac, mac_addr)
+
+ return "SUCCESS: successfully configured bridge as per the VPC topology"
+
+def get_acl(vpcconfig, required_acl_id):
+ acls = vpcconfig.acls
+ for acl in acls:
+ if acl.id == required_acl_id:
+ return acl
+ return None
+
+def configure_ovs_bridge_for_routing_policies(bridge, json_config):
+ vpconfig = jsonLoader(json.loads(json_config)).vpc
+
+ if vpconfig is None:
+ logging.debug("WARNING:Can't find VPC info in json config file")
+ return "FAILURE:IMPROPER_JSON_CONFG_FILE"
+
+ # First flush current egress ACL's before re-applying the ACL's
+ del_flows(bridge, table=3)
+
+ egress_rules_added = False
+ ingress_rules_added = False
+
+ tiers = vpconfig.tiers
+ for tier in tiers:
+ tier_cidr = tier.cidr
+ acl = get_acl(vpconfig, tier.aclid)
+ acl_items = acl.aclitems
+
+ for acl_item in acl_items:
+ number = acl_item.number
+ action = acl_item.action
+ direction = acl_item.direction
+ source_port_start = acl_item.sourceportstart
+ source_port_end = acl_item.sourceportend
+ protocol = acl_item.protocol
+ source_cidrs = acl_item.sourcecidrs
+ acl_priority = 1000 + number
+ for source_cidr in source_cidrs:
+ if direction is "ingress":
+ ingress_rules_added = True
+ # add flow rule to do action (allow/deny) for flows where source IP of the packet is in
+ # source_cidr and destination ip is in tier_cidr
+ port = source_port_start
+ while (port < source_port_end):
+ if action is "deny":
+ add_flow(bridge, priority= acl_priority, table=5, nw_src=source_cidr, nw_dst=tier_cidr, tp_dst=port,
+ nw_proto=protocol, actions='drop')
+ if action is "allow":
+ add_flow(bridge, priority= acl_priority,table=5, nw_src=source_cidr, nw_dst=tier_cidr, tp_dst=port,
+ nw_proto=protocol, actions='resubmit(,1)')
+ port = port + 1
+
+ elif direction in "egress":
+ egress_rules_added = True
+ # add flow rule to do action (allow/deny) for flows where destination IP of the packet is in
+ # source_cidr and source ip is in tier_cidr
+ port = source_port_start
+ while (port < source_port_end):
+ if action is "deny":
+ add_flow(bridge, priority= acl_priority, table=5, nw_src=tier_cidr, nw_dst=source_cidr, tp_dst=port,
+ nw_proto=protocol, actions='drop')
+ if action is "allow":
+ add_flow(bridge, priority= acl_priority, table=5, nw_src=tier_cidr, nw_dst=source_cidr, tp_dst=port,
+ nw_proto=protocol, actions='resubmit(,1)')
+ port = port + 1
+
+ if egress_rules_added is False:
+ # add a default rule in egress table to forward packet to L3 lookup table
+ add_flow(bridge, priority=0, table=3, actions='resubmit(,4)')
+
+ if ingress_rules_added is False:
+ # add a default rule in egress table drop packets
+ add_flow(bridge, priority=0, table=5, actions='drop')
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/36541a2f/scripts/vm/network/vnet/ovstunnel.py
----------------------------------------------------------------------
diff --git a/scripts/vm/network/vnet/ovstunnel.py b/scripts/vm/network/vnet/ovstunnel.py
index 9e05413..57085d8 100755
--- a/scripts/vm/network/vnet/ovstunnel.py
+++ b/scripts/vm/network/vnet/ovstunnel.py
@@ -27,6 +27,7 @@ import os
import sys
import subprocess
import time
+import simplejson as json
from optparse import OptionParser, OptionGroup, OptParseError, BadOptionError, OptionError, OptionConflictError, OptionValueError
from time import localtime as _localtime, asctime as _asctime
@@ -72,6 +73,58 @@ def setup_ovs_bridge(bridge, key, cs_host_id):
logging.debug("Setup_ovs_bridge completed with result:%s" % result)
return result
+@echo
+def setup_ovs_bridge_for_distributed_routing(bridge, cs_host_id):
+
+ res = lib.check_switch()
+ if res != "SUCCESS":
+ return "FAILURE:%s" % res
+
+ logging.debug("About to manually create the bridge:%s" % bridge)
+ res = lib.do_cmd([lib.VSCTL_PATH, "--", "--may-exist", "add-br", bridge])
+ logging.debug("Bridge has been manually created:%s" % res)
+
+ # Non empty result means something went wrong
+ if res:
+ result = "FAILURE:%s" % res
+ else:
+ # Verify the bridge actually exists
+ res = lib.do_cmd([lib.VSCTL_PATH, "list", "bridge", bridge])
+
+ res = lib.do_cmd([lib.VSCTL_PATH, "set", "bridge", bridge, "other_config:is-ovs_vpc_distributed_vr_network=True"])
+ conf_hosts = lib.do_cmd([lib.VSCTL_PATH, "get","bridge", bridge,"other:ovs-host-setup"])
+ conf_hosts = cs_host_id + (conf_hosts and ',%s' % conf_hosts or '')
+ lib.do_cmd([lib.VSCTL_PATH, "set", "bridge", bridge,
+ "other_config:ovs-host-setup=%s" % conf_hosts])
+
+ # add a default flow rule to send broadcast and multi-cast packets to L2 flooding table
+ lib.add_flow(bridge, priority=1000, dl_dst='ff:ff:ff:ff:ff:ff', table=0, actions='resubmit(,2)')
+ lib.add_flow(bridge, priority=1000, nw_dst='224.0.0.0/24', table=0, actions='resubmit(,2)')
+
+ # add a default flow rule to send uni-cast traffic to L2 lookup table
+ lib.add_flow(bridge, priority=0, table=0, actions='resubmit(,1)')
+
+ # add a default rule to send unknown mac address to L2 flooding table
+ lib.add_flow(bridge, priority=0, table=1, actions='resubmit(,2)')
+
+ # add a default rule in L2 flood table to drop packet
+ lib.add_flow(bridge, priority=0, table=2, actions='drop')
+
+ # add a default rule in egress table to forward packet to L3 lookup table
+ lib.add_flow(bridge, priority=0, table=3, actions='resubmit(,4)')
+
+ # add a default rule in L3 lookup table to forward packet to L2 lookup table
+ lib.add_flow(bridge, priority=0, table=4, actions='resubmit(,1)')
+
+ # add a default rule in ingress table to drop in bound packets
+ lib.add_flow(bridge, priority=0, table=5, actions='drop')
+
+ result = "SUCCESS: successfully setup bridge with flow rules"
+
+ logging.debug("Setup_ovs_bridge completed with result:%s" % result)
+
+ return result
+
def destroy_ovs_bridge(bridge):
res = lib.check_switch()
@@ -163,12 +216,30 @@ def create_tunnel(bridge, remote_ip, key, src_host, dst_host):
# Ensure no trailing LF
if tun_ofport.endswith('\n'):
tun_ofport = tun_ofport[:-1]
- # add flow entryies for dropping broadcast coming in from gre tunnel
- lib.add_flow(bridge, priority=1000, in_port=tun_ofport,
+
+ ovs_tunnel_network = lib.do_cmd([lib.VSCTL_PATH, "get", "bridge", bridge, "other_config:is-ovs-tun-network"])
+ ovs_vpc_distributed_vr_network = lib.do_cmd([lib.VSCTL_PATH, "get", "bridge", bridge,
+ "other_config:is-ovs_vpc_distributed_vr_network"])
+
+ if ovs_tunnel_network == 'True':
+ # add flow entryies for dropping broadcast coming in from gre tunnel
+ lib.add_flow(bridge, priority=1000, in_port=tun_ofport,
+ dl_dst='ff:ff:ff:ff:ff:ff', actions='drop')
+ lib.add_flow(bridge, priority=1000, in_port=tun_ofport,
+ nw_dst='224.0.0.0/24', actions='drop')
+ drop_flow_setup = True
+
+ if ovs_vpc_distributed_vr_network == 'True':
+ # add flow rules for dropping broadcast coming in from tunnel ports
+ lib.add_flow(bridge, priority=1000, in_port=tun_ofport, table=0,
dl_dst='ff:ff:ff:ff:ff:ff', actions='drop')
- lib.add_flow(bridge, priority=1000, in_port=tun_ofport,
+ lib.add_flow(bridge, priority=1000, in_port=tun_ofport, table=0,
nw_dst='224.0.0.0/24', actions='drop')
- drop_flow_setup = True
+
+ # add flow rule to send the traffic from tunnel ports to L2 switching table only
+ lib.add_flow(bridge, priority=1000, in_port=tun_ofport, table=0, actions='resubmit(,1)')
+ lib.do_cmd([lib.VSCTL_PATH, "set", "interface", name, "options:cloudstack-network-id=%s" % network_uuid])
+
logging.debug("Broadcast drop rules added")
# return "SUCCESS:%s" % name
return 'true'
@@ -210,6 +281,7 @@ if __name__ == '__main__':
parser.add_option("--src_host", dest="src_host")
parser.add_option("--dst_host", dest="dst_host")
parser.add_option("--iface_name", dest="iface_name")
+ parser.ad_option("--config", dest="config")
(option, args) = parser.parse_args()
if len(args) == 0:
logging.debug("No command to execute")
@@ -223,6 +295,12 @@ if __name__ == '__main__':
create_tunnel(option.bridge, option.remote_ip, option.key, option.src_host, option.dst_host)
elif cmd == "destroy_tunnel":
destroy_tunnel(option.bridge, option.iface_name)
+ elif cmd == "setup_ovs_bridge_for_distributed_routing":
+ setup_ovs_bridge_for_distributed_routing(bridge, cs_host_id)
+ elif cmd == "configure_ovs_bridge_for_network_topology":
+ configure_bridge_for_network_topology(brdige, cs_host_id, config)
+ elif cmd == "configure_ovs_bridge_for_routing_policies":
+ configure_ovs_bridge_for_routing_policies(bridge, config)
else:
logging.debug("Unknown command: " + cmd)
sys.exit(1)
[49/50] [abbrv] git commit: updated refs/heads/4.4 to 48f8a95
Posted by hu...@apache.org.
CLOUDSTACK-6106 Agent side changes for VPC on Hyper-V
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4523f5d8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4523f5d8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4523f5d8
Branch: refs/heads/4.4
Commit: 4523f5d8de64761a507b5a8f1f9b4d451a8be17a
Parents: 1b4325d
Author: Rajesh Battala <ra...@citrix.com>
Authored: Wed Mar 12 07:45:50 2014 +0530
Committer: Rajesh Battala <ra...@citrix.com>
Committed: Fri Mar 14 17:36:43 2014 +0530
----------------------------------------------------------------------
.../HypervResource/HypervResourceController.cs | 14 ++++++++---
.../HypervResource/IWmiCallsV2.cs | 1 +
.../ServerResource/HypervResource/WmiCallsV2.cs | 26 +++++++++++++++++++-
3 files changed, 37 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4523f5d8/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs
index 2d44753..40609e4 100644
--- a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs
+++ b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs
@@ -992,6 +992,7 @@ namespace HypervResource
using (log4net.NDC.Push(Guid.NewGuid().ToString()))
{
logger.Info(CloudStackTypes.PlugNicCommand + cmd.ToString());
+
object ansContent = new
{
result = true,
@@ -1299,9 +1300,16 @@ namespace HypervResource
String vmName = cmd.vmName;
uint vlan = (uint)cmd.vlan;
string macAddress = cmd.macAddress;
- wmiCallsV2.ModifyVmVLan(vmName, vlan, macAddress);
-
- result = true;
+ uint pos = cmd.index;
+ if (macAddress != null)
+ {
+ wmiCallsV2.ModifyVmVLan(vmName, vlan, macAddress);
+ }
+ else if (pos > 1)
+ {
+ wmiCallsV2.ModifyVmVLan(vmName, vlan, pos);
+ }
+ result = true;
object ansContent = new
{
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4523f5d8/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/IWmiCallsV2.cs
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/IWmiCallsV2.cs b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/IWmiCallsV2.cs
index 6018896..8c682ad 100644
--- a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/IWmiCallsV2.cs
+++ b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/IWmiCallsV2.cs
@@ -70,5 +70,6 @@ namespace HypervResource
void SetState(ComputerSystem vm, ushort requiredState);
Dictionary<String, VmState> GetVmSync(String privateIpAddress);
void ModifyVmVLan(string vmName, uint vlanid, string mac);
+ void ModifyVmVLan(string vmName, uint vlanid, uint pos);
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4523f5d8/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/WmiCallsV2.cs
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/WmiCallsV2.cs b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/WmiCallsV2.cs
index 73156c5..d5cf7c9 100644
--- a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/WmiCallsV2.cs
+++ b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/WmiCallsV2.cs
@@ -229,6 +229,7 @@ namespace HypervResource
string errMsg = vmName;
var diskDrives = vmInfo.disks;
var bootArgs = vmInfo.bootArgs;
+ string defaultvlan = "4094";
// assert
errMsg = vmName + ": missing disk information, array empty or missing, agent expects *at least* one disk for a VM";
@@ -391,6 +392,8 @@ namespace HypervResource
string vlan = null;
string isolationUri = nic.isolationUri;
string broadcastUri = nic.broadcastUri;
+ string nicIp = nic.ip;
+ string nicNetmask = nic.netmask;
if ( (broadcastUri != null ) || (isolationUri != null && isolationUri.StartsWith("vlan://")))
{
if (broadcastUri != null && broadcastUri.StartsWith("storage"))
@@ -415,6 +418,10 @@ namespace HypervResource
throw ex;
}
}
+ if(nicIp.Equals("0.0.0.0") && nicNetmask.Equals("255.255.255.255") ) {
+ // this is the extra nic added to VR.
+ vlan = defaultvlan;
+ }
if (nicCount == 2)
{
@@ -913,7 +920,6 @@ namespace HypervResource
ResourceAllocationSettingData defaultDiskDriveSettings = defaultDiskDriveSettingsObjs.OfType<ResourceAllocationSettingData>().First();
return new ResourceAllocationSettingData((ManagementBaseObject)defaultDiskDriveSettings.LateBoundObject.Clone());
}
-
// Modify the systemvm nic's VLAN id
public void ModifyVmVLan(string vmName, uint vlanid, String mac)
@@ -945,6 +951,24 @@ namespace HypervResource
vlanSettings.LateBoundObject.GetText(TextFormat.CimDtd20)});
}
+ // Modify the systemvm nic's VLAN id
+ public void ModifyVmVLan(string vmName, uint vlanid, uint pos)
+ {
+ ComputerSystem vm = GetComputerSystem(vmName);
+ SyntheticEthernetPortSettingData[] nicSettingsViaVm = GetEthernetPortSettings(vm);
+ // Obtain controller for Hyper-V virtualisation subsystem
+ VirtualSystemManagementService vmMgmtSvc = GetVirtualisationSystemManagementService();
+
+ EthernetPortAllocationSettingData[] ethernetConnections = GetEthernetConnections(vm);
+ EthernetSwitchPortVlanSettingData vlanSettings = GetVlanSettings(ethernetConnections[pos]);
+
+ //Assign configuration to new NIC
+ vlanSettings.LateBoundObject["AccessVlanId"] = vlanid;
+ vlanSettings.LateBoundObject["OperationMode"] = 1;
+ ModifyFeatureVmResources(vmMgmtSvc, vm, new String[] {
+ vlanSettings.LateBoundObject.GetText(TextFormat.CimDtd20)});
+ }
+
public void AttachIso(string displayName, string iso)
{
logger.DebugFormat("Got request to attach iso {0} to vm {1}", iso, displayName);
[34/50] [abbrv] git commit: updated refs/heads/4.4 to 48f8a95
Posted by hu...@apache.org.
mark VPC to be using distributed router if VPC offerign supports
distributedrouter capability.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3139b355
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3139b355
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3139b355
Branch: refs/heads/4.4
Commit: 3139b3551809e176eac8111fe0884579cc80d595
Parents: e3ec12e
Author: Murali Reddy <mu...@gmail.com>
Authored: Tue Mar 4 18:17:02 2014 +0530
Committer: Murali Reddy <mu...@gmail.com>
Committed: Fri Mar 14 16:56:35 2014 +0530
----------------------------------------------------------------------
api/src/com/cloud/network/vpc/Vpc.java | 6 ++++++
.../apache/cloudstack/api/response/VpcResponse.java | 9 +++++++++
engine/schema/src/com/cloud/network/vpc/VpcVO.java | 13 +++++++++++--
server/src/com/cloud/api/ApiResponseHelper.java | 1 +
server/src/com/cloud/network/vpc/VpcManagerImpl.java | 9 +++++----
server/test/com/cloud/vpc/VpcApiUnitTest.java | 2 +-
server/test/com/cloud/vpc/dao/MockVpcDaoImpl.java | 4 ++--
setup/db/db/schema-430to440.sql | 1 +
8 files changed, 36 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3139b355/api/src/com/cloud/network/vpc/Vpc.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/vpc/Vpc.java b/api/src/com/cloud/network/vpc/Vpc.java
index eb7e391..4bc8c98 100644
--- a/api/src/com/cloud/network/vpc/Vpc.java
+++ b/api/src/com/cloud/network/vpc/Vpc.java
@@ -73,4 +73,10 @@ public interface Vpc extends ControlledEntity, Identity, InternalIdentity {
boolean isRestartRequired();
boolean isDisplay();
+
+ /**
+ *
+ * @return true if VPC is configured to use distributed router to provides one-hop forwarding and hypervisor based ACL
+ */
+ boolean usesDistributedRouter();
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3139b355/api/src/org/apache/cloudstack/api/response/VpcResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/VpcResponse.java b/api/src/org/apache/cloudstack/api/response/VpcResponse.java
index eeafb40..e3b44f2 100644
--- a/api/src/org/apache/cloudstack/api/response/VpcResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/VpcResponse.java
@@ -111,6 +111,11 @@ public class VpcResponse extends BaseResponse implements ControlledEntityRespons
@Param(description = "is vpc for display to the regular user", since = "4.4", authorized = {RoleType.Admin})
private Boolean forDisplay;
+
+ @SerializedName(ApiConstants.DISTRIBUTED_VPC_ROUTER)
+ @Param(description = "is VPC uses distributed router for one hop forwarding and host based network ACL's")
+ private boolean usesDistributedRouter;
+
public void setId(String id) {
this.id = id;
}
@@ -199,4 +204,8 @@ public class VpcResponse extends BaseResponse implements ControlledEntityRespons
public void setForDisplay(Boolean forDisplay) {
this.forDisplay = forDisplay;
}
+
+ public void setUsesDistributedRouter(Boolean usesDistributedRouter) {
+ this.usesDistributedRouter = usesDistributedRouter;
+ }
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3139b355/engine/schema/src/com/cloud/network/vpc/VpcVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/vpc/VpcVO.java b/engine/schema/src/com/cloud/network/vpc/VpcVO.java
index 39bea77..d7aaa95 100644
--- a/engine/schema/src/com/cloud/network/vpc/VpcVO.java
+++ b/engine/schema/src/com/cloud/network/vpc/VpcVO.java
@@ -81,11 +81,15 @@ public class VpcVO implements Vpc {
@Column(name = "display", updatable = true, nullable = false)
protected boolean display = true;
+ @Column(name="uses_distributed_router")
+ boolean usesDistributedRouter = false;
+
public VpcVO() {
uuid = UUID.randomUUID().toString();
}
- public VpcVO(long zoneId, String name, String displayText, long accountId, long domainId, long vpcOffId, String cidr, String networkDomain) {
+ public VpcVO(long zoneId, String name, String displayText, long accountId, long domainId, long vpcOffId, String cidr,
+ String networkDomain, boolean useDistributedRouter) {
this.zoneId = zoneId;
this.name = name;
this.displayText = displayText;
@@ -95,7 +99,8 @@ public class VpcVO implements Vpc {
uuid = UUID.randomUUID().toString();
state = State.Enabled;
this.networkDomain = networkDomain;
- vpcOfferingId = vpcOffId;
+ this.vpcOfferingId = vpcOffId;
+ this.usesDistributedRouter = useDistributedRouter;
}
@Override
@@ -201,5 +206,9 @@ public class VpcVO implements Vpc {
@Override
public IAMEntityType getEntityType() {
return IAMEntityType.Vpc;
+
+ @Override
+ public boolean usesDistributedRouter() {
+ return usesDistributedRouter;
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3139b355/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 e87c3e0..a37bf7b 100755
--- a/server/src/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/com/cloud/api/ApiResponseHelper.java
@@ -2808,6 +2808,7 @@ public class ApiResponseHelper implements ResponseGenerator {
response.setRestartRequired(vpc.isRestartRequired());
response.setNetworkDomain(vpc.getNetworkDomain());
response.setForDisplay(vpc.isDisplay());
+ response.setUsesDistributedRouter(vpc.usesDistributedRouter());
Map<Service, Set<Provider>> serviceProviderMap = ApiDBUtils.listVpcOffServices(vpc.getVpcOfferingId());
List<ServiceResponse> serviceResponses = new ArrayList<ServiceResponse>();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3139b355/server/src/com/cloud/network/vpc/VpcManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpc/VpcManagerImpl.java b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
index 16a8399..6da1a55 100644
--- a/server/src/com/cloud/network/vpc/VpcManagerImpl.java
+++ b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
@@ -728,13 +728,13 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis
networkDomain = "cs" + Long.toHexString(owner.getId()) + NetworkOrchestrationService.GuestDomainSuffix.valueIn(zoneId);
}
}
-
- return createVpc(zoneId, vpcOffId, owner, vpcName, displayText, cidr, networkDomain, displayVpc);
+ boolean useDistributedRouter = vpcOff.supportsDistributedRouter();
+ return createVpc(zoneId, vpcOffId, owner, vpcName, displayText, cidr, networkDomain, displayVpc, useDistributedRouter);
}
@DB
protected Vpc createVpc(final long zoneId, final long vpcOffId, final Account vpcOwner, final String vpcName, final String displayText, final String cidr,
- final String networkDomain, final Boolean displayVpc) {
+ final String networkDomain, final Boolean displayVpc, final boolean useDistributedRouter) {
//Validate CIDR
if (!NetUtils.isValidCIDR(cidr)) {
@@ -756,7 +756,8 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis
return Transaction.execute(new TransactionCallback<VpcVO>() {
@Override
public VpcVO doInTransaction(TransactionStatus status) {
- VpcVO vpc = new VpcVO(zoneId, vpcName, displayText, vpcOwner.getId(), vpcOwner.getDomainId(), vpcOffId, cidr, networkDomain);
+ VpcVO vpc = new VpcVO(zoneId, vpcName, displayText, vpcOwner.getId(), vpcOwner.getDomainId(), vpcOffId,
+ cidr, networkDomain, useDistributedRouter);
if (displayVpc != null) {
vpc.setDisplay(displayVpc);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3139b355/server/test/com/cloud/vpc/VpcApiUnitTest.java
----------------------------------------------------------------------
diff --git a/server/test/com/cloud/vpc/VpcApiUnitTest.java b/server/test/com/cloud/vpc/VpcApiUnitTest.java
index bc982a9..5e28374 100644
--- a/server/test/com/cloud/vpc/VpcApiUnitTest.java
+++ b/server/test/com/cloud/vpc/VpcApiUnitTest.java
@@ -85,7 +85,7 @@ public class VpcApiUnitTest extends TestCase {
public void validateNtwkOffForVpc() {
//validate network offering
//1) correct network offering
- VpcVO vo = new VpcVO(1, "new vpc", "new vpc", 1, 1, 1, "0.0.0.0/0", "vpc domain");
+ VpcVO vo = new VpcVO(1, "new vpc", "new vpc", 1, 1, 1, "0.0.0.0/0", "vpc domain", false);
boolean result = false;
try {
_vpcService.validateNtwkOffForNtwkInVpc(2L, 1, "0.0.0.0", "111-", vo, "10.1.1.1", new AccountVO(), null);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3139b355/server/test/com/cloud/vpc/dao/MockVpcDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/test/com/cloud/vpc/dao/MockVpcDaoImpl.java b/server/test/com/cloud/vpc/dao/MockVpcDaoImpl.java
index 7a0c7a0..e1a6ac2 100644
--- a/server/test/com/cloud/vpc/dao/MockVpcDaoImpl.java
+++ b/server/test/com/cloud/vpc/dao/MockVpcDaoImpl.java
@@ -98,9 +98,9 @@ public class MockVpcDaoImpl extends GenericDaoBase<VpcVO, Long> implements VpcDa
public VpcVO findById(Long id) {
VpcVO vo = null;
if (id.longValue() == 1) {
- vo = new VpcVO(1, "new vpc", "new vpc", 1, 1, 1, "0.0.0.0/0", "vpc domain");
+ vo = new VpcVO(1, "new vpc", "new vpc", 1, 1, 1, "0.0.0.0/0", "vpc domain", false);
} else if (id.longValue() == 2) {
- vo = new VpcVO(1, "new vpc", "new vpc", 1, 1, 1, "0.0.0.0/0", "vpc domain");
+ vo = new VpcVO(1, "new vpc", "new vpc", 1, 1, 1, "0.0.0.0/0", "vpc domain", false);
vo.setState(State.Inactive);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3139b355/setup/db/db/schema-430to440.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-430to440.sql b/setup/db/db/schema-430to440.sql
index ac398e5..9298f72 100644
--- a/setup/db/db/schema-430to440.sql
+++ b/setup/db/db/schema-430to440.sql
@@ -741,3 +741,4 @@ ALTER TABLE `cloud`.`guest_os` ADD COLUMN `removed` datetime COMMENT 'Time when
UPDATE `cloud`.`guest_os` SET `created` = now();
ALTER TABLE `cloud`.`vm_reservation` ADD COLUMN `deployment_planner` varchar(40) DEFAULT NULL COMMENT 'Preferred deployment planner for the vm';
ALTER TABLE `cloud`.`vpc_offerings` ADD COLUMN supports_distributed_router boolean default false;
+ALTER TABLE `cloud`.`vpc` ADD COLUMN uses_distributed_router boolean default false;
[18/50] [abbrv] git commit: updated refs/heads/4.4 to 48f8a95
Posted by hu...@apache.org.
Give graceful state transition period to live with race-condition on VM startup time
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5a75a3e1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5a75a3e1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5a75a3e1
Branch: refs/heads/4.4
Commit: 5a75a3e1f92dc8f6352f1e27797c44d40565454b
Parents: 3123c30
Author: Kelven Yang <ke...@gmail.com>
Authored: Wed Mar 12 14:30:18 2014 -0700
Committer: Kelven Yang <ke...@gmail.com>
Committed: Thu Mar 13 16:59:56 2014 -0700
----------------------------------------------------------------------
.../vm/VirtualMachinePowerStateSyncImpl.java | 44 +++++++++++++++++---
.../vmware/resource/VmwareResource.java | 2 -
2 files changed, 38 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5a75a3e1/engine/orchestration/src/com/cloud/vm/VirtualMachinePowerStateSyncImpl.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/com/cloud/vm/VirtualMachinePowerStateSyncImpl.java b/engine/orchestration/src/com/cloud/vm/VirtualMachinePowerStateSyncImpl.java
index 6332958..9edecac 100644
--- a/engine/orchestration/src/com/cloud/vm/VirtualMachinePowerStateSyncImpl.java
+++ b/engine/orchestration/src/com/cloud/vm/VirtualMachinePowerStateSyncImpl.java
@@ -16,6 +16,7 @@
// under the License.
package com.cloud.vm;
+import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -24,10 +25,12 @@ import javax.inject.Inject;
import org.apache.log4j.Logger;
+import org.apache.cloudstack.framework.config.ConfigKey;
import org.apache.cloudstack.framework.messagebus.MessageBus;
import org.apache.cloudstack.framework.messagebus.PublishScope;
import com.cloud.agent.api.HostVmStateReportEntry;
+import com.cloud.utils.DateUtil;
import com.cloud.vm.dao.VMInstanceDao;
public class VirtualMachinePowerStateSyncImpl implements VirtualMachinePowerStateSync {
@@ -37,6 +40,9 @@ public class VirtualMachinePowerStateSyncImpl implements VirtualMachinePowerStat
@Inject VMInstanceDao _instanceDao;
@Inject VirtualMachineManager _vmMgr;
+ protected final ConfigKey<Integer> PingInterval = new ConfigKey<Integer>(Integer.class, "ping.interval", "Advanced", "60",
+ "Interval to send application level pings to make sure the connection is still working", false);
+
public VirtualMachinePowerStateSyncImpl() {
}
@@ -96,15 +102,41 @@ public class VirtualMachinePowerStateSyncImpl implements VirtualMachinePowerStat
}
if (vmsThatAreMissingReport.size() > 0) {
+ Date currentTime = DateUtil.currentGMTTime();
+ if (s_logger.isDebugEnabled())
+ s_logger.debug("Run missing VM report. current time: " + currentTime.getTime());
+
+ // 2 times of sync-update interval for graceful period
+ long milliSecondsGracefullPeriod = PingInterval.value() * 2000;
+
for (VMInstanceVO instance : vmsThatAreMissingReport) {
- if (_instanceDao.updatePowerState(instance.getId(), hostId, VirtualMachine.PowerState.PowerReportMissing)) {
- if (s_logger.isDebugEnabled())
- s_logger.debug("VM state report is updated. host: " + hostId + ", vm id: " + instance.getId() + ", power state: PowerReportMissing ");
- _messageBus.publish(null, VirtualMachineManager.Topics.VM_POWER_STATE, PublishScope.GLOBAL, instance.getId());
+ Date vmStateUpdateTime = instance.getUpdateTime();
+ if (vmStateUpdateTime == null) {
+ s_logger.warn("VM state was updated but update time is null?! vm id: " + instance.getId());
+ vmStateUpdateTime = currentTime;
+ }
+
+ if (s_logger.isDebugEnabled())
+ s_logger.debug("Detected missing VM. host: " + hostId + ", vm id: " + instance.getId() +
+ ", power state: PowerReportMissing, last state update: " + vmStateUpdateTime.getTime());
+
+ long milliSecondsSinceLastStateUpdate = currentTime.getTime() - vmStateUpdateTime.getTime();
+
+ if (milliSecondsSinceLastStateUpdate > milliSecondsGracefullPeriod) {
+ s_logger.debug("vm id: " + instance.getId() + " - time since last state update(" + milliSecondsSinceLastStateUpdate + "ms) has passed graceful period");
+
+ if (_instanceDao.updatePowerState(instance.getId(), hostId, VirtualMachine.PowerState.PowerReportMissing)) {
+ if (s_logger.isDebugEnabled())
+ s_logger.debug("VM state report is updated. host: " + hostId + ", vm id: " + instance.getId() + ", power state: PowerReportMissing ");
+
+ _messageBus.publish(null, VirtualMachineManager.Topics.VM_POWER_STATE, PublishScope.GLOBAL, instance.getId());
+ } else {
+ if (s_logger.isDebugEnabled())
+ s_logger.debug("VM power state does not change, skip DB writing. vm id: " + instance.getId());
+ }
} else {
- if (s_logger.isDebugEnabled())
- s_logger.debug("VM power state does not change, skip DB writing. vm id: " + instance.getId());
+ s_logger.debug("vm id: " + instance.getId() + " - time since last state update(" + milliSecondsSinceLastStateUpdate + "ms) has not passed graceful period yet");
}
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5a75a3e1/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 4693f86..0a2cad4 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
@@ -41,7 +41,6 @@ import java.util.UUID;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
-
import javax.naming.ConfigurationException;
import org.apache.log4j.Logger;
@@ -2681,7 +2680,6 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
try {
VirtualMachineMO vmMo = hyperHost.findVmOnHyperHost(cmd.getVmName());
if (vmMo != null) {
-
State state = null;
synchronized (_vms) {
state = _vms.get(cmd.getVmName());
[23/50] [abbrv] git commit: updated refs/heads/4.4 to 48f8a95
Posted by hu...@apache.org.
HA manager to check target state of the VM to make decisions on whether or not to carry on a cheduled step. Fix NPE in capacity manager when releasing capacity of a stopped VM.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4312d884
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4312d884
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4312d884
Branch: refs/heads/4.4
Commit: 4312d884629d4a9e7716da4c869433cdaa8181b8
Parents: 3d5fbe7
Author: Kelven Yang <ke...@gmail.com>
Authored: Tue Mar 4 16:43:26 2014 -0800
Committer: Kelven Yang <ke...@gmail.com>
Committed: Thu Mar 13 16:59:56 2014 -0700
----------------------------------------------------------------------
server/src/com/cloud/capacity/CapacityManagerImpl.java | 5 +++++
server/src/com/cloud/ha/HighAvailabilityManagerImpl.java | 2 ++
2 files changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4312d884/server/src/com/cloud/capacity/CapacityManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/capacity/CapacityManagerImpl.java b/server/src/com/cloud/capacity/CapacityManagerImpl.java
index 957a5d0..69e8cfa 100755
--- a/server/src/com/cloud/capacity/CapacityManagerImpl.java
+++ b/server/src/com/cloud/capacity/CapacityManagerImpl.java
@@ -188,6 +188,11 @@ public class CapacityManagerImpl extends ManagerBase implements CapacityManager,
Long clusterId = null;
if (hostId != null) {
HostVO host = _hostDao.findById(hostId);
+ if (host == null) {
+ s_logger.warn("Host " + hostId + " no long exist anymore!");
+ return true;
+ }
+
clusterId = host.getClusterId();
}
if (capacityCpu == null || capacityMemory == null || svo == null) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4312d884/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java b/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
index 3bcaf2e..8bd569a 100755
--- a/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
+++ b/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
@@ -701,6 +701,7 @@ public class HighAvailabilityManagerImpl extends ManagerBase implements HighAvai
(vm.getHostId() != null ? vm.getHostId() : "none") + " State: " + vm.getState());
return null;
}
+
_itMgr.advanceStop(vm.getUuid(), false);
s_logger.info("Stop for " + vm + " was successful");
return null;
@@ -711,6 +712,7 @@ public class HighAvailabilityManagerImpl extends ManagerBase implements HighAvai
(vm.getHostId() != null ? vm.getHostId() : "none") + " State: " + vm.getState());
return null;
}
+
_itMgr.advanceStop(vm.getUuid(), true);
s_logger.info("Stop for " + vm + " was successful");
return null;
[09/50] [abbrv] git commit: updated refs/heads/4.4 to 48f8a95
Posted by hu...@apache.org.
Removing the copy task that is not needed any more.
We do not need to copy commands.properties to utils anymore since the IAM permissions are no longer loaded during Upgrade
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/fa80c63c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/fa80c63c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/fa80c63c
Branch: refs/heads/4.4
Commit: fa80c63c339aceba11064ca649d44516b9a421af
Parents: 1f6263d
Author: Prachi Damle <pr...@cloud.com>
Authored: Thu Mar 13 14:14:12 2014 -0700
Committer: Prachi Damle <pr...@cloud.com>
Committed: Thu Mar 13 14:14:12 2014 -0700
----------------------------------------------------------------------
client/pom.xml | 6 ------
1 file changed, 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fa80c63c/client/pom.xml
----------------------------------------------------------------------
diff --git a/client/pom.xml b/client/pom.xml
index eadd6e9..74c459e 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -510,12 +510,6 @@
<exclude name="*.in"/>
</fileset>
</copy>
- <copy overwrite="true" todir="${basedir}/../utils/conf/">
- <fileset dir="${basedir}/tomcatconf">
- <include name="commands.properties.in" />
- </fileset>
- <globmapper from="*.in" to="*" />
- </copy>
</target>
</configuration>
</execution>
[28/50] [abbrv] git commit: updated refs/heads/4.4 to 48f8a95
Posted by hu...@apache.org.
CLOUDSTACK-6092: Storage OverProvisioning as a Per Primary Basis Allow storage.overprovisioning.factor to be specified at storape pool level.
Signed-off-by: Sateesh Chodapuneedi <sa...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/48f8a95b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/48f8a95b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/48f8a95b
Branch: refs/heads/4.4
Commit: 48f8a95b06b0348ba1349cb5434183c2c18710db
Parents: 6a4927f
Author: Saksham Srivastava <sa...@citrix.com>
Authored: Tue Mar 11 17:52:00 2014 +0530
Committer: Sateesh Chodapuneedi <sa...@apache.org>
Committed: Fri Mar 14 12:16:46 2014 +0530
----------------------------------------------------------------------
.../api/response/StoragePoolResponse.java | 8 ++
.../src/com/cloud/capacity/CapacityManager.java | 2 +-
.../api/query/dao/StoragePoolJoinDaoImpl.java | 4 +-
.../cloud/capacity/StorageCapacityListener.java | 2 +-
.../com/cloud/storage/StorageManagerImpl.java | 25 +++--
setup/db/db/schema-430to440.sql | 3 +
.../integration/smoke/test_over_provisioning.py | 107 +++++++++++++++++++
7 files changed, 141 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48f8a95b/api/src/org/apache/cloudstack/api/response/StoragePoolResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/StoragePoolResponse.java b/api/src/org/apache/cloudstack/api/response/StoragePoolResponse.java
index 03a4f34..98c90e2 100644
--- a/api/src/org/apache/cloudstack/api/response/StoragePoolResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/StoragePoolResponse.java
@@ -107,6 +107,10 @@ public class StoragePoolResponse extends BaseResponse {
@Param(description = "the scope of the storage pool")
private String scope;
+ @SerializedName("overprovisionfactor")
+ @Param(description = "the overprovisionfactor for the storage pool")
+ private String overprovisionfactor;
+
@SerializedName(ApiConstants.HYPERVISOR)
@Param(description = "the hypervisor type of the storage pool")
private String hypervisor;
@@ -301,4 +305,8 @@ public class StoragePoolResponse extends BaseResponse {
public void setSuitableForMigration(Boolean suitableForMigration) {
this.suitableForMigration = suitableForMigration;
}
+
+ public void setOverProvisionFactor(String overProvisionFactor) {
+ this.overprovisionfactor = overProvisionFactor;
+ }
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48f8a95b/engine/components-api/src/com/cloud/capacity/CapacityManager.java
----------------------------------------------------------------------
diff --git a/engine/components-api/src/com/cloud/capacity/CapacityManager.java b/engine/components-api/src/com/cloud/capacity/CapacityManager.java
index bd1a610..038a2c0 100755
--- a/engine/components-api/src/com/cloud/capacity/CapacityManager.java
+++ b/engine/components-api/src/com/cloud/capacity/CapacityManager.java
@@ -44,7 +44,7 @@ public interface CapacityManager {
"Percentage (as a value between 0 and 1) of storage utilization above which allocators will disable using the pool for low storage available.", true,
ConfigKey.Scope.Zone);
static final ConfigKey<Double> StorageOverprovisioningFactor = new ConfigKey<Double>("Storage", Double.class, StorageOverprovisioningFactorCK, "2",
- "Used for storage overprovisioning calculation; available storage will be (actualStorageSize * storage.overprovisioning.factor)", true, ConfigKey.Scope.Zone);
+ "Used for storage overprovisioning calculation; available storage will be (actualStorageSize * storage.overprovisioning.factor)", true, ConfigKey.Scope.StoragePool);
static final ConfigKey<Double> StorageAllocatedCapacityDisableThreshold =
new ConfigKey<Double>(
"Alert",
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48f8a95b/server/src/com/cloud/api/query/dao/StoragePoolJoinDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/query/dao/StoragePoolJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/StoragePoolJoinDaoImpl.java
index 274bf1c..1d89b19 100644
--- a/server/src/com/cloud/api/query/dao/StoragePoolJoinDaoImpl.java
+++ b/server/src/com/cloud/api/query/dao/StoragePoolJoinDaoImpl.java
@@ -24,13 +24,13 @@ import javax.inject.Inject;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
-
import org.apache.cloudstack.api.response.StoragePoolResponse;
import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
import com.cloud.api.ApiDBUtils;
import com.cloud.api.query.vo.StoragePoolJoinVO;
import com.cloud.capacity.Capacity;
+import com.cloud.capacity.CapacityManager;
import com.cloud.storage.ScopeType;
import com.cloud.storage.StoragePool;
import com.cloud.storage.StorageStats;
@@ -103,6 +103,7 @@ public class StoragePoolJoinDaoImpl extends GenericDaoBase<StoragePoolJoinVO, Lo
poolResponse.setClusterId(pool.getClusterUuid());
poolResponse.setClusterName(pool.getClusterName());
poolResponse.setTags(pool.getTag());
+ poolResponse.setOverProvisionFactor(Double.toString(CapacityManager.StorageOverprovisioningFactor.valueIn(pool.getId())));
// set async job
if (pool.getJobId() != null) {
@@ -156,6 +157,7 @@ public class StoragePoolJoinDaoImpl extends GenericDaoBase<StoragePoolJoinVO, Lo
poolResponse.setDiskSizeTotal(pool.getCapacityBytes());
poolResponse.setDiskSizeAllocated(allocatedSize);
poolResponse.setCapacityIops(pool.getCapacityIops());
+ poolResponse.setOverProvisionFactor(Double.toString(CapacityManager.StorageOverprovisioningFactor.valueIn(pool.getId())));
// TODO: StatsCollector does not persist data
StorageStats stats = ApiDBUtils.getStoragePoolStatistics(pool.getId());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48f8a95b/server/src/com/cloud/capacity/StorageCapacityListener.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/capacity/StorageCapacityListener.java b/server/src/com/cloud/capacity/StorageCapacityListener.java
index 4322ecf..f83cbd3 100755
--- a/server/src/com/cloud/capacity/StorageCapacityListener.java
+++ b/server/src/com/cloud/capacity/StorageCapacityListener.java
@@ -67,7 +67,7 @@ public class StorageCapacityListener implements Listener {
StartupStorageCommand ssCmd = (StartupStorageCommand)startup;
if (ssCmd.getResourceType() == Storage.StorageResourceType.STORAGE_HOST) {
- BigDecimal overProvFactor = _storageMgr.getStorageOverProvisioningFactor(server.getDataCenterId());
+ BigDecimal overProvFactor = BigDecimal.valueOf(CapacityManager.StorageOverprovisioningFactor.value());
CapacityVO capacity =
new CapacityVO(server.getId(), server.getDataCenterId(), server.getPodId(), server.getClusterId(), 0L, (overProvFactor.multiply(new BigDecimal(
server.getTotalSize()))).longValue(), Capacity.CAPACITY_TYPE_STORAGE_ALLOCATED);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48f8a95b/server/src/com/cloud/storage/StorageManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/StorageManagerImpl.java b/server/src/com/cloud/storage/StorageManagerImpl.java
index 913dc23..3b29b33 100755
--- a/server/src/com/cloud/storage/StorageManagerImpl.java
+++ b/server/src/com/cloud/storage/StorageManagerImpl.java
@@ -854,8 +854,8 @@ public class StorageManagerImpl extends ManagerBase implements StorageManager, C
}
@Override
- public BigDecimal getStorageOverProvisioningFactor(Long dcId) {
- return new BigDecimal(CapacityManager.StorageOverprovisioningFactor.valueIn(dcId));
+ public BigDecimal getStorageOverProvisioningFactor(Long poolId) {
+ return new BigDecimal(CapacityManager.StorageOverprovisioningFactor.valueIn(poolId));
}
@Override
@@ -869,13 +869,18 @@ public class StorageManagerImpl extends ManagerBase implements StorageManager, C
long totalOverProvCapacity;
if (storagePool.getPoolType() == StoragePoolType.NetworkFilesystem || storagePool.getPoolType() == StoragePoolType.VMFS) {
- BigDecimal overProvFactor = getStorageOverProvisioningFactor(storagePool.getDataCenterId());
- totalOverProvCapacity = overProvFactor.multiply(new BigDecimal(storagePool.getCapacityBytes())).longValue();
// All this is for the inaccuracy of floats for big number multiplication.
+ BigDecimal overProvFactor = getStorageOverProvisioningFactor(storagePool.getId());
+ totalOverProvCapacity = overProvFactor.multiply(new BigDecimal(storagePool.getCapacityBytes())).longValue();
+ s_logger.debug("Found storage pool " + storagePool.getName() + " of type " + storagePool.getPoolType().toString() + " with overprovisioning factor "
+ + overProvFactor.toString());
+ s_logger.debug("Total over provisioned capacity calculated is " + overProvFactor + " * " + storagePool.getCapacityBytes());
} else {
+ s_logger.debug("Found storage pool " + storagePool.getName() + " of type " + storagePool.getPoolType().toString());
totalOverProvCapacity = storagePool.getCapacityBytes();
}
+ s_logger.debug("Total over provisioned capacity of the pool " + storagePool.getName() + " id: " + storagePool.getId() + " is " + totalOverProvCapacity);
if (capacities.size() == 0) {
CapacityVO capacity =
new CapacityVO(storagePool.getId(), storagePool.getDataCenterId(), storagePool.getPodId(), storagePool.getClusterId(), allocated, totalOverProvCapacity,
@@ -1552,16 +1557,22 @@ public class StorageManagerImpl extends ManagerBase implements StorageManager, C
long totalOverProvCapacity;
if (pool.getPoolType() == StoragePoolType.NetworkFilesystem || pool.getPoolType() == StoragePoolType.VMFS) {
- totalOverProvCapacity = getStorageOverProvisioningFactor(pool.getDataCenterId()).multiply(new BigDecimal(pool.getCapacityBytes())).longValue();
+ BigDecimal overProvFactor = getStorageOverProvisioningFactor(pool.getId());
+ totalOverProvCapacity = overProvFactor.multiply(new BigDecimal(pool.getCapacityBytes())).longValue();
+ s_logger.debug("Found storage pool " + poolVO.getName() + " of type " + pool.getPoolType().toString() + " with overprovisioning factor "
+ + overProvFactor.toString());
+ s_logger.debug("Total over provisioned capacity calculated is " + overProvFactor + " * " + pool.getCapacityBytes());
} else {
totalOverProvCapacity = pool.getCapacityBytes();
+ s_logger.debug("Found storage pool " + poolVO.getName() + " of type " + pool.getPoolType().toString());
}
+ s_logger.debug("Total capacity of the pool " + poolVO.getName() + " id: " + pool.getId() + " is " + totalOverProvCapacity);
double storageAllocatedThreshold = CapacityManager.StorageAllocatedCapacityDisableThreshold.valueIn(pool.getDataCenterId());
if (s_logger.isDebugEnabled()) {
s_logger.debug("Checking pool: " + pool.getId() + " for volume allocation " + volumes.toString() + ", maxSize : " + totalOverProvCapacity +
- ", totalAllocatedSize : " + allocatedSizeWithtemplate + ", askingSize : " + totalAskingSize + ", allocated disable threshold: " +
- storageAllocatedThreshold);
+ ", totalAllocatedSize : " + allocatedSizeWithtemplate + ", askingSize : " + totalAskingSize + ", allocated disable threshold: " +
+ storageAllocatedThreshold);
}
double usedPercentage = (allocatedSizeWithtemplate + totalAskingSize) / (double)(totalOverProvCapacity);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48f8a95b/setup/db/db/schema-430to440.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-430to440.sql b/setup/db/db/schema-430to440.sql
index 9298f72..5c5511a 100644
--- a/setup/db/db/schema-430to440.sql
+++ b/setup/db/db/schema-430to440.sql
@@ -742,3 +742,6 @@ UPDATE `cloud`.`guest_os` SET `created` = now();
ALTER TABLE `cloud`.`vm_reservation` ADD COLUMN `deployment_planner` varchar(40) DEFAULT NULL COMMENT 'Preferred deployment planner for the vm';
ALTER TABLE `cloud`.`vpc_offerings` ADD COLUMN supports_distributed_router boolean default false;
ALTER TABLE `cloud`.`vpc` ADD COLUMN uses_distributed_router boolean default false;
+
+INSERT INTO `cloud`.`storage_pool_details` (pool_id,name,value,display) SELECT storage_pool.id,data_center_details.name,data_center_details.value,data_center_details.display FROM `cloud`.`storage_pool` JOIN `cloud`.`data_center_details` ON data_center_details.dc_id=storage_pool.data_center_id WHERE data_center_details.name = "storage.overprovisioning.factor";
+DELETE FROM `cloud`.`data_center_details` WHERE name="storage.overprovisioning.factor";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48f8a95b/test/integration/smoke/test_over_provisioning.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_over_provisioning.py b/test/integration/smoke/test_over_provisioning.py
new file mode 100644
index 0000000..28f32b7af
--- /dev/null
+++ b/test/integration/smoke/test_over_provisioning.py
@@ -0,0 +1,107 @@
+# 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.
+""" Test for storage.overprovisioning.factor update
+"""
+#Import Local Modules
+from marvin.cloudstackTestCase import *
+from marvin.cloudstackAPI import *
+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
+
+class TestUpdateOverProvision(cloudstackTestCase):
+ """
+ Test to update a storage.overprovisioning.factor
+ """
+ def setUp(self):
+ self.apiClient = self.testClient.getApiClient()
+
+ @attr(tags=["simulator", "devcloud", "basic", "advanced"])
+ def test_UpdateStorageOverProvisioningFactor(self):
+ """
+ test update configuration setting at storage scope
+ @return:
+ """
+
+ """ 1. list storagepools for id """
+ """ 2. list overprovisioning factor for storage pool """
+ """ 3. update setting for the pool"""
+ """ 4. list overprovisioning factor for storage pool and assert"""
+
+ """ list storagepools """
+ storage_pools = StoragePool.list(
+ self.apiClient,
+ listall=True
+ )
+ self.assertEqual(
+ isinstance(storage_pools, list),
+ True,
+ "List storage pools should not return empty response"
+ )
+
+ if len(storage_pools) < 1:
+ raise self.skipTest(
+ "The environment don't have storage pools required for test")
+
+ for pool in storage_pools:
+ if pool.type == "NetworkFilesystem" or pool.type == "VMFS":
+ break
+ if pool.type != "NetworkFilesystem" and pool.type != "VMFS":
+ raise self.skipTest("Storage overprovisioning currently not supported on " + pool.type + " pools")
+
+ self.poolId = pool.id
+ """ list overprovisioning factor for storage pool """
+ factorOld = float(pool.overprovisionfactor)
+ factorNew = str(factorOld + 1.0)
+
+ """ update setting for the pool"""
+ updateConfigurationCmd = updateConfiguration.updateConfigurationCmd()
+ updateConfigurationCmd.name = "storage.overprovisioning.factor"
+ updateConfigurationCmd.value = factorNew
+ updateConfigurationCmd.storageid = pool.id
+
+ updateConfigurationResponse = self.apiClient.updateConfiguration(updateConfigurationCmd)
+
+ self.debug("updated the parameter %s with value %s"%(updateConfigurationResponse.name, updateConfigurationResponse.value))
+
+ storage_pools = StoragePool.list(
+ self.apiClient,
+ id = self.poolId
+ )
+ pool = storage_pools[0]
+ factorNew = float(pool.overprovisionfactor)
+ self.assertNotEqual(int(factorNew), int(factorOld)," Check if overprovision factor of storage pool has changed")
+ self.assertEqual(int(factorNew), int(factorOld + 1.0)," Check if overprovision factor of storage pool has increased by 1")
+
+ def tearDown(self):
+ """Reset the storage.overprovisioning.factor back to its original value
+ @return:
+ """
+ storage_pools = StoragePool.list(
+ self.apiClient,
+ id = self.poolId
+ )
+ pool = storage_pools[0]
+ updateConfigurationCmd = updateConfiguration.updateConfigurationCmd()
+ updateConfigurationCmd.name = "storage.overprovisioning.factor"
+ factorOld = float(pool.overprovisionfactor)
+ factorNew = str(factorOld - 1.0)
+ updateConfigurationCmd.value = factorNew
+ updateConfigurationCmd.storageid = pool.id
+ updateConfigurationResponse = self.apiClient.updateConfiguration(updateConfigurationCmd)
[08/50] [abbrv] git commit: updated refs/heads/4.4 to 48f8a95
Posted by hu...@apache.org.
fix build for the juniper-contrail plugin
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1f6263de
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1f6263de
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1f6263de
Branch: refs/heads/4.4
Commit: 1f6263dead08e208efacdb382ac57bbf143c4607
Parents: d9696b2
Author: Prachi Damle <pr...@cloud.com>
Authored: Thu Mar 13 13:50:36 2014 -0700
Committer: Prachi Damle <pr...@cloud.com>
Committed: Thu Mar 13 13:50:36 2014 -0700
----------------------------------------------------------------------
.../network/contrail/management/MockAccountManager.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1f6263de/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java b/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java
index c0b9ee5..957f708 100644
--- a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java
+++ b/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java
@@ -177,13 +177,13 @@ public class MockAccountManager extends ManagerBase implements AccountManager {
}
@Override
- public boolean isRootAdmin(long accountId) {
+ public boolean isRootAdmin(Long accountId) {
// TODO Auto-generated method stub
return false;
}
@Override
- public boolean isDomainAdmin(long accountId) {
+ public boolean isDomainAdmin(Long accountId) {
// TODO Auto-generated method stub
return false;
}
[11/50] [abbrv] git commit: updated refs/heads/4.4 to 48f8a95
Posted by hu...@apache.org.
Removed the AccessType.UseNetwork - replaced all referrences by AccessType.UseEntry
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/36c0a4e2
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/36c0a4e2
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/36c0a4e2
Branch: refs/heads/4.4
Commit: 36c0a4e2c33f59649ff52e3be7a4f181f8defeae
Parents: 84a528f
Author: Prachi Damle <pr...@cloud.com>
Authored: Thu Mar 13 15:32:38 2014 -0700
Committer: Prachi Damle <pr...@cloud.com>
Committed: Thu Mar 13 15:32:38 2014 -0700
----------------------------------------------------------------------
api/src/org/apache/cloudstack/acl/SecurityChecker.java | 1 -
.../apache/cloudstack/api/command/user/vm/DeployVMCmd.java | 2 +-
server/src/com/cloud/acl/DomainChecker.java | 2 +-
server/src/com/cloud/network/IpAddressManagerImpl.java | 8 +++++---
server/src/com/cloud/network/NetworkServiceImpl.java | 4 ++--
server/src/com/cloud/user/AccountManagerImpl.java | 3 ++-
server/src/com/cloud/vm/UserVmManagerImpl.java | 6 +++---
.../network/lb/ApplicationLoadBalancerManagerImpl.java | 2 +-
8 files changed, 15 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/36c0a4e2/api/src/org/apache/cloudstack/acl/SecurityChecker.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/acl/SecurityChecker.java b/api/src/org/apache/cloudstack/acl/SecurityChecker.java
index 2889bc8..614f604 100644
--- a/api/src/org/apache/cloudstack/acl/SecurityChecker.java
+++ b/api/src/org/apache/cloudstack/acl/SecurityChecker.java
@@ -32,7 +32,6 @@ public interface SecurityChecker extends Adapter {
public enum AccessType {
ModifyProject,
- UseNetwork,
OperateEntry,
UseEntry
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/36c0a4e2/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
index 69e079f..0235fcc 100755
--- a/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
@@ -105,7 +105,7 @@ public class DeployVMCmd extends BaseAsyncCreateCustomIdCmd {
private Long domainId;
//Network information
- @ACL(accessType = AccessType.UseNetwork)
+ @ACL(accessType = AccessType.UseEntry)
@Parameter(name = ApiConstants.NETWORK_IDS, type = CommandType.LIST, collectionType = CommandType.UUID, entityType = NetworkResponse.class, description = "list of network ids used by virtual machine. Can't be specified with ipToNetworkList parameter")
private List<Long> networkIds;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/36c0a4e2/server/src/com/cloud/acl/DomainChecker.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/acl/DomainChecker.java b/server/src/com/cloud/acl/DomainChecker.java
index 3df71a7..cb6921d 100755
--- a/server/src/com/cloud/acl/DomainChecker.java
+++ b/server/src/com/cloud/acl/DomainChecker.java
@@ -134,7 +134,7 @@ public class DomainChecker extends AdapterBase implements SecurityChecker {
}
return true;
- } else if (entity instanceof Network && accessType != null && accessType == AccessType.UseNetwork) {
+ } else if (entity instanceof Network && accessType != null && accessType == AccessType.UseEntry) {
_networkMgr.checkNetworkPermissions(caller, (Network)entity);
} else if (entity instanceof AffinityGroup) {
return false;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/36c0a4e2/server/src/com/cloud/network/IpAddressManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/IpAddressManagerImpl.java b/server/src/com/cloud/network/IpAddressManagerImpl.java
index 5225e3d..9b1f9bd 100644
--- a/server/src/com/cloud/network/IpAddressManagerImpl.java
+++ b/server/src/com/cloud/network/IpAddressManagerImpl.java
@@ -1164,7 +1164,8 @@ public class IpAddressManagerImpl extends ManagerBase implements IpAddressManage
if (zone.getNetworkType() == NetworkType.Advanced) {
if (network.getGuestType() == Network.GuestType.Shared) {
if (isSharedNetworkOfferingWithServices(network.getNetworkOfferingId())) {
- _accountMgr.checkAccess(CallContext.current().getCallingAccount(), AccessType.UseNetwork, false, network);
+ _accountMgr.checkAccess(CallContext.current().getCallingAccount(), AccessType.UseEntry, false,
+ network);
} else {
throw new InvalidParameterValueException("IP can be associated with guest network of 'shared' type only if "
+ "network services Source Nat, Static Nat, Port Forwarding, Load balancing, firewall are enabled in the network");
@@ -1186,7 +1187,7 @@ public class IpAddressManagerImpl extends ManagerBase implements IpAddressManage
Network network = _networksDao.findById(networkId);
if (network != null) {
- _accountMgr.checkAccess(owner, AccessType.UseNetwork, false, network);
+ _accountMgr.checkAccess(owner, AccessType.UseEntry, false, network);
} else {
s_logger.debug("Unable to find ip address by id: " + ipId);
return null;
@@ -1318,7 +1319,8 @@ public class IpAddressManagerImpl extends ManagerBase implements IpAddressManage
if (zone.getNetworkType() == NetworkType.Advanced) {
if (network.getGuestType() == Network.GuestType.Shared) {
assert (isSharedNetworkOfferingWithServices(network.getNetworkOfferingId()));
- _accountMgr.checkAccess(CallContext.current().getCallingAccount(), AccessType.UseNetwork, false, network);
+ _accountMgr.checkAccess(CallContext.current().getCallingAccount(), AccessType.UseEntry, false,
+ network);
}
} else {
_accountMgr.checkAccess(caller, null, true, ipToAssoc);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/36c0a4e2/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 9185d84..9238a1e 100755
--- a/server/src/com/cloud/network/NetworkServiceImpl.java
+++ b/server/src/com/cloud/network/NetworkServiceImpl.java
@@ -535,7 +535,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService {
// if shared network in the advanced zone, then check the caller against the network for 'AccessType.UseNetwork'
if (zone.getNetworkType() == NetworkType.Advanced) {
if (isSharedNetworkOfferingWithServices(network.getNetworkOfferingId())) {
- _accountMgr.checkAccess(caller, AccessType.UseNetwork, false, network);
+ _accountMgr.checkAccess(caller, AccessType.UseEntry, false, network);
if (s_logger.isDebugEnabled()) {
s_logger.debug("Associate IP address called by the user " + callerUserId + " account " + ipOwner.getId());
}
@@ -578,7 +578,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService {
// if shared network in the advanced zone, then check the caller against the network for 'AccessType.UseNetwork'
if (zone.getNetworkType() == NetworkType.Advanced) {
if (isSharedNetworkOfferingWithServices(network.getNetworkOfferingId())) {
- _accountMgr.checkAccess(caller, AccessType.UseNetwork, false, network);
+ _accountMgr.checkAccess(caller, AccessType.UseEntry, false, network);
if (s_logger.isDebugEnabled()) {
s_logger.debug("Associate IP address called by the user " + callerUserId + " account " + ipOwner.getId());
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/36c0a4e2/server/src/com/cloud/user/AccountManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/user/AccountManagerImpl.java b/server/src/com/cloud/user/AccountManagerImpl.java
index 1b68b0c..f0d129a 100755
--- a/server/src/com/cloud/user/AccountManagerImpl.java
+++ b/server/src/com/cloud/user/AccountManagerImpl.java
@@ -91,6 +91,7 @@ import com.cloud.exception.PermissionDeniedException;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.IpAddress;
import com.cloud.network.IpAddressManager;
+import com.cloud.network.Network;
import com.cloud.network.VpnUserVO;
import com.cloud.network.as.AutoScaleManager;
import com.cloud.network.dao.AccountGuestVlanMapDao;
@@ -490,7 +491,7 @@ public class AccountManagerImpl extends ManagerBase implements AccountManager, M
domainId = account != null ? account.getDomainId() : -1;
}
if (entity.getAccountId() != -1 && domainId != -1 && !(entity instanceof VirtualMachineTemplate) &&
- !(accessType != null && accessType == AccessType.UseNetwork) && !(entity instanceof AffinityGroup)) {
+ !(entity instanceof Network && accessType != null && accessType == AccessType.UseEntry) && !(entity instanceof AffinityGroup)) {
List<ControlledEntity> toBeChecked = domains.get(entity.getDomainId());
// for templates, we don't have to do cross domains check
if (toBeChecked == null) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/36c0a4e2/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 e7c0c8d..0e4fb5e 100755
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -987,7 +987,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
}
// Perform account permission check on network
- _accountMgr.checkAccess(caller, AccessType.UseNetwork, false, network);
+ _accountMgr.checkAccess(caller, AccessType.UseEntry, false, network);
//ensure network belongs in zone
if (network.getDataCenterId() != vmInstance.getDataCenterId()) {
@@ -1061,7 +1061,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
}
// Perform account permission check on network
- _accountMgr.checkAccess(caller, AccessType.UseNetwork, false, network);
+ _accountMgr.checkAccess(caller, AccessType.UseEntry, false, network);
boolean nicremoved = false;
@@ -2336,7 +2336,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
// Perform account permission check
if (network.getAclType() == ACLType.Account) {
- _accountMgr.checkAccess(caller, AccessType.UseNetwork, false, network);
+ _accountMgr.checkAccess(caller, AccessType.UseEntry, false, network);
}
networkList.add(network);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/36c0a4e2/server/src/org/apache/cloudstack/network/lb/ApplicationLoadBalancerManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/org/apache/cloudstack/network/lb/ApplicationLoadBalancerManagerImpl.java b/server/src/org/apache/cloudstack/network/lb/ApplicationLoadBalancerManagerImpl.java
index 1f3e0d2..73bf0d2 100644
--- a/server/src/org/apache/cloudstack/network/lb/ApplicationLoadBalancerManagerImpl.java
+++ b/server/src/org/apache/cloudstack/network/lb/ApplicationLoadBalancerManagerImpl.java
@@ -114,7 +114,7 @@ public class ApplicationLoadBalancerManagerImpl extends ManagerBase implements A
}
Account caller = CallContext.current().getCallingAccount();
- _accountMgr.checkAccess(caller, AccessType.UseNetwork, false, guestNtwk);
+ _accountMgr.checkAccess(caller, AccessType.UseEntry, false, guestNtwk);
Network sourceIpNtwk = _networkModel.getNetwork(sourceIpNetworkId);
if (sourceIpNtwk == null) {
[24/50] [abbrv] git commit: updated refs/heads/4.4 to 48f8a95
Posted by hu...@apache.org.
move HA rescheduling operation to HA worker context.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3d5fbe70
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3d5fbe70
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3d5fbe70
Branch: refs/heads/4.4
Commit: 3d5fbe7073d4b7234611e972ca030088bff2f3f2
Parents: 53f306e
Author: Kelven Yang <ke...@gmail.com>
Authored: Tue Mar 4 15:58:03 2014 -0800
Committer: Kelven Yang <ke...@gmail.com>
Committed: Thu Mar 13 16:59:56 2014 -0700
----------------------------------------------------------------------
.../cloud/ha/HighAvailabilityManagerImpl.java | 22 +++++++++++++++++---
1 file changed, 19 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3d5fbe70/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java b/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
index b7d5be8..3bcaf2e 100755
--- a/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
+++ b/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
@@ -267,10 +267,17 @@ public class HighAvailabilityManagerImpl extends ManagerBase implements HighAvai
"] is down." +
((sb != null) ? sb.toString() : ""));
- for (final VMInstanceVO vm : vms) {
+ for (VMInstanceVO vm : vms) {
if (s_logger.isDebugEnabled()) {
s_logger.debug("Notifying HA Mgr of to restart vm " + vm.getId() + "-" + vm.getHostName());
}
+ vm = _instanceDao.findByUuid(vm.getUuid());
+ Long hostId = vm.getHostId();
+ if ( hostId != null && !hostId.equals(host.getId()) ) {
+ s_logger.debug("VM " + vm.getHostName() + " is not on down host " + host.getId() + " it is on other host "
+ + hostId + " VM HA is done");
+ continue;
+ }
scheduleRestart(vm, investigate);
}
}
@@ -951,10 +958,19 @@ public class HighAvailabilityManagerImpl extends ManagerBase implements HighAvai
@Override
public boolean postStateTransitionEvent(State oldState, VirtualMachine.Event event, State newState, VirtualMachine vo, boolean status, Object opaque) {
if (oldState == State.Running && event == VirtualMachine.Event.FollowAgentPowerOffReport && newState == State.Stopped) {
- VMInstanceVO vm = _instanceDao.findById(vo.getId());
+ final VMInstanceVO vm = _instanceDao.findById(vo.getId());
if (vm.isHaEnabled()) {
s_logger.info("Detected out-of-band stop of a HA enabled VM " + vm.getInstanceName() + ", will schedule restart");
- scheduleRestart(vm, true);
+ _executor.submit(new ManagedContextRunnable() {
+ @Override
+ protected void runInContext() {
+ try {
+ scheduleRestart(vm, true);
+ } catch (Exception e) {
+ s_logger.warn("Unexpected exception when scheduling a HA restart", e);
+ }
+ }
+ });
}
}
return true;
[43/50] [abbrv] git commit: updated refs/heads/4.4 to 48f8a95
Posted by hu...@apache.org.
couple of bug fixes
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e487b24b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e487b24b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e487b24b
Branch: refs/heads/4.4
Commit: e487b24bb657295dd6d3da1ab9069d4e3b4c15bd
Parents: 015b667
Author: Murali Reddy <mu...@gmail.com>
Authored: Thu Mar 13 19:18:41 2014 +0530
Committer: Murali Reddy <mu...@gmail.com>
Committed: Fri Mar 14 16:56:38 2014 +0530
----------------------------------------------------------------------
.../schema/src/com/cloud/network/vpc/VpcVO.java | 1 +
.../xen/resource/CitrixResourceBase.java | 12 +-
.../network/ovs/OvsNetworkTopologyGuru.java | 5 +
.../network/ovs/OvsNetworkTopologyGuruImpl.java | 18 ++
.../cloud/network/ovs/OvsTunnelManagerImpl.java | 251 ++++++++++++-------
.../xenserver/cloudstack_pluginlib.py | 26 +-
.../vm/hypervisor/xenserver/ovs-vif-flows.py | 27 +-
7 files changed, 223 insertions(+), 117 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e487b24b/engine/schema/src/com/cloud/network/vpc/VpcVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/vpc/VpcVO.java b/engine/schema/src/com/cloud/network/vpc/VpcVO.java
index d7aaa95..dea8c31 100644
--- a/engine/schema/src/com/cloud/network/vpc/VpcVO.java
+++ b/engine/schema/src/com/cloud/network/vpc/VpcVO.java
@@ -206,6 +206,7 @@ public class VpcVO implements Vpc {
@Override
public IAMEntityType getEntityType() {
return IAMEntityType.Vpc;
+ }
@Override
public boolean usesDistributedRouter() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e487b24b/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 273c08c..57debc6 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
@@ -5284,15 +5284,17 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
public Answer execute(OvsVpcPhysicalTopologyConfigCommand cmd) {
Connection conn = getConnection();
try {
+ Network nw = findOrCreateTunnelNetwork(conn, cmd.getBridgeName());
+ String bridgeName = nw.getBridge(conn);;
String result = callHostPlugin(conn, "ovstunnel", "configure_ovs_bridge_for_network_topology", "bridge",
- cmd.getBridgeName(), "config", cmd.getVpcConfigInJson());
- if (result.equalsIgnoreCase("SUCCESS")) {
+ bridgeName, "config", cmd.getVpcConfigInJson(), "host-id", ((Long)cmd.getHostId()).toString());
+ if (result.startsWith("SUCCESS")) {
return new Answer(cmd, true, result);
} else {
return new Answer(cmd, false, result);
}
} catch (Exception e) {
- s_logger.warn("caught exception while updating host with latest routing polcies", e);
+ s_logger.warn("caught exception while updating host with latest VPC topology", e);
return new Answer(cmd, false, e.getMessage());
}
}
@@ -5303,13 +5305,13 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
String result = callHostPlugin(conn, "ovstunnel", "configure_ovs_bridge_for_routing_policies", "bridge",
cmd.getBridgeName(), "host-id", ((Long)cmd.getHostId()).toString(), "config",
cmd.getVpcConfigInJson());
- if (result.equalsIgnoreCase("SUCCESS")) {
+ if (result.startsWith("SUCCESS")) {
return new Answer(cmd, true, result);
} else {
return new Answer(cmd, false, result);
}
} catch (Exception e) {
- s_logger.warn("caught exception while updating host with latest VPC topology", e);
+ s_logger.warn("caught exception while updating host with latest routing policies", e);
return new Answer(cmd, false, e.getMessage());
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e487b24b/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsNetworkTopologyGuru.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsNetworkTopologyGuru.java b/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsNetworkTopologyGuru.java
index 122175c..a9b62bf 100644
--- a/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsNetworkTopologyGuru.java
+++ b/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsNetworkTopologyGuru.java
@@ -56,4 +56,9 @@ public interface OvsNetworkTopologyGuru extends Manager {
* get the list of all Vm id's in the network that are running on the host
*/
public List<Long> getActiveVmsInNetworkOnHost(long vpcId, long hostId);
+
+ /**
+ * get the list of all Vpc id's in which, a VM has a nic in the network that is part of VPC
+ */
+ public List<Long> getVpcIdsVmIsPartOf(long vmId);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e487b24b/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsNetworkTopologyGuruImpl.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsNetworkTopologyGuruImpl.java b/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsNetworkTopologyGuruImpl.java
index 7715641..740df80 100644
--- a/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsNetworkTopologyGuruImpl.java
+++ b/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsNetworkTopologyGuruImpl.java
@@ -187,4 +187,22 @@ public class OvsNetworkTopologyGuruImpl extends ManagerBase implements OvsNetwor
}
return vmIds;
}
+
+ @Override
+ public List<Long> getVpcIdsVmIsPartOf(long vmId) {
+ List<Long> vpcIds = new ArrayList<>();
+ List<NicVO> nics = _nicDao.listByVmId(vmId);
+ if (nics == null)
+ return null;
+
+ for (Nic nic: nics) {
+ Network network = _networkDao.findById(nic.getNetworkId());
+ if (network != null && network.getTrafficType() == Networks.TrafficType.Guest && network.getVpcId() != null) {
+ if (!vpcIds.contains(network.getVpcId())) {
+ vpcIds.add(network.getVpcId());
+ }
+ }
+ }
+ return vpcIds;
+ }
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e487b24b/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java b/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java
index eeb22b1..30088aa 100644
--- a/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java
+++ b/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java
@@ -36,6 +36,7 @@ import com.cloud.network.vpc.dao.VpcDao;
import com.cloud.network.vpc.VpcManager;
import com.cloud.network.vpc.VpcVO;
import com.cloud.network.vpc.dao.NetworkACLDao;
+import com.cloud.vm.VMInstanceVO;
import com.cloud.vm.dao.VMInstanceDao;
import com.cloud.vm.Nic;
import com.cloud.vm.NicVO;
@@ -80,13 +81,14 @@ import com.cloud.network.ovs.dao.OvsTunnel;
import com.cloud.utils.component.ManagerBase;
import com.cloud.utils.concurrency.NamedThreadFactory;
import com.cloud.utils.db.DB;
+import com.cloud.utils.fsm.StateListener;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.vm.dao.DomainRouterDao;
import com.cloud.vm.dao.NicDao;
@Component
@Local(value = {OvsTunnelManager.class})
-public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManager {
+public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManager, StateListener<VirtualMachine.State, VirtualMachine.Event, VirtualMachine> {
public static final Logger s_logger = Logger.getLogger(OvsTunnelManagerImpl.class.getName());
// boolean _isEnabled;
@@ -133,7 +135,12 @@ public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManage
_executorPool = Executors.newScheduledThreadPool(10, new NamedThreadFactory("OVS"));
_cleanupExecutor = Executors.newScheduledThreadPool(1, new NamedThreadFactory("OVS-Cleanup"));
+ // register for network ACL updated for a VPC.
_messageBus.subscribe("Network_ACL_Replaced", new NetworkAclEventsSubscriber());
+
+ // register for VM state transition updates
+ VirtualMachine.State.getStateMachine().registerListener(this);
+
return true;
}
@@ -540,92 +547,6 @@ public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManage
return "OVS-DR-VPC-Bridge" + vpcId;
}
- public boolean sendVpcTopologyChangeUpdate(OvsVpcPhysicalTopologyConfigCommand updateCmd, long hostId, String bridgeName) {
- try {
- s_logger.debug("Sending VPC topology update to the host " + hostId);
- updateCmd.setHostId(hostId);
- updateCmd.setBridgeName(bridgeName);
- Answer ans = _agentMgr.send(hostId, updateCmd);
- if (ans.getResult()) {
- s_logger.debug("Successfully updated the host " + hostId + " with latest VPC topology." );
- return true;
- } else {
- s_logger.debug("Failed to update the host " + hostId + " with latest VPC topology." );
- return false;
- }
- } catch (Exception e) {
- s_logger.debug("Failed to updated the host " + hostId + " with latest VPC topology." );
- return false;
- }
- }
-
- OvsVpcPhysicalTopologyConfigCommand prepareVpcTopologyUpdate(long vpcId) {
- VpcVO vpc = _vpcDao.findById(vpcId);
- assert (vpc != null): "invalid vpc id";
-
- List<? extends Network> vpcNetworks = _vpcMgr.getVpcNetworks(vpcId);
- List<Long> hostIds = _ovsNetworkToplogyGuru.getVpcSpannedHosts(vpcId);
- List<Long> vmIds = _ovsNetworkToplogyGuru.getAllActiveVmsInVpc(vpcId);
-
- List<OvsVpcPhysicalTopologyConfigCommand.Host> hosts = new ArrayList<>();
- List<OvsVpcPhysicalTopologyConfigCommand.Tier> tiers = new ArrayList<>();
- List<OvsVpcPhysicalTopologyConfigCommand.Vm> vms = new ArrayList<>();
-
- for (Long hostId : hostIds) {
- HostVO hostDetails = _hostDao.findById(hostId);
- String remoteIp = null;
- for (Network network: vpcNetworks) {
- try {
- remoteIp = getGreEndpointIP(hostDetails, network);
- } catch (Exception e) {
-
- }
- }
- OvsVpcPhysicalTopologyConfigCommand.Host host = new OvsVpcPhysicalTopologyConfigCommand.Host(hostId, remoteIp);
- hosts.add(host);
- }
-
- for (Network network: vpcNetworks) {
- String key = network.getBroadcastUri().getAuthority();
- long gre_key;
- if (key.contains(".")) {
- String[] parts = key.split("\\.");
- gre_key = Long.parseLong(parts[1]);
- } else {
- try {
- gre_key = Long.parseLong(BroadcastDomainType.getValue(key));
- } catch (Exception e) {
- return null;
- }
- }
- NicVO nic = _nicDao.findByIp4AddressAndNetworkId(network.getGateway(), network.getId());
- OvsVpcPhysicalTopologyConfigCommand.Tier tier = new OvsVpcPhysicalTopologyConfigCommand.Tier(gre_key,
- network.getUuid(), network.getGateway(), nic.getMacAddress(), network.getCidr());
- tiers.add(tier);
- }
-
- for (long vmId: vmIds) {
- VirtualMachine vmInstance = _vmInstanceDao.findById(vmId);
- List<OvsVpcPhysicalTopologyConfigCommand.Nic> vmNics = new ArrayList<OvsVpcPhysicalTopologyConfigCommand.Nic>();
- for (Nic vmNic :_nicDao.listByVmId(vmId)) {
- Network network = _networkDao.findById(vmNic.getNetworkId());
- if (network.getTrafficType() == TrafficType.Guest) {
- OvsVpcPhysicalTopologyConfigCommand.Nic nic = new OvsVpcPhysicalTopologyConfigCommand.Nic(
- vmNic.getIp4Address(), vmNic.getMacAddress(), ((Long)vmNic.getNetworkId()).toString());
- vmNics.add(nic);
- }
- }
- OvsVpcPhysicalTopologyConfigCommand.Vm vm = new OvsVpcPhysicalTopologyConfigCommand.Vm(
- vmInstance.getHostId(), vmNics.toArray(new OvsVpcPhysicalTopologyConfigCommand.Nic[vmNics.size()]));
- vms.add(vm);
- }
- return new OvsVpcPhysicalTopologyConfigCommand(
- hosts.toArray(new OvsVpcPhysicalTopologyConfigCommand.Host[hosts.size()]),
- tiers.toArray(new OvsVpcPhysicalTopologyConfigCommand.Tier[tiers.size()]),
- vms.toArray(new OvsVpcPhysicalTopologyConfigCommand.Vm[vms.size()]),
- vpc.getCidr());
- }
-
@DB
protected void checkAndCreateVpcTunnelNetworks(Host host, long vpcId) {
@@ -731,16 +652,158 @@ public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManage
s_logger.warn("Ovs Tunnel network created tunnel failed", e);
}
}
+ }
+
+ @Override
+ public boolean preStateTransitionEvent(VirtualMachine.State oldState,
+ VirtualMachine.Event event, VirtualMachine.State newState,
+ VirtualMachine vo, boolean status, Object opaque) {
+ return true;
+ }
+
+ @Override
+ public boolean postStateTransitionEvent(VirtualMachine.State oldState, VirtualMachine.Event event,
+ VirtualMachine.State newState, VirtualMachine vm,
+ boolean status, Object opaque) {
+
+ if (!status) {
+ return false;
+ }
+
+ if (VirtualMachine.State.isVmStarted(oldState, event, newState)) {
+ if (s_logger.isTraceEnabled()) {
+ s_logger.trace("Security Group Mgr: handling start of vm id" + vm.getId());
+ }
+ handleVmStateChange((VMInstanceVO)vm);
+ } else if (VirtualMachine.State.isVmStopped(oldState, event, newState)) {
+ if (s_logger.isTraceEnabled()) {
+ s_logger.trace("Security Group Mgr: handling stop of vm id" + vm.getId());
+ }
+ handleVmStateChange((VMInstanceVO)vm);
+ } else if (VirtualMachine.State.isVmMigrated(oldState, event, newState)) {
+ if (s_logger.isTraceEnabled()) {
+ s_logger.trace("Security Group Mgr: handling migration of vm id" + vm.getId());
+ }
+ handleVmStateChange((VMInstanceVO)vm);
+ }
+
+ return true;
+ }
+
+ public void handleVmStateChange(VMInstanceVO vm) {
+
+ // get the VPC's impacted with the VM start
+ List<Long> vpcIds = _ovsNetworkToplogyGuru.getVpcIdsVmIsPartOf(vm.getId());
+ if (vpcIds == null || vpcIds.isEmpty()) {
+ return;
+ }
+
+ for (Long vpcId: vpcIds) {
+ VpcVO vpc = _vpcDao.findById(vpcId);
+ if (vpc == null || !vpc.usesDistributedRouter()) {
+ return;
+ }
+
+ // get the list of hosts on which VPC spans (i.e hosts that need to be aware of VPC topology change update)
+ List<Long> vpcSpannedHostIds = _ovsNetworkToplogyGuru.getVpcSpannedHosts(vpcId);
+ String bridgeName=generateBridgeNameForVpc(vpcId);
- OvsVpcPhysicalTopologyConfigCommand topologyConfigCommand = prepareVpcTopologyUpdate(vpcId);
- for (Long id: vpcSpannedHostIds) {
- if (!sendVpcTopologyChangeUpdate(topologyConfigCommand, id, bridgeName)) {
- s_logger.debug("Failed to send VPC topology change update to host : " + id + ". Moving on with rest of" +
- "the host update.");
+ OvsVpcPhysicalTopologyConfigCommand topologyConfigCommand = prepareVpcTopologyUpdate(vpcId);
+ for (Long id: vpcSpannedHostIds) {
+ if (!sendVpcTopologyChangeUpdate(topologyConfigCommand, id, bridgeName)) {
+ s_logger.debug("Failed to send VPC topology change update to host : " + id + ". Moving on " +
+ "with rest of the host update.");
+ }
+ }
+ }
+ }
+
+ public boolean sendVpcTopologyChangeUpdate(OvsVpcPhysicalTopologyConfigCommand updateCmd, long hostId, String bridgeName) {
+ try {
+ s_logger.debug("Sending VPC topology update to the host " + hostId);
+ updateCmd.setHostId(hostId);
+ updateCmd.setBridgeName(bridgeName);
+ Answer ans = _agentMgr.send(hostId, updateCmd);
+ if (ans.getResult()) {
+ s_logger.debug("Successfully updated the host " + hostId + " with latest VPC topology." );
+ return true;
+ } else {
+ s_logger.debug("Failed to update the host " + hostId + " with latest VPC topology." );
+ return false;
}
+ } catch (Exception e) {
+ s_logger.debug("Failed to updated the host " + hostId + " with latest VPC topology." );
+ return false;
}
}
+ OvsVpcPhysicalTopologyConfigCommand prepareVpcTopologyUpdate(long vpcId) {
+ VpcVO vpc = _vpcDao.findById(vpcId);
+ assert (vpc != null): "invalid vpc id";
+
+ List<? extends Network> vpcNetworks = _vpcMgr.getVpcNetworks(vpcId);
+ List<Long> hostIds = _ovsNetworkToplogyGuru.getVpcSpannedHosts(vpcId);
+ List<Long> vmIds = _ovsNetworkToplogyGuru.getAllActiveVmsInVpc(vpcId);
+
+ List<OvsVpcPhysicalTopologyConfigCommand.Host> hosts = new ArrayList<>();
+ List<OvsVpcPhysicalTopologyConfigCommand.Tier> tiers = new ArrayList<>();
+ List<OvsVpcPhysicalTopologyConfigCommand.Vm> vms = new ArrayList<>();
+
+ for (Long hostId : hostIds) {
+ HostVO hostDetails = _hostDao.findById(hostId);
+ String remoteIp = null;
+ for (Network network: vpcNetworks) {
+ try {
+ remoteIp = getGreEndpointIP(hostDetails, network);
+ } catch (Exception e) {
+
+ }
+ }
+ OvsVpcPhysicalTopologyConfigCommand.Host host = new OvsVpcPhysicalTopologyConfigCommand.Host(hostId, remoteIp);
+ hosts.add(host);
+ }
+
+ for (Network network: vpcNetworks) {
+ String key = network.getBroadcastUri().getAuthority();
+ long gre_key;
+ if (key.contains(".")) {
+ String[] parts = key.split("\\.");
+ gre_key = Long.parseLong(parts[1]);
+ } else {
+ try {
+ gre_key = Long.parseLong(BroadcastDomainType.getValue(key));
+ } catch (Exception e) {
+ return null;
+ }
+ }
+ NicVO nic = _nicDao.findByIp4AddressAndNetworkId(network.getGateway(), network.getId());
+ OvsVpcPhysicalTopologyConfigCommand.Tier tier = new OvsVpcPhysicalTopologyConfigCommand.Tier(gre_key,
+ network.getUuid(), network.getGateway(), nic.getMacAddress(), network.getCidr());
+ tiers.add(tier);
+ }
+
+ for (long vmId: vmIds) {
+ VirtualMachine vmInstance = _vmInstanceDao.findById(vmId);
+ List<OvsVpcPhysicalTopologyConfigCommand.Nic> vmNics = new ArrayList<OvsVpcPhysicalTopologyConfigCommand.Nic>();
+ for (Nic vmNic :_nicDao.listByVmId(vmId)) {
+ Network network = _networkDao.findById(vmNic.getNetworkId());
+ if (network.getTrafficType() == TrafficType.Guest) {
+ OvsVpcPhysicalTopologyConfigCommand.Nic nic = new OvsVpcPhysicalTopologyConfigCommand.Nic(
+ vmNic.getIp4Address(), vmNic.getMacAddress(), network.getUuid());
+ vmNics.add(nic);
+ }
+ }
+ OvsVpcPhysicalTopologyConfigCommand.Vm vm = new OvsVpcPhysicalTopologyConfigCommand.Vm(
+ vmInstance.getHostId(), vmNics.toArray(new OvsVpcPhysicalTopologyConfigCommand.Nic[vmNics.size()]));
+ vms.add(vm);
+ }
+ return new OvsVpcPhysicalTopologyConfigCommand(
+ hosts.toArray(new OvsVpcPhysicalTopologyConfigCommand.Host[hosts.size()]),
+ tiers.toArray(new OvsVpcPhysicalTopologyConfigCommand.Tier[tiers.size()]),
+ vms.toArray(new OvsVpcPhysicalTopologyConfigCommand.Vm[vms.size()]),
+ vpc.getCidr());
+ }
+
// Subscriber to ACL replace events. On acl replace event, if the vpc is enabled for distributed routing
// send the ACL update to all the hosts on which VPC spans
public class NetworkAclEventsSubscriber implements MessageSubscriber {
@@ -755,14 +818,14 @@ public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManage
for (Long id: vpcSpannedHostIds) {
if (!sendVpcRoutingPolicyChangeUpdate(cmd, id, bridgeName)) {
s_logger.debug("Failed to send VPC routing policy change update to host : " + id +
- ". Moving on with rest of the host updates.");
+ ". But moving on with sending the host updates to the rest of the hosts.");
}
}
}
}
}
- OvsVpcRoutingPolicyConfigCommand prepareVpcRoutingPolicyUpdate(long vpcId) {
+ private OvsVpcRoutingPolicyConfigCommand prepareVpcRoutingPolicyUpdate(long vpcId) {
VpcVO vpc = _vpcDao.findById(vpcId);
assert (vpc != null): "invalid vpc id";
List<OvsVpcRoutingPolicyConfigCommand.Acl> acls = new ArrayList<>();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e487b24b/scripts/vm/hypervisor/xenserver/cloudstack_pluginlib.py
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/xenserver/cloudstack_pluginlib.py b/scripts/vm/hypervisor/xenserver/cloudstack_pluginlib.py
index ac8a11d..1c9d513 100644
--- a/scripts/vm/hypervisor/xenserver/cloudstack_pluginlib.py
+++ b/scripts/vm/hypervisor/xenserver/cloudstack_pluginlib.py
@@ -239,7 +239,7 @@ def clear_flooding_rules_for_port(bridge, ofport):
def add_flooding_rules_for_port(bridge, in_ofport, out_ofports):
action = "".join("output:%s," %ofport for ofport in out_ofports)[:-1]
- add_flow(bridge, priority=1100, in_port=in_ofport, table=1, actions=action)
+ add_flow(bridge, priority=1100, in_port=in_ofport, table=2, actions=action)
def get_ofport_for_vif(vif_name):
return do_cmd([VSCTL_PATH, "get", "interface", vif_name, "ofport"])
@@ -259,28 +259,30 @@ def get_vif_name_from_macaddress(macaddress):
return "vif"+vm_domain_id+"."+vif_device_id
def add_mac_lookup_table_entry(bridge, mac_address, out_of_port):
- add_flow(bridge, priority=1100, dl_dst=mac_address, table=1, actions="output:%s" % out_of_port)
+ action = "output=%s" %out_of_port
+ add_flow(bridge, priority=1100, dl_dst=mac_address, table=1, actions=action)
def delete_mac_lookup_table_entry(bridge, mac_address):
del_flows(bridge, dl_dst=mac_address, table=1)
def add_ip_lookup_table_entry(bridge, ip, dst_tier_gateway_mac, dst_vm_mac):
- action_str = "mod_dl_sr:%s" % dst_tier_gateway_mac + ",mod_dl_dst:%s" % dst_vm_mac +",resubmit(,5)"
- addflow = [OFCTL_PATH, "add-flow", bridge, "table=4", "nw_dst=%s" % ip, "actions=%s" %action_str]
+ action_str = "mod_dl_src:%s" % dst_tier_gateway_mac + ",mod_dl_dst:%s" % dst_vm_mac + ",resubmit(,5)"
+ action_str = "table=4, ip, nw_dst=%s" % ip + ", actions=%s" %action_str
+ addflow = [OFCTL_PATH, "add-flow", bridge, action_str]
do_cmd(addflow)
def get_vms_on_host(vpc, host_id):
all_vms = vpc.vms
vms_on_host = []
for vm in all_vms:
- if vm.hostid == host_id:
+ if str(vm.hostid) == (host_id):
vms_on_host.append(vm)
return vms_on_host
def get_network_details(vpc, network_uuid):
tiers = vpc.tiers
for tier in tiers:
- if tier.networkuuid == network_uuid:
+ if str(tier.networkuuid) == (network_uuid):
return tier
return None
@@ -338,20 +340,22 @@ def configure_bridge_for_network_topology(bridge, this_host_id, json_config):
add_ip_lookup_table_entry(bridge, ip, network.gatewaymac, mac_addr)
# Add flow entry to send with intra tier traffic from the NIC to L2 lookup path)
- addflow = [OFCTL_PATH, "add-flow", bridge, "table=0", "in_port=%s" % of_port,
- "nw_dst=%s" %network.cidr, "actions=resubmit(,1)"]
+ action_str = "table=0, in_port=%s," %of_port + " ip, nw_dst=%s," %network.cidr + " actions=resubmit(,1)"
+ addflow = [OFCTL_PATH, "add-flow", bridge, action_str]
do_cmd(addflow)
#add flow entry to send inter-tier traffic from the NIC to egress ACL table(to L3 lookup path)
- addflow = [OFCTL_PATH, "add-flow", bridge, "table=0", "in_port=%s" % of_port,
- "dl_dst=%s" %network.gatewaymac, "nw_dst=%s" %vpconfig.cidr, "actions=resubmit(,3)"]
+ action_str = "table=0, in_port=%s," % of_port + " ip, dl_dst=%s," %network.gatewaymac +\
+ "nw_dst=%s," %vpconfig.cidr + "actions=resubmit(,3)"
+ addflow = [OFCTL_PATH, "add-flow", bridge, action_str]
+
do_cmd(addflow)
# get the list of hosts on which VPC spans from the JSON config
vpc_spanning_hosts = vpconfig.hosts
for host in vpc_spanning_hosts:
- if this_host_id == host.hostid:
+ if str(this_host_id) == str(host.hostid):
continue
other_host_vms = get_vms_on_host(vpconfig, host.hostid)
for vm in other_host_vms:
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e487b24b/scripts/vm/hypervisor/xenserver/ovs-vif-flows.py
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/xenserver/ovs-vif-flows.py b/scripts/vm/hypervisor/xenserver/ovs-vif-flows.py
index ae37525..1445d94 100644
--- a/scripts/vm/hypervisor/xenserver/ovs-vif-flows.py
+++ b/scripts/vm/hypervisor/xenserver/ovs-vif-flows.py
@@ -21,9 +21,11 @@
import copy
import os
import sys
+import logging
import cloudstack_pluginlib as pluginlib
+pluginlib.setup_logging("/var/log/cloud/ovstunnel.log")
def clear_flows(bridge, this_vif_ofport, vif_ofports):
# Remove flow entries originating from given ofport
@@ -83,18 +85,26 @@ def main(command, vif_raw):
bridge = pluginlib.do_cmd([pluginlib.VSCTL_PATH, 'iface-to-br', this_vif])
- # find xs network for this bridge, verify is used for ovs tunnel network
+ # find xs network for this bridge, verify is used for ovs tunnel network
xs_nw_uuid = pluginlib.do_cmd([pluginlib.XE_PATH, "network-list",
"bridge=%s" % bridge, "--minimal"])
- ovs_tunnel_network = pluginlib.do_cmd([pluginlib.XE_PATH,"network-param-get",
+ ovs_tunnel_network = False
+ try:
+ ovs_tunnel_network = pluginlib.do_cmd([pluginlib.XE_PATH,"network-param-get",
"uuid=%s" % xs_nw_uuid,
"param-name=other-config",
"param-key=is-ovs-tun-network", "--minimal"])
+ except:
+ pass
- ovs_vpc_distributed_vr_network = pluginlib.do_cmd([pluginlib.XE_PATH,"network-param-get",
+ ovs_vpc_distributed_vr_network = False
+ try:
+ ovs_vpc_distributed_vr_network = pluginlib.do_cmd([pluginlib.XE_PATH,"network-param-get",
"uuid=%s" % xs_nw_uuid,
"param-name=other-config",
"param-key=is-ovs_vpc_distributed_vr_network", "--minimal"])
+ except:
+ pass
if ovs_tunnel_network == 'True':
vlan = pluginlib.do_cmd([pluginlib.VSCTL_PATH, 'br-to-vlan', bridge])
@@ -121,6 +131,7 @@ def main(command, vif_raw):
apply_flows(bridge, this_vif_ofport, vif_ofports)
+ # handle case where brdige is setup for VPC and VPC is enabled for distributed routing
if ovs_vpc_distributed_vr_network == 'True':
vlan = pluginlib.do_cmd([pluginlib.VSCTL_PATH, 'br-to-vlan', bridge])
if vlan != '0':
@@ -136,15 +147,15 @@ def main(command, vif_raw):
ports = vsctl_output.split('\n')
for port in ports:
- if_ofport = pluginlib.do_cmd([pluginlib.VSCTL_PATH, 'get', 'Interface', vif, 'ofport'])
- if vif.startswith('vif'):
+ if_ofport = pluginlib.do_cmd([pluginlib.VSCTL_PATH, 'get', 'Interface', port, 'ofport'])
+ if port.startswith('vif'):
# check VIF is in same network as that of plugged vif
if vif_network_id != pluginlib.get_network_id_for_vif(port):
continue
vnet_vif_ofports.append(if_ofport)
vnet_all_ofports.append(if_ofport)
- if vif.startswith('t'):
+ if port.startswith('t'):
# check tunnel port is in same network as that of plugged vif
if vif_network_id != pluginlib.get_network_id_for_tunnel_port(port):
continue
@@ -159,7 +170,8 @@ def main(command, vif_raw):
for port in vnet_tunnelif_ofports:
pluginlib.add_flooding_rules_for_port(bridge, port, vnet_vif_ofports)
- # send on all VIF and tunnel port excluding the port on which packet arrived
+ # for a packet arrived from VIF port send on all VIF and tunnel port excluding the port
+ # on which packet arrived
for port in vnet_vif_ofports:
vnet_all_ofports_copy = copy.copy(vnet_all_ofports)
vnet_all_ofports_copy.remove(port)
@@ -167,6 +179,7 @@ def main(command, vif_raw):
#learn that MAC is reachable through the VIF port
mac = pluginlib.get_macaddress_of_vif(this_vif)
+ this_vif_ofport = pluginlib.do_cmd([pluginlib.VSCTL_PATH, 'get', 'Interface', this_vif, 'ofport'])
pluginlib.add_mac_lookup_table_entry(bridge, mac, this_vif_ofport)
if command == 'offline':
[17/50] [abbrv] git commit: updated refs/heads/4.4 to 48f8a95
Posted by hu...@apache.org.
perform VM HA based on agent state report.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7fa4715b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7fa4715b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7fa4715b
Branch: refs/heads/4.4
Commit: 7fa4715b996fe551c09423b22bb24b22f9926044
Parents: 8e27120
Author: Kelven Yang <ke...@gmail.com>
Authored: Thu Mar 6 11:45:13 2014 -0800
Committer: Kelven Yang <ke...@gmail.com>
Committed: Thu Mar 13 16:59:56 2014 -0700
----------------------------------------------------------------------
.../src/com/cloud/ha/HighAvailabilityManagerImpl.java | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7fa4715b/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java b/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
index 29f1e7b..52100c8 100755
--- a/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
+++ b/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
@@ -393,8 +393,12 @@ public class HighAvailabilityManagerImpl extends ManagerBase implements HighAvai
}
}
- HaWorkVO work =
- new HaWorkVO(vm.getId(), vm.getType(), WorkType.HA, investigate ? Step.Investigating : Step.Scheduled, hostId, vm.getState(), maxRetries + 1, vm.getUpdated());
+ if (hostId == null) {
+ hostId = vm.getLastHostId();
+ }
+
+ HaWorkVO work = new HaWorkVO(vm.getId(), vm.getType(), WorkType.HA, investigate ? Step.Investigating : Step.Scheduled,
+ hostId != null ? hostId : 0L, vm.getState(), maxRetries + 1, vm.getUpdated());
_haDao.persist(work);
if (s_logger.isInfoEnabled()) {
@@ -962,7 +966,7 @@ public class HighAvailabilityManagerImpl extends ManagerBase implements HighAvai
if (oldState == State.Running && event == VirtualMachine.Event.FollowAgentPowerOffReport && newState == State.Stopped) {
final VMInstanceVO vm = _instanceDao.findById(vo.getId());
if (vm.isHaEnabled()) {
- if (vm.getState() == State.Stopped)
+ if (vm.getState() != State.Stopped)
s_logger.warn("Sanity check failed. postStateTransitionEvent reports transited to Stopped but VM " + vm + " is still at state " + vm.getState());
s_logger.info("Detected out-of-band stop of a HA enabled VM " + vm.getInstanceName() + ", will schedule restart");
@@ -970,7 +974,7 @@ public class HighAvailabilityManagerImpl extends ManagerBase implements HighAvai
@Override
protected void runInContext() {
try {
- scheduleRestart(vm, true);
+ scheduleRestart(vm, false);
} catch (Exception e) {
s_logger.warn("Unexpected exception when scheduling a HA restart", e);
}
[16/50] [abbrv] git commit: updated refs/heads/4.4 to 48f8a95
Posted by hu...@apache.org.
Do not use row lock in sync-queue scheduling to work around mysql locking issues.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5310e66f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5310e66f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5310e66f
Branch: refs/heads/4.4
Commit: 5310e66f30fbfcc025b69b50a9a717557ac9eb3c
Parents: 7fa4715
Author: Kelven Yang <ke...@gmail.com>
Authored: Thu Mar 6 16:28:29 2014 -0800
Committer: Kelven Yang <ke...@gmail.com>
Committed: Thu Mar 13 16:59:56 2014 -0700
----------------------------------------------------------------------
api/src/com/cloud/vm/VirtualMachine.java | 2 ++
.../jobs/impl/AsyncJobManagerImpl.java | 16 ++++++++++++++
.../jobs/impl/SyncQueueManagerImpl.java | 22 ++++++++++----------
3 files changed, 29 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5310e66f/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 dd11a82..b085d4a 100755
--- a/api/src/com/cloud/vm/VirtualMachine.java
+++ b/api/src/com/cloud/vm/VirtualMachine.java
@@ -119,10 +119,12 @@ public interface VirtualMachine extends RunningOn, ControlledEntity, Identity, I
s_fsm.addTransition(State.Error, VirtualMachine.Event.DestroyRequested, State.Expunging);
s_fsm.addTransition(State.Error, VirtualMachine.Event.ExpungeOperation, State.Expunging);
+ s_fsm.addTransition(State.Starting, VirtualMachine.Event.FollowAgentPowerOnReport, State.Running);
s_fsm.addTransition(State.Stopping, VirtualMachine.Event.FollowAgentPowerOnReport, State.Running);
s_fsm.addTransition(State.Stopped, VirtualMachine.Event.FollowAgentPowerOnReport, State.Running);
s_fsm.addTransition(State.Running, VirtualMachine.Event.FollowAgentPowerOnReport, State.Running);
s_fsm.addTransition(State.Migrating, VirtualMachine.Event.FollowAgentPowerOnReport, State.Running);
+
s_fsm.addTransition(State.Starting, VirtualMachine.Event.FollowAgentPowerOffReport, State.Stopped);
s_fsm.addTransition(State.Stopping, VirtualMachine.Event.FollowAgentPowerOffReport, State.Stopped);
s_fsm.addTransition(State.Running, VirtualMachine.Event.FollowAgentPowerOffReport, State.Stopped);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5310e66f/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java
----------------------------------------------------------------------
diff --git a/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java b/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java
index 9b9460c..49c3032 100644
--- a/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java
+++ b/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java
@@ -659,8 +659,24 @@ public class AsyncJobManagerImpl extends ManagerBase implements AsyncJobManager,
private Runnable getHeartbeatTask() {
return new ManagedContextRunnable() {
+
@Override
protected void runInContext() {
+ GlobalLock scanLock = GlobalLock.getInternLock("AsyncJobManagerHeartbeat");
+ try {
+ if (scanLock.lock(ACQUIRE_GLOBAL_LOCK_TIMEOUT_FOR_COOPERATION)) {
+ try {
+ reallyRun();
+ } finally {
+ scanLock.unlock();
+ }
+ }
+ } finally {
+ scanLock.releaseRef();
+ }
+ }
+
+ protected void reallyRun() {
try {
List<SyncQueueItemVO> l = _queueMgr.dequeueFromAny(getMsid(), MAX_ONETIME_SCHEDULE_SIZE);
if (l != null && l.size() > 0) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5310e66f/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/SyncQueueManagerImpl.java
----------------------------------------------------------------------
diff --git a/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/SyncQueueManagerImpl.java b/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/SyncQueueManagerImpl.java
index d8e2674..5160e05 100644
--- a/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/SyncQueueManagerImpl.java
+++ b/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/SyncQueueManagerImpl.java
@@ -83,8 +83,8 @@ public class SyncQueueManagerImpl extends ManagerBase implements SyncQueueManage
return Transaction.execute(new TransactionCallback<SyncQueueItemVO>() {
@Override
public SyncQueueItemVO doInTransaction(TransactionStatus status) {
- SyncQueueVO queueVO = _syncQueueDao.lockRow(queueId, true);
- if (queueVO == null) {
+ SyncQueueVO queueVO = _syncQueueDao.findById(queueId);
+ if(queueVO == null) {
s_logger.error("Sync queue(id: " + queueId + ") does not exist");
return null;
}
@@ -139,11 +139,11 @@ public class SyncQueueManagerImpl extends ManagerBase implements SyncQueueManage
@Override
public void doInTransactionWithoutResult(TransactionStatus status) {
List<SyncQueueItemVO> l = _syncQueueItemDao.getNextQueueItems(maxItems);
- if (l != null && l.size() > 0) {
- for (SyncQueueItemVO item : l) {
- SyncQueueVO queueVO = _syncQueueDao.lockRow(item.getQueueId(), true);
- SyncQueueItemVO itemVO = _syncQueueItemDao.lockRow(item.getId(), true);
- if (queueReadyToProcess(queueVO) && itemVO.getLastProcessNumber() == null) {
+ if(l != null && l.size() > 0) {
+ for(SyncQueueItemVO item : l) {
+ SyncQueueVO queueVO = _syncQueueDao.findById(item.getQueueId());
+ SyncQueueItemVO itemVO = _syncQueueItemDao.findById(item.getId());
+ if(queueReadyToProcess(queueVO) && itemVO.getLastProcessNumber() == null) {
Long processNumber = queueVO.getLastProcessNumber();
if (processNumber == null)
processNumber = new Long(1);
@@ -184,8 +184,8 @@ public class SyncQueueManagerImpl extends ManagerBase implements SyncQueueManage
@Override
public void doInTransactionWithoutResult(TransactionStatus status) {
SyncQueueItemVO itemVO = _syncQueueItemDao.findById(queueItemId);
- if (itemVO != null) {
- SyncQueueVO queueVO = _syncQueueDao.lockRow(itemVO.getQueueId(), true);
+ if(itemVO != null) {
+ SyncQueueVO queueVO = _syncQueueDao.findById(itemVO.getQueueId());
_syncQueueItemDao.expunge(itemVO.getId());
@@ -213,8 +213,8 @@ public class SyncQueueManagerImpl extends ManagerBase implements SyncQueueManage
@Override
public void doInTransactionWithoutResult(TransactionStatus status) {
SyncQueueItemVO itemVO = _syncQueueItemDao.findById(queueItemId);
- if (itemVO != null) {
- SyncQueueVO queueVO = _syncQueueDao.lockRow(itemVO.getQueueId(), true);
+ if(itemVO != null) {
+ SyncQueueVO queueVO = _syncQueueDao.findById(itemVO.getQueueId());
itemVO.setLastProcessMsid(null);
itemVO.setLastProcessNumber(null);
[48/50] [abbrv] git commit: updated refs/heads/4.4 to 48f8a95
Posted by hu...@apache.org.
CLOUDSTACK-6106 supporting VPC VR on Hyper-V
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1b4325d2
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1b4325d2
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1b4325d2
Branch: refs/heads/4.4
Commit: 1b4325d2c88d49b394256f2130c509eebfe9bf36
Parents: 794b38a
Author: Rajesh Battala <ra...@citrix.com>
Authored: Wed Mar 12 07:26:08 2014 +0530
Committer: Rajesh Battala <ra...@citrix.com>
Committed: Fri Mar 14 17:36:43 2014 +0530
----------------------------------------------------------------------
.../agent/api/ModifyVmNicConfigCommand.java | 7 +
.../hypervisor/hyperv/guru/HypervGuru.java | 45 ++++--
.../resource/HypervDirectConnectResource.java | 138 ++++++++++++++++---
.../com/cloud/network/vpc/VpcManagerImpl.java | 1 +
4 files changed, 158 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1b4325d2/core/src/com/cloud/agent/api/ModifyVmNicConfigCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/ModifyVmNicConfigCommand.java b/core/src/com/cloud/agent/api/ModifyVmNicConfigCommand.java
index 0230bec..5f4f0e1 100644
--- a/core/src/com/cloud/agent/api/ModifyVmNicConfigCommand.java
+++ b/core/src/com/cloud/agent/api/ModifyVmNicConfigCommand.java
@@ -21,6 +21,7 @@ public class ModifyVmNicConfigCommand extends Command {
String vmName;
int vlan;
String macAddress;
+ int index;
protected ModifyVmNicConfigCommand() {
}
@@ -30,6 +31,12 @@ public class ModifyVmNicConfigCommand extends Command {
this.macAddress = macAddress;
}
+ public ModifyVmNicConfigCommand(String vmName, int vlan, int position) {
+ this.vmName = vmName;
+ this.vlan = vlan;
+ this.index = position;
+ }
+
public String getVmName() {
return vmName;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1b4325d2/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/guru/HypervGuru.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/guru/HypervGuru.java b/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/guru/HypervGuru.java
index bf0795d..4e8d3d5 100644
--- a/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/guru/HypervGuru.java
+++ b/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/guru/HypervGuru.java
@@ -34,6 +34,7 @@ import com.cloud.storage.dao.GuestOSDao;
import com.cloud.exception.InsufficientAddressCapacityException;
import com.cloud.hypervisor.hyperv.manager.HypervManager;
import com.cloud.network.NetworkModel;
+import com.cloud.network.Networks.BroadcastDomainType;
import com.cloud.network.Networks.TrafficType;
import com.cloud.network.dao.NetworkDao;
import com.cloud.network.dao.NetworkVO;
@@ -74,16 +75,20 @@ public class HypervGuru extends HypervisorGuruBase implements HypervisorGuru {
if(vm.getVirtualMachine().getType() == VirtualMachine.Type.DomainRouter) {
NicProfile publicNicProfile = null;
+ NicProfile controlNicProfile = null;
+ NicProfile profile = null;
for(NicProfile nicProfile : nicProfiles) {
if(nicProfile.getTrafficType() == TrafficType.Public) {
publicNicProfile = nicProfile;
break;
}
+ else if (nicProfile.getTrafficType() == TrafficType.Control) {
+ controlNicProfile = nicProfile;
+ }
}
- if(publicNicProfile != null) {
+ if(publicNicProfile != null || controlNicProfile != null) {
NicTO[] nics = to.getNics();
-
// reserve extra NICs
NicTO[] expandedNics = new NicTO[MaxNicSupported];
int i = 0;
@@ -95,18 +100,27 @@ public class HypervGuru extends HypervisorGuruBase implements HypervisorGuru {
}
deviceId++;
- long networkId = publicNicProfile.getNetworkId();
+ long networkId = 0;
+ if(publicNicProfile != null ) {
+ networkId= publicNicProfile.getNetworkId();
+ profile = publicNicProfile;
+ }
+ else {
+ networkId = controlNicProfile.getNetworkId();
+ profile = controlNicProfile;
+ }
+
NetworkVO network = _networkDao.findById(networkId);
// for Hyperv Hot Nic plug is not supported and it will support upto 8 nics.
// creating the VR with extra nics (actual nics(3) + extra nics) will be 8
for(; i < MaxNicSupported; i++) {
NicTO nicTo = new NicTO();
nicTo.setDeviceId(deviceId++);
- nicTo.setBroadcastType(publicNicProfile.getBroadcastType());
- nicTo.setType(publicNicProfile.getTrafficType());
+ nicTo.setBroadcastType(BroadcastDomainType.Vlan);
+ nicTo.setType(TrafficType.Public);
nicTo.setIp("0.0.0.0");
nicTo.setNetmask("255.255.255.255");
- nicTo.setName(publicNicProfile.getName());
+ nicTo.setName(profile.getName());
try {
String mac = _networkMgr.getNextAvailableMacAddressInNetwork(networkId);
@@ -114,16 +128,16 @@ public class HypervGuru extends HypervisorGuruBase implements HypervisorGuru {
} catch (InsufficientAddressCapacityException e) {
throw new CloudRuntimeException("unable to allocate mac address on network: " + networkId);
}
- nicTo.setDns1(publicNicProfile.getDns1());
- nicTo.setDns2(publicNicProfile.getDns2());
- if (publicNicProfile.getGateway() != null) {
+ nicTo.setDns1(profile.getDns1());
+ nicTo.setDns2(profile.getDns2());
+ if (publicNicProfile != null && publicNicProfile.getGateway() != null) {
nicTo.setGateway(publicNicProfile.getGateway());
} else {
nicTo.setGateway(network.getGateway());
}
nicTo.setDefaultNic(false);
- nicTo.setBroadcastUri(publicNicProfile.getBroadCastUri());
- nicTo.setIsolationuri(publicNicProfile.getIsolationUri());
+ nicTo.setBroadcastUri(profile.getBroadCastUri());
+ nicTo.setIsolationuri(profile.getIsolationUri());
Integer networkRate = _networkMgr.getNetworkRate(network.getId(), null);
nicTo.setNetworkRateMbps(networkRate);
@@ -137,9 +151,12 @@ public class HypervGuru extends HypervisorGuruBase implements HypervisorGuru {
for(NicTO nicTo : sortNicsByDeviceId(to.getNics())) {
sbMacSequence.append(nicTo.getMac()).append("|");
}
- sbMacSequence.deleteCharAt(sbMacSequence.length() - 1);
- String bootArgs = to.getBootArgs();
- to.setBootArgs(bootArgs + " nic_macs=" + sbMacSequence.toString());
+
+ if (!sbMacSequence.toString().isEmpty()) {
+ sbMacSequence.deleteCharAt(sbMacSequence.length() - 1);
+ String bootArgs = to.getBootArgs();
+ to.setBootArgs(bootArgs + " nic_macs=" + sbMacSequence.toString());
+ }
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1b4325d2/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/resource/HypervDirectConnectResource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/resource/HypervDirectConnectResource.java b/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/resource/HypervDirectConnectResource.java
index a3ffa75..b1f5a67 100644
--- a/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/resource/HypervDirectConnectResource.java
+++ b/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/resource/HypervDirectConnectResource.java
@@ -83,10 +83,14 @@ import com.cloud.agent.api.NetworkUsageCommand;
import com.cloud.agent.api.PingCommand;
import com.cloud.agent.api.PingRoutingCommand;
import com.cloud.agent.api.PingTestCommand;
+import com.cloud.agent.api.PlugNicAnswer;
+import com.cloud.agent.api.PlugNicCommand;
import com.cloud.agent.api.SetupGuestNetworkCommand;
import com.cloud.agent.api.StartCommand;
import com.cloud.agent.api.StartupCommand;
import com.cloud.agent.api.StartupRoutingCommand;
+import com.cloud.agent.api.UnPlugNicAnswer;
+import com.cloud.agent.api.UnPlugNicCommand;
import com.cloud.agent.api.StartupRoutingCommand.VmState;
import com.cloud.agent.api.StartupStorageCommand;
import com.cloud.agent.api.UnsupportedAnswer;
@@ -172,7 +176,7 @@ public class HypervDirectConnectResource extends ServerResourceBase implements S
protected final int _retry = 24;
protected final int _sleep = 10000;
protected static final int DEFAULT_DOMR_SSHPORT = 3922;
-
+ private final int maxid = 4094;
private String _clusterGuid;
// Used by initialize to assert object configured before
@@ -477,7 +481,12 @@ public class HypervDirectConnectResource extends ServerResourceBase implements S
answer = execute((SetStaticRouteCommand) cmd);
} else if (clazz == SetMonitorServiceCommand.class) {
answer = execute((SetMonitorServiceCommand) cmd);
- } else {
+ } else if (clazz == PlugNicCommand.class) {
+ answer = execute((PlugNicCommand)cmd);
+ } else if (clazz == UnPlugNicCommand.class) {
+ answer = execute((UnPlugNicCommand)cmd);
+ }
+ else {
if (clazz == StartCommand.class) {
VirtualMachineTO vmSpec = ((StartCommand)cmd).getVirtualMachine();
if (vmSpec.getType() != VirtualMachine.Type.User) {
@@ -509,6 +518,59 @@ public class HypervDirectConnectResource extends ServerResourceBase implements S
return answer;
}
+
+ private PlugNicAnswer execute(PlugNicCommand cmd) {
+ if (s_logger.isInfoEnabled()) {
+ s_logger.info("Executing resource PlugNicCommand " + s_gson.toJson(cmd));
+ }
+
+ try {
+
+ String vmName = cmd.getVmName();
+ NicTO nic = cmd.getNic();
+ URI broadcastUri = nic.getBroadcastUri();
+ if (BroadcastDomainType.getSchemeValue(broadcastUri) != BroadcastDomainType.Vlan) {
+ throw new InternalErrorException("Unable to assign a public IP to a VIF on network " + nic.getBroadcastUri());
+ }
+ int vlanId = Integer.parseInt(BroadcastDomainType.getValue(broadcastUri));
+ int publicNicInfo = -1;
+ publicNicInfo = getVmNics(vmName, maxid);
+ if (publicNicInfo > 0) {
+ modifyNicVlan(vmName, vlanId, publicNicInfo);
+ }
+ return new PlugNicAnswer(cmd, true, "success");
+ } catch (Exception e) {
+ s_logger.error("Unexpected exception: ", e);
+ return new PlugNicAnswer(cmd, false, "Unable to execute PlugNicCommand due to " + e.toString());
+ }
+ }
+
+
+ private UnPlugNicAnswer execute(UnPlugNicCommand cmd) {
+ if (s_logger.isInfoEnabled()) {
+ s_logger.info("Executing resource UnPlugNicCommand " + s_gson.toJson(cmd));
+ }
+
+ try {
+ String vmName = cmd.getVmName();
+ NicTO nic = cmd.getNic();
+ URI broadcastUri = nic.getBroadcastUri();
+ if (BroadcastDomainType.getSchemeValue(broadcastUri) != BroadcastDomainType.Vlan) {
+ throw new InternalErrorException("Unable to unassign a public IP to a VIF on network " + nic.getBroadcastUri());
+ }
+ int vlanId = Integer.parseInt(BroadcastDomainType.getValue(broadcastUri));
+ int publicNicInfo = -1;
+ publicNicInfo = getVmNics(vmName, vlanId);
+ if (publicNicInfo > 0) {
+ modifyNicVlan(vmName, maxid, publicNicInfo);
+ }
+ return new UnPlugNicAnswer(cmd, true, "success");
+ } catch (Exception e) {
+ s_logger.error("Unexpected exception: ", e);
+ return new UnPlugNicAnswer(cmd, false, "Unable to execute unPlugNicCommand due to " + e.toString());
+ }
+ }
+
@Override
public ExecutionResult executeInVR(String routerIP, String script, String args) {
Pair<Boolean, String> result;
@@ -621,14 +683,18 @@ public class HypervDirectConnectResource extends ServerResourceBase implements S
protected ExecutionResult prepareNetworkElementCommand(SetupGuestNetworkCommand cmd) {
NicTO nic = cmd.getNic();
- String routerIp = getRouterSshControlIp(cmd);
String domrName =
cmd.getAccessDetail(NetworkElementCommand.ROUTER_NAME);
try {
- int ethDeviceNum = findRouterEthDeviceIndex(domrName, routerIp,
- nic.getMac());
- nic.setDeviceId(ethDeviceNum);
+ URI broadcastUri = nic.getBroadcastUri();
+ int vlanId = Integer.parseInt(BroadcastDomainType.getValue(broadcastUri));
+ int ethDeviceNum = getVmNics(domrName, vlanId);
+ if (ethDeviceNum > 0) {
+ nic.setDeviceId(ethDeviceNum);
+ } else {
+ return new ExecutionResult(false, "Prepare SetupGuestNetwork failed due to unable to find the nic");
+ }
} catch (Exception e) {
String msg = "Prepare SetupGuestNetwork failed due to " + e.toString();
s_logger.warn(msg, e);
@@ -640,23 +706,27 @@ public class HypervDirectConnectResource extends ServerResourceBase implements S
private ExecutionResult prepareNetworkElementCommand(IpAssocVpcCommand cmd) {
String routerName = cmd.getAccessDetail(NetworkElementCommand.ROUTER_NAME);
- String routerIp = getRouterSshControlIp(cmd);
try {
IpAddressTO[] ips = cmd.getIpAddresses();
for (IpAddressTO ip : ips) {
-
- int ethDeviceNum = findRouterEthDeviceIndex(routerName, routerIp, ip.getVifMacAddress());
- if (ethDeviceNum < 0) {
+ URI broadcastUri = BroadcastDomainType.fromString(ip.getBroadcastUri());
+ if (BroadcastDomainType.getSchemeValue(broadcastUri) != BroadcastDomainType.Vlan) {
+ throw new InternalErrorException("Invalid Broadcast URI " + ip.getBroadcastUri());
+ }
+ int vlanId = Integer.parseInt(BroadcastDomainType.getValue(broadcastUri));
+ int publicNicInfo = -1;
+ publicNicInfo = getVmNics(routerName, vlanId);
+ if (publicNicInfo < 0) {
if (ip.isAdd()) {
throw new InternalErrorException("Failed to find DomR VIF to associate/disassociate IP with.");
- } else {
+ } else {
s_logger.debug("VIF to deassociate IP with does not exist, return success");
continue;
}
}
- ip.setNicDevId(ethDeviceNum);
+ ip.setNicDevId(publicNicInfo);
}
} catch (Exception e) {
s_logger.error("Prepare Ip Assoc failure on applying one ip due to exception: ", e);
@@ -668,12 +738,17 @@ public class HypervDirectConnectResource extends ServerResourceBase implements S
protected ExecutionResult prepareNetworkElementCommand(SetSourceNatCommand cmd) {
String routerName = cmd.getAccessDetail(NetworkElementCommand.ROUTER_NAME);
- String routerIp = getRouterSshControlIp(cmd);
IpAddressTO pubIp = cmd.getIpAddress();
try {
- int ethDeviceNum = findRouterEthDeviceIndex(routerName, routerIp, pubIp.getVifMacAddress());
- pubIp.setNicDevId(ethDeviceNum);
+ String broadcastUri = pubIp.getBroadcastUri();
+ int vlanId = Integer.parseInt(BroadcastDomainType.getValue(broadcastUri));
+ int ethDeviceNum = getVmNics(routerName, vlanId);
+ if (ethDeviceNum > 0) {
+ pubIp.setNicDevId(ethDeviceNum);
+ } else {
+ return new ExecutionResult(false, "Prepare Ip SNAT failed due to unable to find the nic");
+ }
} catch (Exception e) {
String msg = "Prepare Ip SNAT failure due to " + e.toString();
s_logger.error(msg, e);
@@ -686,12 +761,16 @@ public class HypervDirectConnectResource extends ServerResourceBase implements S
NicTO nic = cmd.getNic();
String routerName =
cmd.getAccessDetail(NetworkElementCommand.ROUTER_NAME);
- String routerIp = getRouterSshControlIp(cmd);
try {
- int ethDeviceNum = findRouterEthDeviceIndex(routerName, routerIp,
- nic.getMac());
- nic.setDeviceId(ethDeviceNum);
+ URI broadcastUri = nic.getBroadcastUri();
+ int vlanId = Integer.parseInt(BroadcastDomainType.getValue(broadcastUri));
+ int ethDeviceNum = getVmNics(routerName, vlanId);
+ if (ethDeviceNum > 0) {
+ nic.setDeviceId(ethDeviceNum);
+ } else {
+ return new ExecutionResult(false, "Prepare SetNetworkACL failed due to unable to find the nic");
+ }
} catch (Exception e) {
String msg = "Prepare SetNetworkACL failed due to " + e.toString();
s_logger.error(msg, e);
@@ -1730,6 +1809,27 @@ public class HypervDirectConnectResource extends ServerResourceBase implements S
}
}
+ protected void modifyNicVlan(String vmName, int vlanId, int pos) {
+ ModifyVmNicConfigCommand modifynic = new ModifyVmNicConfigCommand(vmName, vlanId, pos);
+ URI agentUri = null;
+ try {
+ String cmdName = ModifyVmNicConfigCommand.class.getName();
+ agentUri =
+ new URI("https", null, _agentIp, _port,
+ "/api/HypervResource/" + cmdName, null, null);
+ } catch (URISyntaxException e) {
+ String errMsg = "Could not generate URI for Hyper-V agent";
+ s_logger.error(errMsg, e);
+ }
+ String ansStr = postHttpRequest(s_gson.toJson(modifynic), agentUri);
+ Answer[] result = s_gson.fromJson(ansStr, Answer[].class);
+ s_logger.debug("executeRequest received response "
+ + s_gson.toJson(result));
+ if (result.length > 0) {
+ ModifyVmNicConfigAnswer ans = ((ModifyVmNicConfigAnswer)result[0]);
+ }
+ }
+
protected void assignPublicIpAddress(final String vmName, final String privateIpAddress, final String publicIpAddress, final boolean add, final boolean firstIP,
final boolean sourceNat, final String broadcastId, final String vlanGateway, final String vlanNetmask, final String vifMacAddress) throws Exception {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1b4325d2/server/src/com/cloud/network/vpc/VpcManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpc/VpcManagerImpl.java b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
index c5a048c..2e63639 100644
--- a/server/src/com/cloud/network/vpc/VpcManagerImpl.java
+++ b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
@@ -2289,6 +2289,7 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis
hTypes.add(HypervisorType.KVM);
hTypes.add(HypervisorType.Simulator);
hTypes.add(HypervisorType.LXC);
+ hTypes.add(HypervisorType.Hyperv);
return hTypes;
}
[05/50] [abbrv] git commit: updated refs/heads/4.4 to 48f8a95
Posted by hu...@apache.org.
Removed getUUID() method from Domain interface as this interface already implements @Identity where getUUID is defined
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/67ab3211
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/67ab3211
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/67ab3211
Branch: refs/heads/4.4
Commit: 67ab3211bd49724ee4a15aa4933c19c0e7adddff
Parents: df85211
Author: Alena Prokharchyk <al...@citrix.com>
Authored: Thu Mar 13 12:54:13 2014 -0700
Committer: Alena Prokharchyk <al...@citrix.com>
Committed: Thu Mar 13 12:54:13 2014 -0700
----------------------------------------------------------------------
api/src/com/cloud/domain/Domain.java | 3 ---
1 file changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/67ab3211/api/src/com/cloud/domain/Domain.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/domain/Domain.java b/api/src/com/cloud/domain/Domain.java
index c4755d7..365a705 100644
--- a/api/src/com/cloud/domain/Domain.java
+++ b/api/src/com/cloud/domain/Domain.java
@@ -60,7 +60,4 @@ public interface Domain extends OwnedBy, Identity, InternalIdentity {
String getNetworkDomain();
- @Override
- public String getUuid();
-
}
[14/50] [abbrv] git commit: updated refs/heads/4.4 to 48f8a95
Posted by hu...@apache.org.
Merge branch 'rbac' to master
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8ff94601
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8ff94601
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8ff94601
Branch: refs/heads/4.4
Commit: 8ff94601f1b7dc3c6c92b083d343e392325e860e
Parents: 6c23e20 d3fd66e
Author: Min Chen <mi...@citrix.com>
Authored: Thu Mar 13 16:42:22 2014 -0700
Committer: Min Chen <mi...@citrix.com>
Committed: Thu Mar 13 16:42:22 2014 -0700
----------------------------------------------------------------------
.../cloud/network/vpc/StaticRouteProfile.java | 2 +-
api/src/com/cloud/storage/VolumeApiService.java | 4 +-
api/src/com/cloud/user/Account.java | 4 +-
api/src/com/cloud/user/AccountService.java | 14 +-
.../com/cloud/user/ResourceLimitService.java | 2 +-
api/src/org/apache/cloudstack/acl/Role.java | 34 -
api/src/org/apache/cloudstack/acl/RoleType.java | 2 +-
.../apache/cloudstack/acl/SecurityChecker.java | 13 +-
api/src/org/apache/cloudstack/api/ACL.java | 4 +-
.../org/apache/cloudstack/api/APICommand.java | 3 +
.../org/apache/cloudstack/api/ApiConstants.java | 3 +-
api/src/org/apache/cloudstack/api/BaseCmd.java | 9 +-
.../BaseListTemplateOrIsoPermissionsCmd.java | 21 +-
.../cloudstack/api/ResponseGenerator.java | 44 +-
.../apache/cloudstack/api/ResponseObject.java | 5 +
.../command/admin/account/CreateAccountCmd.java | 9 +-
.../command/admin/account/DeleteAccountCmd.java | 9 +-
.../admin/account/DisableAccountCmd.java | 15 +-
.../command/admin/account/EnableAccountCmd.java | 13 +-
.../admin/account/ListAccountsCmdByAdmin.java | 26 +
.../command/admin/account/LockAccountCmd.java | 3 +-
.../command/admin/account/UpdateAccountCmd.java | 14 +-
.../address/AssociateIPAddrCmdByAdmin.java | 65 +
.../ListPublicIpAddressesCmdByAdmin.java | 53 +
.../UpdateVMAffinityGroupCmdByAdmin.java | 63 +
.../admin/internallb/ListInternalLBVMsCmd.java | 5 +-
.../admin/internallb/StartInternalLBVMCmd.java | 9 +-
.../admin/internallb/StopInternalLBVMCmd.java | 9 +-
.../command/admin/iso/AttachIsoCmdByAdmin.java | 53 +
.../command/admin/iso/DetachIsoCmdByAdmin.java | 47 +
.../admin/iso/ListIsoPermissionsCmdByAdmin.java | 31 +
.../command/admin/iso/ListIsosCmdByAdmin.java | 26 +
.../admin/iso/RegisterIsoCmdByAdmin.java | 53 +
.../command/admin/iso/UpdateIsoCmdByAdmin.java | 45 +
...ListLoadBalancerRuleInstancesCmdByAdmin.java | 57 +
.../admin/network/CreateNetworkCmdByAdmin.java | 66 +
.../admin/network/ListNetworksCmdByAdmin.java | 50 +
.../admin/network/UpdateNetworkCmdByAdmin.java | 63 +
.../command/admin/router/DestroyRouterCmd.java | 5 +-
.../command/admin/router/ListRoutersCmd.java | 5 +-
.../command/admin/router/RebootRouterCmd.java | 7 +-
.../command/admin/router/StartRouterCmd.java | 5 +-
.../api/command/admin/router/StopRouterCmd.java | 5 +-
.../command/admin/router/UpgradeRouterCmd.java | 5 +-
.../admin/systemvm/DestroySystemVmCmd.java | 8 +-
.../admin/systemvm/ListSystemVMsCmd.java | 5 +-
.../admin/systemvm/MigrateSystemVMCmd.java | 8 +-
.../admin/systemvm/RebootSystemVmCmd.java | 9 +-
.../admin/systemvm/ScaleSystemVMCmd.java | 9 +-
.../admin/systemvm/StartSystemVMCmd.java | 9 +-
.../command/admin/systemvm/StopSystemVmCmd.java | 8 +-
.../admin/systemvm/UpgradeSystemVMCmd.java | 11 +-
.../admin/template/CopyTemplateCmdByAdmin.java | 63 +
.../template/CreateTemplateCmdByAdmin.java | 62 +
.../ListTemplatePermissionsCmdByAdmin.java | 32 +
.../admin/template/ListTemplatesCmdByAdmin.java | 28 +
.../admin/template/PrepareTemplateCmd.java | 11 +-
.../template/RegisterTemplateCmdByAdmin.java | 57 +
.../template/UpdateTemplateCmdByAdmin.java | 47 +
.../command/admin/vm/AddNicToVMCmdByAdmin.java | 55 +
.../api/command/admin/vm/AssignVMCmd.java | 8 +-
.../command/admin/vm/DeployVMCmdByAdmin.java | 79 +
.../command/admin/vm/DestroyVMCmdByAdmin.java | 57 +
.../api/command/admin/vm/ExpungeVMCmd.java | 8 +-
.../api/command/admin/vm/ListVMsCmdByAdmin.java | 69 +
.../api/command/admin/vm/MigrateVMCmd.java | 8 +-
.../vm/MigrateVirtualMachineWithVolumeCmd.java | 10 +-
.../command/admin/vm/RebootVMCmdByAdmin.java | 51 +
.../api/command/admin/vm/RecoverVMCmd.java | 10 +-
.../admin/vm/RemoveNicFromVMCmdByAdmin.java | 55 +
.../admin/vm/ResetVMPasswordCmdByAdmin.java | 54 +
.../admin/vm/ResetVMSSHKeyCmdByAdmin.java | 57 +
.../command/admin/vm/RestoreVMCmdByAdmin.java | 54 +
.../api/command/admin/vm/ScaleVMCmdByAdmin.java | 69 +
.../api/command/admin/vm/StartVMCmdByAdmin.java | 80 +
.../api/command/admin/vm/StopVMCmdByAdmin.java | 53 +
.../vm/UpdateDefaultNicForVMCmdByAdmin.java | 56 +
.../command/admin/vm/UpdateVMCmdByAdmin.java | 53 +
.../command/admin/vm/UpgradeVMCmdByAdmin.java | 59 +
.../RevertToVMSnapshotCmdByAdmin.java | 57 +
.../admin/volume/AttachVolumeCmdByAdmin.java | 47 +
.../admin/volume/CreateVolumeCmdByAdmin.java | 61 +
.../admin/volume/DetachVolumeCmdByAdmin.java | 48 +
.../admin/volume/ListVolumesCmdByAdmin.java | 63 +
.../admin/volume/MigrateVolumeCmdByAdmin.java | 47 +
.../admin/volume/ResizeVolumeCmdByAdmin.java | 47 +
.../admin/volume/UpdateVolumeCmdByAdmin.java | 45 +
.../admin/volume/UploadVolumeCmdByAdmin.java | 57 +
.../admin/vpc/CreatePrivateGatewayCmd.java | 3 +-
.../command/admin/vpc/CreateVPCCmdByAdmin.java | 64 +
.../admin/vpc/DeletePrivateGatewayCmd.java | 5 +-
.../command/admin/vpc/ListVPCsCmdByAdmin.java | 55 +
.../command/admin/vpc/UpdateVPCCmdByAdmin.java | 47 +
.../api/command/admin/zone/CreateZoneCmd.java | 7 +-
.../command/admin/zone/ListZonesCmdByAdmin.java | 26 +
.../zone/MarkDefaultZoneForAccountCmd.java | 10 +-
.../api/command/admin/zone/UpdateZoneCmd.java | 5 +-
.../command/user/account/ListAccountsCmd.java | 8 +-
.../user/address/AssociateIPAddrCmd.java | 10 +-
.../user/address/ListPublicIpAddressesCmd.java | 10 +-
.../command/user/address/UpdateIPAddrCmd.java | 12 +-
.../affinitygroup/CreateAffinityGroupCmd.java | 8 +-
.../affinitygroup/DeleteAffinityGroupCmd.java | 12 +-
.../affinitygroup/ListAffinityGroupsCmd.java | 10 +-
.../affinitygroup/UpdateVMAffinityGroupCmd.java | 13 +-
.../autoscale/CreateAutoScalePolicyCmd.java | 9 +-
.../autoscale/CreateAutoScaleVmGroupCmd.java | 10 +-
.../autoscale/CreateAutoScaleVmProfileCmd.java | 12 +-
.../user/autoscale/CreateConditionCmd.java | 12 +-
.../autoscale/DeleteAutoScalePolicyCmd.java | 8 +-
.../autoscale/DeleteAutoScaleVmGroupCmd.java | 8 +-
.../autoscale/DeleteAutoScaleVmProfileCmd.java | 8 +-
.../user/autoscale/DeleteConditionCmd.java | 8 +-
.../autoscale/DisableAutoScaleVmGroupCmd.java | 8 +-
.../autoscale/EnableAutoScaleVmGroupCmd.java | 8 +-
.../autoscale/ListAutoScalePoliciesCmd.java | 5 +-
.../autoscale/ListAutoScaleVmGroupsCmd.java | 8 +-
.../autoscale/ListAutoScaleVmProfilesCmd.java | 8 +-
.../autoscale/UpdateAutoScalePolicyCmd.java | 8 +-
.../autoscale/UpdateAutoScaleVmGroupCmd.java | 15 +-
.../autoscale/UpdateAutoScaleVmProfileCmd.java | 15 +-
.../command/user/event/ArchiveEventsCmd.java | 5 +-
.../api/command/user/event/DeleteEventsCmd.java | 5 +-
.../api/command/user/event/ListEventsCmd.java | 5 +-
.../firewall/CreateEgressFirewallRuleCmd.java | 18 +-
.../user/firewall/CreateFirewallRuleCmd.java | 6 +-
.../firewall/CreatePortForwardingRuleCmd.java | 20 +-
.../firewall/DeleteEgressFirewallRuleCmd.java | 8 +-
.../user/firewall/DeleteFirewallRuleCmd.java | 9 +-
.../firewall/DeletePortForwardingRuleCmd.java | 6 +-
.../firewall/ListEgressFirewallRulesCmd.java | 8 +-
.../user/firewall/ListFirewallRulesCmd.java | 8 +-
.../firewall/ListPortForwardingRulesCmd.java | 8 +-
.../firewall/UpdatePortForwardingRuleCmd.java | 14 +-
.../api/command/user/iso/AttachIsoCmd.java | 23 +-
.../api/command/user/iso/DetachIsoCmd.java | 18 +-
.../command/user/iso/ListIsoPermissionsCmd.java | 10 +-
.../api/command/user/iso/ListIsosCmd.java | 8 +-
.../api/command/user/iso/RegisterIsoCmd.java | 20 +-
.../api/command/user/iso/UpdateIsoCmd.java | 7 +-
.../ListLoadBalancerRuleInstancesCmd.java | 13 +-
.../command/user/network/CreateNetworkCmd.java | 13 +-
.../command/user/network/DeleteNetworkCmd.java | 9 +-
.../command/user/network/ListNetworksCmd.java | 11 +-
.../command/user/network/RestartNetworkCmd.java | 9 +-
.../command/user/network/UpdateNetworkCmd.java | 31 +-
.../AuthorizeSecurityGroupEgressCmd.java | 24 +-
.../AuthorizeSecurityGroupIngressCmd.java | 23 +-
.../securitygroup/CreateSecurityGroupCmd.java | 8 +-
.../securitygroup/DeleteSecurityGroupCmd.java | 16 +-
.../securitygroup/ListSecurityGroupsCmd.java | 5 +-
.../RevokeSecurityGroupEgressCmd.java | 11 +-
.../RevokeSecurityGroupIngressCmd.java | 10 +-
.../user/snapshot/CreateSnapshotCmd.java | 17 +-
.../user/snapshot/DeleteSnapshotCmd.java | 13 +-
.../command/user/snapshot/ListSnapshotsCmd.java | 5 +-
.../user/snapshot/RevertSnapshotCmd.java | 14 +-
.../command/user/ssh/CreateSSHKeyPairCmd.java | 8 +-
.../command/user/ssh/DeleteSSHKeyPairCmd.java | 9 +-
.../command/user/ssh/ListSSHKeyPairsCmd.java | 5 +-
.../command/user/ssh/RegisterSSHKeyPairCmd.java | 8 +-
.../api/command/user/tag/CreateTagsCmd.java | 5 +-
.../api/command/user/tag/DeleteTagsCmd.java | 5 +-
.../api/command/user/tag/ListTagsCmd.java | 5 +-
.../command/user/template/CopyTemplateCmd.java | 9 +-
.../user/template/CreateTemplateCmd.java | 40 +-
.../template/ListTemplatePermissionsCmd.java | 11 +-
.../command/user/template/ListTemplatesCmd.java | 9 +-
.../user/template/RegisterTemplateCmd.java | 16 +-
.../user/template/UpdateTemplateCmd.java | 9 +-
.../template/UpdateTemplatePermissionsCmd.java | 3 +-
.../api/command/user/vm/AddNicToVMCmd.java | 21 +-
.../api/command/user/vm/DeployVMCmd.java | 37 +-
.../api/command/user/vm/DestroyVMCmd.java | 18 +-
.../api/command/user/vm/GetVMPasswordCmd.java | 11 +-
.../api/command/user/vm/ListVMsCmd.java | 28 +-
.../api/command/user/vm/RebootVMCmd.java | 20 +-
.../command/user/vm/RemoveIpFromVmNicCmd.java | 14 +-
.../api/command/user/vm/RemoveNicFromVMCmd.java | 21 +-
.../api/command/user/vm/ResetVMPasswordCmd.java | 27 +-
.../api/command/user/vm/ResetVMSSHKeyCmd.java | 14 +-
.../api/command/user/vm/RestoreVMCmd.java | 21 +-
.../api/command/user/vm/ScaleVMCmd.java | 27 +-
.../api/command/user/vm/StartVMCmd.java | 19 +-
.../api/command/user/vm/StopVMCmd.java | 14 +-
.../user/vm/UpdateDefaultNicForVMCmd.java | 20 +-
.../api/command/user/vm/UpdateVMCmd.java | 25 +-
.../api/command/user/vm/UpgradeVMCmd.java | 26 +-
.../command/user/vmgroup/CreateVMGroupCmd.java | 8 +-
.../command/user/vmgroup/DeleteVMGroupCmd.java | 8 +-
.../command/user/vmgroup/ListVMGroupsCmd.java | 5 +-
.../command/user/vmgroup/UpdateVMGroupCmd.java | 9 +-
.../user/vmsnapshot/CreateVMSnapshotCmd.java | 10 +-
.../user/vmsnapshot/DeleteVMSnapshotCmd.java | 8 +-
.../user/vmsnapshot/ListVMSnapshotCmd.java | 5 +-
.../user/vmsnapshot/RevertToVMSnapshotCmd.java | 13 +-
.../command/user/volume/AttachVolumeCmd.java | 23 +-
.../command/user/volume/CreateVolumeCmd.java | 21 +-
.../command/user/volume/DeleteVolumeCmd.java | 14 +-
.../command/user/volume/DetachVolumeCmd.java | 21 +-
.../command/user/volume/ExtractVolumeCmd.java | 13 +-
.../api/command/user/volume/ListVolumesCmd.java | 9 +-
.../command/user/volume/MigrateVolumeCmd.java | 20 +-
.../command/user/volume/ResizeVolumeCmd.java | 20 +-
.../command/user/volume/UpdateVolumeCmd.java | 18 +-
.../command/user/volume/UploadVolumeCmd.java | 29 +-
.../command/user/vpc/CreateStaticRouteCmd.java | 3 +-
.../api/command/user/vpc/CreateVPCCmd.java | 23 +-
.../command/user/vpc/DeleteStaticRouteCmd.java | 9 +-
.../api/command/user/vpc/DeleteVPCCmd.java | 9 +-
.../user/vpc/ListPrivateGatewaysCmd.java | 5 +-
.../command/user/vpc/ListStaticRoutesCmd.java | 5 +-
.../api/command/user/vpc/ListVPCsCmd.java | 14 +-
.../api/command/user/vpc/RestartVPCCmd.java | 9 +-
.../api/command/user/vpc/UpdateVPCCmd.java | 21 +-
.../api/command/user/vpn/AddVpnUserCmd.java | 8 +-
.../user/vpn/CreateRemoteAccessVpnCmd.java | 12 +-
.../user/vpn/CreateVpnConnectionCmd.java | 7 +-
.../user/vpn/CreateVpnCustomerGatewayCmd.java | 8 +-
.../command/user/vpn/CreateVpnGatewayCmd.java | 6 +-
.../user/vpn/DeleteRemoteAccessVpnCmd.java | 4 +-
.../user/vpn/DeleteVpnConnectionCmd.java | 5 +-
.../user/vpn/DeleteVpnCustomerGatewayCmd.java | 8 +-
.../command/user/vpn/DeleteVpnGatewayCmd.java | 5 +-
.../user/vpn/ListRemoteAccessVpnsCmd.java | 8 +-
.../command/user/vpn/ListVpnConnectionsCmd.java | 8 +-
.../user/vpn/ListVpnCustomerGatewaysCmd.java | 5 +-
.../command/user/vpn/ListVpnGatewaysCmd.java | 8 +-
.../api/command/user/vpn/ListVpnUsersCmd.java | 5 +-
.../api/command/user/vpn/RemoveVpnUserCmd.java | 6 +-
.../command/user/vpn/ResetVpnConnectionCmd.java | 8 +-
.../user/vpn/UpdateVpnCustomerGatewayCmd.java | 8 +-
.../api/command/user/zone/ListZonesByCmd.java | 133 --
.../api/command/user/zone/ListZonesCmd.java | 134 ++
.../api/response/AccountResponse.java | 9 +
.../apache/cloudstack/query/QueryService.java | 18 +-
.../api/command/test/ScaleVMCmdTest.java | 4 +-
client/pom.xml | 16 +-
client/tomcatconf/applicationContext.xml.in | 951 ++++++++
client/tomcatconf/commands.properties.in | 16 +
client/tomcatconf/componentContext.xml.in | 317 +++
client/tomcatconf/nonossComponentContext.xml.in | 422 ++++
.../tomcatconf/simulatorComponentContext.xml.in | 286 +++
...g-core-lifecycle-api-context-inheritable.xml | 5 +
.../core/spring-core-registry-core-context.xml | 9 +-
.../src/com/cloud/network/addr/PublicIp.java | 4 +-
.../orchestration/NetworkOrchestrator.java | 168 +-
engine/schema/src/com/cloud/event/EventVO.java | 1 -
.../cloud/network/as/AutoScaleVmGroupVO.java | 1 -
.../cloud/network/dao/RemoteAccessVpnVO.java | 2 +-
.../network/dao/Site2SiteCustomerGatewayVO.java | 1 +
.../network/dao/Site2SiteVpnConnectionVO.java | 1 +
.../network/dao/Site2SiteVpnGatewayVO.java | 1 +
.../com/cloud/network/rules/FirewallRuleVO.java | 2 +-
.../schema/src/com/cloud/network/vpc/VpcVO.java | 1 +
.../schema/src/com/cloud/storage/VolumeVO.java | 1 +
.../src/com/cloud/tags/ResourceTagVO.java | 1 +
.../com/cloud/upgrade/dao/Upgrade430to440.java | 52 +-
engine/schema/src/com/cloud/user/AccountVO.java | 1 -
.../schema/src/com/cloud/vm/VMInstanceVO.java | 16 +-
.../src/com/cloud/vm/dao/NicIpAliasVO.java | 10 +-
.../storage/snapshot/SnapshotObject.java | 2 +-
.../db/src/com/cloud/utils/db/SearchBase.java | 12 +-
.../ratelimit/ApiRateLimitServiceImpl.java | 4 +-
.../cloudstack/ratelimit/ApiRateLimitTest.java | 10 +-
.../commands/ListF5LoadBalancerNetworksCmd.java | 9 +-
.../contrail/management/MockAccountManager.java | 63 +-
.../commands/ListSrxFirewallNetworksCmd.java | 9 +-
.../ListNetscalerLoadBalancerNetworksCmd.java | 9 +-
.../ListNiciraNvpDeviceNetworksCmd.java | 5 +-
.../ListPaloAltoFirewallNetworksCmd.java | 5 +-
.../api/command/LdapCreateAccountCmd.java | 20 +-
.../spring-server-core-managers-context.xml | 3 +-
.../cloud/acl/AffinityGroupAccessChecker.java | 6 +-
server/src/com/cloud/acl/DomainChecker.java | 41 +-
server/src/com/cloud/api/ApiDBUtils.java | 49 +-
server/src/com/cloud/api/ApiDispatcher.java | 37 +-
server/src/com/cloud/api/ApiResponseHelper.java | 96 +-
server/src/com/cloud/api/ApiServer.java | 129 +-
.../com/cloud/api/query/QueryManagerImpl.java | 653 +++---
.../com/cloud/api/query/ViewResponseHelper.java | 53 +-
.../com/cloud/api/query/dao/AccountJoinDao.java | 3 +-
.../cloud/api/query/dao/AccountJoinDaoImpl.java | 100 +-
.../cloud/api/query/dao/DataCenterJoinDao.java | 3 +-
.../api/query/dao/DataCenterJoinDaoImpl.java | 11 +-
.../api/query/dao/DomainRouterJoinDaoImpl.java | 10 +-
.../cloud/api/query/dao/TemplateJoinDao.java | 11 +-
.../api/query/dao/TemplateJoinDaoImpl.java | 52 +-
.../com/cloud/api/query/dao/UserVmJoinDao.java | 5 +-
.../cloud/api/query/dao/UserVmJoinDaoImpl.java | 21 +-
.../com/cloud/api/query/dao/VolumeJoinDao.java | 5 +-
.../cloud/api/query/dao/VolumeJoinDaoImpl.java | 18 +-
.../com/cloud/api/query/vo/AsyncJobJoinVO.java | 34 +-
.../cloud/api/query/vo/DomainRouterJoinVO.java | 1 -
.../src/com/cloud/api/query/vo/EventJoinVO.java | 1 -
.../cloud/api/query/vo/InstanceGroupJoinVO.java | 1 -
.../api/query/vo/ProjectInvitationJoinVO.java | 1 -
.../cloud/api/query/vo/ResourceTagJoinVO.java | 1 -
.../cloud/api/query/vo/SecurityGroupJoinVO.java | 1 -
.../com/cloud/api/query/vo/TemplateJoinVO.java | 5 +-
.../com/cloud/api/query/vo/UserVmJoinVO.java | 1 -
.../com/cloud/api/query/vo/VolumeJoinVO.java | 2 +-
.../api/response/ApiResponseSerializer.java | 10 +-
.../configuration/ConfigurationManagerImpl.java | 544 ++---
.../deploy/DeploymentPlanningManagerImpl.java | 2204 +++++++++---------
.../src/com/cloud/deploy/FirstFitPlanner.java | 10 +-
.../com/cloud/network/IpAddressManagerImpl.java | 670 +++---
.../com/cloud/network/NetworkServiceImpl.java | 482 ++--
.../cloud/network/as/AutoScaleManagerImpl.java | 485 ++--
.../network/firewall/FirewallManagerImpl.java | 174 +-
.../lb/LoadBalancingRulesManagerImpl.java | 29 +-
.../cloud/network/rules/RulesManagerImpl.java | 47 +-
.../security/SecurityGroupManagerImpl.java | 3 +-
.../network/vpc/NetworkACLServiceImpl.java | 34 +-
.../com/cloud/network/vpc/VpcManagerImpl.java | 419 ++--
.../network/vpn/RemoteAccessVpnManagerImpl.java | 43 +-
.../network/vpn/Site2SiteVpnManagerImpl.java | 49 +-
.../com/cloud/projects/ProjectManagerImpl.java | 228 +-
.../com/cloud/resource/ResourceManagerImpl.java | 250 +-
.../resourcelimit/ResourceLimitManagerImpl.java | 243 +-
.../com/cloud/server/ManagementServerImpl.java | 219 +-
.../com/cloud/servlet/ConsoleProxyServlet.java | 57 +-
.../com/cloud/storage/StorageManagerImpl.java | 47 +-
.../com/cloud/storage/VolumeApiServiceImpl.java | 280 +--
.../storage/snapshot/SnapshotManagerImpl.java | 42 +-
.../cloud/tags/TaggedResourceManagerImpl.java | 14 +-
.../template/HypervisorTemplateAdapter.java | 26 +-
.../com/cloud/template/TemplateAdapterBase.java | 15 +-
.../com/cloud/template/TemplateManagerImpl.java | 99 +-
.../src/com/cloud/usage/UsageServiceImpl.java | 9 +-
server/src/com/cloud/user/AccountManager.java | 53 +-
.../src/com/cloud/user/AccountManagerImpl.java | 526 +++--
.../src/com/cloud/user/DomainManagerImpl.java | 52 +-
.../com/cloud/uuididentity/UUIDManagerImpl.java | 2 +-
server/src/com/cloud/vm/UserVmManager.java | 24 +-
server/src/com/cloud/vm/UserVmManagerImpl.java | 439 ++--
.../vm/snapshot/VMSnapshotManagerImpl.java | 138 +-
.../affinity/AffinityGroupServiceImpl.java | 998 ++++----
.../lb/ApplicationLoadBalancerManagerImpl.java | 18 +-
.../cloudstack/network/lb/CertServiceImpl.java | 21 +-
.../GlobalLoadBalancingRulesServiceImpl.java | 12 +-
.../com/cloud/user/MockAccountManagerImpl.java | 88 +-
server/test/com/cloud/vm/UserVmManagerTest.java | 35 +-
.../cloud/vpc/MockResourceLimitManagerImpl.java | 2 +-
.../affinity/AffinityApiUnitTest.java | 6 +
.../iam/AddIAMPermissionToIAMPolicyCmd.java | 3 -
.../api/response/iam/IAMPermissionResponse.java | 8 +-
.../cloudstack/iam/IAMApiServiceImpl.java | 22 +-
.../iam/RoleBasedEntityAccessChecker.java | 13 +-
services/pom.xml | 2 +-
setup/db/db/schema-430to440.sql | 113 +-
test/integration/smoke/test_vm_iam.py | 717 ++++++
tools/apidoc/gen_toc.py | 15 +-
tools/marvin/marvin/integration/lib/base.py | 130 +-
354 files changed, 12593 insertions(+), 6294 deletions(-)
----------------------------------------------------------------------
[38/50] [abbrv] git commit: updated refs/heads/4.4 to 48f8a95
Posted by hu...@apache.org.
introduce OvsNetworkTopologyGuru that has convinenace functions to
- get the hosts on which VPC spans given vpc id
- get the VM's in the VPC
- get the hosts on which a network spans
- get the VPC's to which a hosts is part of
- get VM's of a VPC on a hosts
introduces capability to build a physical toplogy representation of a
VPC. This json file is encapsulated in
OvsVpcPhysicalTopologyConfigCommand, and is used to send full topology
to hypervisor hosts. On hypervisor this json config can be used to setup
tunnels, configure bridge, add flow rules etc
Ovs GURU, to use different broasdcast scheme VS://vpcid.gerkey for the
networks in VPC that use distributed routing
each VIF and tunnel interface to carry the network UUID in other/options
config
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e045883c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e045883c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e045883c
Branch: refs/heads/4.4
Commit: e045883c52240a0d960d4d8496910ed189c80b59
Parents: 100df92
Author: Murali Reddy <mu...@gmail.com>
Authored: Mon Mar 10 12:52:30 2014 +0530
Committer: Murali Reddy <mu...@gmail.com>
Committed: Fri Mar 14 16:56:37 2014 +0530
----------------------------------------------------------------------
api/src/com/cloud/agent/api/to/NicTO.java | 8 +
.../kvm/resource/LibvirtComputingResource.java | 34 +-
.../xen/resource/CitrixResourceBase.java | 95 +++--
.../cloudstack/ovs/spring-ovs-context.xml | 2 +-
.../cloud/agent/api/OvsCreateTunnelCommand.java | 19 +-
.../agent/api/OvsDestroyBridgeCommand.java | 10 +-
.../agent/api/OvsDestroyTunnelCommand.java | 10 +-
.../cloud/agent/api/OvsSetupBridgeCommand.java | 10 +-
.../OvsVpcPhysicalTopologyConfigCommand.java | 127 +++++++
.../com/cloud/network/element/OvsElement.java | 35 +-
.../cloud/network/guru/OvsGuestNetworkGuru.java | 17 +-
.../network/ovs/OvsNetworkTopologyGuru.java | 49 +++
.../network/ovs/OvsNetworkTopologyGuruImpl.java | 74 ++++
.../com/cloud/network/ovs/OvsTunnelManager.java | 16 +-
.../cloud/network/ovs/OvsTunnelManagerImpl.java | 356 ++++++++++++++-----
.../com/cloud/network/ovs/dao/OvsTunnel.java | 24 ++
.../network/ovs/dao/OvsTunnelNetworkVO.java | 2 +-
scripts/vm/hypervisor/xenserver/ovstunnel | 2 +
.../cloud/hypervisor/HypervisorGuruBase.java | 7 +
19 files changed, 737 insertions(+), 160 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e045883c/api/src/com/cloud/agent/api/to/NicTO.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/to/NicTO.java b/api/src/com/cloud/agent/api/to/NicTO.java
index bd8f24e..67660c8 100644
--- a/api/src/com/cloud/agent/api/to/NicTO.java
+++ b/api/src/com/cloud/agent/api/to/NicTO.java
@@ -80,4 +80,12 @@ public class NicTO extends NetworkTO {
public List<String> getNicSecIps() {
return nicSecIps;
}
+
+ public String getNetworkUuid() {
+ return super.getUuid();
+ }
+
+ public void setNetworkUuid(String uuid) {
+ super.setUuid(uuid);
+ }
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e045883c/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
index cdeedfe..c1a7721 100755
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
@@ -1388,23 +1388,22 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
}
private Answer execute(OvsSetupBridgeCommand cmd) {
- findOrCreateTunnelNetwork(cmd.getKey());
+ findOrCreateTunnelNetwork(cmd.getBridgeName());
configureTunnelNetwork(cmd.getNetworkId(), cmd.getHostId(),
- cmd.getKey());
+ cmd.getBridgeName());
s_logger.debug("OVS Bridge configured");
return new Answer(cmd, true, null);
}
private Answer execute(OvsDestroyBridgeCommand cmd) {
- destroyTunnelNetwork(cmd.getKey());
+ destroyTunnelNetwork(cmd.getBridgeName());
s_logger.debug("OVS Bridge destroyed");
return new Answer(cmd, true, null);
}
- private synchronized void destroyTunnelNetwork(int key) {
+ private synchronized void destroyTunnelNetwork(String bridge) {
try {
- findOrCreateTunnelNetwork(key);
- String bridge = "OVSTunnel" + key;
+ findOrCreateTunnelNetwork(bridge);
Script cmd = new Script(_ovsTunnelPath, _timeout, s_logger);
cmd.add("destroy_ovs_bridge");
cmd.add("--bridge", bridge);
@@ -1423,9 +1422,8 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
}
}
- private synchronized boolean findOrCreateTunnelNetwork(long key) {
+ private synchronized boolean findOrCreateTunnelNetwork(String nwName) {
try {
- String nwName = "OVSTunnel" + key;
if (checkNetwork(nwName)) {
return true;
}
@@ -1443,10 +1441,9 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
}
private synchronized boolean configureTunnelNetwork(long networkId,
- long hostId, int key) {
+ long hostId, String nwName) {
try {
- findOrCreateTunnelNetwork(key);
- String nwName = "OVSTunnel" + key;
+ findOrCreateTunnelNetwork(nwName);
String configuredHosts = Script
.runSimpleBashScript("ovs-vsctl get bridge " + nwName
+ " other_config:ovs_host_setup");
@@ -1463,7 +1460,7 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
if (!configured) {
Script cmd = new Script(_ovsTunnelPath, _timeout, s_logger);
cmd.add("setup_ovs_bridge");
- cmd.add("--key", String.valueOf(key));
+ cmd.add("--key", nwName);
cmd.add("--cs_host_id", ((Long)hostId).toString());
cmd.add("--bridge", nwName);
String result = cmd.execute();
@@ -1481,16 +1478,16 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
}
private OvsCreateTunnelAnswer execute(OvsCreateTunnelCommand cmd) {
- String bridge = "OVSTunnel" + cmd.getKey();
+ String bridge = cmd.getNetworkName();
try {
- if (!findOrCreateTunnelNetwork(cmd.getKey())) {
+ if (!findOrCreateTunnelNetwork(bridge)) {
s_logger.debug("Error during bridge setup");
return new OvsCreateTunnelAnswer(cmd, false,
"Cannot create network", bridge);
}
configureTunnelNetwork(cmd.getNetworkId(), cmd.getFrom(),
- cmd.getKey());
+ cmd.getNetworkName());
Script command = new Script(_ovsTunnelPath, _timeout, s_logger);
command.add("create_tunnel");
command.add("--bridge", bridge);
@@ -1515,16 +1512,15 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
private Answer execute(OvsDestroyTunnelCommand cmd) {
try {
- if (!findOrCreateTunnelNetwork(cmd.getKey())) {
+ if (!findOrCreateTunnelNetwork(cmd.getBridgeName())) {
s_logger.warn("Unable to find tunnel network for GRE key:"
- + cmd.getKey());
+ + cmd.getBridgeName());
return new Answer(cmd, false, "No network found");
}
- String bridge = "OVSTunnel" + cmd.getKey();
Script command = new Script(_ovsTunnelPath, _timeout, s_logger);
command.add("destroy_tunnel");
- command.add("--bridge", bridge);
+ command.add("--bridge", cmd.getBridgeName());
command.add("--iface_name", cmd.getInPortName());
String result = command.execute();
if (result == null) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e045883c/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 9103b59..3e7dfaf 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
@@ -148,6 +148,7 @@ import com.cloud.agent.api.OvsFetchInterfaceCommand;
import com.cloud.agent.api.OvsSetTagAndFlowAnswer;
import com.cloud.agent.api.OvsSetTagAndFlowCommand;
import com.cloud.agent.api.OvsSetupBridgeCommand;
+import com.cloud.agent.api.OvsVpcPhysicalTopologyConfigCommand;
import com.cloud.agent.api.PerformanceMonitorAnswer;
import com.cloud.agent.api.PerformanceMonitorCommand;
import com.cloud.agent.api.PingCommand;
@@ -507,6 +508,8 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
return execute((OvsSetTagAndFlowCommand)cmd);
} else if (clazz == OvsDeleteFlowCommand.class) {
return execute((OvsDeleteFlowCommand)cmd);
+ } else if (clazz == OvsVpcPhysicalTopologyConfigCommand.class) {
+ return execute((OvsVpcPhysicalTopologyConfigCommand) cmd);
} else if (clazz == CleanupNetworkRulesCmd.class) {
return execute((CleanupNetworkRulesCmd)cmd);
} else if (clazz == NetworkRulesSystemVmCommand.class) {
@@ -964,15 +967,14 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
/**
* This method just creates a XenServer network following the tunnel network naming convention
*/
- private synchronized Network findOrCreateTunnelNetwork(Connection conn, long key) {
+ private synchronized Network findOrCreateTunnelNetwork(Connection conn, String nwName) {
try {
- String nwName = "OVSTunnel" + key;
Network nw = null;
Network.Record rec = new Network.Record();
Set<Network> networks = Network.getByNameLabel(conn, nwName);
if (networks.size() == 0) {
- rec.nameDescription = "tunnel network id# " + key;
+ rec.nameDescription = "tunnel network id# " + nwName;
rec.nameLabel = nwName;
//Initialize the ovs-host-setup to avoid error when doing get-param in plugin
Map<String, String> otherConfig = new HashMap<String, String>();
@@ -981,7 +983,7 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
nw = Network.create(conn, rec);
// Plug dom0 vif only when creating network
if (!is_xcp())
- enableXenServerNetwork(conn, nw, nwName, "tunnel network for account " + key);
+ enableXenServerNetwork(conn, nw, nwName, "tunnel network for account " + nwName);
s_logger.debug("### Xen Server network for tunnels created:" + nwName);
} else {
nw = networks.iterator().next();
@@ -997,10 +999,10 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
/**
* This method creates a XenServer network and configures it for being used as a L2-in-L3 tunneled network
*/
- private synchronized Network configureTunnelNetwork(Connection conn, long networkId, long hostId, int key) {
+ private synchronized Network configureTunnelNetwork(Connection conn, long networkId, long hostId, String bridgeName) {
try {
- Network nw = findOrCreateTunnelNetwork(conn, key);
- String nwName = "OVSTunnel" + key;
+ Network nw = findOrCreateTunnelNetwork(conn, bridgeName);
+ String nwName = bridgeName;
//Invoke plugin to setup the bridge which will be used by this network
String bridge = nw.getBridge(conn);
Map<String, String> nwOtherConfig = nw.getOtherConfig(conn);
@@ -1018,11 +1020,20 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
if (!configured) {
// Plug dom0 vif only if not done before for network and host
if (!is_xcp())
- enableXenServerNetwork(conn, nw, nwName, "tunnel network for account " + key);
- String result = callHostPlugin(conn, "ovstunnel", "setup_ovs_bridge", "bridge", bridge,
- "key", String.valueOf(key),
- "xs_nw_uuid", nw.getUuid(conn),
- "cs_host_id", ((Long)hostId).toString());
+ enableXenServerNetwork(conn, nw, nwName, "tunnel network for account " + bridgeName);
+ String result;
+ if (bridgeName.startsWith("OVS-DR-VPC-Bridge")) {
+ result = callHostPlugin(conn, "ovstunnel", "setup_ovs_bridge_for_distributed_routing", "bridge", bridge,
+ "key", bridgeName,
+ "xs_nw_uuid", nw.getUuid(conn),
+ "cs_host_id", ((Long)hostId).toString());
+ } else {
+ result = callHostPlugin(conn, "ovstunnel", "setup_ovs_bridge", "bridge", bridge,
+ "key", bridgeName,
+ "xs_nw_uuid", nw.getUuid(conn),
+ "cs_host_id", ((Long)hostId).toString());
+ }
+
//Note down the fact that the ovs bridge has been setup
String[] res = result.split(":");
if (res.length != 2 || !res[0].equalsIgnoreCase("SUCCESS")) {
@@ -1037,9 +1048,9 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
}
}
- private synchronized void destroyTunnelNetwork(Connection conn, int key) {
+ private synchronized void destroyTunnelNetwork(Connection conn, String bridgeName) {
try {
- Network nw = findOrCreateTunnelNetwork(conn, key);
+ Network nw = findOrCreateTunnelNetwork(conn, bridgeName);
String bridge = nw.getBridge(conn);
String result = callHostPlugin(conn, "ovstunnel", "destroy_ovs_bridge", "bridge", bridge);
String[] res = result.split(":");
@@ -1079,8 +1090,7 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
_isOvs = true;
return setupvSwitchNetwork(conn);
} else {
- long vnetId = Long.parseLong(BroadcastDomainType.getValue(uri));
- return findOrCreateTunnelNetwork(conn, vnetId);
+ return findOrCreateTunnelNetwork(conn, getOvsTunnelNetworkName(BroadcastDomainType.getValue(uri)));
}
} else if (type == BroadcastDomainType.Storage) {
if (uri == null) {
@@ -1102,6 +1112,19 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
throw new CloudRuntimeException("Unable to support this type of network broadcast domain: " + nic.getBroadcastUri());
}
+ private String getOvsTunnelNetworkName(String broadcastUri) {
+ if (broadcastUri.contains(".")) {
+ String[] parts = broadcastUri.split(".");
+ return "OVS-DR-VPC-Bridge"+parts[0];
+ } else {
+ try {
+ return "OVSTunnel" + broadcastUri;
+ } catch (Exception e) {
+ return null;
+ }
+ }
+ }
+
protected VIF createVif(Connection conn, String vmName, VM vm, VirtualMachineTO vmSpec, NicTO nic) throws XmlRpcException, XenAPIException {
assert (nic.getUuid() != null) : "Nic should have a uuid value";
@@ -1122,7 +1145,7 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
if (vmSpec != null) {
vifr.otherConfig.put("cloudstack-vm-id", vmSpec.getUuid());
}
-
+ vifr.otherConfig.put("cloudstack-network-id", nic.getNetworkUuid());
vifr.network = getNetwork(conn, nic);
if (nic.getNetworkRateMbps() != null && nic.getNetworkRateMbps().intValue() != -1) {
@@ -5220,15 +5243,15 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
private Answer execute(OvsSetupBridgeCommand cmd) {
Connection conn = getConnection();
- findOrCreateTunnelNetwork(conn, cmd.getKey());
- configureTunnelNetwork(conn, cmd.getNetworkId(), cmd.getHostId(), cmd.getKey());
+ findOrCreateTunnelNetwork(conn, cmd.getBridgeName());
+ configureTunnelNetwork(conn, cmd.getNetworkId(), cmd.getHostId(), cmd.getBridgeName());
s_logger.debug("OVS Bridge configured");
return new Answer(cmd, true, null);
}
private Answer execute(OvsDestroyBridgeCommand cmd) {
Connection conn = getConnection();
- destroyTunnelNetwork(conn, cmd.getKey());
+ destroyTunnelNetwork(conn, cmd.getBridgeName());
s_logger.debug("OVS Bridge destroyed");
return new Answer(cmd, true, null);
}
@@ -5236,14 +5259,14 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
private Answer execute(OvsDestroyTunnelCommand cmd) {
Connection conn = getConnection();
try {
- Network nw = findOrCreateTunnelNetwork(conn, cmd.getNetworkId());
+ Network nw = findOrCreateTunnelNetwork(conn, cmd.getBridgeName());
if (nw == null) {
- s_logger.warn("Unable to find tunnel network for GRE key:" + cmd.getKey());
+ s_logger.warn("Unable to find tunnel network for GRE key:" + cmd.getBridgeName());
return new Answer(cmd, false, "No network found");
}
String bridge = nw.getBridge(conn);
- String result = callHostPlugin(conn, "ovstunnel", "destroy_tunnel", "bridge", bridge, "in_port", cmd.getInPortName());
+ String result = callHostPlugin(conn, "ovstunnel", "configure_ovs_bridge_for_network_topology", "bridge", bridge, "in_port", cmd.getInPortName());
if (result.equalsIgnoreCase("SUCCESS")) {
return new Answer(cmd, true, result);
} else {
@@ -5255,6 +5278,22 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
}
}
+ public Answer execute(OvsVpcPhysicalTopologyConfigCommand cmd) {
+ Connection conn = getConnection();
+ try {
+ String result = callHostPlugin(conn, "ovstunnel", "configure_ovs_bridge_for_network_topology", "bridge",
+ cmd.getBridgeName(), "host-id", ((Long)cmd.getHostId()).toString());
+ if (result.equalsIgnoreCase("SUCCESS")) {
+ return new Answer(cmd, true, result);
+ } else {
+ return new Answer(cmd, false, result);
+ }
+ } catch (Exception e) {
+ s_logger.warn("caught exception while updating host with latest VPC topology", e);
+ return new Answer(cmd, false, e.getMessage());
+ }
+ }
+
private Answer execute(UpdateHostPasswordCommand cmd) {
_password.add(cmd.getNewPassword());
return new Answer(cmd, true, null);
@@ -5264,17 +5303,19 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
Connection conn = getConnection();
String bridge = "unknown";
try {
- Network nw = findOrCreateTunnelNetwork(conn, cmd.getKey());
+ Network nw = findOrCreateTunnelNetwork(conn, cmd.getNetworkName());
if (nw == null) {
s_logger.debug("Error during bridge setup");
return new OvsCreateTunnelAnswer(cmd, false, "Cannot create network", bridge);
}
- configureTunnelNetwork(conn, cmd.getNetworkId(), cmd.getFrom(), cmd.getKey());
+ configureTunnelNetwork(conn, cmd.getNetworkId(), cmd.getFrom(), cmd.getNetworkName());
bridge = nw.getBridge(conn);
String result =
- callHostPlugin(conn, "ovstunnel", "create_tunnel", "bridge", bridge, "remote_ip", cmd.getRemoteIp(), "key", cmd.getKey().toString(), "from",
- cmd.getFrom().toString(), "to", cmd.getTo().toString());
+ callHostPlugin(conn, "ovstunnel", "create_tunnel", "bridge", bridge, "remote_ip", cmd.getRemoteIp(),
+ "key", cmd.getKey().toString(), "from",
+ cmd.getFrom().toString(), "to", cmd.getTo().toString(), "cloudstack-network-id",
+ cmd.getNetworkUuid());
String[] res = result.split(":");
if (res.length == 2 && res[0].equalsIgnoreCase("SUCCESS")) {
return new OvsCreateTunnelAnswer(cmd, true, result, res[1], bridge);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e045883c/plugins/network-elements/ovs/resources/META-INF/cloudstack/ovs/spring-ovs-context.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/ovs/resources/META-INF/cloudstack/ovs/spring-ovs-context.xml b/plugins/network-elements/ovs/resources/META-INF/cloudstack/ovs/spring-ovs-context.xml
index e60d93e..fa56d5d 100644
--- a/plugins/network-elements/ovs/resources/META-INF/cloudstack/ovs/spring-ovs-context.xml
+++ b/plugins/network-elements/ovs/resources/META-INF/cloudstack/ovs/spring-ovs-context.xml
@@ -38,5 +38,5 @@
<bean id="ovsTunnelManagerImpl" class="com.cloud.network.ovs.OvsTunnelManagerImpl" />
<bean id="ovsTunnelInterfaceDaoImpl" class="com.cloud.network.ovs.dao.OvsTunnelInterfaceDaoImpl" />
<bean id="ovsTunnelNetworkDaoImpl" class="com.cloud.network.ovs.dao.OvsTunnelNetworkDaoImpl" />
-
+ <bean id="ovsNetworkTopologyGuruImpl" class="com.cloud.network.ovs.OvsNetworkTopologyGuruImpl"/>
</beans>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e045883c/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsCreateTunnelCommand.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsCreateTunnelCommand.java b/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsCreateTunnelCommand.java
index 7f151fb..3e08531 100644
--- a/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsCreateTunnelCommand.java
+++ b/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsCreateTunnelCommand.java
@@ -20,10 +20,13 @@ package com.cloud.agent.api;
public class OvsCreateTunnelCommand extends Command {
Integer key;
String remoteIp;
+ String networkName;
Long from;
Long to;
long networkId;
+ String networkUuid;
+
// for debug info
String fromIp;
@@ -33,13 +36,15 @@ public class OvsCreateTunnelCommand extends Command {
}
public OvsCreateTunnelCommand(String remoteIp, Integer key, Long from,
- Long to, long networkId, String fromIp) {
+ Long to, long networkId, String fromIp, String networkName, String networkUuid) {
this.remoteIp = remoteIp;
this.key = key;
this.from = from;
this.to = to;
this.networkId = networkId;
this.fromIp = fromIp;
+ this.networkName = networkName;
+ this.networkUuid = networkUuid;
}
public Integer getKey() {
@@ -66,4 +71,16 @@ public class OvsCreateTunnelCommand extends Command {
return fromIp;
}
+ public String getNetworkName() {
+ return networkName;
+ }
+
+
+ public String getNetworkUuid() {
+ return networkUuid;
+ }
+
+ public void setNetworkUuid(String networkUuid) {
+ this.networkUuid = networkUuid;
+ }
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e045883c/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsDestroyBridgeCommand.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsDestroyBridgeCommand.java b/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsDestroyBridgeCommand.java
index 59b50be..f9205c5 100644
--- a/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsDestroyBridgeCommand.java
+++ b/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsDestroyBridgeCommand.java
@@ -21,19 +21,19 @@ package com.cloud.agent.api;
public class OvsDestroyBridgeCommand extends Command {
Long networkId;
- Integer key;
+ String name;
- public OvsDestroyBridgeCommand(Long networkId, Integer key) {
+ public OvsDestroyBridgeCommand(Long networkId, String name) {
this.networkId = networkId;
- this.key = key;
+ this.name = name;
}
public Long getNetworkId() {
return networkId;
}
- public Integer getKey() {
- return key;
+ public String getBridgeName() {
+ return name;
}
@Override
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e045883c/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsDestroyTunnelCommand.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsDestroyTunnelCommand.java b/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsDestroyTunnelCommand.java
index 4776a07..9fc6c37 100644
--- a/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsDestroyTunnelCommand.java
+++ b/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsDestroyTunnelCommand.java
@@ -20,14 +20,14 @@ package com.cloud.agent.api;
public class OvsDestroyTunnelCommand extends Command {
Long networkId;
- Integer key;
+ String networkName;
String inPortName;
- public OvsDestroyTunnelCommand(Long networkId, Integer key,
+ public OvsDestroyTunnelCommand(Long networkId, String networkName,
String inPortName) {
this.networkId = networkId;
this.inPortName = inPortName;
- this.key = key;
+ this.networkName = networkName;
}
public Long getNetworkId() {
@@ -38,8 +38,8 @@ public class OvsDestroyTunnelCommand extends Command {
return inPortName;
}
- public Integer getKey() {
- return key;
+ public String getBridgeName() {
+ return networkName;
}
@Override
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e045883c/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsSetupBridgeCommand.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsSetupBridgeCommand.java b/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsSetupBridgeCommand.java
index e3390f3..a104598 100644
--- a/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsSetupBridgeCommand.java
+++ b/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsSetupBridgeCommand.java
@@ -19,7 +19,7 @@ package com.cloud.agent.api;
public class OvsSetupBridgeCommand extends Command {
- Integer key;
+ String name;
Long hostId;
Long networkId;
@@ -28,14 +28,14 @@ public class OvsSetupBridgeCommand extends Command {
return true;
}
- public OvsSetupBridgeCommand(Integer key, Long hostId, Long networkId) {
- this.key = key;
+ public OvsSetupBridgeCommand(String name, Long hostId, Long networkId) {
+ this.name = name;
this.hostId = hostId;
this.networkId = networkId;
}
- public Integer getKey() {
- return key;
+ public String getBridgeName() {
+ return name;
}
public Long getHostId() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e045883c/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsVpcPhysicalTopologyConfigCommand.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsVpcPhysicalTopologyConfigCommand.java b/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsVpcPhysicalTopologyConfigCommand.java
new file mode 100644
index 0000000..35d4c6e
--- /dev/null
+++ b/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsVpcPhysicalTopologyConfigCommand.java
@@ -0,0 +1,127 @@
+// 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.
+package com.cloud.agent.api;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+
+/**
+ * This command represents view of how a VPC is laid out (on which hosts, which VM is on which host etc)
+ * on the physical infrastructure.
+ */
+public class OvsVpcPhysicalTopologyConfigCommand extends Command {
+
+ VpcConfig vpcConfig =null;
+ long hostId;
+ String bridgeName;
+
+ public static class Host {
+ long hostId;
+ String ipAddress;
+
+ public Host (long hostId, String ipAddress) {
+ this.hostId = hostId;
+ this.ipAddress = ipAddress;
+ }
+ }
+
+ public static class Nic {
+ String ipAddress;
+ String macAddress;
+ String networkUuid;
+ public Nic (String ipAddress, String macAddress, String networkUuid) {
+ this.ipAddress = ipAddress;
+ this.macAddress = macAddress;
+ this.networkUuid = networkUuid;
+ }
+ }
+
+ public static class Tier {
+ long greKey;
+ String networkUuid;
+ String gatewayIp;
+ String gatewayMac;
+ String cidr;
+ public Tier(long greKey, String networkUuid, String gatewayIp, String gatewayMac, String cidr) {
+ this.greKey = greKey;
+ this.networkUuid = networkUuid;
+ this.gatewayIp = gatewayIp;
+ this.gatewayMac = gatewayMac;
+ this.cidr = cidr;
+ }
+ }
+
+ public static class Vm {
+ long hostId;
+ Nic[] nics;
+ public Vm(long hostId, Nic[] nics) {
+ this.hostId = hostId;
+ this.nics = nics;
+ }
+ }
+
+ public static class Vpc {
+ String cidr;
+ Host[] hosts;
+ Tier[] tiers;
+ Vm[] vms;
+ public Vpc(Host[] hosts, Tier[] tiers, Vm[] vms, String cidr) {
+ this.hosts = hosts;
+ this.tiers = tiers;
+ this.vms = vms;
+ this.cidr = cidr;
+ }
+ }
+
+ public static class VpcConfig {
+ Vpc vpc;
+ public VpcConfig(Vpc vpc) {
+ this.vpc = vpc;
+ }
+ }
+
+ public OvsVpcPhysicalTopologyConfigCommand(Host[] hosts, Tier[] tiers, Vm[] vms, String cidr) {
+ Vpc vpc = new Vpc(hosts, tiers, vms, cidr);
+ vpcConfig = new VpcConfig(vpc);
+ }
+
+ public String getjsonVpcConfig() {
+ Gson gson = new GsonBuilder().create();
+ return gson.toJson(vpcConfig).toLowerCase();
+ }
+
+ @Override
+ public boolean executeInSequence() {
+ return false;
+ }
+
+ public void setHostId(long hostId) {
+ this.hostId = hostId;
+ }
+
+ public long getHostId() {
+ return hostId;
+ }
+
+ public String getBridgeName() {
+ return bridgeName;
+ }
+
+ public void setBridgeName(String bridgeName) {
+ this.bridgeName = bridgeName;
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e045883c/plugins/network-elements/ovs/src/com/cloud/network/element/OvsElement.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/ovs/src/com/cloud/network/element/OvsElement.java b/plugins/network-elements/ovs/src/com/cloud/network/element/OvsElement.java
index 05e81a1..c28d908 100644
--- a/plugins/network-elements/ovs/src/com/cloud/network/element/OvsElement.java
+++ b/plugins/network-elements/ovs/src/com/cloud/network/element/OvsElement.java
@@ -16,6 +16,8 @@
// under the License.
package com.cloud.network.element;
+import com.cloud.host.dao.HostDao;
+import com.cloud.vm.dao.UserVmDao;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -73,6 +75,8 @@ import com.cloud.vm.NicProfile;
import com.cloud.vm.ReservationContext;
import com.cloud.vm.VirtualMachineProfile;
import com.cloud.vm.dao.DomainRouterDao;
+import com.cloud.vm.UserVmVO;
+import com.cloud.vm.VirtualMachine;
@Local(value = {NetworkElement.class, ConnectivityProvider.class,
SourceNatServiceProvider.class, StaticNatServiceProvider.class,
@@ -93,6 +97,10 @@ StaticNatServiceProvider, IpDeployer {
DomainRouterDao _routerDao;
@Inject
VpcVirtualNetworkApplianceManager _routerMgr;
+ @Inject
+ UserVmDao _userVmDao;
+ @Inject
+ HostDao _hostDao;
private static final Logger s_logger = Logger.getLogger(OvsElement.class);
private static final Map<Service, Map<Capability, String>> capabilities = setCapabilities();
@@ -171,7 +179,12 @@ StaticNatServiceProvider, IpDeployer {
return false;
}
- _ovsTunnelMgr.vmCheckAndCreateTunnel(vm, network, dest);
+ if (vm.getType() != VirtualMachine.Type.User && vm.getType() != VirtualMachine.Type.DomainRouter) {
+ return false;
+ }
+
+ // prepare the tunnel network on the host, in order for VM to get launched
+ _ovsTunnelMgr.checkAndPrepareHostForTunnelNetwork(network, dest.getHost());
return true;
}
@@ -192,7 +205,25 @@ StaticNatServiceProvider, IpDeployer {
return false;
}
- _ovsTunnelMgr.checkAndDestroyTunnel(vm.getVirtualMachine(), network);
+ List<UserVmVO> userVms = _userVmDao.listByAccountIdAndHostId(vm.getVirtualMachine().getAccountId(),
+ vm.getVirtualMachine().getHostId());
+ if (vm.getType() == VirtualMachine.Type.User) {
+ if (userVms.size() > 1) {
+ return true;
+ }
+
+ List<DomainRouterVO> routers = _routerDao.findByNetwork(network.getId());
+ for (DomainRouterVO router : routers) {
+ if (router.getHostId().equals(vm.getVirtualMachine().getHostId())) {
+ return true;
+ }
+ }
+ } else if (vm.getType() == VirtualMachine.Type.DomainRouter && userVms.size() != 0) {
+ return true;
+ }
+
+ HostVO host = _hostDao.findById(vm.getVirtualMachine().getHostId());
+ _ovsTunnelMgr.checkAndRemoveHostFromTunnelNetwork(network, host);
return true;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e045883c/plugins/network-elements/ovs/src/com/cloud/network/guru/OvsGuestNetworkGuru.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/ovs/src/com/cloud/network/guru/OvsGuestNetworkGuru.java b/plugins/network-elements/ovs/src/com/cloud/network/guru/OvsGuestNetworkGuru.java
index 8fa636d..2814c2a 100644
--- a/plugins/network-elements/ovs/src/com/cloud/network/guru/OvsGuestNetworkGuru.java
+++ b/plugins/network-elements/ovs/src/com/cloud/network/guru/OvsGuestNetworkGuru.java
@@ -16,6 +16,8 @@
// under the License.
package com.cloud.network.guru;
+import com.cloud.network.vpc.VpcVO;
+import com.cloud.network.vpc.dao.VpcDao;
import javax.ejb.Local;
import javax.inject.Inject;
@@ -61,6 +63,8 @@ public class OvsGuestNetworkGuru extends GuestNetworkGuru {
OvsTunnelManager _ovsTunnelMgr;
@Inject
NetworkOfferingServiceMapDao _ntwkOfferingSrvcDao;
+ @Inject
+ VpcDao _vpcDao;
OvsGuestNetworkGuru() {
super();
@@ -145,10 +149,14 @@ public class OvsGuestNetworkGuru extends GuestNetworkGuru {
implemented.setCidr(network.getCidr());
}
- // do we need to create switch right now?
-
implemented.setBroadcastDomainType(BroadcastDomainType.Vswitch);
+ if (network.getVpcId() != null && isVpcEnabledForDistributedRouter(network.getVpcId())) {
+ String keyStr = BroadcastDomainType.getValue(implemented.getBroadcastUri());
+ Long vpcid= network.getVpcId();
+ implemented.setBroadcastUri(BroadcastDomainType.Vswitch.toUri(vpcid.toString()+keyStr));
+ }
+
return implemented;
}
@@ -215,4 +223,9 @@ public class OvsGuestNetworkGuru extends GuestNetworkGuru {
implemented.setBroadcastUri(network.getBroadcastUri());
}
}
+
+ boolean isVpcEnabledForDistributedRouter(long vpcId) {
+ VpcVO vpc = _vpcDao.findById(vpcId);
+ return vpc.usesDistributedRouter();
+ }
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e045883c/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsNetworkTopologyGuru.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsNetworkTopologyGuru.java b/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsNetworkTopologyGuru.java
new file mode 100644
index 0000000..c410d10
--- /dev/null
+++ b/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsNetworkTopologyGuru.java
@@ -0,0 +1,49 @@
+// 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.
+package com.cloud.network.ovs;
+
+import com.cloud.utils.component.Manager;
+
+import java.util.List;
+
+public interface OvsNetworkTopologyGuru extends Manager {
+
+ /**
+ * get the list of hypervisor hosts id's on which VM's belonging to the network currently spans
+ */
+ public List<Long> getNetworkSpanedHosts(long networkId);
+
+ /**
+ * get the list of hypervisor hosts id's on which VM's belonging to a VPC spans
+ */
+ public List<Long> getVpcSpannedHosts(long vpId);
+
+ /**
+ * get the list of VPC id's of the vpc's for which one or more VM's from the VPC are running on the host
+ */
+ public List<Long> getVpcOnHost(long hostId);
+
+ /**
+ * get the list of all active Vm id's in the VPC for all ther tiers
+ */
+ public List<Long> getAllActiveVmsInVpc(long vpcId);
+
+ /**
+ * get the list of all Vm id's in the VPC for all the tiers that are running on the host
+ */
+ public List<Long> getActiveVmsInVpcOnHost(long vpcId, long hostId);
+}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e045883c/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsNetworkTopologyGuruImpl.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsNetworkTopologyGuruImpl.java b/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsNetworkTopologyGuruImpl.java
new file mode 100644
index 0000000..7560e35
--- /dev/null
+++ b/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsNetworkTopologyGuruImpl.java
@@ -0,0 +1,74 @@
+package com.cloud.network.ovs;
+
+import com.cloud.utils.component.ManagerBase;
+import com.cloud.vm.DomainRouterVO;
+import com.cloud.vm.UserVmVO;
+import com.cloud.vm.VMInstanceVO;
+import com.cloud.vm.VirtualMachine;
+import com.cloud.vm.dao.DomainRouterDao;
+import com.cloud.vm.dao.UserVmDao;
+import java.util.ArrayList;
+import java.util.List;
+import javax.ejb.Local;
+import javax.inject.Inject;
+import org.springframework.stereotype.Component;
+
+@Component
+@Local(value = {OvsNetworkTopologyGuru.class})
+public class OvsNetworkTopologyGuruImpl extends ManagerBase implements OvsNetworkTopologyGuru {
+
+ @Inject
+ UserVmDao _userVmDao;
+ @Inject
+ DomainRouterDao _routerDao;
+
+ /**
+ * get the list of hypervisor hosts on which VM's belonging to a network currently spans
+ */
+ public List<Long> getNetworkSpanedHosts(long networkId) {
+ List<Long> hostIds = new ArrayList<Long>();
+ // Find active VMs with a NIC on the target network
+ List<UserVmVO> vms = _userVmDao.listByNetworkIdAndStates(networkId,
+ VirtualMachine.State.Running, VirtualMachine.State.Starting, VirtualMachine.State.Stopping, VirtualMachine.State.Unknown,
+ VirtualMachine.State.Migrating);
+ // Find routers for the network
+ List<DomainRouterVO> routers = _routerDao.findByNetwork(networkId);
+ List<VMInstanceVO> ins = new ArrayList<VMInstanceVO>();
+ if (vms != null) {
+ ins.addAll(vms);
+ }
+ if (routers.size() != 0) {
+ ins.addAll(routers);
+ }
+ for (VMInstanceVO v : ins) {
+ Long rh = v.getHostId();
+ if (rh == null) {
+ continue;
+ }
+ if (!hostIds.contains(rh)) {
+ hostIds.add(rh);
+ }
+ }
+ return hostIds;
+ }
+
+ @Override
+ public List<Long> getVpcSpannedHosts(long vpId) {
+ return null;
+ }
+
+ @Override
+ public List<Long> getVpcOnHost(long hostId) {
+ return null;
+ }
+
+ @Override
+ public List<Long> getAllActiveVmsInVpc(long vpcId) {
+ return null;
+ }
+
+ @Override
+ public List<Long> getActiveVmsInVpcOnHost(long vpcId, long hostId) {
+ return null;
+ }
+}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e045883c/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManager.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManager.java b/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManager.java
index 118beeb..cd88136 100644
--- a/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManager.java
+++ b/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManager.java
@@ -16,18 +16,24 @@
// under the License.
package com.cloud.network.ovs;
-import com.cloud.deploy.DeployDestination;
+import com.cloud.host.Host;
import com.cloud.network.Network;
import com.cloud.utils.component.Manager;
-import com.cloud.vm.VirtualMachine;
-import com.cloud.vm.VirtualMachineProfile;
public interface OvsTunnelManager extends Manager {
boolean isOvsTunnelEnabled();
- public void vmCheckAndCreateTunnel(VirtualMachineProfile vm, Network nw, DeployDestination dest);
+ /**
+ * create a bridge on the host if not already created for the network and establish full tunnel mesh with
+ * the rest of the hosts on which network spans
+ */
+ public void checkAndPrepareHostForTunnelNetwork(Network nw, Host host);
- public void checkAndDestroyTunnel(VirtualMachine vm, Network nw);
+ /**
+ * remove the bridge and tunnels to the hosts on which network spans if there are no other VM's
+ * belonging to the network are running on the host
+ */
+ public void checkAndRemoveHostFromTunnelNetwork(Network nw, Host host);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e045883c/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java b/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java
index 320568b..ae37095 100644
--- a/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java
+++ b/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java
@@ -16,6 +16,12 @@
// under the License.
package com.cloud.network.ovs;
+import com.cloud.network.dao.NetworkDao;
+import com.cloud.network.vpc.VpcManager;
+import com.cloud.vm.Nic;
+import com.cloud.vm.NicVO;
+import com.cloud.vm.VirtualMachine;
+import com.cloud.vm.dao.VMInstanceDao;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -42,9 +48,9 @@ import com.cloud.agent.api.OvsDestroyTunnelCommand;
import com.cloud.agent.api.OvsFetchInterfaceAnswer;
import com.cloud.agent.api.OvsFetchInterfaceCommand;
import com.cloud.agent.api.OvsSetupBridgeCommand;
+import com.cloud.agent.api.OvsVpcPhysicalTopologyConfigCommand;
import com.cloud.agent.manager.Commands;
import com.cloud.configuration.Config;
-import com.cloud.deploy.DeployDestination;
import com.cloud.exception.AgentUnavailableException;
import com.cloud.exception.OperationTimedoutException;
import com.cloud.host.Host;
@@ -60,19 +66,15 @@ import com.cloud.network.ovs.dao.OvsTunnelInterfaceDao;
import com.cloud.network.ovs.dao.OvsTunnelInterfaceVO;
import com.cloud.network.ovs.dao.OvsTunnelNetworkDao;
import com.cloud.network.ovs.dao.OvsTunnelNetworkVO;
+import com.cloud.network.ovs.dao.OvsTunnel;
+import com.cloud.network.vpc.dao.VpcDao;
+import com.cloud.network.vpc.VpcVO;
import com.cloud.utils.component.ManagerBase;
import com.cloud.utils.concurrency.NamedThreadFactory;
import com.cloud.utils.db.DB;
import com.cloud.utils.exception.CloudRuntimeException;
-import com.cloud.vm.DomainRouterVO;
-import com.cloud.vm.UserVmVO;
-import com.cloud.vm.VMInstanceVO;
-import com.cloud.vm.VirtualMachine;
-import com.cloud.vm.VirtualMachine.State;
-import com.cloud.vm.VirtualMachineProfile;
import com.cloud.vm.dao.DomainRouterDao;
import com.cloud.vm.dao.NicDao;
-import com.cloud.vm.dao.UserVmDao;
@Component
@Local(value = {OvsTunnelManager.class})
@@ -91,8 +93,7 @@ public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManage
HostDao _hostDao;
@Inject
PhysicalNetworkTrafficTypeDao _physNetTTDao;
- @Inject
- UserVmDao _userVmDao;
+
@Inject
DomainRouterDao _routerDao;
@Inject
@@ -101,6 +102,16 @@ public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManage
OvsTunnelInterfaceDao _tunnelInterfaceDao;
@Inject
AgentManager _agentMgr;
+ @Inject
+ OvsNetworkTopologyGuru _ovsNetworkToplogyGuru;
+ @Inject
+ VpcDao _vpcDao;
+ @Inject
+ VpcManager _vpcMgr;
+ @Inject
+ protected VMInstanceDao _vmInstanceDao;
+ @Inject
+ NetworkDao _networkDao;
@Override
public boolean configure(String name, Map<String, Object> params)
@@ -182,13 +193,13 @@ public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManage
from, to, networkId));
}
if (!r.getResult()) {
- tunnel.setState("FAILED");
- s_logger.warn("Create GRE tunnel failed due to " + r.getDetails()
+ tunnel.setState(OvsTunnel.State.Failed.name());
+ s_logger.warn("Create GRE tunnel from " + from + " to " + to + " failed due to " + r.getDetails()
+ s);
} else {
- tunnel.setState("SUCCESS");
+ tunnel.setState(OvsTunnel.State.Established.name());
tunnel.setPortName(r.getInPortName());
- s_logger.warn("Create GRE tunnel " + r.getDetails() + s);
+ s_logger.info("Create GRE tunnel from " + from + " to " + to + " succeeded." + r.getDetails() + s);
}
_tunnelNetworkDao.update(tunnel.getId(), tunnel);
}
@@ -249,13 +260,14 @@ public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManage
int key = 0;
try {
//The GRE key is actually in the host part of the URI
- // this is not true for lswitch/NiciraNvp!
String keyStr = BroadcastDomainType.getValue(network.getBroadcastUri());
- // The key is most certainly and int if network is a vlan.
- // !! not in the case of lswitch/pvlan/(possibly)vswitch
- // So we now feel quite safe in converting it into a string
- // by calling the appropriate BroadcastDomainType method
- key = Integer.parseInt(keyStr);
+ if (keyStr.contains(".")) {
+ String[] parts = keyStr.split(".");
+ key = Integer.parseInt(parts[1]);
+ } else {
+ key = Integer.parseInt(keyStr);
+ }
+
return key;
} catch (NumberFormatException e) {
s_logger.debug("Well well, how did '" + key
@@ -268,41 +280,23 @@ public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManage
}
@DB
- protected void checkAndCreateTunnel(VirtualMachine instance, Network nw, DeployDestination dest) {
+ protected void checkAndCreateTunnel(Network nw, Host host) {
s_logger.debug("Creating tunnels with OVS tunnel manager");
- if (instance.getType() != VirtualMachine.Type.User
- && instance.getType() != VirtualMachine.Type.DomainRouter) {
- s_logger.debug("Will not work if you're not"
- + "an instance or a virtual router");
- return;
- }
- long hostId = dest.getHost().getId();
+ long hostId = host.getId();
int key = getGreKey(nw);
- // Find active VMs with a NIC on the target network
- List<UserVmVO> vms = _userVmDao.listByNetworkIdAndStates(nw.getId(),
- State.Running, State.Starting, State.Stopping, State.Unknown,
- State.Migrating);
- // Find routers for the network
- List<DomainRouterVO> routers = _routerDao.findByNetwork(nw.getId());
- List<VMInstanceVO> ins = new ArrayList<VMInstanceVO>();
- if (vms != null) {
- ins.addAll(vms);
- }
- if (routers.size() != 0) {
- ins.addAll(routers);
- }
+ String bridgeName = generateBridgeName(nw, key);
List<Long> toHostIds = new ArrayList<Long>();
List<Long> fromHostIds = new ArrayList<Long>();
- for (VMInstanceVO v : ins) {
- Long rh = v.getHostId();
- if (rh == null || rh.longValue() == hostId) {
+ List<Long> networkSpannedHosts = _ovsNetworkToplogyGuru.getNetworkSpanedHosts(nw.getId());
+ for (Long rh : networkSpannedHosts) {
+ if (rh == hostId) {
continue;
}
OvsTunnelNetworkVO ta = _tunnelNetworkDao.getByFromToNetwork(hostId, rh.longValue(), nw.getId());
// Try and create the tunnel even if a previous attempt failed
- if (ta == null || ta.getState().equals("FAILED")) {
+ if (ta == null || ta.getState().equals(OvsTunnel.State.Failed.name())) {
s_logger.debug("Attempting to create tunnel from:" + hostId + " to:" + rh.longValue());
if (ta == null) {
createTunnelRecord(hostId, rh.longValue(), nw.getId(), key);
@@ -315,7 +309,7 @@ public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManage
ta = _tunnelNetworkDao.getByFromToNetwork(rh.longValue(),
hostId, nw.getId());
// Try and create the tunnel even if a previous attempt failed
- if (ta == null || ta.getState().equals("FAILED")) {
+ if (ta == null || ta.getState().equals(OvsTunnel.State.Failed.name())) {
s_logger.debug("Attempting to create tunnel from:" +
rh.longValue() + " to:" + hostId);
if (ta == null) {
@@ -329,9 +323,9 @@ public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManage
}
//TODO: Should we propagate the exception here?
try {
- String myIp = getGreEndpointIP(dest.getHost(), nw);
+ String myIp = getGreEndpointIP(host, nw);
if (myIp == null)
- throw new GreTunnelException("Unable to retrieve the source " + "endpoint for the GRE tunnel." + "Failure is on host:" + dest.getHost().getId());
+ throw new GreTunnelException("Unable to retrieve the source " + "endpoint for the GRE tunnel." + "Failure is on host:" + host.getId());
boolean noHost = true;
for (Long i : toHostIds) {
HostVO rHost = _hostDao.findById(i);
@@ -343,7 +337,8 @@ public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManage
+ "Failure is on host:" + rHost.getId());
Commands cmds = new Commands(
new OvsCreateTunnelCommand(otherIp, key,
- Long.valueOf(hostId), i, nw.getId(), myIp));
+ Long.valueOf(hostId), i, nw.getId(), myIp, bridgeName, nw.getUuid()));
+ s_logger.debug("Attempting to create tunnel from:" + hostId + " to:" + i + " for the network " + nw.getId());
s_logger.debug("Ask host " + hostId
+ " to create gre tunnel to " + i);
Answer[] answers = _agentMgr.send(hostId, cmds);
@@ -355,21 +350,19 @@ public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManage
HostVO rHost = _hostDao.findById(i);
String otherIp = getGreEndpointIP(rHost, nw);
Commands cmds = new Commands(new OvsCreateTunnelCommand(myIp,
- key, i, Long.valueOf(hostId), nw.getId(), otherIp));
+ key, i, Long.valueOf(hostId), nw.getId(), otherIp, bridgeName, nw.getUuid()));
s_logger.debug("Ask host " + i + " to create gre tunnel to "
+ hostId);
Answer[] answers = _agentMgr.send(i, cmds);
handleCreateTunnelAnswer(answers);
noHost = false;
}
+
// If no tunnels have been configured, perform the bridge setup
- // anyway
- // This will ensure VIF rules will be triggered
+ // anyway. This will ensure VIF rules will be triggered
if (noHost) {
- Commands cmds = new Commands(new OvsSetupBridgeCommand(key,
- hostId, nw.getId()));
- s_logger.debug("Ask host " + hostId
- + " to configure bridge for network:" + nw.getId());
+ Commands cmds = new Commands(new OvsSetupBridgeCommand(bridgeName, hostId, nw.getId()));
+ s_logger.debug("Ask host " + hostId + " to configure bridge for network:" + nw.getId());
Answer[] answers = _agentMgr.send(hostId, cmds);
handleSetupBridgeAnswer(answers);
}
@@ -384,10 +377,20 @@ public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManage
return true;
}
+ boolean isVpcEnabledForDistributedRouter(long vpcId) {
+ VpcVO vpc = _vpcDao.findById(vpcId);
+ return vpc.usesDistributedRouter();
+ }
+
@Override
- public void vmCheckAndCreateTunnel(VirtualMachineProfile vm,
- Network nw, DeployDestination dest) {
- checkAndCreateTunnel(vm.getVirtualMachine(), nw, dest);
+ public void checkAndPrepareHostForTunnelNetwork(Network nw, Host host) {
+ if (nw.getVpcId() != null && isVpcEnabledForDistributedRouter(nw.getVpcId())) {
+ // check and setup host to be in full tunnel mesh with each of the network in the VPC
+ checkAndCreateVpcTunnelNetworks(host, nw.getVpcId());
+ } else {
+ // check and setup host to be in full tunnel mesh with the network
+ checkAndCreateTunnel(nw, host);
+ }
}
@DB
@@ -440,45 +443,28 @@ public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManage
}
@Override
- public void checkAndDestroyTunnel(VirtualMachine vm, Network nw) {
- // if (!_isEnabled) {
- // return;
- // }
-
- List<UserVmVO> userVms = _userVmDao.listByAccountIdAndHostId(vm.getAccountId(), vm.getHostId());
- if (vm.getType() == VirtualMachine.Type.User) {
- if (userVms.size() > 1) {
- return;
- }
+ public void checkAndRemoveHostFromTunnelNetwork(Network nw, Host host) {
- List<DomainRouterVO> routers = _routerDao.findByNetwork(nw.getId());
- for (DomainRouterVO router : routers) {
- if (router.getHostId().equals(vm.getHostId())) {
- return;
- }
- }
- } else if (vm.getType() == VirtualMachine.Type.DomainRouter && userVms.size() != 0) {
- return;
- }
try {
/* Now we are last one on host, destroy the bridge with all
* the tunnels for this network */
int key = getGreKey(nw);
- Command cmd = new OvsDestroyBridgeCommand(nw.getId(), key);
- s_logger.debug("Destroying bridge for network " + nw.getId() + " on host:" + vm.getHostId());
- Answer ans = _agentMgr.send(vm.getHostId(), cmd);
- handleDestroyBridgeAnswer(ans, vm.getHostId(), nw.getId());
+ String bridgeName = generateBridgeName(nw, key);
+ Command cmd = new OvsDestroyBridgeCommand(nw.getId(), bridgeName);
+ s_logger.debug("Destroying bridge for network " + nw.getId() + " on host:" + host.getId());
+ Answer ans = _agentMgr.send(host.getId(), cmd);
+ handleDestroyBridgeAnswer(ans, host.getId(), nw.getId());
/* Then ask hosts have peer tunnel with me to destroy them */
List<OvsTunnelNetworkVO> peers =
- _tunnelNetworkDao.listByToNetwork(vm.getHostId(),
+ _tunnelNetworkDao.listByToNetwork(host.getId(),
nw.getId());
for (OvsTunnelNetworkVO p : peers) {
// If the tunnel was not successfully created don't bother to remove it
- if (p.getState().equals("SUCCESS")) {
- cmd = new OvsDestroyTunnelCommand(p.getNetworkId(), key,
+ if (p.getState().equals(OvsTunnel.State.Established.name())) {
+ cmd = new OvsDestroyTunnelCommand(p.getNetworkId(), bridgeName,
p.getPortName());
- s_logger.debug("Destroying tunnel to " + vm.getHostId() +
+ s_logger.debug("Destroying tunnel to " + host.getId() +
" from " + p.getFrom());
ans = _agentMgr.send(p.getFrom(), cmd);
handleDestroyTunnelAnswer(ans, p.getFrom(),
@@ -486,8 +472,204 @@ public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManage
}
}
} catch (Exception e) {
- s_logger.warn(String.format("Destroy tunnel(account:%1$s," + "hostId:%2$s) failed", vm.getAccountId(), vm.getHostId()), e);
+ s_logger.warn(String.format("Destroy tunnel failed", e));
+ }
+ }
+
+ private String generateBridgeName(Network nw, int key) {
+ if (nw.getVpcId() != null && isVpcEnabledForDistributedRouter(nw.getVpcId())) {
+ return "OVS-DR-VPC-Bridge" + nw.getVpcId();
+ } else {
+ return "OVSTunnel"+key;
+ }
+ }
+ private String generateBridgeNameForVpc(long vpcId) {
+ return "OVS-DR-VPC-Bridge" + vpcId;
+ }
+
+ public boolean sendVpcTopologyChangeUpdate(OvsVpcPhysicalTopologyConfigCommand updateCmd, long hostId, String bridgeName) {
+ try {
+ s_logger.debug("Sending VPC topology update to the host " + hostId);
+ updateCmd.setHostId(hostId);
+ updateCmd.setBridgeName(bridgeName);
+ Answer ans = _agentMgr.send(hostId, updateCmd);
+ if (ans.getResult()) {
+ s_logger.debug("Successfully updated the host " + hostId + " with latest VPC topology." );
+ return true;
+ } else {
+ s_logger.debug("Failed to update the host " + hostId + " with latest VPC topology." );
+ return false;
+ }
+ } catch (Exception e) {
+ s_logger.debug("Failed to updated the host " + hostId + " with latest VPC topology." );
+ return false;
}
}
+ OvsVpcPhysicalTopologyConfigCommand prepareVpcTopologyUpdate(long vpcId) {
+ VpcVO vpc = _vpcDao.findById(vpcId);
+ assert (vpc != null): "invalid vpc id";
+
+ List<? extends Network> vpcNetworks = _vpcMgr.getVpcNetworks(vpcId);
+ List<Long> hostIds = _ovsNetworkToplogyGuru.getVpcSpannedHosts(vpcId);
+ List<Long> vmIds = _ovsNetworkToplogyGuru.getAllActiveVmsInVpc(vpcId);
+
+ List<OvsVpcPhysicalTopologyConfigCommand.Host> hosts = new ArrayList<OvsVpcPhysicalTopologyConfigCommand.Host>();
+ List<OvsVpcPhysicalTopologyConfigCommand.Tier> tiers = new ArrayList<OvsVpcPhysicalTopologyConfigCommand.Tier>();
+ List<OvsVpcPhysicalTopologyConfigCommand.Vm> vms = new ArrayList<OvsVpcPhysicalTopologyConfigCommand.Vm>();
+
+ for (Long hostId : hostIds) {
+ HostVO hostDetails = _hostDao.findById(hostId);
+ String remoteIp = null;
+ for (Network network: vpcNetworks) {
+ try {
+ remoteIp = getGreEndpointIP(hostDetails, network);
+ } catch (Exception e) {
+
+ }
+ }
+ OvsVpcPhysicalTopologyConfigCommand.Host host = new OvsVpcPhysicalTopologyConfigCommand.Host(hostId, remoteIp);
+ hosts.add(host);
+ }
+
+ for (Network network: vpcNetworks) {
+ String key = BroadcastDomainType.getValue(network.getBroadcastUri());
+ long gre_key;
+ if (key.contains(".")) {
+ String[] parts = key.split(".");
+ gre_key = Long.parseLong(parts[1]);
+ } else {
+ try {
+ gre_key = Long.parseLong(BroadcastDomainType.getValue(key));
+ } catch (Exception e) {
+ return null;
+ }
+ }
+ NicVO nic = _nicDao.findByIp4AddressAndNetworkId(network.getGateway(), network.getId());
+ OvsVpcPhysicalTopologyConfigCommand.Tier tier = new OvsVpcPhysicalTopologyConfigCommand.Tier(gre_key,
+ network.getUuid(), network.getGateway(), nic.getMacAddress(), network.getCidr());
+ tiers.add(tier);
+ }
+
+ for (long vmId: vmIds) {
+ VirtualMachine vmInstance = _vmInstanceDao.findById(vmId);
+ List<OvsVpcPhysicalTopologyConfigCommand.Nic> vmNics = new ArrayList<OvsVpcPhysicalTopologyConfigCommand.Nic>();
+ for (Nic vmNic :_nicDao.listByVmId(vmId)) {
+ Network network = _networkDao.findById(vmNic.getNetworkId());
+ if (network.getTrafficType() == TrafficType.Guest) {
+ OvsVpcPhysicalTopologyConfigCommand.Nic nic = new OvsVpcPhysicalTopologyConfigCommand.Nic(
+ vmNic.getIp4Address(), vmNic.getMacAddress(), ((Long)vmNic.getNetworkId()).toString());
+ vmNics.add(nic);
+ }
+ }
+ OvsVpcPhysicalTopologyConfigCommand.Vm vm = new OvsVpcPhysicalTopologyConfigCommand.Vm(
+ vmInstance.getHostId(), vmNics.toArray(new OvsVpcPhysicalTopologyConfigCommand.Nic[vmNics.size()]));
+ vms.add(vm);
+ }
+ return new OvsVpcPhysicalTopologyConfigCommand(
+ hosts.toArray(new OvsVpcPhysicalTopologyConfigCommand.Host[hosts.size()]),
+ tiers.toArray(new OvsVpcPhysicalTopologyConfigCommand.Tier[tiers.size()]),
+ vms.toArray(new OvsVpcPhysicalTopologyConfigCommand.Vm[vms.size()]),
+ vpc.getCidr());
+ }
+
+ @DB
+ protected void checkAndCreateVpcTunnelNetworks(Host host, long vpcId) {
+
+ long hostId = host.getId();
+ List<? extends Network> vpcNetworks = _vpcMgr.getVpcNetworks(vpcId);
+ List<Long> vpcSpannedHostIds = _ovsNetworkToplogyGuru.getVpcSpannedHosts(vpcId);
+ String bridgeName=generateBridgeNameForVpc(vpcId);
+
+ for (Network vpcNetwork: vpcNetworks) {
+ int key = getGreKey(vpcNetwork);
+ List<Long> toHostIds = new ArrayList<Long>();
+ List<Long> fromHostIds = new ArrayList<Long>();
+
+ for (Long rh : vpcSpannedHostIds) {
+ if (rh == hostId) {
+ continue;
+ }
+ OvsTunnelNetworkVO ta = _tunnelNetworkDao.getByFromToNetwork(hostId, rh.longValue(), vpcNetwork.getId());
+ // Try and create the tunnel even if a previous attempt failed
+ if (ta == null || ta.getState().equals(OvsTunnel.State.Failed.name())) {
+ s_logger.debug("Attempting to create tunnel from:" + hostId + " to:" + rh.longValue());
+ if (ta == null) {
+ createTunnelRecord(hostId, rh.longValue(), vpcNetwork.getId(), key);
+ }
+ if (!toHostIds.contains(rh)) {
+ toHostIds.add(rh);
+ }
+ }
+
+ ta = _tunnelNetworkDao.getByFromToNetwork(rh.longValue(),
+ hostId, vpcNetwork.getId());
+ // Try and create the tunnel even if a previous attempt failed
+ if (ta == null || ta.getState().equals(OvsTunnel.State.Failed.name())) {
+ s_logger.debug("Attempting to create tunnel from:" +
+ rh.longValue() + " to:" + hostId);
+ if (ta == null) {
+ createTunnelRecord(rh.longValue(), hostId,
+ vpcNetwork.getId(), key);
+ }
+ if (!fromHostIds.contains(rh)) {
+ fromHostIds.add(rh);
+ }
+ }
+ }
+
+ try {
+ String myIp = getGreEndpointIP(host, vpcNetwork);
+ if (myIp == null)
+ throw new GreTunnelException("Unable to retrieve the source " + "endpoint for the GRE tunnel."
+ + "Failure is on host:" + host.getId());
+ boolean noHost = true;
+
+ for (Long i : toHostIds) {
+ HostVO rHost = _hostDao.findById(i);
+ String otherIp = getGreEndpointIP(rHost, vpcNetwork);
+ if (otherIp == null)
+ throw new GreTunnelException(
+ "Unable to retrieve the remote "
+ + "endpoint for the GRE tunnel."
+ + "Failure is on host:" + rHost.getId());
+ Commands cmds = new Commands(
+ new OvsCreateTunnelCommand(otherIp, key,
+ Long.valueOf(hostId), i, vpcNetwork.getId(), myIp, bridgeName,
+ vpcNetwork.getUuid()));
+ s_logger.debug("Attempting to create tunnel from:" + hostId + " to:" + i + " for the network "
+ + vpcNetwork.getId());
+ s_logger.debug("Ask host " + hostId
+ + " to create gre tunnel to " + i);
+ Answer[] answers = _agentMgr.send(hostId, cmds);
+ handleCreateTunnelAnswer(answers);
+ noHost = false;
+ }
+
+ for (Long i : fromHostIds) {
+ HostVO rHost = _hostDao.findById(i);
+ String otherIp = getGreEndpointIP(rHost, vpcNetwork);
+ Commands cmds = new Commands(new OvsCreateTunnelCommand(myIp,
+ key, i, Long.valueOf(hostId), vpcNetwork.getId(), otherIp, bridgeName,
+ vpcNetwork.getUuid()));
+ s_logger.debug("Ask host " + i + " to create gre tunnel to "
+ + hostId);
+ Answer[] answers = _agentMgr.send(i, cmds);
+ handleCreateTunnelAnswer(answers);
+ noHost = false;
+ }
+ } catch (GreTunnelException | OperationTimedoutException | AgentUnavailableException e) {
+ // I really thing we should do a better handling of these exceptions
+ s_logger.warn("Ovs Tunnel network created tunnel failed", e);
+ }
+ }
+
+ OvsVpcPhysicalTopologyConfigCommand topologyConfigCommand = prepareVpcTopologyUpdate(vpcId);
+ for (Long id: vpcSpannedHostIds) {
+ if (!sendVpcTopologyChangeUpdate(topologyConfigCommand, id, bridgeName)) {
+ s_logger.debug("Failed to send VPC topology change update to host : " + id + ". Moving on with rest of" +
+ "the host update.");
+ }
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e045883c/plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/OvsTunnel.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/OvsTunnel.java b/plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/OvsTunnel.java
new file mode 100644
index 0000000..3216ac7
--- /dev/null
+++ b/plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/OvsTunnel.java
@@ -0,0 +1,24 @@
+// 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.
+
+package com.cloud.network.ovs.dao;
+
+public interface OvsTunnel {
+ public enum State {
+ Created, Established, Failed
+ }
+}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e045883c/plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/OvsTunnelNetworkVO.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/OvsTunnelNetworkVO.java b/plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/OvsTunnelNetworkVO.java
index 2826912..88a7591 100644
--- a/plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/OvsTunnelNetworkVO.java
+++ b/plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/OvsTunnelNetworkVO.java
@@ -62,7 +62,7 @@ public class OvsTunnelNetworkVO implements InternalIdentity {
this.key = key;
this.networkId = networkId;
this.portName = "[]";
- this.state = "FAILED";
+ this.state = OvsTunnel.State.Created.name();
}
public void setKey(int key) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e045883c/scripts/vm/hypervisor/xenserver/ovstunnel
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/xenserver/ovstunnel b/scripts/vm/hypervisor/xenserver/ovstunnel
index d558e97..64a2d36 100755
--- a/scripts/vm/hypervisor/xenserver/ovstunnel
+++ b/scripts/vm/hypervisor/xenserver/ovstunnel
@@ -224,6 +224,7 @@ def create_tunnel(session, args):
gre_key = args.pop("key")
src_host = args.pop("from")
dst_host = args.pop("to")
+ network_uuid = args.pop("cloudstack-network-id")
logging.debug("Entering create_tunnel")
@@ -318,6 +319,7 @@ def create_tunnel(session, args):
# add flow rule to send the traffic from tunnel ports to L2 switching table only
lib.add_flow(bridge, priority=1000, in_port=tun_ofport, table=0, actions='resubmit(,1)')
+ lib.do_cmd([lib.VSCTL_PATH, "set", "interface", name, "options:cloudstack-network-id=%s" % network_uuid])
return "SUCCESS:%s" % name
except:
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e045883c/server/src/com/cloud/hypervisor/HypervisorGuruBase.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/hypervisor/HypervisorGuruBase.java b/server/src/com/cloud/hypervisor/HypervisorGuruBase.java
index 4af20c6..b643ec4 100644
--- a/server/src/com/cloud/hypervisor/HypervisorGuruBase.java
+++ b/server/src/com/cloud/hypervisor/HypervisorGuruBase.java
@@ -16,6 +16,7 @@
// under the License.
package com.cloud.hypervisor;
+import com.cloud.network.dao.NetworkVO;
import java.util.List;
import java.util.Map;
@@ -41,6 +42,7 @@ import com.cloud.vm.VMInstanceVO;
import com.cloud.vm.VirtualMachine;
import com.cloud.vm.VirtualMachineProfile;
import com.cloud.vm.dao.NicDao;
+import com.cloud.network.dao.NetworkDao;
import com.cloud.vm.dao.NicSecondaryIpDao;
import com.cloud.vm.dao.UserVmDetailsDao;
import com.cloud.vm.dao.VMInstanceDao;
@@ -52,6 +54,8 @@ public abstract class HypervisorGuruBase extends AdapterBase implements Hypervis
@Inject
NicDao _nicDao;
@Inject
+ NetworkDao _networkDao;
+ @Inject
VMInstanceDao _virtualMachineDao;
@Inject
UserVmDetailsDao _userVmDetailsDao;
@@ -87,6 +91,9 @@ public abstract class HypervisorGuruBase extends AdapterBase implements Hypervis
to.setName(profile.getName());
to.setSecurityGroupEnabled(profile.isSecurityGroupEnabled());
+ NetworkVO network = _networkDao.findById(profile.getNetworkId());
+ to.setNetworkUuid(network.getUuid());
+
// Workaround to make sure the TO has the UUID we need for Niciri integration
NicVO nicVO = _nicDao.findById(profile.getId());
to.setUuid(nicVO.getUuid());
[02/50] [abbrv] Merge branch 'master' into rbac.
Posted by hu...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99bdc8d8/server/src/com/cloud/api/ApiDispatcher.java
----------------------------------------------------------------------
diff --cc server/src/com/cloud/api/ApiDispatcher.java
index 4bc6578,27ff952..95074e2
--- a/server/src/com/cloud/api/ApiDispatcher.java
+++ b/server/src/com/cloud/api/ApiDispatcher.java
@@@ -33,14 -21,10 +21,13 @@@ import java.util.Map
import javax.annotation.PostConstruct;
import javax.inject.Inject;
-import com.cloud.event.EventTypes;
-import com.cloud.utils.ReflectUtil;
-import com.cloud.vm.VirtualMachine;
++import org.apache.log4j.Logger;
++
+import org.apache.cloudstack.acl.ControlledEntity;
+import org.apache.cloudstack.acl.InfrastructureEntity;
- import org.apache.cloudstack.acl.RoleType;
+import org.apache.cloudstack.acl.SecurityChecker.AccessType;
- import org.apache.cloudstack.api.ACL;
+import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
- import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
import org.apache.cloudstack.api.BaseAsyncCreateCmd;
import org.apache.cloudstack.api.BaseAsyncCustomIdCmd;
@@@ -50,43 -33,26 +36,33 @@@ import org.apache.cloudstack.api.BaseCu
import org.apache.cloudstack.context.CallContext;
import org.apache.cloudstack.framework.jobs.AsyncJob;
import org.apache.cloudstack.framework.jobs.AsyncJobManager;
--import org.apache.log4j.Logger;
- import com.cloud.exception.InvalidParameterValueException;
+ import com.cloud.api.dispatch.DispatchChain;
+ import com.cloud.api.dispatch.DispatchChainFactory;
+ import com.cloud.api.dispatch.DispatchTask;
++import com.cloud.event.EventTypes;
+import com.cloud.user.Account;
+import com.cloud.user.AccountManager;
- import com.cloud.utils.DateUtil;
+import com.cloud.utils.ReflectUtil;
- import com.cloud.utils.db.EntityManager;
- import com.cloud.utils.exception.CSExceptionErrorCode;
- import com.cloud.utils.exception.CloudRuntimeException;
++import com.cloud.vm.VirtualMachine;
public class ApiDispatcher {
private static final Logger s_logger = Logger.getLogger(ApiDispatcher.class.getName());
Long _createSnapshotQueueSizeLimit;
+
@Inject
- AsyncJobManager _asyncMgr = null;
- @Inject
- AccountManager _accountMgr = null;
+ AsyncJobManager _asyncMgr;
+
+ @Inject
- EntityManager _entityMgr = null;
++ AccountManager _accountMgr;
+
- private static ApiDispatcher s_instance;
+ @Inject()
+ protected DispatchChainFactory dispatchChainFactory;
- public static ApiDispatcher getInstance() {
- return s_instance;
- }
+ protected DispatchChain standardDispatchChain;
+
+ protected DispatchChain asyncCreationDispatchChain;
public ApiDispatcher() {
}
@@@ -100,41 -67,37 +77,54 @@@
_createSnapshotQueueSizeLimit = snapshotLimit;
}
- public void dispatchCreateCmd(BaseAsyncCreateCmd cmd, Map<String, String> params) throws Exception {
- processParameters(cmd, params);
- CallContext.current().setEventDisplayEnabled(cmd.isDisplayResourceEnabled());
- cmd.create();
+ public void dispatchCreateCmd(final BaseAsyncCreateCmd cmd, final Map<String, String> params) throws Exception {
+ asyncCreationDispatchChain.dispatch(new DispatchTask(cmd, params));
+ CallContext.current().setEventDisplayEnabled(cmd.isDisplayResourceEnabled());
}
+ private void doAccessChecks(BaseCmd cmd, Map<Object, AccessType> entitiesToAccess) {
+ Account caller = CallContext.current().getCallingAccount();
+
+ APICommand commandAnnotation = cmd.getClass().getAnnotation(APICommand.class);
+ String apiName = commandAnnotation != null ? commandAnnotation.name() : null;
+
+ if (!entitiesToAccess.isEmpty()) {
+ for (Object entity : entitiesToAccess.keySet()) {
+ if (entity instanceof ControlledEntity) {
+ _accountMgr.checkAccess(caller, entitiesToAccess.get(entity), false, apiName, (ControlledEntity) entity);
+ } else if (entity instanceof InfrastructureEntity) {
+ //FIXME: Move this code in adapter, remove code from Account manager
+ }
+ }
+ }
+ }
+
- public void dispatch(BaseCmd cmd, Map<String, String> params, boolean execute) throws Exception {
- processParameters(cmd, params);
- CallContext ctx = CallContext.current();
+ public void dispatch(final BaseCmd cmd, final Map<String, String> params, final boolean execute) throws Exception {
+ // Let the chain of responsibility dispatch gradually
+ standardDispatchChain.dispatch(new DispatchTask(cmd, params));
+
+ final CallContext ctx = CallContext.current();
ctx.setEventDisplayEnabled(cmd.isDisplayResourceEnabled());
+ // TODO This if shouldn't be here. Use polymorphism and move it to validateSpecificParameters
if (cmd instanceof BaseAsyncCmd) {
- BaseAsyncCmd asyncCmd = (BaseAsyncCmd)cmd;
- String startEventId = params.get("ctxStartEventId");
+ final BaseAsyncCmd asyncCmd = (BaseAsyncCmd)cmd;
+ final String startEventId = params.get(ApiConstants.CTX_START_EVENT_ID);
+ String uuid = params.get(ApiConstants.UUID);
ctx.setStartEventId(Long.valueOf(startEventId));
+ // Fow now use the key from EventTypes.java rather than getInstanceType bcz the later doesn't refer to the interfaces
+ // Add the resource id in the call context, also add some other first class object ids (for now vm) if available.
+ // TODO - this should be done for all the uuids passed in the cmd - so should be moved where uuid to id conversion happens.
+ if(EventTypes.getEntityForEvent(asyncCmd.getEventType()) != null){
+ ctx.putContextParameter(EventTypes.getEntityForEvent(asyncCmd.getEventType()), uuid);
+ }
+ if(params.get(ApiConstants.VIRTUAL_MACHINE_ID) != null){
+ ctx.putContextParameter(ReflectUtil.getEntityName(VirtualMachine.class), params.get(ApiConstants.VIRTUAL_MACHINE_ID));
+ }
+
// Synchronise job on the object if needed
if (asyncCmd.getJob() != null && asyncCmd.getSyncObjId() != null && asyncCmd.getSyncObjType() != null) {
Long queueSizeLimit = null;
@@@ -163,392 -127,6 +154,6 @@@
}
cmd.execute();
-
-- }
-
- @SuppressWarnings({"unchecked", "rawtypes"})
- public static void processParameters(BaseCmd cmd, Map<String, String> params) {
- Map<Object, AccessType> entitiesToAccess = new HashMap<Object, AccessType>();
- Map<String, Object> unpackedParams = cmd.unpackParams(params);
-
- if (cmd instanceof BaseListCmd) {
- Object pageSizeObj = unpackedParams.get(ApiConstants.PAGE_SIZE);
- Long pageSize = null;
- if (pageSizeObj != null) {
- pageSize = Long.valueOf((String)pageSizeObj);
- }
-
- if ((unpackedParams.get(ApiConstants.PAGE) == null) && (pageSize != null && !pageSize.equals(BaseListCmd.s_pageSizeUnlimited))) {
- ServerApiException ex = new ServerApiException(ApiErrorCode.PARAM_ERROR, "\"page\" parameter is required when \"pagesize\" is specified");
- ex.setCSErrorCode(CSExceptionErrorCode.getCSErrCode(ex.getClass().getName()));
- throw ex;
- } else if (pageSize == null && (unpackedParams.get(ApiConstants.PAGE) != null)) {
- throw new ServerApiException(ApiErrorCode.PARAM_ERROR, "\"pagesize\" parameter is required when \"page\" is specified");
- }
- }
-
- List<Field> fields = ReflectUtil.getAllFieldsForClass(cmd.getClass(), BaseCmd.class);
-
- for (Field field : fields) {
- Parameter parameterAnnotation = field.getAnnotation(Parameter.class);
- if ((parameterAnnotation == null) || !parameterAnnotation.expose()) {
- continue;
- }
-
- //TODO: Annotate @Validate on API Cmd classes, FIXME how to process Validate
- RoleType[] allowedRoles = parameterAnnotation.authorized();
- if (allowedRoles.length > 0) {
- boolean permittedParameter = false;
- Account caller = CallContext.current().getCallingAccount();
- for (RoleType allowedRole : allowedRoles) {
- if (allowedRole.getValue() == caller.getType()) {
- permittedParameter = true;
- break;
- }
- }
- if (!permittedParameter) {
- s_logger.debug("Ignoring paremeter " + parameterAnnotation.name() + " as the caller is not authorized to pass it in");
- continue;
- }
- }
-
- Object paramObj = unpackedParams.get(parameterAnnotation.name());
- if (paramObj == null) {
- if (parameterAnnotation.required()) {
- throw new ServerApiException(ApiErrorCode.PARAM_ERROR, "Unable to execute API command " +
- cmd.getCommandName().substring(0, cmd.getCommandName().length() - 8) + " due to missing parameter " + parameterAnnotation.name());
- }
- continue;
- }
-
- // marshall the parameter into the correct type and set the field value
- try {
- setFieldValue(field, cmd, paramObj, parameterAnnotation);
- } catch (IllegalArgumentException argEx) {
- if (s_logger.isDebugEnabled()) {
- s_logger.debug("Unable to execute API command " + cmd.getCommandName() + " due to invalid value " + paramObj + " for parameter " +
- parameterAnnotation.name());
- }
- throw new ServerApiException(ApiErrorCode.PARAM_ERROR, "Unable to execute API command " +
- cmd.getCommandName().substring(0, cmd.getCommandName().length() - 8) + " due to invalid value " + paramObj + " for parameter " +
- parameterAnnotation.name());
- } catch (ParseException parseEx) {
- if (s_logger.isDebugEnabled()) {
- s_logger.debug("Invalid date parameter " + paramObj + " passed to command " + cmd.getCommandName().substring(0, cmd.getCommandName().length() - 8));
- }
- throw new ServerApiException(ApiErrorCode.PARAM_ERROR, "Unable to parse date " + paramObj + " for command " +
- cmd.getCommandName().substring(0, cmd.getCommandName().length() - 8) + ", please pass dates in the format mentioned in the api documentation");
- } catch (InvalidParameterValueException invEx) {
- throw new ServerApiException(ApiErrorCode.PARAM_ERROR, "Unable to execute API command " +
- cmd.getCommandName().substring(0, cmd.getCommandName().length() - 8) + " due to invalid value. " + invEx.getMessage());
- } catch (CloudRuntimeException cloudEx) {
- s_logger.error("CloudRuntimeException", cloudEx);
- // FIXME: Better error message? This only happens if the API command is not executable, which typically
- //means
- // there was
- // and IllegalAccessException setting one of the parameters.
- throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Internal error executing API command " +
- cmd.getCommandName().substring(0, cmd.getCommandName().length() - 8));
- }
-
- //check access on the resource this field points to
- try {
- ACL checkAccess = field.getAnnotation(ACL.class);
- CommandType fieldType = parameterAnnotation.type();
-
- if (checkAccess != null) {
- // Verify that caller can perform actions in behalf of vm owner
- //acumulate all Controlled Entities together.
-
- //parse the array of resource types and in case of map check access on key or value or both as specified in @acl
- //implement external dao for classes that need findByName
- //for maps, specify access to be checkd on key or value.
-
- // find the controlled entity DBid by uuid
- if (parameterAnnotation.entityType() != null) {
- Class<?>[] entityList = parameterAnnotation.entityType()[0].getAnnotation(EntityReference.class).value();
-
- for (Class entity : entityList) {
- // Check if the parameter type is a single
- // Id or list of id's/name's
- switch (fieldType) {
- case LIST:
- CommandType listType = parameterAnnotation.collectionType();
- switch (listType) {
- case LONG:
- case UUID:
- List<Long> listParam = (List<Long>)field.get(cmd);
- for (Long entityId : listParam) {
- Object entityObj = s_instance._entityMgr.findById(entity, entityId);
- entitiesToAccess.put(entityObj, checkAccess.accessType());
- }
- break;
- /*
- * case STRING: List<String> listParam =
- * new ArrayList<String>(); listParam =
- * (List)field.get(cmd); for(String
- * entityName: listParam){
- * ControlledEntity entityObj =
- * (ControlledEntity
- * )daoClassInstance(entityId);
- * entitiesToAccess.add(entityObj); }
- * break;
- */
- default:
- break;
- }
- break;
- case LONG:
- case UUID:
- Object entityObj = s_instance._entityMgr.findById(entity, (Long)field.get(cmd));
- entitiesToAccess.put(entityObj, checkAccess.accessType());
- break;
- default:
- break;
- }
-
- if (ControlledEntity.class.isAssignableFrom(entity)) {
- if (s_logger.isDebugEnabled()) {
- s_logger.debug("ControlledEntity name is:" + entity.getName());
- }
+ }
- if (InfrastructureEntity.class.isAssignableFrom(entity)) {
- if (s_logger.isDebugEnabled()) {
- s_logger.debug("InfrastructureEntity name is:" + entity.getName());
- }
- }
- }
-
- }
-
- }
-
- } catch (IllegalArgumentException e) {
- s_logger.error("Error initializing command " + cmd.getCommandName() + ", field " + field.getName() + " is not accessible.");
- throw new CloudRuntimeException("Internal error initializing parameters for command " + cmd.getCommandName() + " [field " + field.getName() +
- " is not accessible]");
- } catch (IllegalAccessException e) {
- s_logger.error("Error initializing command " + cmd.getCommandName() + ", field " + field.getName() + " is not accessible.");
- throw new CloudRuntimeException("Internal error initializing parameters for command " + cmd.getCommandName() + " [field " + field.getName() +
- " is not accessible]");
- }
-
- }
-
- //check access on the entities.
- getInstance().doAccessChecks(cmd, entitiesToAccess);
-
- }
-
- private static Long translateUuidToInternalId(String uuid, Parameter annotation) {
- if (uuid.equals("-1")) {
- // FIXME: This is to handle a lot of hardcoded special cases where -1 is sent
- // APITODO: Find and get rid of all hardcoded params in API Cmds and service layer
- return -1L;
- }
- Long internalId = null;
- // If annotation's empty, the cmd existed before 3.x try conversion to long
- boolean isPre3x = annotation.since().isEmpty();
- // Match against Java's UUID regex to check if input is uuid string
- boolean isUuid = uuid.matches("^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$");
- // Enforce that it's uuid for newly added apis from version 3.x
- if (!isPre3x && !isUuid)
- return null;
- // Allow both uuid and internal id for pre3x apis
- if (isPre3x && !isUuid) {
- try {
- internalId = Long.parseLong(uuid);
- } catch (NumberFormatException e) {
- internalId = null;
- }
- if (internalId != null)
- return internalId;
- }
- // There may be multiple entities defined on the @EntityReference of a Response.class
- // UUID CommandType would expect only one entityType, so use the first entityType
- Class<?>[] entities = annotation.entityType()[0].getAnnotation(EntityReference.class).value();
- // Go through each entity which is an interface to a VO class and get a VO object
- // Try to getId() for the object using reflection, break on first non-null value
- for (Class<?> entity : entities) {
- // For backward compatibility, we search within removed entities and let service layer deal
- // with removed ones, return empty response or error
- Object objVO = s_instance._entityMgr.findByUuidIncludingRemoved(entity, uuid);
- if (objVO == null) {
- continue;
- }
- // Invoke the getId method, get the internal long ID
- // If that fails hide exceptions as the uuid may not exist
- try {
- internalId = ((InternalIdentity)objVO).getId();
- } catch (IllegalArgumentException e) {
- } catch (NullPointerException e) {
- }
- // Return on first non-null Id for the uuid entity
- if (internalId != null)
- break;
- }
- if (internalId == null) {
- if (s_logger.isDebugEnabled())
- s_logger.debug("Object entity uuid = " + uuid + " does not exist in the database.");
- throw new InvalidParameterValueException("Invalid parameter " + annotation.name() + " value=" + uuid +
- " due to incorrect long value format, or entity does not exist or due to incorrect parameter annotation for the field in api cmd class.");
- }
- return internalId;
- }
-
- @SuppressWarnings({"unchecked", "rawtypes"})
- private static void setFieldValue(Field field, BaseCmd cmdObj, Object paramObj, Parameter annotation) throws IllegalArgumentException, ParseException {
- try {
- field.setAccessible(true);
- CommandType fieldType = annotation.type();
- switch (fieldType) {
- case BOOLEAN:
- field.set(cmdObj, Boolean.valueOf(paramObj.toString()));
- break;
- case DATE:
- // This piece of code is for maintaining backward compatibility
- // and support both the date formats(Bug 9724)
- // Do the date messaging for ListEventsCmd only
- if (cmdObj instanceof ListEventsCmd || cmdObj instanceof DeleteEventsCmd || cmdObj instanceof ArchiveEventsCmd ||
- cmdObj instanceof ArchiveAlertsCmd || cmdObj instanceof DeleteAlertsCmd) {
- boolean isObjInNewDateFormat = isObjInNewDateFormat(paramObj.toString());
- if (isObjInNewDateFormat) {
- DateFormat newFormat = BaseCmd.NEW_INPUT_FORMAT;
- synchronized (newFormat) {
- field.set(cmdObj, newFormat.parse(paramObj.toString()));
- }
- } else {
- DateFormat format = BaseCmd.INPUT_FORMAT;
- synchronized (format) {
- Date date = format.parse(paramObj.toString());
- if (field.getName().equals("startDate")) {
- date = messageDate(date, 0, 0, 0);
- } else if (field.getName().equals("endDate")) {
- date = messageDate(date, 23, 59, 59);
- }
- field.set(cmdObj, date);
- }
- }
- } else {
- DateFormat format = BaseCmd.INPUT_FORMAT;
- synchronized (format) {
- format.setLenient(false);
- field.set(cmdObj, format.parse(paramObj.toString()));
- }
- }
- break;
- case FLOAT:
- // Assuming that the parameters have been checked for required before now,
- // we ignore blank or null values and defer to the command to set a default
- // value for optional parameters ...
- if (paramObj != null && isNotBlank(paramObj.toString())) {
- field.set(cmdObj, Float.valueOf(paramObj.toString()));
- }
- break;
- case INTEGER:
- // Assuming that the parameters have been checked for required before now,
- // we ignore blank or null values and defer to the command to set a default
- // value for optional parameters ...
- if (paramObj != null && isNotBlank(paramObj.toString())) {
- field.set(cmdObj, Integer.valueOf(paramObj.toString()));
- }
- break;
- case LIST:
- List listParam = new ArrayList();
- StringTokenizer st = new StringTokenizer(paramObj.toString(), ",");
- while (st.hasMoreTokens()) {
- String token = st.nextToken();
- CommandType listType = annotation.collectionType();
- switch (listType) {
- case INTEGER:
- listParam.add(Integer.valueOf(token));
- break;
- case UUID:
- if (token.isEmpty())
- break;
- Long internalId = translateUuidToInternalId(token, annotation);
- listParam.add(internalId);
- break;
- case LONG: {
- listParam.add(Long.valueOf(token));
- }
- break;
- case SHORT:
- listParam.add(Short.valueOf(token));
- case STRING:
- listParam.add(token);
- break;
- }
- }
- field.set(cmdObj, listParam);
- break;
- case UUID:
- if (paramObj.toString().isEmpty())
- break;
- Long internalId = translateUuidToInternalId(paramObj.toString(), annotation);
- field.set(cmdObj, internalId);
- break;
- case LONG:
- field.set(cmdObj, Long.valueOf(paramObj.toString()));
- break;
- case SHORT:
- field.set(cmdObj, Short.valueOf(paramObj.toString()));
- break;
- case STRING:
- if ((paramObj != null) && paramObj.toString().length() > annotation.length()) {
- s_logger.error("Value greater than max allowed length " + annotation.length() + " for param: " + field.getName());
- throw new InvalidParameterValueException("Value greater than max allowed length " + annotation.length() + " for param: " + field.getName());
- }
- field.set(cmdObj, paramObj.toString());
- break;
- case TZDATE:
- field.set(cmdObj, DateUtil.parseTZDateString(paramObj.toString()));
- break;
- case MAP:
- default:
- field.set(cmdObj, paramObj);
- break;
- }
- } catch (IllegalAccessException ex) {
- s_logger.error("Error initializing command " + cmdObj.getCommandName() + ", field " + field.getName() + " is not accessible.");
- throw new CloudRuntimeException("Internal error initializing parameters for command " + cmdObj.getCommandName() + " [field " + field.getName() +
- " is not accessible]");
- }
- }
-
- private static boolean isObjInNewDateFormat(String string) {
- Matcher matcher = BaseCmd.newInputDateFormat.matcher(string);
- return matcher.matches();
- }
-
- private static Date messageDate(Date date, int hourOfDay, int minute, int second) {
- Calendar cal = Calendar.getInstance();
- cal.setTime(date);
- cal.set(Calendar.HOUR_OF_DAY, hourOfDay);
- cal.set(Calendar.MINUTE, minute);
- cal.set(Calendar.SECOND, second);
- return cal.getTime();
- }
-
- public static void plugService(Field field, BaseCmd cmd) {
-
- Class<?> fc = field.getType();
- Object instance = null;
-
- if (instance == null) {
- throw new CloudRuntimeException("Unable to plug service " + fc.getSimpleName() + " in command " + cmd.getClass().getSimpleName());
- }
-
- try {
- field.setAccessible(true);
- field.set(cmd, instance);
- } catch (IllegalArgumentException e) {
- s_logger.error("IllegalArgumentException at plugService for command " + cmd.getCommandName() + ", field " + field.getName());
- throw new CloudRuntimeException("Internal error at plugService for command " + cmd.getCommandName() + " [Illegal argumet at field " + field.getName() + "]");
- } catch (IllegalAccessException e) {
- s_logger.error("Error at plugService for command " + cmd.getCommandName() + ", field " + field.getName() + " is not accessible.");
- throw new CloudRuntimeException("Internal error at plugService for command " + cmd.getCommandName() + " [field " + field.getName() + " is not accessible]");
- }
- }
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99bdc8d8/server/src/com/cloud/api/ApiResponseHelper.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99bdc8d8/server/src/com/cloud/api/ApiServer.java
----------------------------------------------------------------------
diff --cc server/src/com/cloud/api/ApiServer.java
index 5ab65f4,3502689..e4486c1
--- a/server/src/com/cloud/api/ApiServer.java
+++ b/server/src/com/cloud/api/ApiServer.java
@@@ -53,39 -53,12 +53,40 @@@ import javax.naming.ConfigurationExcept
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
-import com.cloud.event.EventTypes;
-import com.cloud.utils.ReflectUtil;
-import com.cloud.vm.VirtualMachine;
+import org.apache.commons.codec.binary.Base64;
+import org.apache.http.ConnectionClosedException;
+import org.apache.http.HttpException;
+import org.apache.http.HttpRequest;
+import org.apache.http.HttpResponse;
+import org.apache.http.HttpServerConnection;
+import org.apache.http.HttpStatus;
+import org.apache.http.NameValuePair;
+import org.apache.http.client.utils.URLEncodedUtils;
+import org.apache.http.entity.BasicHttpEntity;
+import org.apache.http.impl.DefaultHttpResponseFactory;
+import org.apache.http.impl.DefaultHttpServerConnection;
+import org.apache.http.impl.NoConnectionReuseStrategy;
+import org.apache.http.impl.SocketHttpServerConnection;
+import org.apache.http.params.BasicHttpParams;
+import org.apache.http.params.CoreConnectionPNames;
+import org.apache.http.params.CoreProtocolPNames;
+import org.apache.http.params.HttpParams;
+import org.apache.http.protocol.BasicHttpContext;
+import org.apache.http.protocol.BasicHttpProcessor;
+import org.apache.http.protocol.HttpContext;
+import org.apache.http.protocol.HttpRequestHandler;
+import org.apache.http.protocol.HttpRequestHandlerRegistry;
+import org.apache.http.protocol.HttpService;
+import org.apache.http.protocol.ResponseConnControl;
+import org.apache.http.protocol.ResponseContent;
+import org.apache.http.protocol.ResponseDate;
+import org.apache.http.protocol.ResponseServer;
+import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
+
import org.apache.cloudstack.acl.APIChecker;
import org.apache.cloudstack.api.APICommand;
+ import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
import org.apache.cloudstack.api.BaseAsyncCreateCmd;
@@@ -122,12 -94,44 +123,15 @@@ import org.apache.cloudstack.framework.
import org.apache.cloudstack.framework.jobs.AsyncJobManager;
import org.apache.cloudstack.framework.jobs.impl.AsyncJobVO;
import org.apache.cloudstack.managed.context.ManagedContextRunnable;
-import org.apache.commons.codec.binary.Base64;
-import org.apache.http.ConnectionClosedException;
-import org.apache.http.HttpException;
-import org.apache.http.HttpRequest;
-import org.apache.http.HttpResponse;
-import org.apache.http.HttpServerConnection;
-import org.apache.http.HttpStatus;
-import org.apache.http.NameValuePair;
-import org.apache.http.client.utils.URLEncodedUtils;
-import org.apache.http.entity.BasicHttpEntity;
-import org.apache.http.impl.DefaultHttpResponseFactory;
-import org.apache.http.impl.DefaultHttpServerConnection;
-import org.apache.http.impl.NoConnectionReuseStrategy;
-import org.apache.http.impl.SocketHttpServerConnection;
-import org.apache.http.params.BasicHttpParams;
-import org.apache.http.params.CoreConnectionPNames;
-import org.apache.http.params.CoreProtocolPNames;
-import org.apache.http.params.HttpParams;
-import org.apache.http.protocol.BasicHttpContext;
-import org.apache.http.protocol.BasicHttpProcessor;
-import org.apache.http.protocol.HttpContext;
-import org.apache.http.protocol.HttpRequestHandler;
-import org.apache.http.protocol.HttpRequestHandlerRegistry;
-import org.apache.http.protocol.HttpService;
-import org.apache.http.protocol.ResponseConnControl;
-import org.apache.http.protocol.ResponseContent;
-import org.apache.http.protocol.ResponseDate;
-import org.apache.http.protocol.ResponseServer;
-import org.apache.log4j.Logger;
-import org.springframework.stereotype.Component;
+ import com.cloud.api.dispatch.DispatchChainFactory;
+ import com.cloud.api.dispatch.DispatchTask;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.configuration.Config;
import com.cloud.domain.Domain;
import com.cloud.domain.DomainVO;
import com.cloud.event.ActionEventUtils;
++import com.cloud.event.EventTypes;
import com.cloud.exception.AccountLimitException;
import com.cloud.exception.CloudAuthenticationException;
import com.cloud.exception.InsufficientCapacityException;
@@@ -144,6 -148,6 +148,7 @@@ import com.cloud.user.UserAccount
import com.cloud.user.UserVO;
import com.cloud.utils.NumbersUtil;
import com.cloud.utils.Pair;
++import com.cloud.utils.ReflectUtil;
import com.cloud.utils.StringUtils;
import com.cloud.utils.component.ComponentContext;
import com.cloud.utils.component.ManagerBase;
@@@ -154,6 -158,6 +159,7 @@@ import com.cloud.utils.db.SearchCriteri
import com.cloud.utils.db.TransactionLegacy;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.utils.exception.ExceptionProxyObject;
++import com.cloud.vm.VirtualMachine;
@Component
public class ApiServer extends ManagerBase implements HttpRequestHandler, ApiServerService {
@@@ -234,14 -245,12 +248,15 @@@
if (at == null) {
throw new CloudRuntimeException(String.format("%s is claimed as a API command, but it doesn't have @APICommand annotation", cmdClass.getName()));
}
- final String apiName = at.name();
- if (s_apiNameCmdClassMap.containsKey(apiName)) {
- s_logger.error("API Cmd class " + cmdClass.getName() + " has non-unique apiname" + apiName);
- continue;
++
+ String apiName = at.name();
+ List<Class<?>> apiCmdList = s_apiNameCmdClassMap.get(apiName);
+ if (apiCmdList == null) {
+ apiCmdList = new ArrayList<Class<?>>();
+ s_apiNameCmdClassMap.put(apiName, apiCmdList);
}
- s_apiNameCmdClassMap.put(apiName, cmdClass);
+ apiCmdList.add(cmdClass);
+
}
setEncodeApiResponse(Boolean.valueOf(_configDao.getValue(Config.EncodeApiResponse.key())));
@@@ -392,10 -414,10 +420,10 @@@
StringUtils.cleanString(response));
}
else
- buildAuditTrail(auditTrailSb, command[0], response);
+ buildAuditTrail(auditTrailSb, command[0], response);
} else {
if (!command[0].equalsIgnoreCase("login") && !command[0].equalsIgnoreCase("logout")) {
- String errorString = "Unknown API command: " + command[0];
+ final String errorString = "Unknown API command: " + command[0];
s_logger.warn(errorString);
auditTrailSb.append(" " + errorString);
throw new ServerApiException(ApiErrorCode.UNSUPPORTED_ACTION_ERROR, errorString);
@@@ -423,35 -445,35 +451,35 @@@
s_logger.info("PermissionDenied: " + ex.getMessage());
}
throw new ServerApiException(ApiErrorCode.ACCOUNT_ERROR, ex.getMessage(), ex);
- } catch (AccountLimitException ex) {
+ } catch (final AccountLimitException ex) {
s_logger.info(ex.getMessage());
throw new ServerApiException(ApiErrorCode.ACCOUNT_RESOURCE_LIMIT_ERROR, ex.getMessage(), ex);
- } catch (InsufficientCapacityException ex) {
+ } catch (final InsufficientCapacityException ex) {
s_logger.info(ex.getMessage());
String errorMsg = ex.getMessage();
- if (CallContext.current().getCallingAccount().getType() != Account.ACCOUNT_TYPE_ADMIN) {
+ if (!_accountMgr.isRootAdmin(CallContext.current().getCallingAccount().getId())) {
// hide internal details to non-admin user for security reason
errorMsg = BaseCmd.USER_ERROR_MESSAGE;
}
throw new ServerApiException(ApiErrorCode.INSUFFICIENT_CAPACITY_ERROR, errorMsg, ex);
- } catch (ResourceAllocationException ex) {
+ } catch (final ResourceAllocationException ex) {
s_logger.info(ex.getMessage());
throw new ServerApiException(ApiErrorCode.RESOURCE_ALLOCATION_ERROR, ex.getMessage(), ex);
- } catch (ResourceUnavailableException ex) {
+ } catch (final ResourceUnavailableException ex) {
s_logger.info(ex.getMessage());
String errorMsg = ex.getMessage();
- if (CallContext.current().getCallingAccount().getType() != Account.ACCOUNT_TYPE_ADMIN) {
+ if (!_accountMgr.isRootAdmin(CallContext.current().getCallingAccount().getId())) {
// hide internal details to non-admin user for security reason
errorMsg = BaseCmd.USER_ERROR_MESSAGE;
}
throw new ServerApiException(ApiErrorCode.RESOURCE_UNAVAILABLE_ERROR, errorMsg, ex);
- } catch (ServerApiException ex) {
+ } catch (final ServerApiException ex) {
s_logger.info(ex.getDescription());
throw ex;
- } catch (Exception ex) {
- s_logger.error("unhandled exception executing api command: " + ((command == null) ? "null" : command[0]), ex);
+ } catch (final Exception ex) {
+ s_logger.error("unhandled exception executing api command: " + ((command == null) ? "null" : command), ex);
String errorMsg = ex.getMessage();
- if (CallContext.current().getCallingAccount().getType() != Account.ACCOUNT_TYPE_ADMIN) {
+ if (!_accountMgr.isRootAdmin(CallContext.current().getCallingAccount().getId())) {
// hide internal details to non-admin user for security reason
errorMsg = BaseCmd.USER_ERROR_MESSAGE;
}
@@@ -553,23 -589,12 +595,12 @@@
// if the command is of the listXXXCommand, we will need to also return the
// the job id and status if possible
// For those listXXXCommand which we have already created DB views, this step is not needed since async job is joined in their db views.
- if (cmdObj instanceof BaseListCmd && !(cmdObj instanceof ListVMsCmd) && !(cmdObj instanceof ListRoutersCmd)
- && !(cmdObj instanceof ListSecurityGroupsCmd)
- && !(cmdObj instanceof ListTagsCmd)
- && !(cmdObj instanceof ListEventsCmd)
- && !(cmdObj instanceof ListVMGroupsCmd)
- && !(cmdObj instanceof ListProjectsCmd)
- && !(cmdObj instanceof ListProjectAccountsCmd)
- && !(cmdObj instanceof ListProjectInvitationsCmd)
- && !(cmdObj instanceof ListHostsCmd)
- && !(cmdObj instanceof ListVolumesCmd)
- && !(cmdObj instanceof ListUsersCmd)
- && !(cmdObj instanceof ListAccountsCmd)
- && !(cmdObj instanceof ListStoragePoolsCmd)
- && !(cmdObj instanceof ListDiskOfferingsCmd)
- && !(cmdObj instanceof ListServiceOfferingsCmd)
- && !(cmdObj instanceof ListZonesCmd)
- ) {
+ if (cmdObj instanceof BaseListCmd && !(cmdObj instanceof ListVMsCmd) && !(cmdObj instanceof ListRoutersCmd) && !(cmdObj instanceof ListSecurityGroupsCmd) &&
+ !(cmdObj instanceof ListTagsCmd) && !(cmdObj instanceof ListEventsCmd) && !(cmdObj instanceof ListVMGroupsCmd) && !(cmdObj instanceof ListProjectsCmd) &&
+ !(cmdObj instanceof ListProjectAccountsCmd) && !(cmdObj instanceof ListProjectInvitationsCmd) && !(cmdObj instanceof ListHostsCmd) &&
+ !(cmdObj instanceof ListVolumesCmd) && !(cmdObj instanceof ListUsersCmd) && !(cmdObj instanceof ListAccountsCmd) &&
+ !(cmdObj instanceof ListStoragePoolsCmd) && !(cmdObj instanceof ListDiskOfferingsCmd) && !(cmdObj instanceof ListServiceOfferingsCmd) &&
- !(cmdObj instanceof ListZonesByCmd)) {
++ !(cmdObj instanceof ListZonesCmd)) {
buildAsyncListResponse((BaseListCmd) cmdObj, caller);
}
@@@ -988,10 -988,10 +1019,10 @@@
.setIntParameter(CoreConnectionPNames.SOCKET_BUFFER_SIZE, 8 * 1024)
.setBooleanParameter(CoreConnectionPNames.STALE_CONNECTION_CHECK, false)
.setBooleanParameter(CoreConnectionPNames.TCP_NODELAY, true)
- .setParameter(CoreProtocolPNames.ORIGIN_SERVER, "HttpComponents/1.1");
+ .setParameter(CoreProtocolPNames.ORIGIN_SERVER, "HttpComponents/1.1");
// Set up the HTTP protocol processor
- BasicHttpProcessor httpproc = new BasicHttpProcessor();
+ final BasicHttpProcessor httpproc = new BasicHttpProcessor();
httpproc.addInterceptor(new ResponseDate());
httpproc.addInterceptor(new ResponseServer());
httpproc.addInterceptor(new ResponseContent());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99bdc8d8/server/src/com/cloud/api/query/QueryManagerImpl.java
----------------------------------------------------------------------
diff --cc server/src/com/cloud/api/query/QueryManagerImpl.java
index 96647f8,47d2aec..0554e3a
--- a/server/src/com/cloud/api/query/QueryManagerImpl.java
+++ b/server/src/com/cloud/api/query/QueryManagerImpl.java
@@@ -751,50 -728,95 +751,61 @@@ public class QueryManagerImpl extends M
Boolean isRecursive = domainIdRecursiveListProject.second();
ListProjectResourcesCriteria listProjectResourcesCriteria = domainIdRecursiveListProject.third();
+ Filter searchFilter = new Filter(UserVmJoinVO.class, "id", true, cmd.getStartIndex(),
+ cmd.getPageSizeVal());
+
+ List<Long> ids = null;
+ if (cmd.getId() != null) {
+ if (cmd.getIds() != null && !cmd.getIds().isEmpty()) {
+ throw new InvalidParameterValueException("Specify either id or ids but not both parameters");
+ }
+ ids = new ArrayList<Long>();
+ ids.add(cmd.getId());
+ } else {
+ ids = cmd.getIds();
+ }
+
- Criteria c = new Criteria("id", Boolean.TRUE, cmd.getStartIndex(), cmd.getPageSizeVal());
- // Criteria c = new Criteria(null, Boolean.FALSE, cmd.getStartIndex(),
- // cmd.getPageSizeVal()); //version without default sorting
- c.addCriteria(Criteria.KEYWORD, cmd.getKeyword());
- c.addCriteria(Criteria.ID, ids);
- c.addCriteria(Criteria.NAME, cmd.getName());
- c.addCriteria(Criteria.STATE, cmd.getState());
- c.addCriteria(Criteria.DATACENTERID, cmd.getZoneId());
- c.addCriteria(Criteria.GROUPID, cmd.getGroupId());
- c.addCriteria(Criteria.FOR_VIRTUAL_NETWORK, cmd.getForVirtualNetwork());
- c.addCriteria(Criteria.NETWORKID, cmd.getNetworkId());
- c.addCriteria(Criteria.TEMPLATE_ID, cmd.getTemplateId());
- c.addCriteria(Criteria.ISO_ID, cmd.getIsoId());
- c.addCriteria(Criteria.VPC_ID, cmd.getVpcId());
- c.addCriteria(Criteria.AFFINITY_GROUP_ID, cmd.getAffinityGroupId());
- c.addCriteria(Criteria.SERVICE_OFFERING_ID, cmd.getServiceOfferingId());
- c.addCriteria(Criteria.DISPLAY, cmd.getDisplay());
+ // first search distinct vm id by using query criteria and pagination
+ SearchBuilder<UserVmJoinVO> sb = _userVmJoinDao.createSearchBuilder();
+ sb.select(null, Func.DISTINCT, sb.entity().getId()); // select distinct ids
- if (domainId != null) {
- c.addCriteria(Criteria.DOMAINID, domainId);
+ String hypervisor = cmd.getHypervisor();
+ Object name = cmd.getName();
+ Object state = cmd.getState();
+ Object zoneId = cmd.getZoneId();
+ Object keyword = cmd.getKeyword();
+ boolean isAdmin = false;
+ boolean isRootAdmin = false;
+ if (_accountMgr.isAdmin(caller.getType())) {
+ isAdmin = true;
+ }
+ if (_accountMgr.isRootAdmin(caller.getId())) {
+ isRootAdmin = true;
}
- if (HypervisorType.getType(hypervisor) != HypervisorType.None) {
- c.addCriteria(Criteria.HYPERVISOR, hypervisor);
- } else if (hypervisor != null) {
+ Object groupId = cmd.getGroupId();
+ Object networkId = cmd.getNetworkId();
+ if (HypervisorType.getType(hypervisor) == HypervisorType.None && hypervisor != null) {
+ // invalid hypervisor type input
throw new InvalidParameterValueException("Invalid HypervisorType " + hypervisor);
}
-
- // ignore these search requests if it's not an admin
- if (_accountMgr.isAdmin(caller.getType())) {
- c.addCriteria(Criteria.PODID, cmd.getPodId());
- c.addCriteria(Criteria.HOSTID, cmd.getHostId());
- c.addCriteria(Criteria.STORAGE_ID, cmd.getStorageId());
+ Object templateId = cmd.getTemplateId();
+ Object isoId = cmd.getIsoId();
+ Object vpcId = cmd.getVpcId();
+ Object affinityGroupId = cmd.getAffinityGroupId();
+ Object serviceOffId = cmd.getServiceOfferingId();
+ Object pod = null;
+ Object hostId = null;
+ Object storageId = null;
+ if (cmd instanceof ListVMsCmdByAdmin) {
+ ListVMsCmdByAdmin adCmd = (ListVMsCmdByAdmin)cmd;
+ pod = adCmd.getPodId();
+ hostId = adCmd.getHostId();
+ storageId = adCmd.getStorageId();
}
- if (!permittedAccounts.isEmpty()) {
- c.addCriteria(Criteria.ACCOUNTID, permittedAccounts.toArray());
- }
- c.addCriteria(Criteria.ISADMIN, _accountMgr.isAdmin(caller.getType()));
-
- return searchForUserVMsByCriteria(c, caller, domainId, isRecursive, permittedAccounts, listAll, listProjectResourcesCriteria, tags);
- }
-
- private Pair<List<UserVmJoinVO>, Integer> searchForUserVMsByCriteria(Criteria c, Account caller, Long domainId, boolean isRecursive, List<Long> permittedAccounts,
- boolean listAll, ListProjectResourcesCriteria listProjectResourcesCriteria, Map<String, String> tags) {
- Filter searchFilter = new Filter(UserVmJoinVO.class, c.getOrderBy(), c.getAscending(), c.getOffset(), c.getLimit());
- boolean isRootAdmin = _accountMgr.isRootAdmin(caller.getType());
-
- // first search distinct vm id by using query criteria and pagination
- SearchBuilder<UserVmJoinVO> sb = _userVmJoinDao.createSearchBuilder();
- sb.select(null, Func.DISTINCT, sb.entity().getId()); // select distinct
- // ids
- _accountMgr.buildACLViewSearchBuilder(sb, domainId, isRecursive, permittedAccounts, listProjectResourcesCriteria);
-
- Object id = c.getCriteria(Criteria.ID);
- Object name = c.getCriteria(Criteria.NAME);
- Object state = c.getCriteria(Criteria.STATE);
- Object notState = c.getCriteria(Criteria.NOTSTATE);
- Object zoneId = c.getCriteria(Criteria.DATACENTERID);
- Object pod = c.getCriteria(Criteria.PODID);
- Object hostId = c.getCriteria(Criteria.HOSTID);
- Object hostName = c.getCriteria(Criteria.HOSTNAME);
- Object keyword = c.getCriteria(Criteria.KEYWORD);
- Object isAdmin = c.getCriteria(Criteria.ISADMIN);
- assert c.getCriteria(Criteria.IPADDRESS) == null : "We don't support search by ip address on VM any more. If you see this assert, it means we have to find a different way to search by the nic table.";
- Object groupId = c.getCriteria(Criteria.GROUPID);
- Object networkId = c.getCriteria(Criteria.NETWORKID);
- Object hypervisor = c.getCriteria(Criteria.HYPERVISOR);
- Object storageId = c.getCriteria(Criteria.STORAGE_ID);
- Object templateId = c.getCriteria(Criteria.TEMPLATE_ID);
- Object isoId = c.getCriteria(Criteria.ISO_ID);
- Object vpcId = c.getCriteria(Criteria.VPC_ID);
- Object affinityGroupId = c.getCriteria(Criteria.AFFINITY_GROUP_ID);
- Object serviceOffId = c.getCriteria(Criteria.SERVICE_OFFERING_ID);
- Object display = c.getCriteria(Criteria.DISPLAY);
-
sb.and("displayName", sb.entity().getDisplayName(), SearchCriteria.Op.LIKE);
- sb.and("id", sb.entity().getId(), SearchCriteria.Op.EQ);
+ sb.and("idIN", sb.entity().getId(), SearchCriteria.Op.IN);
sb.and("name", sb.entity().getName(), SearchCriteria.Op.LIKE);
sb.and("stateEQ", sb.entity().getState(), SearchCriteria.Op.EQ);
sb.and("stateNEQ", sb.entity().getState(), SearchCriteria.Op.NEQ);
@@@ -877,8 -899,11 +888,11 @@@
sc.setParameters("display", display);
}
-- if (id != null) {
- sc.setParameters("id", id);
- List<?> idList = (id instanceof List<?> ? (List<?>)id : null);
++ if (ids != null) {
++ List<?> idList = (ids instanceof List<?> ? (List<?>)ids : null);
+ if (idList != null && !idList.isEmpty()) {
+ sc.setParameters("idIN", idList.toArray());
+ }
}
if (templateId != null) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99bdc8d8/server/src/com/cloud/api/query/dao/TemplateJoinDaoImpl.java
----------------------------------------------------------------------
diff --cc server/src/com/cloud/api/query/dao/TemplateJoinDaoImpl.java
index 92f5110,07b4c91..1cab6e8
--- a/server/src/com/cloud/api/query/dao/TemplateJoinDaoImpl.java
+++ b/server/src/com/cloud/api/query/dao/TemplateJoinDaoImpl.java
@@@ -59,9 -57,9 +59,9 @@@ public class TemplateJoinDaoImpl extend
public static final Logger s_logger = Logger.getLogger(TemplateJoinDaoImpl.class);
@Inject
- private ConfigurationDao _configDao;
+ private ConfigurationDao _configDao;
@Inject
- public AccountService _accountService;
+ private AccountService _accountService;
private final SearchBuilder<TemplateJoinVO> tmpltIdPairSearch;
@@@ -98,24 -96,33 +98,23 @@@
_count = "select count(distinct temp_zone_pair) from template_view WHERE ";
}
-
private String getTemplateStatus(TemplateJoinVO template) {
- boolean isAdmin = false;
- Account caller = CallContext.current().getCallingAccount();
- if ((caller == null) || _accountService.isAdmin(caller.getType())) {
- isAdmin = true;
- }
-
- // If the user is an Admin, add the template download status
String templateStatus = null;
- if (isAdmin || caller.getId() == template.getAccountId()) {
- // add download status
- if (template.getDownloadState() != Status.DOWNLOADED) {
- templateStatus = "Processing";
- if (template.getDownloadState() == VMTemplateHostVO.Status.DOWNLOAD_IN_PROGRESS) {
- if (template.getDownloadPercent() == 100) {
- templateStatus = "Installing Template";
- } else {
- templateStatus = template.getDownloadPercent() + "% Downloaded";
- }
+ if (template.getDownloadState() != Status.DOWNLOADED) {
+ templateStatus = "Processing";
+ if (template.getDownloadState() == VMTemplateHostVO.Status.DOWNLOAD_IN_PROGRESS) {
+ if (template.getDownloadPercent() == 100) {
+ templateStatus = "Installing Template";
} else {
- templateStatus = template.getErrorString();
+ templateStatus = template.getDownloadPercent() + "% Downloaded";
}
- } else if (template.getDownloadState() == VMTemplateHostVO.Status.DOWNLOADED) {
- templateStatus = "Download Complete";
} else {
- templateStatus = "Successfully Installed";
+ templateStatus = template.getErrorString();
}
+ } else if (template.getDownloadState() == VMTemplateHostVO.Status.DOWNLOADED) {
+ templateStatus = "Download Complete";
+ } else {
+ templateStatus = "Successfully Installed";
}
return templateStatus;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99bdc8d8/server/src/com/cloud/api/query/dao/UserVmJoinDaoImpl.java
----------------------------------------------------------------------
diff --cc server/src/com/cloud/api/query/dao/UserVmJoinDaoImpl.java
index a5dfb16,235902c..779ddb4
--- a/server/src/com/cloud/api/query/dao/UserVmJoinDaoImpl.java
+++ b/server/src/com/cloud/api/query/dao/UserVmJoinDaoImpl.java
@@@ -42,9 -40,10 +42,11 @@@ import org.apache.cloudstack.framework.
import com.cloud.api.ApiDBUtils;
import com.cloud.api.query.vo.ResourceTagJoinVO;
import com.cloud.api.query.vo.UserVmJoinVO;
+ import com.cloud.gpu.GPU;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
+ import com.cloud.service.ServiceOfferingDetailsVO;
import com.cloud.user.Account;
+import com.cloud.user.AccountManager;
import com.cloud.uservm.UserVm;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.SearchBuilder;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99bdc8d8/server/src/com/cloud/api/query/vo/EventJoinVO.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99bdc8d8/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
----------------------------------------------------------------------
diff --cc server/src/com/cloud/configuration/ConfigurationManagerImpl.java
index b739d30,2d4539c..9b9bd13
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@@ -2035,13 -2075,62 +2076,62 @@@ public class ConfigurationManagerImpl e
if ((iopsWriteRate != null) && (iopsWriteRate > 0))
offering.setIopsWriteRate(iopsWriteRate);
- if ((offering = _serviceOfferingDao.persist(offering)) != null) {
+ if (hypervisorSnapshotReserve != null && hypervisorSnapshotReserve < 0) {
+ throw new InvalidParameterValueException("If provided, Hypervisor Snapshot Reserve must be greater than or equal to 0.");
+ }
+
+ offering.setHypervisorSnapshotReserve(hypervisorSnapshotReserve);
+
+ List<ServiceOfferingDetailsVO> detailsVO = null;
- if (details != null) {
+ if (details != null) {
- List<ServiceOfferingDetailsVO> detailsVO = new ArrayList<ServiceOfferingDetailsVO>();
+ // Check if the user has passed the gpu-type before passing the VGPU type
+ if (!details.containsKey(GPU.Keys.pciDevice.toString()) && details.containsKey(GPU.Keys.vgpuType.toString())) {
+ throw new InvalidParameterValueException("Please specify the gpu type");
+ }
+ detailsVO = new ArrayList<ServiceOfferingDetailsVO>();
- for (Entry<String, String> detailEntry : details.entrySet()) {
+ for (Entry<String, String> detailEntry : details.entrySet()) {
+ String value = null;
+ if (detailEntry.getKey().equals(GPU.Keys.pciDevice.toString())) {
+ for (GPU.Type type : GPU.Type.values()) {
+ if (detailEntry.getValue().equals(type.toString())) {
+ value = detailEntry.getValue();
+ }
+ }
+ if (value == null) {
+ throw new InvalidParameterValueException("Please specify valid gpu type");
+ }
+ }
+ if (detailEntry.getKey().equals(GPU.Keys.vgpuType.toString())) {
+ if (details.get(GPU.Keys.pciDevice.toString()).equals(GPU.Type.GPU_Passthrough.toString())) {
+ throw new InvalidParameterValueException("vgpuTypes are supported only with vGPU pciDevice");
+ }
+ if (detailEntry.getValue() == null) {
+ throw new InvalidParameterValueException("With vGPU as pciDevice, vGPUType value cannot be null");
+ }
+ for (GPU.vGPUType entry : GPU.vGPUType.values()) {
+ if (detailEntry.getValue().equals(entry.getType())) {
+ value = entry.getType();
+ }
+ }
+ if (value == null || detailEntry.getValue().equals(GPU.vGPUType.passthrough.getType())) {
+ throw new InvalidParameterValueException("Please specify valid vGPU type");
+ }
+ }
- detailsVO.add(new ServiceOfferingDetailsVO(offering.getId(), detailEntry.getKey(), detailEntry.getValue(), true));
- }
+ detailsVO.add(new ServiceOfferingDetailsVO(offering.getId(), detailEntry.getKey(), detailEntry.getValue(), true));
+ }
+ // If pciDevice type is passed, put the default VGPU type as 'passthrough'
+ if (details.containsKey(GPU.Keys.pciDevice.toString())
+ && !details.containsKey(GPU.Keys.vgpuType.toString())) {
+ detailsVO.add(new ServiceOfferingDetailsVO(offering.getId(),
+ GPU.Keys.vgpuType.toString(), GPU.vGPUType.passthrough.getType(), true));
+ }
+ }
+ if ((offering = _serviceOfferingDao.persist(offering)) != null) {
+ if (detailsVO != null && !detailsVO.isEmpty()) {
+ for (int index = 0; index < detailsVO.size(); index++) {
+ detailsVO.get(index).setResourceId(offering.getId());
+ }
_serviceOfferingDetailsDao.saveDetails(detailsVO);
}
CallContext.current().setEventDetails("Service offering id=" + offering.getId());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99bdc8d8/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
----------------------------------------------------------------------
diff --cc server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
index ee8cc4d,f76e485..74c141e
--- a/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
+++ b/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
@@@ -61,108 -61,112 +61,112 @@@ import com.cloud.agent.api.Command
import com.cloud.agent.api.StartupCommand;
import com.cloud.agent.api.StartupRoutingCommand;
import com.cloud.agent.manager.allocator.HostAllocator;
-import com.cloud.capacity.CapacityManager;
-import com.cloud.capacity.dao.CapacityDao;
-import com.cloud.configuration.Config;
-import com.cloud.dc.ClusterDetailsDao;
-import com.cloud.dc.ClusterDetailsVO;
-import com.cloud.dc.ClusterVO;
-import com.cloud.dc.DataCenter;
-import com.cloud.dc.DataCenterVO;
+import com.cloud.capacity.CapacityManager;
+import com.cloud.capacity.dao.CapacityDao;
+import com.cloud.configuration.Config;
+import com.cloud.dc.ClusterDetailsDao;
+import com.cloud.dc.ClusterDetailsVO;
+import com.cloud.dc.ClusterVO;
+import com.cloud.dc.DataCenter;
+import com.cloud.dc.DataCenterVO;
import com.cloud.dc.DedicatedResourceVO;
-import com.cloud.dc.Pod;
-import com.cloud.dc.dao.ClusterDao;
-import com.cloud.dc.dao.DataCenterDao;
+import com.cloud.dc.Pod;
+import com.cloud.dc.dao.ClusterDao;
+import com.cloud.dc.dao.DataCenterDao;
import com.cloud.dc.dao.DedicatedResourceDao;
-import com.cloud.dc.dao.HostPodDao;
-import com.cloud.deploy.DeploymentPlanner.ExcludeList;
-import com.cloud.deploy.DeploymentPlanner.PlannerResourceUsage;
-import com.cloud.deploy.dao.PlannerHostReservationDao;
-import com.cloud.exception.AffinityConflictException;
-import com.cloud.exception.ConnectionException;
-import com.cloud.exception.InsufficientServerCapacityException;
+import com.cloud.dc.dao.HostPodDao;
+import com.cloud.deploy.DeploymentPlanner.ExcludeList;
+import com.cloud.deploy.DeploymentPlanner.PlannerResourceUsage;
+import com.cloud.deploy.dao.PlannerHostReservationDao;
+import com.cloud.exception.AffinityConflictException;
+import com.cloud.exception.ConnectionException;
+import com.cloud.exception.InsufficientServerCapacityException;
+ import com.cloud.gpu.GPU;
-import com.cloud.host.Host;
-import com.cloud.host.HostVO;
-import com.cloud.host.Status;
-import com.cloud.host.dao.HostDao;
-import com.cloud.hypervisor.Hypervisor.HypervisorType;
-import com.cloud.offering.ServiceOffering;
-import com.cloud.org.Cluster;
-import com.cloud.org.Grouping;
+import com.cloud.host.Host;
+import com.cloud.host.HostVO;
+import com.cloud.host.Status;
+import com.cloud.host.dao.HostDao;
+import com.cloud.hypervisor.Hypervisor.HypervisorType;
+import com.cloud.offering.ServiceOffering;
+import com.cloud.org.Cluster;
+import com.cloud.org.Grouping;
+ import com.cloud.resource.ResourceManager;
-import com.cloud.resource.ResourceState;
+import com.cloud.resource.ResourceState;
+ import com.cloud.service.ServiceOfferingDetailsVO;
+ import com.cloud.service.dao.ServiceOfferingDetailsDao;
-import com.cloud.storage.DiskOfferingVO;
-import com.cloud.storage.ScopeType;
+import com.cloud.storage.DiskOfferingVO;
+import com.cloud.storage.ScopeType;
import com.cloud.storage.Storage;
-import com.cloud.storage.StorageManager;
-import com.cloud.storage.StoragePool;
-import com.cloud.storage.StoragePoolHostVO;
-import com.cloud.storage.Volume;
-import com.cloud.storage.VolumeVO;
-import com.cloud.storage.dao.DiskOfferingDao;
-import com.cloud.storage.dao.GuestOSCategoryDao;
-import com.cloud.storage.dao.GuestOSDao;
-import com.cloud.storage.dao.StoragePoolHostDao;
-import com.cloud.storage.dao.VolumeDao;
-import com.cloud.user.AccountManager;
-import com.cloud.utils.DateUtil;
-import com.cloud.utils.NumbersUtil;
-import com.cloud.utils.Pair;
-import com.cloud.utils.component.Manager;
-import com.cloud.utils.component.ManagerBase;
-import com.cloud.utils.db.DB;
-import com.cloud.utils.db.SearchCriteria;
-import com.cloud.utils.db.Transaction;
-import com.cloud.utils.db.TransactionCallback;
-import com.cloud.utils.db.TransactionStatus;
+import com.cloud.storage.StorageManager;
+import com.cloud.storage.StoragePool;
+import com.cloud.storage.StoragePoolHostVO;
+import com.cloud.storage.Volume;
+import com.cloud.storage.VolumeVO;
+import com.cloud.storage.dao.DiskOfferingDao;
+import com.cloud.storage.dao.GuestOSCategoryDao;
+import com.cloud.storage.dao.GuestOSDao;
+import com.cloud.storage.dao.StoragePoolHostDao;
+import com.cloud.storage.dao.VolumeDao;
+import com.cloud.user.AccountManager;
+import com.cloud.utils.DateUtil;
+import com.cloud.utils.NumbersUtil;
+import com.cloud.utils.Pair;
+import com.cloud.utils.component.Manager;
+import com.cloud.utils.component.ManagerBase;
+import com.cloud.utils.db.DB;
+import com.cloud.utils.db.SearchCriteria;
+import com.cloud.utils.db.Transaction;
+import com.cloud.utils.db.TransactionCallback;
+import com.cloud.utils.db.TransactionStatus;
import com.cloud.utils.exception.CloudRuntimeException;
-import com.cloud.utils.fsm.StateListener;
-import com.cloud.vm.DiskProfile;
-import com.cloud.vm.ReservationContext;
-import com.cloud.vm.VMInstanceVO;
-import com.cloud.vm.VirtualMachine;
-import com.cloud.vm.VirtualMachine.Event;
-import com.cloud.vm.VirtualMachine.State;
+import com.cloud.utils.fsm.StateListener;
+import com.cloud.vm.DiskProfile;
+import com.cloud.vm.ReservationContext;
+import com.cloud.vm.VMInstanceVO;
+import com.cloud.vm.VirtualMachine;
+import com.cloud.vm.VirtualMachine.Event;
+import com.cloud.vm.VirtualMachine.State;
import com.cloud.vm.VirtualMachineProfile;
-import com.cloud.vm.dao.UserVmDao;
-import com.cloud.vm.dao.VMInstanceDao;
-
+import com.cloud.vm.dao.UserVmDao;
+import com.cloud.vm.dao.VMInstanceDao;
+
@Local(value = {DeploymentPlanningManager.class})
-public class DeploymentPlanningManagerImpl extends ManagerBase implements DeploymentPlanningManager, Manager, Listener,
- StateListener<State, VirtualMachine.Event, VirtualMachine> {
-
- private static final Logger s_logger = Logger.getLogger(DeploymentPlanningManagerImpl.class);
- @Inject
- AgentManager _agentMgr;
- @Inject
- protected UserVmDao _vmDao;
- @Inject
- protected VMInstanceDao _vmInstanceDao;
- @Inject
- protected AffinityGroupDao _affinityGroupDao;
- @Inject
- protected AffinityGroupVMMapDao _affinityGroupVMMapDao;
- @Inject
- AffinityGroupService _affinityGroupService;
- @Inject
- DataCenterDao _dcDao;
- @Inject
- PlannerHostReservationDao _plannerHostReserveDao;
- private int _vmCapacityReleaseInterval;
- @Inject
- MessageBus _messageBus;
- private Timer _timer = null;
- private long _hostReservationReleasePeriod = 60L * 60L * 1000L; // one hour by default
- @Inject
- protected VMReservationDao _reservationDao;
-
- private static final long INITIAL_RESERVATION_RELEASE_CHECKER_DELAY = 30L * 1000L; // thirty seconds expressed in milliseconds
- protected long _nodeId = -1;
-
- protected List<StoragePoolAllocator> _storagePoolAllocators;
-
- public List<StoragePoolAllocator> getStoragePoolAllocators() {
- return _storagePoolAllocators;
- }
+public class DeploymentPlanningManagerImpl extends ManagerBase implements DeploymentPlanningManager, Manager, Listener,
+ StateListener<State, VirtualMachine.Event, VirtualMachine> {
+
+ private static final Logger s_logger = Logger.getLogger(DeploymentPlanningManagerImpl.class);
+ @Inject
+ AgentManager _agentMgr;
+ @Inject
+ protected UserVmDao _vmDao;
+ @Inject
+ protected VMInstanceDao _vmInstanceDao;
+ @Inject
+ protected AffinityGroupDao _affinityGroupDao;
+ @Inject
+ protected AffinityGroupVMMapDao _affinityGroupVMMapDao;
+ @Inject
+ AffinityGroupService _affinityGroupService;
+ @Inject
+ DataCenterDao _dcDao;
+ @Inject
+ PlannerHostReservationDao _plannerHostReserveDao;
+ private int _vmCapacityReleaseInterval;
+ @Inject
+ MessageBus _messageBus;
+ private Timer _timer = null;
+ private long _hostReservationReleasePeriod = 60L * 60L * 1000L; // one hour by default
+ @Inject
+ protected VMReservationDao _reservationDao;
+
+ private static final long INITIAL_RESERVATION_RELEASE_CHECKER_DELAY = 30L * 1000L; // thirty seconds expressed in milliseconds
+ protected long _nodeId = -1;
+
+ protected List<StoragePoolAllocator> _storagePoolAllocators;
+
+ public List<StoragePoolAllocator> getStoragePoolAllocators() {
+ return _storagePoolAllocators;
+ }
public void setStoragePoolAllocators(List<StoragePoolAllocator> storagePoolAllocators) {
_storagePoolAllocators = storagePoolAllocators;
@@@ -213,12 -217,16 +217,16 @@@
DataStoreManager dataStoreMgr;
@Inject
protected ClusterDetailsDao _clusterDetailsDao;
+ @Inject
+ protected ResourceManager _resourceMgr;
+ @Inject
+ protected ServiceOfferingDetailsDao _serviceOfferingDetailsDao;
+
+ protected List<DeploymentPlanner> _planners;
- protected List<DeploymentPlanner> _planners;
-
- public List<DeploymentPlanner> getPlanners() {
- return _planners;
- }
+ public List<DeploymentPlanner> getPlanners() {
+ return _planners;
+ }
public void setPlanners(List<DeploymentPlanner> planners) {
_planners = planners;
@@@ -318,50 -326,54 +326,54 @@@
DataCenterDeployment lastPlan =
new DataCenterDeployment(host.getDataCenterId(), host.getPodId(), host.getClusterId(), hostIdSpecified, plan.getPoolId(), null,
plan.getReservationContext());
-
+
Pair<Map<Volume, List<StoragePool>>, List<Volume>> result = findSuitablePoolsForVolumes(vmProfile, lastPlan, avoids, HostAllocator.RETURN_UPTO_ALL);
- Map<Volume, List<StoragePool>> suitableVolumeStoragePools = result.first();
- List<Volume> readyAndReusedVolumes = result.second();
-
- // choose the potential pool for this VM for this host
- if (!suitableVolumeStoragePools.isEmpty()) {
- List<Host> suitableHosts = new ArrayList<Host>();
- suitableHosts.add(host);
- Pair<Host, Map<Volume, StoragePool>> potentialResources = findPotentialDeploymentResources(
+ Map<Volume, List<StoragePool>> suitableVolumeStoragePools = result.first();
+ List<Volume> readyAndReusedVolumes = result.second();
+
+ // choose the potential pool for this VM for this host
+ if (!suitableVolumeStoragePools.isEmpty()) {
+ List<Host> suitableHosts = new ArrayList<Host>();
+ suitableHosts.add(host);
+ Pair<Host, Map<Volume, StoragePool>> potentialResources = findPotentialDeploymentResources(
suitableHosts, suitableVolumeStoragePools, avoids,
getPlannerUsage(planner, vmProfile, plan, avoids), readyAndReusedVolumes);
- if (potentialResources != null) {
- Pod pod = _podDao.findById(host.getPodId());
- Cluster cluster = _clusterDao.findById(host.getClusterId());
- Map<Volume, StoragePool> storageVolMap = potentialResources.second();
- // remove the reused vol<->pool from destination, since
- // we don't have to prepare this volume.
- for (Volume vol : readyAndReusedVolumes) {
- storageVolMap.remove(vol);
- }
- DeployDestination dest = new DeployDestination(dc, pod, cluster, host, storageVolMap);
- s_logger.debug("Returning Deployment Destination: " + dest);
- return dest;
- }
- }
- }
- s_logger.debug("Cannnot deploy to specified host, returning.");
- return null;
- }
-
- if (vm.getLastHostId() != null && haVmTag == null) {
- s_logger.debug("This VM has last host_id specified, trying to choose the same host: " + vm.getLastHostId());
-
- HostVO host = _hostDao.findById(vm.getLastHostId());
+ if (potentialResources != null) {
+ Pod pod = _podDao.findById(host.getPodId());
+ Cluster cluster = _clusterDao.findById(host.getClusterId());
+ Map<Volume, StoragePool> storageVolMap = potentialResources.second();
+ // remove the reused vol<->pool from destination, since
+ // we don't have to prepare this volume.
+ for (Volume vol : readyAndReusedVolumes) {
+ storageVolMap.remove(vol);
+ }
+ DeployDestination dest = new DeployDestination(dc, pod, cluster, host, storageVolMap);
+ s_logger.debug("Returning Deployment Destination: " + dest);
+ return dest;
+ }
+ }
+ }
+ s_logger.debug("Cannnot deploy to specified host, returning.");
+ return null;
+ }
+
+ if (vm.getLastHostId() != null && haVmTag == null) {
+ s_logger.debug("This VM has last host_id specified, trying to choose the same host: " + vm.getLastHostId());
+
+ HostVO host = _hostDao.findById(vm.getLastHostId());
+ ServiceOfferingDetailsVO offeringDetails = null;
- if (host == null) {
- s_logger.debug("The last host of this VM cannot be found");
- } else if (avoids.shouldAvoid(host)) {
- s_logger.debug("The last host of this VM is in avoid set");
- } else if (_capacityMgr.checkIfHostReachMaxGuestLimit(host)) {
+ if (host == null) {
+ s_logger.debug("The last host of this VM cannot be found");
+ } else if (avoids.shouldAvoid(host)) {
+ s_logger.debug("The last host of this VM is in avoid set");
+ } else if (_capacityMgr.checkIfHostReachMaxGuestLimit(host)) {
s_logger.debug("The last Host, hostId: " + host.getId() +
" already has max Running VMs(count includes system VMs), skipping this and trying other available hosts");
+ } else if ((offeringDetails = _serviceOfferingDetailsDao.findDetail(offering.getId(), GPU.Keys.vgpuType.toString())) != null
+ && !_resourceMgr.isGPUDeviceAvailable(host.getId(), offeringDetails.getValue())){
+ s_logger.debug("The last host of this VM does not have required GPU devices available");
- } else {
- if (host.getStatus() == Status.Up && host.getResourceState() == ResourceState.Enabled) {
+ } else {
+ if (host.getStatus() == Status.Up && host.getResourceState() == ResourceState.Enabled) {
boolean hostTagsMatch = true;
if(offering.getHostTag() != null){
_hostDao.loadHostTags(host);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99bdc8d8/server/src/com/cloud/network/IpAddressManagerImpl.java
----------------------------------------------------------------------
diff --cc server/src/com/cloud/network/IpAddressManagerImpl.java
index 5905fd3,15d1458..4b7d4b9
--- a/server/src/com/cloud/network/IpAddressManagerImpl.java
+++ b/server/src/com/cloud/network/IpAddressManagerImpl.java
@@@ -660,115 -660,115 +660,115 @@@ public class IpAddressManagerImpl exten
IPAddressVO addr = Transaction.execute(new TransactionCallbackWithException<IPAddressVO, InsufficientAddressCapacityException>() {
@Override
public IPAddressVO doInTransaction(TransactionStatus status) throws InsufficientAddressCapacityException {
- StringBuilder errorMessage = new StringBuilder("Unable to get ip adress in ");
- boolean fetchFromDedicatedRange = false;
- List<Long> dedicatedVlanDbIds = new ArrayList<Long>();
- List<Long> nonDedicatedVlanDbIds = new ArrayList<Long>();
-
- SearchCriteria<IPAddressVO> sc = null;
- if (podId != null) {
- sc = AssignIpAddressFromPodVlanSearch.create();
- sc.setJoinParameters("podVlanMapSB", "podId", podId);
- errorMessage.append(" pod id=" + podId);
- } else {
- sc = AssignIpAddressSearch.create();
- errorMessage.append(" zone id=" + dcId);
- }
+ StringBuilder errorMessage = new StringBuilder("Unable to get ip adress in ");
+ boolean fetchFromDedicatedRange = false;
+ List<Long> dedicatedVlanDbIds = new ArrayList<Long>();
+ List<Long> nonDedicatedVlanDbIds = new ArrayList<Long>();
+
+ SearchCriteria<IPAddressVO> sc = null;
+ if (podId != null) {
+ sc = AssignIpAddressFromPodVlanSearch.create();
+ sc.setJoinParameters("podVlanMapSB", "podId", podId);
+ errorMessage.append(" pod id=" + podId);
+ } else {
+ sc = AssignIpAddressSearch.create();
+ errorMessage.append(" zone id=" + dcId);
+ }
- // If owner has dedicated Public IP ranges, fetch IP from the dedicated range
- // Otherwise fetch IP from the system pool
- List<AccountVlanMapVO> maps = _accountVlanMapDao.listAccountVlanMapsByAccount(owner.getId());
- for (AccountVlanMapVO map : maps) {
- if (vlanDbIds == null || vlanDbIds.contains(map.getVlanDbId()))
- dedicatedVlanDbIds.add(map.getVlanDbId());
- }
- List<VlanVO> nonDedicatedVlans = _vlanDao.listZoneWideNonDedicatedVlans(dcId);
- for (VlanVO nonDedicatedVlan : nonDedicatedVlans) {
- if (vlanDbIds == null || vlanDbIds.contains(nonDedicatedVlan.getId()))
- nonDedicatedVlanDbIds.add(nonDedicatedVlan.getId());
- }
- if (dedicatedVlanDbIds != null && !dedicatedVlanDbIds.isEmpty()) {
- fetchFromDedicatedRange = true;
- sc.setParameters("vlanId", dedicatedVlanDbIds.toArray());
+ // If owner has dedicated Public IP ranges, fetch IP from the dedicated range
+ // Otherwise fetch IP from the system pool
+ List<AccountVlanMapVO> maps = _accountVlanMapDao.listAccountVlanMapsByAccount(owner.getId());
+ for (AccountVlanMapVO map : maps) {
+ if (vlanDbIds == null || vlanDbIds.contains(map.getVlanDbId()))
+ dedicatedVlanDbIds.add(map.getVlanDbId());
+ }
+ List<VlanVO> nonDedicatedVlans = _vlanDao.listZoneWideNonDedicatedVlans(dcId);
+ for (VlanVO nonDedicatedVlan : nonDedicatedVlans) {
+ if (vlanDbIds == null || vlanDbIds.contains(nonDedicatedVlan.getId()))
+ nonDedicatedVlanDbIds.add(nonDedicatedVlan.getId());
+ }
+ if (dedicatedVlanDbIds != null && !dedicatedVlanDbIds.isEmpty()) {
+ fetchFromDedicatedRange = true;
+ sc.setParameters("vlanId", dedicatedVlanDbIds.toArray());
errorMessage.append(", vlanId id=" + Arrays.toString(dedicatedVlanDbIds.toArray()));
- } else if (nonDedicatedVlanDbIds != null && !nonDedicatedVlanDbIds.isEmpty()) {
- sc.setParameters("vlanId", nonDedicatedVlanDbIds.toArray());
+ } else if (nonDedicatedVlanDbIds != null && !nonDedicatedVlanDbIds.isEmpty()) {
+ sc.setParameters("vlanId", nonDedicatedVlanDbIds.toArray());
- errorMessage.append(", vlanId id=" + nonDedicatedVlanDbIds.toArray());
+ errorMessage.append(", vlanId id=" + Arrays.toString(nonDedicatedVlanDbIds.toArray()));
- } else {
- if (podId != null) {
- InsufficientAddressCapacityException ex = new InsufficientAddressCapacityException("Insufficient address capacity", Pod.class, podId);
- ex.addProxyObject(ApiDBUtils.findPodById(podId).getUuid());
- throw ex;
- }
- s_logger.warn(errorMessage.toString());
- InsufficientAddressCapacityException ex = new InsufficientAddressCapacityException("Insufficient address capacity", DataCenter.class, dcId);
- ex.addProxyObject(ApiDBUtils.findZoneById(dcId).getUuid());
- throw ex;
- }
+ } else {
+ if (podId != null) {
+ InsufficientAddressCapacityException ex = new InsufficientAddressCapacityException("Insufficient address capacity", Pod.class, podId);
+ ex.addProxyObject(ApiDBUtils.findPodById(podId).getUuid());
+ throw ex;
+ }
+ s_logger.warn(errorMessage.toString());
+ InsufficientAddressCapacityException ex = new InsufficientAddressCapacityException("Insufficient address capacity", DataCenter.class, dcId);
+ ex.addProxyObject(ApiDBUtils.findZoneById(dcId).getUuid());
+ throw ex;
+ }
- sc.setParameters("dc", dcId);
+ sc.setParameters("dc", dcId);
- DataCenter zone = _entityMgr.findById(DataCenter.class, dcId);
+ DataCenter zone = _entityMgr.findById(DataCenter.class, dcId);
- // for direct network take ip addresses only from the vlans belonging to the network
- if (vlanUse == VlanType.DirectAttached) {
- sc.setJoinParameters("vlan", "networkId", guestNetworkId);
- errorMessage.append(", network id=" + guestNetworkId);
- }
- sc.setJoinParameters("vlan", "type", vlanUse);
+ // for direct network take ip addresses only from the vlans belonging to the network
+ if (vlanUse == VlanType.DirectAttached) {
+ sc.setJoinParameters("vlan", "networkId", guestNetworkId);
+ errorMessage.append(", network id=" + guestNetworkId);
+ }
+ sc.setJoinParameters("vlan", "type", vlanUse);
- if (requestedIp != null) {
- sc.addAnd("address", SearchCriteria.Op.EQ, requestedIp);
- errorMessage.append(": requested ip " + requestedIp + " is not available");
- }
+ if (requestedIp != null) {
+ sc.addAnd("address", SearchCriteria.Op.EQ, requestedIp);
+ errorMessage.append(": requested ip " + requestedIp + " is not available");
+ }
- Filter filter = new Filter(IPAddressVO.class, "vlanId", true, 0l, 1l);
+ Filter filter = new Filter(IPAddressVO.class, "vlanId", true, 0l, 1l);
- List<IPAddressVO> addrs = _ipAddressDao.lockRows(sc, filter, true);
+ List<IPAddressVO> addrs = _ipAddressDao.lockRows(sc, filter, true);
- // If all the dedicated IPs of the owner are in use fetch an IP from the system pool
- if (addrs.size() == 0 && fetchFromDedicatedRange) {
- // Verify if account is allowed to acquire IPs from the system
- boolean useSystemIps = UseSystemPublicIps.valueIn(owner.getId());
- if (useSystemIps && nonDedicatedVlanDbIds != null && !nonDedicatedVlanDbIds.isEmpty()) {
- fetchFromDedicatedRange = false;
- sc.setParameters("vlanId", nonDedicatedVlanDbIds.toArray());
+ // If all the dedicated IPs of the owner are in use fetch an IP from the system pool
+ if (addrs.size() == 0 && fetchFromDedicatedRange) {
+ // Verify if account is allowed to acquire IPs from the system
+ boolean useSystemIps = UseSystemPublicIps.valueIn(owner.getId());
+ if (useSystemIps && nonDedicatedVlanDbIds != null && !nonDedicatedVlanDbIds.isEmpty()) {
+ fetchFromDedicatedRange = false;
+ sc.setParameters("vlanId", nonDedicatedVlanDbIds.toArray());
- errorMessage.append(", vlanId id=" + nonDedicatedVlanDbIds.toArray());
+ errorMessage.append(", vlanId id=" + Arrays.toString(nonDedicatedVlanDbIds.toArray()));
- addrs = _ipAddressDao.lockRows(sc, filter, true);
- }
- }
+ addrs = _ipAddressDao.lockRows(sc, filter, true);
+ }
+ }
- if (addrs.size() == 0) {
- if (podId != null) {
- InsufficientAddressCapacityException ex = new InsufficientAddressCapacityException("Insufficient address capacity", Pod.class, podId);
- // for now, we hardcode the table names, but we should ideally do a lookup for the tablename from the VO object.
- ex.addProxyObject(ApiDBUtils.findPodById(podId).getUuid());
- throw ex;
- }
- s_logger.warn(errorMessage.toString());
- InsufficientAddressCapacityException ex = new InsufficientAddressCapacityException("Insufficient address capacity", DataCenter.class, dcId);
- ex.addProxyObject(ApiDBUtils.findZoneById(dcId).getUuid());
- throw ex;
- }
+ if (addrs.size() == 0) {
+ if (podId != null) {
+ InsufficientAddressCapacityException ex = new InsufficientAddressCapacityException("Insufficient address capacity", Pod.class, podId);
+ // for now, we hardcode the table names, but we should ideally do a lookup for the tablename from the VO object.
+ ex.addProxyObject(ApiDBUtils.findPodById(podId).getUuid());
+ throw ex;
+ }
+ s_logger.warn(errorMessage.toString());
+ InsufficientAddressCapacityException ex = new InsufficientAddressCapacityException("Insufficient address capacity", DataCenter.class, dcId);
+ ex.addProxyObject(ApiDBUtils.findZoneById(dcId).getUuid());
+ throw ex;
+ }
- assert (addrs.size() == 1) : "Return size is incorrect: " + addrs.size();
+ assert (addrs.size() == 1) : "Return size is incorrect: " + addrs.size();
- if (!fetchFromDedicatedRange) {
- // Check that the maximum number of public IPs for the given accountId will not be exceeded
- try {
- _resourceLimitMgr.checkResourceLimit(owner, ResourceType.public_ip);
- } catch (ResourceAllocationException ex) {
- s_logger.warn("Failed to allocate resource of type " + ex.getResourceType() + " for account " + owner);
- throw new AccountLimitException("Maximum number of public IP addresses for account: " + owner.getAccountName() + " has been exceeded.");
- }
- }
+ if (!fetchFromDedicatedRange) {
+ // Check that the maximum number of public IPs for the given accountId will not be exceeded
+ try {
+ _resourceLimitMgr.checkResourceLimit(owner, ResourceType.public_ip);
+ } catch (ResourceAllocationException ex) {
+ s_logger.warn("Failed to allocate resource of type " + ex.getResourceType() + " for account " + owner);
+ throw new AccountLimitException("Maximum number of public IP addresses for account: " + owner.getAccountName() + " has been exceeded.");
+ }
+ }
- IPAddressVO addr = addrs.get(0);
- addr.setSourceNat(sourceNat);
- addr.setAllocatedTime(new Date());
- addr.setAllocatedInDomainId(owner.getDomainId());
- addr.setAllocatedToAccountId(owner.getId());
- addr.setSystem(isSystem);
+ IPAddressVO addr = addrs.get(0);
+ addr.setSourceNat(sourceNat);
+ addr.setAllocatedTime(new Date());
+ addr.setAllocatedInDomainId(owner.getDomainId());
+ addr.setAllocatedToAccountId(owner.getId());
+ addr.setSystem(isSystem);
if (displayIp != null) {
addr.setDisplay(displayIp);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99bdc8d8/server/src/com/cloud/network/NetworkServiceImpl.java
----------------------------------------------------------------------
[25/50] [abbrv] git commit: updated refs/heads/4.4 to 48f8a95
Posted by hu...@apache.org.
A typo that leads to opposite decision on determine whether or not to notify out-of-band VM state changes.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4399e245
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4399e245
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4399e245
Branch: refs/heads/4.4
Commit: 4399e245f4761a6936e3635881db939857850247
Parents: 42d6373
Author: Kelven Yang <ke...@gmail.com>
Authored: Thu Mar 13 16:55:12 2014 -0700
Committer: Kelven Yang <ke...@gmail.com>
Committed: Thu Mar 13 17:17:15 2014 -0700
----------------------------------------------------------------------
.../orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4399e245/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
index e344001..e9d2fd2 100755
--- a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -4100,7 +4100,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
List<VmWorkJobVO> pendingWorkJobs = _workJobDao.listPendingWorkJobs(
VirtualMachine.Type.Instance, vmId);
- if (pendingWorkJobs.size() == 0 || _haMgr.hasPendingHaWork(vmId)) {
+ if (pendingWorkJobs.size() == 0 || !_haMgr.hasPendingHaWork(vmId)) {
// there is no pending operation job
VMInstanceVO vm = _vmDao.findById(vmId);
if (vm != null) {
[07/50] [abbrv] git commit: updated refs/heads/4.4 to 48f8a95
Posted by hu...@apache.org.
Fixed some problems reported by FindBugs
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/90c485e5
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/90c485e5
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/90c485e5
Branch: refs/heads/4.4
Commit: 90c485e5d659afdd8a6a09ec3b81e54ab7398296
Parents: 67ab321
Author: Alena Prokharchyk <al...@citrix.com>
Authored: Thu Mar 13 13:29:25 2014 -0700
Committer: Alena Prokharchyk <al...@citrix.com>
Committed: Thu Mar 13 13:45:30 2014 -0700
----------------------------------------------------------------------
.../org/apache/cloudstack/api/BaseListCmd.java | 2 +-
.../security/dao/VmRulesetLogDaoImpl.java | 2 +-
.../src/com/cloud/projects/ProjectVO.java | 5 +
.../jobs/impl/JobSerializerHelper.java | 5 +-
.../mom/rabbitmq/RabbitMQEventBus.java | 18 ++-
.../src/com/cloud/dc/DedicatedResourceVO.java | 7 ++
.../com/cloud/network/IpAddressManagerImpl.java | 4 +-
.../com/cloud/server/ManagementServerImpl.java | 123 +------------------
8 files changed, 29 insertions(+), 137 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/90c485e5/api/src/org/apache/cloudstack/api/BaseListCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/BaseListCmd.java b/api/src/org/apache/cloudstack/api/BaseListCmd.java
index f280003..407ad22 100644
--- a/api/src/org/apache/cloudstack/api/BaseListCmd.java
+++ b/api/src/org/apache/cloudstack/api/BaseListCmd.java
@@ -24,7 +24,7 @@ import com.cloud.utils.exception.CSExceptionErrorCode;
public abstract class BaseListCmd extends BaseCmd {
private static Long s_maxPageSize = null;
- public static Long s_pageSizeUnlimited = -1L;
+ public static final Long s_pageSizeUnlimited = -1L;
// ///////////////////////////////////////////////////
// ///////// BaseList API parameters /////////////////
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/90c485e5/engine/schema/src/com/cloud/network/security/dao/VmRulesetLogDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/security/dao/VmRulesetLogDaoImpl.java b/engine/schema/src/com/cloud/network/security/dao/VmRulesetLogDaoImpl.java
index c941055..90f8349 100644
--- a/engine/schema/src/com/cloud/network/security/dao/VmRulesetLogDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/security/dao/VmRulesetLogDaoImpl.java
@@ -39,7 +39,7 @@ import com.cloud.utils.db.TransactionLegacy;
@Component
@Local(value = {VmRulesetLogDao.class})
public class VmRulesetLogDaoImpl extends GenericDaoBase<VmRulesetLogVO, Long> implements VmRulesetLogDao {
- protected static Logger s_logger = Logger.getLogger(VmRulesetLogDaoImpl.class);
+ protected static final Logger s_logger = Logger.getLogger(VmRulesetLogDaoImpl.class);
private SearchBuilder<VmRulesetLogVO> VmIdSearch;
private String InsertOrUpdateSQl = "INSERT INTO op_vm_ruleset_log (instance_id, created, logsequence) "
+ " VALUES(?, now(), 1) ON DUPLICATE KEY UPDATE logsequence=logsequence+1";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/90c485e5/engine/schema/src/com/cloud/projects/ProjectVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/projects/ProjectVO.java b/engine/schema/src/com/cloud/projects/ProjectVO.java
index d49e484..77eed40 100644
--- a/engine/schema/src/com/cloud/projects/ProjectVO.java
+++ b/engine/schema/src/com/cloud/projects/ProjectVO.java
@@ -31,6 +31,7 @@ import javax.persistence.Table;
import org.apache.cloudstack.api.Identity;
import org.apache.cloudstack.api.InternalIdentity;
+import com.cloud.utils.NumbersUtil;
import com.cloud.utils.db.GenericDao;
@Entity
@@ -161,4 +162,8 @@ public class ProjectVO implements Project, Identity, InternalIdentity {
this.uuid = uuid;
}
+ @Override
+ public int hashCode() {
+ return NumbersUtil.hash(id);
+ }
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/90c485e5/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/JobSerializerHelper.java
----------------------------------------------------------------------
diff --git a/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/JobSerializerHelper.java b/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/JobSerializerHelper.java
index 67c4b86..735d7cf 100644
--- a/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/JobSerializerHelper.java
+++ b/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/JobSerializerHelper.java
@@ -29,6 +29,7 @@ import java.lang.reflect.Type;
import org.apache.commons.codec.binary.Base64;
import org.apache.log4j.Logger;
+import com.cloud.utils.exception.CloudRuntimeException;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.JsonDeserializationContext;
@@ -40,14 +41,12 @@ import com.google.gson.JsonPrimitive;
import com.google.gson.JsonSerializationContext;
import com.google.gson.JsonSerializer;
-import com.cloud.utils.exception.CloudRuntimeException;
-
/**
* Note: toPairList and appendPairList only support simple POJO objects currently
*/
public class JobSerializerHelper {
private static final Logger s_logger = Logger.getLogger(JobSerializerHelper.class);
- public static String token = "/";
+ public static final String token = "/";
private static Gson s_gson;
static {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/90c485e5/plugins/event-bus/rabbitmq/src/org/apache/cloudstack/mom/rabbitmq/RabbitMQEventBus.java
----------------------------------------------------------------------
diff --git a/plugins/event-bus/rabbitmq/src/org/apache/cloudstack/mom/rabbitmq/RabbitMQEventBus.java b/plugins/event-bus/rabbitmq/src/org/apache/cloudstack/mom/rabbitmq/RabbitMQEventBus.java
index 8ad7033..8403271 100644
--- a/plugins/event-bus/rabbitmq/src/org/apache/cloudstack/mom/rabbitmq/RabbitMQEventBus.java
+++ b/plugins/event-bus/rabbitmq/src/org/apache/cloudstack/mom/rabbitmq/RabbitMQEventBus.java
@@ -30,8 +30,16 @@ import java.util.concurrent.Executors;
import javax.ejb.Local;
import javax.naming.ConfigurationException;
+import org.apache.cloudstack.framework.events.Event;
+import org.apache.cloudstack.framework.events.EventBus;
+import org.apache.cloudstack.framework.events.EventBusException;
+import org.apache.cloudstack.framework.events.EventSubscriber;
+import org.apache.cloudstack.framework.events.EventTopic;
+import org.apache.cloudstack.managed.context.ManagedContextRunnable;
import org.apache.log4j.Logger;
+import com.cloud.utils.Ternary;
+import com.cloud.utils.component.ManagerBase;
import com.rabbitmq.client.AMQP;
import com.rabbitmq.client.AlreadyClosedException;
import com.rabbitmq.client.Channel;
@@ -43,16 +51,6 @@ import com.rabbitmq.client.MessageProperties;
import com.rabbitmq.client.ShutdownListener;
import com.rabbitmq.client.ShutdownSignalException;
-import org.apache.cloudstack.framework.events.Event;
-import org.apache.cloudstack.framework.events.EventBus;
-import org.apache.cloudstack.framework.events.EventBusException;
-import org.apache.cloudstack.framework.events.EventSubscriber;
-import org.apache.cloudstack.framework.events.EventTopic;
-import org.apache.cloudstack.managed.context.ManagedContextRunnable;
-
-import com.cloud.utils.Ternary;
-import com.cloud.utils.component.ManagerBase;
-
@Local(value = EventBus.class)
public class RabbitMQEventBus extends ManagerBase implements EventBus {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/90c485e5/server/src/com/cloud/dc/DedicatedResourceVO.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/dc/DedicatedResourceVO.java b/server/src/com/cloud/dc/DedicatedResourceVO.java
index 2e0fde7..79c563c 100644
--- a/server/src/com/cloud/dc/DedicatedResourceVO.java
+++ b/server/src/com/cloud/dc/DedicatedResourceVO.java
@@ -25,6 +25,8 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
+import com.cloud.utils.NumbersUtil;
+
@Entity
@Table(name = "dedicated_resources")
public class DedicatedResourceVO implements DedicatedResources {
@@ -163,4 +165,9 @@ public class DedicatedResourceVO implements DedicatedResources {
return false;
}
}
+
+ @Override
+ public int hashCode() {
+ return NumbersUtil.hash(id);
+ }
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/90c485e5/server/src/com/cloud/network/IpAddressManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/IpAddressManagerImpl.java b/server/src/com/cloud/network/IpAddressManagerImpl.java
index 15d1458..20eae3a 100644
--- a/server/src/com/cloud/network/IpAddressManagerImpl.java
+++ b/server/src/com/cloud/network/IpAddressManagerImpl.java
@@ -1346,7 +1346,7 @@ public class IpAddressManagerImpl extends ManagerBase implements IpAddressManage
PublicIp publicIp = PublicIp.createFromAddrAndVlan(ipToAssoc, _vlanDao.findById(ipToAssoc.getVlanId()));
ipList.add(publicIp);
Map<PublicIpAddress, Set<Service>> ipToServices = _networkModel.getIpToServices(ipList, false, true);
- if (ipToServices != null & !ipToServices.isEmpty()) {
+ if (!ipToServices.isEmpty()) {
Set<Service> services = ipToServices.get(publicIp);
if (services != null && !services.isEmpty()) {
throw new InvalidParameterValueException("IP " + ipToAssoc + " has services and rules associated in the network " + networkId);
@@ -1387,7 +1387,7 @@ public class IpAddressManagerImpl extends ManagerBase implements IpAddressManage
PublicIp publicIp = PublicIp.createFromAddrAndVlan(ip, _vlanDao.findById(ip.getVlanId()));
ipList.add(publicIp);
Map<PublicIpAddress, Set<Service>> ipToServices = _networkModel.getIpToServices(ipList, false, true);
- if (ipToServices != null & !ipToServices.isEmpty()) {
+ if (!ipToServices.isEmpty()) {
Set<Service> ipServices = ipToServices.get(publicIp);
if (ipServices != null && !ipServices.isEmpty()) {
return false;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/90c485e5/server/src/com/cloud/server/ManagementServerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java
index cb73519..2b63ae9 100755
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -40,15 +40,10 @@ import javax.crypto.spec.SecretKeySpec;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
-import org.apache.commons.codec.binary.Base64;
-import org.apache.log4j.Logger;
-
import org.apache.cloudstack.acl.ControlledEntity;
-import org.apache.cloudstack.acl.SecurityChecker.AccessType;
import org.apache.cloudstack.affinity.AffinityGroupProcessor;
import org.apache.cloudstack.affinity.dao.AffinityGroupVMMapDao;
import org.apache.cloudstack.api.ApiConstants;
-import org.apache.cloudstack.api.BaseUpdateTemplateOrIsoCmd;
import org.apache.cloudstack.api.command.admin.account.CreateAccountCmd;
import org.apache.cloudstack.api.command.admin.account.DeleteAccountCmd;
import org.apache.cloudstack.api.command.admin.account.DisableAccountCmd;
@@ -465,6 +460,8 @@ import org.apache.cloudstack.storage.datastore.db.ImageStoreVO;
import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
import org.apache.cloudstack.utils.identity.ManagementServerNode;
+import org.apache.commons.codec.binary.Base64;
+import org.apache.log4j.Logger;
import com.cloud.agent.AgentManager;
import com.cloud.agent.api.GetVncPortAnswer;
@@ -556,18 +553,14 @@ import com.cloud.storage.GuestOSHypervisor;
import com.cloud.storage.GuestOSHypervisorVO;
import com.cloud.storage.GuestOSVO;
import com.cloud.storage.GuestOsCategory;
-import com.cloud.storage.Storage.ImageFormat;
-import com.cloud.storage.Storage.TemplateType;
import com.cloud.storage.StorageManager;
import com.cloud.storage.StoragePool;
-import com.cloud.storage.VMTemplateVO;
import com.cloud.storage.Volume;
import com.cloud.storage.VolumeVO;
import com.cloud.storage.dao.DiskOfferingDao;
import com.cloud.storage.dao.GuestOSCategoryDao;
import com.cloud.storage.dao.GuestOSDao;
import com.cloud.storage.dao.GuestOSHypervisorDao;
-import com.cloud.storage.dao.VMTemplateDao;
import com.cloud.storage.dao.VolumeDao;
import com.cloud.storage.secondary.SecondaryStorageVmManager;
import com.cloud.tags.ResourceTagVO;
@@ -575,7 +568,6 @@ import com.cloud.tags.dao.ResourceTagDao;
import com.cloud.template.TemplateManager;
import com.cloud.user.Account;
import com.cloud.user.AccountManager;
-import com.cloud.user.AccountService;
import com.cloud.user.SSHKeyPair;
import com.cloud.user.SSHKeyPairVO;
import com.cloud.user.User;
@@ -583,7 +575,6 @@ import com.cloud.user.UserVO;
import com.cloud.user.dao.AccountDao;
import com.cloud.user.dao.SSHKeyPairDao;
import com.cloud.user.dao.UserDao;
-import com.cloud.utils.EnumUtils;
import com.cloud.utils.NumbersUtil;
import com.cloud.utils.Pair;
import com.cloud.utils.PasswordGenerator;
@@ -668,8 +659,6 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
@Inject
private DiskOfferingDao _diskOfferingDao;
@Inject
- private VMTemplateDao _templateDao;
- @Inject
private DomainDao _domainDao;
@Inject
private AccountDao _accountDao;
@@ -734,15 +723,11 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
@Inject
private UserVmManager _userVmMgr;
@Inject
- private AccountService _accountService;
- @Inject
private ServiceOfferingDao _offeringDao;
-
@Inject
private DeploymentPlanningManager _dpMgr;
private LockMasterListener _lockMasterListener;
-
private final ScheduledExecutorService _eventExecutor = Executors.newScheduledThreadPool(1, new NamedThreadFactory("EventChecker"));
private final ScheduledExecutorService _alertExecutor = Executors.newScheduledThreadPool(1, new NamedThreadFactory("AlertChecker"));
@Inject
@@ -1809,108 +1794,6 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
}
*/
- private VMTemplateVO updateTemplateOrIso(BaseUpdateTemplateOrIsoCmd cmd) {
- Long id = cmd.getId();
- String name = cmd.getTemplateName();
- String displayText = cmd.getDisplayText();
- String format = cmd.getFormat();
- Long guestOSId = cmd.getOsTypeId();
- Boolean passwordEnabled = cmd.isPasswordEnabled();
- Boolean bootable = cmd.isBootable();
- Integer sortKey = cmd.getSortKey();
- Boolean isDynamicallyScalable = cmd.isDynamicallyScalable();
- Boolean isRoutingTemplate = cmd.isRoutingType();
- Account account = CallContext.current().getCallingAccount();
-
- // verify that template exists
- VMTemplateVO template = _templateDao.findById(id);
- if (template == null || template.getRemoved() != null) {
- InvalidParameterValueException ex = new InvalidParameterValueException("unable to find template/iso with specified id");
- ex.addProxyObject(id.toString(), "templateId");
- throw ex;
- }
-
- // Don't allow to modify system template
- if (id.equals(Long.valueOf(1))) {
- InvalidParameterValueException ex = new InvalidParameterValueException("Unable to update template/iso of specified id");
- ex.addProxyObject(template.getUuid(), "templateId");
- throw ex;
- }
-
- // do a permission check
- _accountMgr.checkAccess(account, AccessType.ModifyEntry, true, template);
-
- if (cmd.isRoutingType() != null) {
- if (!_accountService.isRootAdmin(account.getType())) {
- throw new PermissionDeniedException("Parameter isrouting can only be specified by a Root Admin, permission denied");
- }
- }
- boolean updateNeeded = !(name == null && displayText == null && format == null && guestOSId == null && passwordEnabled == null && bootable == null && sortKey == null
- && isDynamicallyScalable == null && isRoutingTemplate == null);
- if (!updateNeeded) {
- return template;
- }
-
- template = _templateDao.createForUpdate(id);
-
- if (name != null) {
- template.setName(name);
- }
-
- if (displayText != null) {
- template.setDisplayText(displayText);
- }
-
- if (sortKey != null) {
- template.setSortKey(sortKey);
- }
-
- ImageFormat imageFormat = null;
- if (format != null) {
- try {
- imageFormat = ImageFormat.valueOf(format.toUpperCase());
- } catch (IllegalArgumentException e) {
- throw new InvalidParameterValueException("Image format: " + format + " is incorrect. Supported formats are " + EnumUtils.listValues(ImageFormat.values()));
- }
-
- template.setFormat(imageFormat);
- }
-
- if (guestOSId != null) {
- GuestOSVO guestOS = _guestOSDao.findById(guestOSId);
-
- if (guestOS == null) {
- throw new InvalidParameterValueException("Please specify a valid guest OS ID.");
- } else {
- template.setGuestOSId(guestOSId);
- }
- }
-
- if (passwordEnabled != null) {
- template.setEnablePassword(passwordEnabled);
- }
-
- if (bootable != null) {
- template.setBootable(bootable);
- }
-
- if (isDynamicallyScalable != null) {
- template.setDynamicallyScalable(isDynamicallyScalable);
- }
-
- if (isRoutingTemplate != null) {
- if (isRoutingTemplate) {
- template.setTemplateType(TemplateType.ROUTING);
- } else {
- template.setTemplateType(TemplateType.USER);
- }
- }
-
- _templateDao.update(id, template);
-
- return _templateDao.findById(id);
- }
-
@Override
public Pair<List<? extends IpAddress>, Integer> searchForIPAddresses(ListPublicIpAddressesCmd cmd) {
Object keyword = cmd.getKeyword();
@@ -3462,7 +3345,7 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
}
}
- long diskOffMaxSize = _volumeMgr.CustomDiskOfferingMaxSize.value();
+ long diskOffMaxSize = VolumeOrchestrationService.CustomDiskOfferingMaxSize.value();
KVMSnapshotEnabled = Boolean.parseBoolean(_configDao.getValue("KVM.snapshot.enabled"));
boolean userPublicTemplateEnabled = TemplateManager.AllowPublicUserTemplates.valueIn(caller.getId());
[15/50] [abbrv] git commit: updated refs/heads/4.4 to 48f8a95
Posted by hu...@apache.org.
BUG-ID: CS-19196: Relax HA work termination rule on exceptions. It could cause premature HA termination due to unhandled exceptions. Reviewed-By:Anthony
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3123c30f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3123c30f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3123c30f
Branch: refs/heads/4.4
Commit: 3123c30f23ee0f089a554ec5ea50fac1c4731329
Parents: 5310e66
Author: Kelven Yang <ke...@gmail.com>
Authored: Fri Mar 7 17:15:04 2014 -0800
Committer: Kelven Yang <ke...@gmail.com>
Committed: Thu Mar 13 16:59:56 2014 -0700
----------------------------------------------------------------------
server/src/com/cloud/ha/HighAvailabilityManagerImpl.java | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3123c30f/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java b/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
index 52100c8..48d998a 100755
--- a/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
+++ b/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
@@ -913,8 +913,14 @@ public class HighAvailabilityManagerImpl extends ManagerBase implements HighAvai
work.setDateTaken(null);
}
} catch (Exception e) {
- s_logger.error("Terminating " + work, e);
- work.setStep(Step.Error);
+ s_logger.warn("Encountered unhandled exception during HA process, reschedule retry", e);
+
+ long nextTime = (System.currentTimeMillis() >> 10) + _restartRetryInterval;
+
+ s_logger.info("Rescheduling " + work + " to try again at " + new Date(nextTime << 10));
+ work.setTimeToTry(nextTime);
+ work.setServerId(null);
+ work.setDateTaken(null);
}
_haDao.update(work.getId(), work);
} catch (final Throwable th) {
[12/50] [abbrv] git commit: updated refs/heads/4.4 to 48f8a95
Posted by hu...@apache.org.
1) More fixes for the problems found by findBugs
2) Corrected some logging in MidoNetPublicNetworkGuru - removed .toString method call on the objects in the log body as toString is called on the object by default when use log4j
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6c23e201
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6c23e201
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6c23e201
Branch: refs/heads/4.4
Commit: 6c23e201ad7423e405a4acfae4e8a08938cefd24
Parents: 90c485e
Author: Alena Prokharchyk <al...@citrix.com>
Authored: Thu Mar 13 14:35:19 2014 -0700
Committer: Alena Prokharchyk <al...@citrix.com>
Committed: Thu Mar 13 16:05:45 2014 -0700
----------------------------------------------------------------------
.../cloud/template/VirtualMachineTemplate.java | 2 +-
.../src/com/cloud/storage/VMTemplateVO.java | 2 +-
.../storage/image/store/TemplateObject.java | 7 ++---
.../allocator/AbstractStoragePoolAllocator.java | 3 +-
.../ClusterScopeStoragePoolAllocator.java | 5 ++--
.../storage/image/TemplateEntityImpl.java | 4 +--
.../storage/volume/VolumeServiceImpl.java | 26 ++++++++----------
.../affinity/ExplicitDedicationProcessor.java | 11 ++++----
.../baremetal/manager/BareMetalDiscoverer.java | 18 +-----------
.../discoverer/HypervServerDiscoverer.java | 20 +-------------
.../kvm/resource/LibvirtComputingResource.java | 4 +--
.../kvm/resource/LibvirtXMLParser.java | 3 +-
.../resource/SimulatorSecondaryDiscoverer.java | 5 +---
.../vmware/VmwareServerDiscoverer.java | 18 ++++--------
.../xen/discoverer/XcpServerDiscoverer.java | 19 ++++---------
.../xen/resource/CitrixResourceBase.java | 5 ++--
.../network/guru/MidoNetPublicNetworkGuru.java | 29 ++++++++++----------
.../kvm/discoverer/LibvirtServerDiscoverer.java | 3 --
.../src/com/cloud/resource/DiscovererBase.java | 8 ++++--
19 files changed, 67 insertions(+), 125 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c23e201/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 9118bb2..599212b 100755
--- a/api/src/com/cloud/template/VirtualMachineTemplate.java
+++ b/api/src/com/cloud/template/VirtualMachineTemplate.java
@@ -99,5 +99,5 @@ public interface VirtualMachineTemplate extends ControlledEntity, Identity, Inte
Map getDetails();
- Boolean isDynamicallyScalable();
+ boolean isDynamicallyScalable();
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c23e201/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 e619f68..c0b7d0f 100755
--- a/engine/schema/src/com/cloud/storage/VMTemplateVO.java
+++ b/engine/schema/src/com/cloud/storage/VMTemplateVO.java
@@ -593,7 +593,7 @@ public class VMTemplateVO implements VirtualMachineTemplate {
}
@Override
- public Boolean isDynamicallyScalable() {
+ public boolean isDynamicallyScalable() {
return dynamicallyScalable;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c23e201/engine/storage/image/src/org/apache/cloudstack/storage/image/store/TemplateObject.java
----------------------------------------------------------------------
diff --git a/engine/storage/image/src/org/apache/cloudstack/storage/image/store/TemplateObject.java b/engine/storage/image/src/org/apache/cloudstack/storage/image/store/TemplateObject.java
index 34db481..bd14df5 100644
--- a/engine/storage/image/src/org/apache/cloudstack/storage/image/store/TemplateObject.java
+++ b/engine/storage/image/src/org/apache/cloudstack/storage/image/store/TemplateObject.java
@@ -23,8 +23,6 @@ import java.util.Map;
import javax.inject.Inject;
-import org.apache.log4j.Logger;
-
import org.apache.cloudstack.acl.IAMEntityType;
import org.apache.cloudstack.engine.subsystem.api.storage.DataObjectInStore;
import org.apache.cloudstack.engine.subsystem.api.storage.DataStore;
@@ -37,6 +35,7 @@ import org.apache.cloudstack.storage.datastore.ObjectInDataStoreManager;
import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreDao;
import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreVO;
import org.apache.cloudstack.storage.to.TemplateObjectTO;
+import org.apache.log4j.Logger;
import com.cloud.agent.api.Answer;
import com.cloud.agent.api.to.DataObjectType;
@@ -435,8 +434,8 @@ public class TemplateObject implements TemplateInfo {
}
@Override
- public Boolean isDynamicallyScalable() {
- return Boolean.FALSE;
+ public boolean isDynamicallyScalable() {
+ return false;
}
@Override
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c23e201/engine/storage/src/org/apache/cloudstack/storage/allocator/AbstractStoragePoolAllocator.java
----------------------------------------------------------------------
diff --git a/engine/storage/src/org/apache/cloudstack/storage/allocator/AbstractStoragePoolAllocator.java b/engine/storage/src/org/apache/cloudstack/storage/allocator/AbstractStoragePoolAllocator.java
index aab3876..ddbb5a4 100755
--- a/engine/storage/src/org/apache/cloudstack/storage/allocator/AbstractStoragePoolAllocator.java
+++ b/engine/storage/src/org/apache/cloudstack/storage/allocator/AbstractStoragePoolAllocator.java
@@ -27,12 +27,11 @@ import java.util.Random;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
-import org.apache.log4j.Logger;
-
import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager;
import org.apache.cloudstack.engine.subsystem.api.storage.StoragePoolAllocator;
import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
+import org.apache.log4j.Logger;
import com.cloud.dc.ClusterVO;
import com.cloud.dc.dao.ClusterDao;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c23e201/engine/storage/src/org/apache/cloudstack/storage/allocator/ClusterScopeStoragePoolAllocator.java
----------------------------------------------------------------------
diff --git a/engine/storage/src/org/apache/cloudstack/storage/allocator/ClusterScopeStoragePoolAllocator.java b/engine/storage/src/org/apache/cloudstack/storage/allocator/ClusterScopeStoragePoolAllocator.java
index af22810..ea084c7 100644
--- a/engine/storage/src/org/apache/cloudstack/storage/allocator/ClusterScopeStoragePoolAllocator.java
+++ b/engine/storage/src/org/apache/cloudstack/storage/allocator/ClusterScopeStoragePoolAllocator.java
@@ -25,11 +25,10 @@ import javax.ejb.Local;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
-import org.apache.log4j.Logger;
-import org.springframework.stereotype.Component;
-
import org.apache.cloudstack.engine.subsystem.api.storage.StoragePoolAllocator;
import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
+import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
import com.cloud.deploy.DeploymentPlan;
import com.cloud.deploy.DeploymentPlanner.ExcludeList;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c23e201/engine/storage/src/org/apache/cloudstack/storage/image/TemplateEntityImpl.java
----------------------------------------------------------------------
diff --git a/engine/storage/src/org/apache/cloudstack/storage/image/TemplateEntityImpl.java b/engine/storage/src/org/apache/cloudstack/storage/image/TemplateEntityImpl.java
index fd90ac9..fde13e1 100644
--- a/engine/storage/src/org/apache/cloudstack/storage/image/TemplateEntityImpl.java
+++ b/engine/storage/src/org/apache/cloudstack/storage/image/TemplateEntityImpl.java
@@ -108,8 +108,8 @@ public class TemplateEntityImpl implements TemplateEntity {
}
@Override
- public Boolean isDynamicallyScalable() {
- return null; //To change body of implemented methods use File | Settings | File Templates.
+ public boolean isDynamicallyScalable() {
+ return false;
}
@Override
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c23e201/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 d47ee27..1c01401 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
@@ -26,9 +26,6 @@ import java.util.Map;
import javax.inject.Inject;
-import org.apache.log4j.Logger;
-import org.springframework.stereotype.Component;
-
import org.apache.cloudstack.engine.cloud.entity.api.VolumeEntity;
import org.apache.cloudstack.engine.subsystem.api.storage.ChapInfo;
import org.apache.cloudstack.engine.subsystem.api.storage.CopyCommandResult;
@@ -41,7 +38,6 @@ import org.apache.cloudstack.engine.subsystem.api.storage.EndPoint;
import org.apache.cloudstack.engine.subsystem.api.storage.EndPointSelector;
import org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreStateMachine;
import org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreStateMachine.Event;
-import org.apache.cloudstack.engine.subsystem.api.storage.VolumeService.VolumeApiResult;
import org.apache.cloudstack.engine.subsystem.api.storage.PrimaryDataStore;
import org.apache.cloudstack.engine.subsystem.api.storage.PrimaryDataStoreDriver;
import org.apache.cloudstack.engine.subsystem.api.storage.Scope;
@@ -61,8 +57,10 @@ import org.apache.cloudstack.storage.command.DeleteCommand;
import org.apache.cloudstack.storage.datastore.PrimaryDataStoreProviderManager;
import org.apache.cloudstack.storage.datastore.db.VolumeDataStoreDao;
import org.apache.cloudstack.storage.datastore.db.VolumeDataStoreVO;
-import org.apache.cloudstack.storage.to.VolumeObjectTO;
import org.apache.cloudstack.storage.to.TemplateObjectTO;
+import org.apache.cloudstack.storage.to.VolumeObjectTO;
+import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
import com.cloud.agent.api.Answer;
import com.cloud.agent.api.storage.ListVolumeAnswer;
@@ -75,8 +73,8 @@ import com.cloud.event.EventTypes;
import com.cloud.event.UsageEventUtils;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.ResourceAllocationException;
-import com.cloud.host.dao.HostDao;
import com.cloud.host.Host;
+import com.cloud.host.dao.HostDao;
import com.cloud.storage.DataStoreRole;
import com.cloud.storage.ScopeType;
import com.cloud.storage.StoragePool;
@@ -625,15 +623,15 @@ public class VolumeServiceImpl implements VolumeService {
if (templatePoolRef != null) {
long templatePoolRefId = templatePoolRef.getId();
templatePoolRef = _tmpltPoolDao.acquireInLockTable(templatePoolRefId, 1200);
- if (templatePoolRef == null) {
- s_logger.warn("Reset Template State On Pool failed - unable to lock TemplatePoolRef " + templatePoolRefId);
- }
-
try {
- templatePoolRef.setDownloadState(VMTemplateStorageResourceAssoc.Status.NOT_DOWNLOADED);
- templatePoolRef.setState(ObjectInDataStoreStateMachine.State.Allocated);
- _tmpltPoolDao.update(templatePoolRefId, templatePoolRef);
- } finally {
+ if (templatePoolRef == null) {
+ s_logger.warn("Reset Template State On Pool failed - unable to lock TemplatePoolRef " + templatePoolRefId);
+ } else {
+ templatePoolRef.setDownloadState(VMTemplateStorageResourceAssoc.Status.NOT_DOWNLOADED);
+ templatePoolRef.setState(ObjectInDataStoreStateMachine.State.Allocated);
+ _tmpltPoolDao.update(templatePoolRefId, templatePoolRef);
+ }
+ }finally {
_tmpltPoolDao.releaseFromLockTable(templatePoolRefId);
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c23e201/plugins/affinity-group-processors/explicit-dedication/src/org/apache/cloudstack/affinity/ExplicitDedicationProcessor.java
----------------------------------------------------------------------
diff --git a/plugins/affinity-group-processors/explicit-dedication/src/org/apache/cloudstack/affinity/ExplicitDedicationProcessor.java b/plugins/affinity-group-processors/explicit-dedication/src/org/apache/cloudstack/affinity/ExplicitDedicationProcessor.java
index 8c253ee..9aad5f4 100644
--- a/plugins/affinity-group-processors/explicit-dedication/src/org/apache/cloudstack/affinity/ExplicitDedicationProcessor.java
+++ b/plugins/affinity-group-processors/explicit-dedication/src/org/apache/cloudstack/affinity/ExplicitDedicationProcessor.java
@@ -23,10 +23,9 @@ import java.util.Set;
import javax.ejb.Local;
import javax.inject.Inject;
-import org.apache.log4j.Logger;
-
import org.apache.cloudstack.affinity.dao.AffinityGroupDao;
import org.apache.cloudstack.affinity.dao.AffinityGroupVMMapDao;
+import org.apache.log4j.Logger;
import com.cloud.dc.ClusterVO;
import com.cloud.dc.DataCenter;
@@ -120,10 +119,10 @@ public class ExplicitDedicationProcessor extends AffinityProcessorBase implement
DataCenterVO zoneOfHost = _dcDao.findById(host.getDataCenterId());
if (resourceList != null && resourceList.size() != 0) {
for (DedicatedResourceVO resource : resourceList) {
- if ((resource.getHostId() != null && resource.getHostId() == plan.getHostId()) ||
- (resource.getClusterId() != null && resource.getClusterId() == clusterofHost.getId()) ||
- (resource.getPodId() != null && resource.getPodId() == podOfHost.getId()) ||
- (resource.getDataCenterId() != null && resource.getDataCenterId() == zoneOfHost.getId())) {
+ if ((resource.getHostId() != null && resource.getHostId().longValue() == plan.getHostId().longValue()) ||
+ (resource.getClusterId() != null && resource.getClusterId().longValue() == clusterofHost.getId()) ||
+ (resource.getPodId() != null && resource.getPodId().longValue() == podOfHost.getId()) ||
+ (resource.getDataCenterId() != null && resource.getDataCenterId().longValue() == zoneOfHost.getId())) {
canUse = true;
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c23e201/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalDiscoverer.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalDiscoverer.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalDiscoverer.java
index 76897f2..c312df7 100755
--- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalDiscoverer.java
+++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalDiscoverer.java
@@ -33,10 +33,8 @@ import javax.ejb.Local;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
-import org.apache.log4j.Logger;
-
import org.apache.cloudstack.api.ApiConstants;
-import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
+import org.apache.log4j.Logger;
import com.cloud.agent.api.StartupCommand;
import com.cloud.agent.api.StartupRoutingCommand;
@@ -44,18 +42,14 @@ import com.cloud.baremetal.networkservice.BareMetalResourceBase;
import com.cloud.configuration.Config;
import com.cloud.dc.ClusterVO;
import com.cloud.dc.DataCenterVO;
-import com.cloud.dc.dao.ClusterDao;
-import com.cloud.dc.dao.DataCenterDao;
import com.cloud.exception.DiscoveryException;
import com.cloud.host.Host;
import com.cloud.host.HostVO;
-import com.cloud.host.dao.HostDao;
import com.cloud.hypervisor.Hypervisor;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.network.Network;
import com.cloud.resource.Discoverer;
import com.cloud.resource.DiscovererBase;
-import com.cloud.resource.ResourceManager;
import com.cloud.resource.ResourceStateAdapter;
import com.cloud.resource.ServerResource;
import com.cloud.resource.UnableDeleteHostException;
@@ -71,17 +65,7 @@ import com.cloud.vm.dao.VMInstanceDao;
public class BareMetalDiscoverer extends DiscovererBase implements Discoverer, ResourceStateAdapter {
protected static final Logger s_logger = Logger.getLogger(BareMetalDiscoverer.class);
@Inject
- protected ClusterDao _clusterDao;
- @Inject
- protected HostDao _hostDao;
- @Inject
- protected DataCenterDao _dcDao;
- @Inject
protected VMInstanceDao _vmDao = null;
- @Inject
- protected ResourceManager _resourceMgr;
- @Inject
- protected ConfigurationDao _configDao;
@Override
public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c23e201/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/discoverer/HypervServerDiscoverer.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/discoverer/HypervServerDiscoverer.java b/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/discoverer/HypervServerDiscoverer.java
index 371a618..c3d79c5 100644
--- a/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/discoverer/HypervServerDiscoverer.java
+++ b/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/discoverer/HypervServerDiscoverer.java
@@ -43,12 +43,9 @@ import com.cloud.agent.api.SetupCommand;
import com.cloud.agent.api.StartupCommand;
import com.cloud.agent.api.StartupRoutingCommand;
import com.cloud.alert.AlertManager;
-import com.cloud.dc.ClusterDetailsDao;
import com.cloud.dc.ClusterVO;
import com.cloud.dc.DataCenterVO;
import com.cloud.dc.HostPodVO;
-import com.cloud.dc.dao.ClusterDao;
-import com.cloud.dc.dao.DataCenterDao;
import com.cloud.dc.dao.HostPodDao;
import com.cloud.exception.AgentUnavailableException;
import com.cloud.exception.ConnectionException;
@@ -58,13 +55,11 @@ import com.cloud.host.Host;
import com.cloud.host.HostEnvironment;
import com.cloud.host.HostVO;
import com.cloud.host.Status;
-import com.cloud.host.dao.HostDao;
import com.cloud.hypervisor.Hypervisor;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.hypervisor.hyperv.resource.HypervDirectConnectResource;
import com.cloud.resource.Discoverer;
import com.cloud.resource.DiscovererBase;
-import com.cloud.resource.ResourceManager;
import com.cloud.resource.ResourceStateAdapter;
import com.cloud.resource.ServerResource;
import com.cloud.resource.UnableDeleteHostException;
@@ -78,27 +73,14 @@ import com.cloud.storage.StorageLayer;
@Local(value = Discoverer.class)
public class HypervServerDiscoverer extends DiscovererBase implements Discoverer, Listener, ResourceStateAdapter {
private static final Logger s_logger = Logger.getLogger(HypervServerDiscoverer.class);
-
- private String _instance;
- private String _mountParent;
- private int _timeout;
Random _rand = new Random(System.currentTimeMillis());
Map<String, String> _storageMounts = new HashMap<String, String>();
StorageLayer _storage;
@Inject
- private HostDao _hostDao = null;
- @Inject
- private ClusterDao _clusterDao;
- @Inject
- private ClusterDetailsDao _clusterDetailsDao;
- @Inject
- private ResourceManager _resourceMgr;
- @Inject
private HostPodDao _podDao;
- @Inject
- private DataCenterDao _dcDao;
+
// TODO: AgentManager and AlertManager not being used to transmit info,
// may want to reconsider.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c23e201/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
index 3a5d27c..cdeedfe 100755
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
@@ -449,7 +449,7 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
protected int _stopTimeout;
// TODO vmsync {
- protected static HashMap<DomainInfo.DomainState, State> s_statesTable;
+ protected static final HashMap<DomainInfo.DomainState, State> s_statesTable;
static {
s_statesTable = new HashMap<DomainInfo.DomainState, State>();
s_statesTable.put(DomainInfo.DomainState.VIR_DOMAIN_SHUTOFF, State.Stopped);
@@ -461,7 +461,7 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
}
// TODO vmsync }
- protected static HashMap<DomainInfo.DomainState, PowerState> s_powerStatesTable;
+ protected static final HashMap<DomainInfo.DomainState, PowerState> s_powerStatesTable;
static {
s_powerStatesTable = new HashMap<DomainInfo.DomainState, PowerState>();
s_powerStatesTable.put(DomainInfo.DomainState.VIR_DOMAIN_SHUTOFF, PowerState.PowerOff);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c23e201/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtXMLParser.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtXMLParser.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtXMLParser.java
index c8793f1..9d34781 100644
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtXMLParser.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtXMLParser.java
@@ -30,8 +30,7 @@ import org.xml.sax.helpers.DefaultHandler;
public class LibvirtXMLParser extends DefaultHandler {
private static final Logger s_logger = Logger.getLogger(LibvirtXMLParser.class);
- protected static SAXParserFactory s_spf;
-
+ protected static final SAXParserFactory s_spf;
static {
s_spf = SAXParserFactory.newInstance();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c23e201/plugins/hypervisors/simulator/src/com/cloud/resource/SimulatorSecondaryDiscoverer.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/simulator/src/com/cloud/resource/SimulatorSecondaryDiscoverer.java b/plugins/hypervisors/simulator/src/com/cloud/resource/SimulatorSecondaryDiscoverer.java
index 654eee6..715e9f3 100644
--- a/plugins/hypervisors/simulator/src/com/cloud/resource/SimulatorSecondaryDiscoverer.java
+++ b/plugins/hypervisors/simulator/src/com/cloud/resource/SimulatorSecondaryDiscoverer.java
@@ -25,12 +25,11 @@ import javax.ejb.Local;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
-import org.apache.log4j.Logger;
-
import org.apache.cloudstack.storage.datastore.db.ImageStoreDao;
import org.apache.cloudstack.storage.datastore.db.ImageStoreVO;
import org.apache.cloudstack.storage.resource.SecondaryStorageDiscoverer;
import org.apache.cloudstack.storage.resource.SecondaryStorageResource;
+import org.apache.log4j.Logger;
import com.cloud.agent.AgentManager;
import com.cloud.agent.Listener;
@@ -55,8 +54,6 @@ public class SimulatorSecondaryDiscoverer extends SecondaryStorageDiscoverer imp
@Inject
AgentManager _agentMgr;
@Inject
- ResourceManager _resourceMgr;
- @Inject
SnapshotDao _snapshotDao;
@Inject
ImageStoreDao imageStoreDao;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c23e201/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
index 5ab5af0..51db0d9 100755
--- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
@@ -27,12 +27,8 @@ import javax.ejb.Local;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
-import org.apache.log4j.Logger;
-
-import com.vmware.vim25.ClusterDasConfigInfo;
-import com.vmware.vim25.ManagedObjectReference;
-
import org.apache.cloudstack.api.ApiConstants;
+import org.apache.log4j.Logger;
import com.cloud.agent.api.StartupCommand;
import com.cloud.agent.api.StartupRoutingCommand;
@@ -42,7 +38,6 @@ import com.cloud.dc.ClusterDetailsDao;
import com.cloud.dc.ClusterVO;
import com.cloud.dc.DataCenter.NetworkType;
import com.cloud.dc.DataCenterVO;
-import com.cloud.dc.dao.DataCenterDao;
import com.cloud.exception.DiscoveredWithErrorException;
import com.cloud.exception.DiscoveryException;
import com.cloud.exception.InvalidParameterValueException;
@@ -69,7 +64,6 @@ import com.cloud.network.element.CiscoNexusVSMElement;
import com.cloud.network.element.NetworkElement;
import com.cloud.resource.Discoverer;
import com.cloud.resource.DiscovererBase;
-import com.cloud.resource.ResourceManager;
import com.cloud.resource.ResourceStateAdapter;
import com.cloud.resource.ServerResource;
import com.cloud.resource.UnableDeleteHostException;
@@ -80,6 +74,8 @@ import com.cloud.storage.dao.VMTemplateDao;
import com.cloud.user.Account;
import com.cloud.utils.Pair;
import com.cloud.utils.UriUtils;
+import com.vmware.vim25.ClusterDasConfigInfo;
+import com.vmware.vim25.ManagedObjectReference;
@Local(value = Discoverer.class)
public class VmwareServerDiscoverer extends DiscovererBase implements Discoverer, ResourceStateAdapter {
@@ -94,13 +90,7 @@ public class VmwareServerDiscoverer extends DiscovererBase implements Discoverer
@Inject
ClusterDetailsDao _clusterDetailsDao;
@Inject
- DataCenterDao _dcDao;
- @Inject
- ResourceManager _resourceMgr;
- @Inject
CiscoNexusVSMDeviceDao _nexusDao;
- CiscoNexusVSMElement _nexusElement;
- List<NetworkElement> networkElements;
@Inject
NetworkModel _netmgr;
@Inject
@@ -113,6 +103,8 @@ public class VmwareServerDiscoverer extends DiscovererBase implements Discoverer
protected Map<String, String> _urlParams;
protected boolean useDVS = false;
protected boolean nexusDVS = false;
+ CiscoNexusVSMElement _nexusElement;
+ List<NetworkElement> networkElements;
public VmwareServerDiscoverer() {
s_logger.info("VmwareServerDiscoverer is constructed");
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c23e201/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 fbfd222..0ad6dc4 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
@@ -34,13 +34,6 @@ import javax.persistence.EntityExistsException;
import org.apache.log4j.Logger;
import org.apache.xmlrpc.XmlRpcException;
-import com.xensource.xenapi.Connection;
-import com.xensource.xenapi.Host;
-import com.xensource.xenapi.Pool;
-import com.xensource.xenapi.Session;
-import com.xensource.xenapi.Types.SessionAuthenticationFailed;
-import com.xensource.xenapi.Types.XenAPIException;
-
import com.cloud.agent.AgentManager;
import com.cloud.agent.Listener;
import com.cloud.agent.api.AgentControlAnswer;
@@ -57,7 +50,6 @@ import com.cloud.configuration.Config;
import com.cloud.dc.ClusterVO;
import com.cloud.dc.DataCenterVO;
import com.cloud.dc.HostPodVO;
-import com.cloud.dc.dao.DataCenterDao;
import com.cloud.dc.dao.HostPodDao;
import com.cloud.exception.AgentUnavailableException;
import com.cloud.exception.ConnectionException;
@@ -85,7 +77,6 @@ import com.cloud.hypervisor.xen.resource.XenServerConnectionPool;
import com.cloud.hypervisor.xen.resource.Xenserver625Resource;
import com.cloud.resource.Discoverer;
import com.cloud.resource.DiscovererBase;
-import com.cloud.resource.ResourceManager;
import com.cloud.resource.ResourceStateAdapter;
import com.cloud.resource.ServerResource;
import com.cloud.resource.UnableDeleteHostException;
@@ -99,6 +90,12 @@ import com.cloud.utils.db.QueryBuilder;
import com.cloud.utils.db.SearchCriteria.Op;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.utils.exception.HypervisorVersionChangedException;
+import com.xensource.xenapi.Connection;
+import com.xensource.xenapi.Host;
+import com.xensource.xenapi.Pool;
+import com.xensource.xenapi.Session;
+import com.xensource.xenapi.Types.SessionAuthenticationFailed;
+import com.xensource.xenapi.Types.XenAPIException;
@Local(value = Discoverer.class)
public class XcpServerDiscoverer extends DiscovererBase implements Discoverer, Listener, ResourceStateAdapter {
@@ -122,11 +119,7 @@ public class XcpServerDiscoverer extends DiscovererBase implements Discoverer, L
@Inject
VMTemplateDao _tmpltDao;
@Inject
- ResourceManager _resourceMgr;
- @Inject
HostPodDao _podDao;
- @Inject
- DataCenterDao _dcDao;
protected XcpServerDiscoverer() {
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c23e201/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 d80bddc..9103b59 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
@@ -16,6 +16,7 @@
// under the License.
package com.cloud.hypervisor.xen.resource;
+
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
@@ -329,7 +330,7 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
}
}
- protected static HashMap<Types.VmPowerState, PowerState> s_powerStatesTable;
+ protected static final HashMap<Types.VmPowerState, PowerState> s_powerStatesTable;
static {
s_powerStatesTable = new HashMap<Types.VmPowerState, PowerState>();
s_powerStatesTable.put(Types.VmPowerState.HALTED, PowerState.PowerOff);
@@ -340,7 +341,7 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
}
// TODO vmsync {
- protected static HashMap<Types.VmPowerState, State> s_statesTable;
+ protected static final HashMap<Types.VmPowerState, State> s_statesTable;
static {
s_statesTable = new HashMap<Types.VmPowerState, State>();
s_statesTable.put(Types.VmPowerState.HALTED, State.Stopped);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c23e201/plugins/network-elements/midonet/src/com/cloud/network/guru/MidoNetPublicNetworkGuru.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/midonet/src/com/cloud/network/guru/MidoNetPublicNetworkGuru.java b/plugins/network-elements/midonet/src/com/cloud/network/guru/MidoNetPublicNetworkGuru.java
index d81dc9d..5f0b155 100644
--- a/plugins/network-elements/midonet/src/com/cloud/network/guru/MidoNetPublicNetworkGuru.java
+++ b/plugins/network-elements/midonet/src/com/cloud/network/guru/MidoNetPublicNetworkGuru.java
@@ -72,7 +72,7 @@ public class MidoNetPublicNetworkGuru extends PublicNetworkGuru {
// Only change is to make broadcast domain type Mido
@Override
public Network design(NetworkOffering offering, DeploymentPlan plan, Network network, Account owner) {
- s_logger.debug("design called with network: " + network.toString());
+ s_logger.debug("design called with network: " + network);
if (!canHandle(offering)) {
return null;
}
@@ -96,7 +96,7 @@ public class MidoNetPublicNetworkGuru extends PublicNetworkGuru {
InsufficientAddressCapacityException, ConcurrentOperationException {
if (nic.getIp4Address() == null) {
PublicIp ip = _ipAddrMgr.assignPublicIpAddress(dc.getId(), null, vm.getOwner(), Vlan.VlanType.VirtualNetwork, null, null, false);
- nic.setIp4Address(ip.getAddress().toString());
+ nic.setIp4Address(ip.getAddress().addr());
nic.setGateway(ip.getGateway());
@@ -121,7 +121,7 @@ public class MidoNetPublicNetworkGuru extends PublicNetworkGuru {
@Override
public void updateNicProfile(NicProfile profile, Network network) {
- s_logger.debug("updateNicProfile called with network: " + network.toString() + " profile: " + profile.toString());
+ s_logger.debug("updateNicProfile called with network: " + network + " profile: " + profile);
DataCenter dc = _dcDao.findById(network.getDataCenterId());
if (profile != null) {
@@ -134,17 +134,16 @@ public class MidoNetPublicNetworkGuru extends PublicNetworkGuru {
public NicProfile allocate(Network network, NicProfile nic, VirtualMachineProfile vm) throws InsufficientVirtualNetworkCapcityException,
InsufficientAddressCapacityException, ConcurrentOperationException {
- s_logger.debug("allocate called with network: " + network.toString() + " nic: " + nic.toString() + " vm: " + vm.toString());
+ if (nic == null) {
+ nic = new NicProfile(Nic.ReservationStrategy.Create, null, null, null, null);
+ }
+ s_logger.debug("allocate called with network: " + network + " nic: " + nic + " vm: " + vm);
DataCenter dc = _dcDao.findById(network.getDataCenterId());
- if (nic != null && nic.getRequestedIpv4() != null) {
+ if (nic.getRequestedIpv4() != null) {
throw new CloudRuntimeException("Does not support custom ip allocation at this time: " + nic);
}
- if (nic == null) {
- nic = new NicProfile(Nic.ReservationStrategy.Create, null, null, null, null);
- }
-
getIp(nic, dc, vm, network);
if (nic.getIp4Address() == null) {
@@ -163,7 +162,7 @@ public class MidoNetPublicNetworkGuru extends PublicNetworkGuru {
@Override
public void reserve(NicProfile nic, Network network, VirtualMachineProfile vm, DeployDestination dest, ReservationContext context)
throws InsufficientVirtualNetworkCapcityException, InsufficientAddressCapacityException, ConcurrentOperationException {
- s_logger.debug("reserve called with network: " + network.toString() + " nic: " + nic.toString() + " vm: " + vm.toString());
+ s_logger.debug("reserve called with network: " + network + " nic: " + nic + " vm: " + vm);
if (nic.getIp4Address() == null) {
getIp(nic, dest.getDataCenter(), vm, network);
}
@@ -171,14 +170,14 @@ public class MidoNetPublicNetworkGuru extends PublicNetworkGuru {
@Override
public boolean release(NicProfile nic, VirtualMachineProfile vm, String reservationId) {
- s_logger.debug("release called with nic: " + nic.toString() + " vm: " + vm.toString());
+ s_logger.debug("release called with nic: " + nic + " vm: " + vm);
return true;
}
@Override
public Network implement(Network network, NetworkOffering offering, DeployDestination destination, ReservationContext context)
throws InsufficientVirtualNetworkCapcityException {
- s_logger.debug("implement called with network: " + network.toString());
+ s_logger.debug("implement called with network: " + network);
long dcId = destination.getDataCenter().getId();
//get physical network id
@@ -205,7 +204,7 @@ public class MidoNetPublicNetworkGuru extends PublicNetworkGuru {
@Override
@DB
public void deallocate(Network network, NicProfile nic, VirtualMachineProfile vm) {
- s_logger.debug("deallocate called with network: " + network.toString() + " nic: " + nic.toString() + " vm: " + vm.toString());
+ s_logger.debug("deallocate called with network: " + network + " nic: " + nic + " vm: " + vm);
if (s_logger.isDebugEnabled()) {
s_logger.debug("public network deallocate network: networkId: " + nic.getNetworkId() + ", ip: " + nic.getIp4Address());
}
@@ -229,12 +228,12 @@ public class MidoNetPublicNetworkGuru extends PublicNetworkGuru {
@Override
public void shutdown(NetworkProfile network, NetworkOffering offering) {
- s_logger.debug("shutdown called with network: " + network.toString());
+ s_logger.debug("shutdown called with network: " + network);
}
@Override
public boolean trash(Network network, NetworkOffering offering) {
- s_logger.debug("trash called with network: " + network.toString());
+ s_logger.debug("trash called with network: " + network);
return true;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c23e201/server/src/com/cloud/hypervisor/kvm/discoverer/LibvirtServerDiscoverer.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/hypervisor/kvm/discoverer/LibvirtServerDiscoverer.java b/server/src/com/cloud/hypervisor/kvm/discoverer/LibvirtServerDiscoverer.java
index 770099c..d127256 100644
--- a/server/src/com/cloud/hypervisor/kvm/discoverer/LibvirtServerDiscoverer.java
+++ b/server/src/com/cloud/hypervisor/kvm/discoverer/LibvirtServerDiscoverer.java
@@ -51,7 +51,6 @@ import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.network.PhysicalNetworkSetupInfo;
import com.cloud.resource.Discoverer;
import com.cloud.resource.DiscovererBase;
-import com.cloud.resource.ResourceManager;
import com.cloud.resource.ResourceStateAdapter;
import com.cloud.resource.ServerResource;
import com.cloud.resource.UnableDeleteHostException;
@@ -65,8 +64,6 @@ public abstract class LibvirtServerDiscoverer extends DiscovererBase implements
private String _kvmPublicNic;
private String _kvmGuestNic;
@Inject
- ResourceManager _resourceMgr;
- @Inject
AgentManager _agentMgr;
@Override
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c23e201/server/src/com/cloud/resource/DiscovererBase.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/resource/DiscovererBase.java b/server/src/com/cloud/resource/DiscovererBase.java
index 0da72c0..ae2a9c9 100644
--- a/server/src/com/cloud/resource/DiscovererBase.java
+++ b/server/src/com/cloud/resource/DiscovererBase.java
@@ -25,13 +25,13 @@ import java.util.Map;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
-import org.apache.log4j.Logger;
-
import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
+import org.apache.log4j.Logger;
import com.cloud.configuration.Config;
import com.cloud.dc.ClusterVO;
import com.cloud.dc.dao.ClusterDao;
+import com.cloud.dc.dao.DataCenterDao;
import com.cloud.host.HostVO;
import com.cloud.host.dao.HostDao;
import com.cloud.network.NetworkModel;
@@ -49,6 +49,10 @@ public abstract class DiscovererBase extends AdapterBase implements Discoverer {
protected NetworkModel _networkMgr;
@Inject
protected HostDao _hostDao;
+ @Inject
+ protected ResourceManager _resourceMgr;
+ @Inject
+ protected DataCenterDao _dcDao;
@Override
public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
[30/50] [abbrv] git commit: updated refs/heads/4.4 to 48f8a95
Posted by hu...@apache.org.
CLOUDSTACK-6090: Virtual Router Service Failure Alerting
Signed-off-by: Koushik Das <ko...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f7337527
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f7337527
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f7337527
Branch: refs/heads/4.4
Commit: f7337527cf9dbb35ec4c60621d4b37173635660c
Parents: 6a5d3e9
Author: Harikrishna Patnala <ha...@citrix.com>
Authored: Fri Mar 14 15:00:38 2014 +0530
Committer: Koushik Das <ko...@apache.org>
Committed: Fri Mar 14 15:14:15 2014 +0530
----------------------------------------------------------------------
.../cloud/agent/api/GetRouterAlertsAnswer.java | 62 +++++
.../api/routing/GetRouterAlertsCommand.java | 46 ++++
.../virtualnetwork/VirtualRoutingResource.java | 45 +++-
.../spring-engine-schema-core-daos-context.xml | 1 +
.../network/dao/OpRouterMonitorServiceDao.java | 25 ++
.../dao/OpRouterMonitorServiceDaoImpl.java | 28 +++
.../network/dao/OpRouterMonitorServiceVO.java | 52 ++++
.../VirtualNetworkApplianceManagerImpl.java | 67 +++++
setup/db/db/schema-430to440.sql | 8 +
.../config/opt/cloud/bin/getRouterAlerts.sh | 70 ++++++
.../debian/config/root/monitorServices.py | 3 +
.../smoke/test_VirtualRouter_alerts.py | 244 +++++++++++++++++++
12 files changed, 650 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f7337527/core/src/com/cloud/agent/api/GetRouterAlertsAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/GetRouterAlertsAnswer.java b/core/src/com/cloud/agent/api/GetRouterAlertsAnswer.java
new file mode 100644
index 0000000..06a7a7a
--- /dev/null
+++ b/core/src/com/cloud/agent/api/GetRouterAlertsAnswer.java
@@ -0,0 +1,62 @@
+// 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.
+
+package com.cloud.agent.api;
+
+
+import com.cloud.agent.api.routing.GetRouterAlertsCommand;
+
+public class GetRouterAlertsAnswer extends Answer {
+
+ String routerName;
+ String[] alerts;
+ String timeStamp;
+
+ protected GetRouterAlertsAnswer() {
+ }
+
+ public GetRouterAlertsAnswer(GetRouterAlertsCommand cmd, String alerts[], String timeStamp) {
+ super(cmd, true, null);
+ this.alerts = alerts;
+ this.timeStamp = timeStamp;
+ }
+
+
+ public GetRouterAlertsAnswer(GetRouterAlertsCommand cmd, Exception ex) {
+ super(cmd, ex);
+ }
+
+ public void setAlerts(String[] alerts) {
+ this.alerts = alerts;
+ }
+
+ public String[] getAlerts() {
+ return alerts;
+ }
+
+ public void setTimeStamp(String timeStamp) {
+ this.timeStamp = timeStamp;
+ }
+
+ public String getTimeStamp() {
+ return timeStamp;
+ }
+
+ public String getRouterName() {
+ return routerName;
+ }
+}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f7337527/core/src/com/cloud/agent/api/routing/GetRouterAlertsCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/routing/GetRouterAlertsCommand.java b/core/src/com/cloud/agent/api/routing/GetRouterAlertsCommand.java
new file mode 100644
index 0000000..a6769ef
--- /dev/null
+++ b/core/src/com/cloud/agent/api/routing/GetRouterAlertsCommand.java
@@ -0,0 +1,46 @@
+// 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.
+
+package com.cloud.agent.api.routing;
+
+
+public class GetRouterAlertsCommand extends NetworkElementCommand {
+
+ private String previousAlertTimeStamp;
+
+ protected GetRouterAlertsCommand() {
+
+ }
+
+ @Override
+ public boolean executeInSequence() {
+ return false;
+ }
+
+ public GetRouterAlertsCommand(String timeStamp) {
+ this.previousAlertTimeStamp = timeStamp;
+ }
+
+ public String getPreviousAlertTimeStamp() {
+ return previousAlertTimeStamp;
+ }
+
+ @Override
+ public boolean isQuery() {
+ return true;
+ }
+}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f7337527/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 3712aba..e13fbf6 100755
--- a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
+++ b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
@@ -32,6 +32,8 @@ import com.cloud.agent.api.routing.DeleteIpAliasCommand;
import com.cloud.agent.api.routing.DhcpEntryCommand;
import com.cloud.agent.api.routing.DnsMasqConfigCommand;
import com.cloud.agent.api.routing.GroupAnswer;
+import com.cloud.agent.api.routing.GetRouterAlertsCommand;
+import com.cloud.agent.api.GetRouterAlertsAnswer;
import com.cloud.agent.api.routing.IpAliasTO;
import com.cloud.agent.api.routing.IpAssocCommand;
import com.cloud.agent.api.routing.IpAssocVpcCommand;
@@ -102,6 +104,7 @@ public class VirtualRoutingResource {
protected static final String IPASSOC = "ipassoc.sh";
protected static final String LB = "loadbalancer.sh";
protected static final String MONITOR_SERVICE = "monitor_service.sh";
+ protected static final String ROUTER_ALERTS = "getRouterAlerts.sh";
protected static final String PASSWORD = "savepassword.sh";
protected static final String RVR_CHECK = "checkrouter.sh";
protected static final String RVR_BUMPUP_PRI = "bumpup_priority.sh";
@@ -275,7 +278,9 @@ public class VirtualRoutingResource {
} else if (cmd instanceof GetDomRVersionCmd) {
return execute((GetDomRVersionCmd)cmd);
} else if (cmd instanceof CheckS2SVpnConnectionsCommand) {
- return execute((CheckS2SVpnConnectionsCommand)cmd);
+ return execute((CheckS2SVpnConnectionsCommand) cmd);
+ } else if (cmd instanceof GetRouterAlertsCommand) {
+ return execute((GetRouterAlertsCommand)cmd);
} else {
s_logger.error("Unknown query command in VirtualRoutingResource!");
return Answer.createUnsupportedCommandAnswer(cmd);
@@ -642,6 +647,29 @@ public class VirtualRoutingResource {
return new CheckS2SVpnConnectionsAnswer(cmd, result.isSuccess(), result.getDetails());
}
+ private GetRouterAlertsAnswer execute(GetRouterAlertsCommand cmd) {
+
+ String args = null;
+ String routerIp = cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP);
+ if (cmd.getPreviousAlertTimeStamp() != null) {
+ args = cmd.getPreviousAlertTimeStamp();
+ }
+
+ ExecutionResult result = _vrDeployer.executeInVR(routerIp, VRScripts.ROUTER_ALERTS, args);
+ String alerts[] = null;
+ String lastAlertTimestamp = null;
+ // CallHostPlugin results "success" when there are no alerts on virtual router
+ if (result.isSuccess()) {
+ if (!result.getDetails().isEmpty() && !result.getDetails().equals("No Alerts")) {
+ alerts = result.getDetails().split("\\\\n");
+ String[] lastAlert = alerts[alerts.length - 1].split(" ");
+ lastAlertTimestamp = lastAlert[0] + " " + lastAlert[1];
+ }
+ }
+
+ return new GetRouterAlertsAnswer(cmd, alerts, lastAlertTimestamp);
+ }
+
protected Answer execute(CheckRouterCommand cmd) {
final ExecutionResult result = _vrDeployer.executeInVR(cmd.getRouterAccessIp(), VRScripts.RVR_CHECK, null);
if (!result.isSuccess()) {
@@ -732,6 +760,21 @@ public class VirtualRoutingResource {
return cfg;
}
+ protected List<ConfigItem> generateConfig(GetRouterAlertsCommand cmd) {
+ LinkedList<ConfigItem> cfg = new LinkedList<>();
+
+ String args = null;
+ String routerIp = cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP);
+ if (cmd.getPreviousAlertTimeStamp() != null) {
+ args = "getRouterAlerts.sh " + routerIp + " " + cmd.getPreviousAlertTimeStamp();
+ } else {
+ args = "getRouterAlerts.sh " + routerIp;
+ }
+
+ cfg.add(new ConfigItem(VRScripts.ROUTER_ALERTS, args));
+ return cfg;
+ }
+
protected List<ConfigItem> generateConfig(SetupGuestNetworkCommand cmd) {
LinkedList<ConfigItem> cfg = new LinkedList<>();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f7337527/engine/schema/resources/META-INF/cloudstack/core/spring-engine-schema-core-daos-context.xml
----------------------------------------------------------------------
diff --git a/engine/schema/resources/META-INF/cloudstack/core/spring-engine-schema-core-daos-context.xml b/engine/schema/resources/META-INF/cloudstack/core/spring-engine-schema-core-daos-context.xml
index 765d86c..489b37d 100644
--- a/engine/schema/resources/META-INF/cloudstack/core/spring-engine-schema-core-daos-context.xml
+++ b/engine/schema/resources/META-INF/cloudstack/core/spring-engine-schema-core-daos-context.xml
@@ -157,6 +157,7 @@
<bean id="firewallRulesCidrsDaoImpl" class="com.cloud.network.dao.FirewallRulesCidrsDaoImpl" />
<bean id="firewallRulesDaoImpl" class="com.cloud.network.dao.FirewallRulesDaoImpl" />
<bean id="MonitoringServiceDaoImpl" class="com.cloud.network.dao.MonitoringServiceDaoImpl" />
+ <bean id="OpRouterMonitorServiceDaoImpl" class="com.cloud.network.dao.OpRouterMonitorServiceDaoImpl" />
<bean id="globalLoadBalancerDaoImpl" class="org.apache.cloudstack.region.gslb.GlobalLoadBalancerDaoImpl" />
<bean id="globalLoadBalancerLbRuleMapDaoImpl" class="org.apache.cloudstack.region.gslb.GlobalLoadBalancerLbRuleMapDaoImpl" />
<bean id="guestOSCategoryDaoImpl" class="com.cloud.storage.dao.GuestOSCategoryDaoImpl" />
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f7337527/engine/schema/src/com/cloud/network/dao/OpRouterMonitorServiceDao.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/OpRouterMonitorServiceDao.java b/engine/schema/src/com/cloud/network/dao/OpRouterMonitorServiceDao.java
new file mode 100644
index 0000000..ebc0f1a
--- /dev/null
+++ b/engine/schema/src/com/cloud/network/dao/OpRouterMonitorServiceDao.java
@@ -0,0 +1,25 @@
+// 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.
+
+package com.cloud.network.dao;
+
+
+import com.cloud.utils.db.GenericDao;
+
+public interface OpRouterMonitorServiceDao extends GenericDao<OpRouterMonitorServiceVO, Long> {
+
+}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f7337527/engine/schema/src/com/cloud/network/dao/OpRouterMonitorServiceDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/OpRouterMonitorServiceDaoImpl.java b/engine/schema/src/com/cloud/network/dao/OpRouterMonitorServiceDaoImpl.java
new file mode 100644
index 0000000..b92512e
--- /dev/null
+++ b/engine/schema/src/com/cloud/network/dao/OpRouterMonitorServiceDaoImpl.java
@@ -0,0 +1,28 @@
+// 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.
+
+package com.cloud.network.dao;
+
+import com.cloud.utils.db.GenericDaoBase;
+import org.springframework.stereotype.Component;
+
+import javax.ejb.Local;
+
+@Component
+@Local(value=OpRouterMonitorServiceDao.class)
+public class OpRouterMonitorServiceDaoImpl extends GenericDaoBase<OpRouterMonitorServiceVO, Long> implements OpRouterMonitorServiceDao {
+}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f7337527/engine/schema/src/com/cloud/network/dao/OpRouterMonitorServiceVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/OpRouterMonitorServiceVO.java b/engine/schema/src/com/cloud/network/dao/OpRouterMonitorServiceVO.java
new file mode 100644
index 0000000..c70bba3
--- /dev/null
+++ b/engine/schema/src/com/cloud/network/dao/OpRouterMonitorServiceVO.java
@@ -0,0 +1,52 @@
+package com.cloud.network.dao;
+
+import org.apache.cloudstack.api.InternalIdentity;
+
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Id;
+import javax.persistence.Column;
+
+
+@Entity
+@Table(name = "op_router_monitoring_services")
+public class OpRouterMonitorServiceVO implements InternalIdentity {
+
+ @Id
+ @Column(name="vm_id")
+ Long id;
+
+ @Column(name="router_name")
+ private String name;
+
+ @Column(name="last_alert_timestamp")
+ private String lastAlertTimestamp;
+
+
+ public OpRouterMonitorServiceVO() {}
+
+ public OpRouterMonitorServiceVO(long vmId, String name, String lastAlertTimestamp) {
+ this.id = vmId;
+ this.name = name;
+ this.lastAlertTimestamp = lastAlertTimestamp;
+ }
+
+
+ @Override
+ public long getId() {
+ return id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public String getLastAlertTimestamp() {
+ return lastAlertTimestamp;
+ }
+
+ public void setLastAlertTimestamp (String timestamp) {
+ this.lastAlertTimestamp = timestamp;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f7337527/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 eeab91d..c692491 100755
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -55,6 +55,7 @@ import org.apache.cloudstack.framework.jobs.AsyncJobManager;
import org.apache.cloudstack.framework.jobs.impl.AsyncJobVO;
import org.apache.cloudstack.managed.context.ManagedContextRunnable;
import org.apache.cloudstack.utils.identity.ManagementServerNode;
+import org.apache.cloudstack.alert.AlertService.AlertType;
import com.cloud.agent.AgentManager;
import com.cloud.agent.Listener;
import com.cloud.agent.api.AgentControlAnswer;
@@ -73,6 +74,8 @@ import com.cloud.agent.api.NetworkUsageAnswer;
import com.cloud.agent.api.NetworkUsageCommand;
import com.cloud.agent.api.PvlanSetupCommand;
import com.cloud.agent.api.StartupCommand;
+import com.cloud.agent.api.routing.GetRouterAlertsCommand;
+import com.cloud.agent.api.GetRouterAlertsAnswer;
import com.cloud.agent.api.check.CheckSshAnswer;
import com.cloud.agent.api.check.CheckSshCommand;
import com.cloud.agent.api.routing.AggregationControlCommand;
@@ -179,6 +182,7 @@ import com.cloud.network.dao.MonitoringServiceDao;
import com.cloud.network.dao.MonitoringServiceVO;
import com.cloud.network.dao.NetworkDao;
import com.cloud.network.dao.NetworkVO;
+import com.cloud.network.dao.OpRouterMonitorServiceDao;
import com.cloud.network.dao.PhysicalNetworkServiceProviderDao;
import com.cloud.network.dao.RemoteAccessVpnDao;
import com.cloud.network.dao.Site2SiteCustomerGatewayDao;
@@ -188,6 +192,7 @@ import com.cloud.network.dao.Site2SiteVpnGatewayDao;
import com.cloud.network.dao.UserIpv6AddressDao;
import com.cloud.network.dao.VirtualRouterProviderDao;
import com.cloud.network.dao.VpnUserDao;
+import com.cloud.network.dao.OpRouterMonitorServiceVO;
import com.cloud.network.lb.LoadBalancingRule;
import com.cloud.network.lb.LoadBalancingRule.LbDestination;
import com.cloud.network.lb.LoadBalancingRule.LbHealthCheckPolicy;
@@ -394,6 +399,8 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V
AsyncJobManager _asyncMgr;
@Inject
protected ApiAsyncJobDispatcher _asyncDispatcher;
+ @Inject
+ OpRouterMonitorServiceDao _opRouterMonitorServiceDao;
int _routerRamSize;
int _routerCpuMHz;
@@ -1348,6 +1355,8 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V
updateSite2SiteVpnConnectionState(routers);
+ getRouterAlerts();
+
final List<NetworkVO> networks = _networkDao.listRedundantNetworks();
s_logger.debug("Found " + networks.size() + " networks to update RvR status. ");
for (final NetworkVO network : networks) {
@@ -1362,6 +1371,64 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V
}
}
+ private void getRouterAlerts() {
+ try{
+ List<DomainRouterVO> routersInIsolatedNetwork = _routerDao.listByStateAndNetworkType(State.Running, GuestType.Isolated, mgmtSrvrId);
+ List<DomainRouterVO> routersInSharedNetwork = _routerDao.listByStateAndNetworkType(State.Running, GuestType.Shared, mgmtSrvrId);
+
+ List<DomainRouterVO> routers = new ArrayList<DomainRouterVO>();
+ routers.addAll(routersInIsolatedNetwork);
+ routers.addAll(routersInSharedNetwork);
+ s_logger.debug("Found " + routers.size() + " running routers. ");
+
+ for (final DomainRouterVO router : routers) {
+ if (router.getVpcId() != null) {
+ continue;
+ }
+ String privateIP = router.getPrivateIpAddress();
+
+ if (privateIP != null) {
+ OpRouterMonitorServiceVO opRouterMonitorServiceVO = _opRouterMonitorServiceDao.findById(router.getId());
+
+ GetRouterAlertsCommand command = null;
+ if (opRouterMonitorServiceVO == null) {
+ command = new GetRouterAlertsCommand(null);
+ } else {
+ command = new GetRouterAlertsCommand(opRouterMonitorServiceVO.getLastAlertTimestamp());
+ }
+
+ command.setAccessDetail(NetworkElementCommand.ROUTER_IP, router.getPrivateIpAddress());
+ command.setAccessDetail(NetworkElementCommand.ROUTER_NAME, router.getInstanceName());
+
+ GetRouterAlertsAnswer answer = null;
+ try {
+ answer = (GetRouterAlertsAnswer) _agentMgr.easySend(router.getHostId(), command);
+ String alerts[] = answer.getAlerts();
+ if (alerts != null ) {
+ for (String alert: alerts) {
+ _alertMgr.sendAlert(AlertType.ALERT_TYPE_DOMAIN_ROUTER, router.getDataCenterId(), router.getPodIdToDeployIn(), "Monitoring Service on VR " + router.getInstanceName(), alert);
+ }
+ String lastAlertTimeStamp = answer.getTimeStamp();
+ if (opRouterMonitorServiceVO == null) {
+ opRouterMonitorServiceVO = new OpRouterMonitorServiceVO(router.getId(), router.getHostName(), lastAlertTimeStamp);
+ _opRouterMonitorServiceDao.persist(opRouterMonitorServiceVO);
+ } else {
+ opRouterMonitorServiceVO.setLastAlertTimestamp(lastAlertTimeStamp);
+ _opRouterMonitorServiceDao.update(opRouterMonitorServiceVO.getId(), opRouterMonitorServiceVO);
+ }
+ }
+ } catch (Exception e) {
+ s_logger.warn("Error while collecting alerts from router: " + router.getInstanceName() + " from host: " + router.getHostId(), e);
+ continue;
+ }
+ }
+ }
+ } catch (Exception e) {
+ s_logger.warn("Error while collecting alerts from router", e);
+ }
+ }
+
+
private final static int DEFAULT_PRIORITY = 100;
private final static int DEFAULT_DELTA = 2;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f7337527/setup/db/db/schema-430to440.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-430to440.sql b/setup/db/db/schema-430to440.sql
index 056c5f8..9d41fe9 100644
--- a/setup/db/db/schema-430to440.sql
+++ b/setup/db/db/schema-430to440.sql
@@ -657,6 +657,14 @@ ALTER TABLE `cloud`.`s2s_vpn_gateway` ADD COLUMN `display` tinyint(1) NOT NULL D
INSERT IGNORE INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (225, UUID(), 9, 'FreeBSD 10 (32-bit)');
INSERT IGNORE INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (226, UUID(), 9, 'FreeBSD 10 (64-bit)');
+CREATE TABLE `cloud`.`op_router_monitoring_services` (
+ `vm_id` bigint unsigned UNIQUE NOT NULL COMMENT 'Primary Key',
+ `router_name` varchar(255) NOT NULL COMMENT 'Name of the Virtual Router',
+ `last_alert_timestamp` varchar(255) NOT NULL COMMENT 'Timestamp of the last alert received from Virtual Router',
+ PRIMARY KEY (`vm_id`),
+ CONSTRAINT `fk_virtual_router__id` FOREIGN KEY `fk_virtual_router__id` (`vm_id`) REFERENCES `vm_instance`(`id`) ON DELETE CASCADE
+) ENGINE = InnoDB DEFAULT CHARSET=utf8
+
ALTER TABLE `cloud`.`event` ADD COLUMN `display` tinyint(1) NOT NULL DEFAULT '1' COMMENT 'True if the detail can be displayed to the end user';
DROP VIEW IF EXISTS `cloud`.`event_view`;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f7337527/systemvm/patches/debian/config/opt/cloud/bin/getRouterAlerts.sh
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/getRouterAlerts.sh b/systemvm/patches/debian/config/opt/cloud/bin/getRouterAlerts.sh
new file mode 100644
index 0000000..e5e8abe
--- /dev/null
+++ b/systemvm/patches/debian/config/opt/cloud/bin/getRouterAlerts.sh
@@ -0,0 +1,70 @@
+#!/usr/bin/env bash
+# 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.
+
+# getRouterAlerts.sh --- Send the alerts from routerServiceMonitor.log to Management Server
+
+source /root/func.sh
+
+lock="biglock"
+locked=$(getLockFile $lock)
+if [ "$locked" != "1" ]
+then
+ exit 1
+fi
+
+#set -x
+
+filename=/var/log/routerServiceMonitor.log #Monitor service log file
+if [ -n "$1" -a -n "$2" ]
+then
+ reqdateval=$(date -d $1 +"%Y%m%d");
+ reqtimeval=$(date -d $2 +"%H%M%S");
+else
+ reqdateval=0
+ reqtimeval=0
+fi
+if [ -f $filename ]
+then
+ while read line
+ do
+ if [ -n "$line" ]; then
+ dateval=`echo $line |awk '{print $1}'`
+ timeval=`echo $line |awk '{print $2}'`
+
+ todate=$(date -d "$dateval" +"%Y%m%d") > /dev/null
+ totime=$(date -d "$timeval" +"%H%M%S") > /dev/null
+ if [ "$todate" -gt "$reqdateval" ] > /dev/null
+ then
+ if [ -n "$alerts" ]; then alerts="$alerts\n$line"; else alerts="$line"; fi #>> $outputfile
+ elif [ "$todate" -eq "$reqdateval" ] > /dev/null
+ then
+ if [ "$totime" -gt "$reqtimeval" ] > /dev/null
+ then
+ if [ -n "$alerts" ]; then alerts="$alerts\n$line"; else alerts="$line"; fi #>> $outputfile
+ fi
+ fi
+ fi
+ done < $filename
+fi
+if [ -n "$alerts" ]; then
+ echo $alerts
+else
+ echo "No Alerts"
+fi
+
+unlock_exit 0 $lock $locked
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f7337527/systemvm/patches/debian/config/root/monitorServices.py
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/root/monitorServices.py b/systemvm/patches/debian/config/root/monitorServices.py
index 0319ece..c1dfba2 100755
--- a/systemvm/patches/debian/config/root/monitorServices.py
+++ b/systemvm/patches/debian/config/root/monitorServices.py
@@ -25,6 +25,7 @@ from subprocess import *
from os import path
import time
import os
+import logging
class StatusCodes:
SUCCESS = 0
@@ -92,6 +93,8 @@ def raisealert(severity, msg, process_name=None):
else:
log = '['+severity+']' + " " + msg +"\n"
+ logging.basicConfig(level=logging.INFO,filename='/var/log/routerServiceMonitor.log',format='%(asctime)s %(message)s')
+ logging.info(log)
msg = 'logger -t monit '+ log
pout = Popen(msg, shell=True, stdout=PIPE)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f7337527/test/integration/smoke/test_VirtualRouter_alerts.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_VirtualRouter_alerts.py b/test/integration/smoke/test_VirtualRouter_alerts.py
new file mode 100644
index 0000000..2333d84
--- /dev/null
+++ b/test/integration/smoke/test_VirtualRouter_alerts.py
@@ -0,0 +1,244 @@
+# 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 alert receiving from VR on service failure in VR
+"""
+#Import Local Modules
+import marvin
+from marvin.cloudstackTestCase import *
+from marvin.cloudstackAPI import *
+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 time
+
+
+_multiprocess_shared_ = True
+
+class Services:
+ """Test VM Life Cycle Services
+ """
+
+ def __init__(self):
+ self.services = {
+
+ "account": {
+ "email": "test@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": "SmallInstance",
+ "displaytext": "SmallInstance",
+ "cpunumber": 1,
+ "cpuspeed": 100,
+ "memory": 256,
+ },
+ "big":
+ {
+ # Big service offering ID to for change VM
+ "name": "BigInstance",
+ "displaytext": "BigInstance",
+ "cpunumber": 1,
+ "cpuspeed": 100,
+ "memory": 512,
+ }
+ },
+ #Change this
+ "template": {
+ "displaytext": "xs",
+ "name": "xs",
+ "passwordenabled": False,
+ },
+ "sleep": 60,
+ "timeout": 10,
+ #Migrate VM to hostid
+ "ostype": 'CentOS 5.3 (64-bit)',
+ # CentOS 5.3 (64-bit)
+ }
+
+
+class TestVRServiceFailureAlerting(cloudstackTestCase):
+ @classmethod
+ def setUpClass(cls):
+ cls.api_client = super(TestVRServiceFailureAlerting, cls).getClsTestClient().getApiClient()
+ cls.services = Services().services
+
+ # Get Zone, Domain and templates
+ domain = get_domain(cls.api_client, cls.services)
+ cls.zone = get_zone(cls.api_client, cls.services)
+ cls.services['mode'] = cls.zone.networktype
+
+ template = get_template(
+ cls.api_client,
+ cls.zone.id,
+ cls.services["ostype"]
+ )
+ # Set Zones and disk offerings ??
+ cls.services["small"]["zoneid"] = cls.zone.id
+ cls.services["small"]["template"] = template.id
+
+ # Create account, service offerings, vm.
+ cls.account = Account.create(
+ cls.api_client,
+ cls.services["account"],
+ domainid=domain.id
+ )
+
+ cls.small_offering = ServiceOffering.create(
+ cls.api_client,
+ cls.services["service_offerings"]["small"]
+ )
+
+ #create a virtual machine
+ cls.virtual_machine = VirtualMachine.create(
+ cls.api_client,
+ cls.services["small"],
+ accountid=cls.account.name,
+ domainid=cls.account.domainid,
+ serviceofferingid=cls.small_offering.id,
+ mode=cls.services["mode"]
+ )
+ cls._cleanup = [
+ cls.small_offering,
+ cls.account
+ ]
+
+ @classmethod
+ def tearDownClass(cls):
+ cls.api_client = super(TestVRServiceFailureAlerting, cls).getClsTestClient().getApiClient()
+ cleanup_resources(cls.api_client, cls._cleanup)
+ return
+
+ def setUp(self):
+ self.apiclient = self.testClient.getApiClient()
+ self.dbclient = self.testClient.getDbConnection()
+ self.cleanup = []
+
+ def tearDown(self):
+ #Clean up, terminate the created ISOs
+ cleanup_resources(self.apiclient, self.cleanup)
+ return
+
+ @attr(hypervisor="xenserver")
+ @attr(tags=["advanced", "basic"])
+ def test_01_VRServiceFailureAlerting(self):
+
+
+ if self.zone.networktype == "Basic":
+ list_router_response = list_routers(
+ self.apiclient,
+ listall="true"
+ )
+ else:
+ list_router_response = list_routers(
+ self.apiclient,
+ account=self.account.name,
+ domainid=self.account.domainid
+ )
+ self.assertEqual(
+ isinstance(list_router_response, list),
+ True,
+ "Check list response returns a valid list"
+ )
+ router = list_router_response[0]
+
+ hosts = list_hosts(
+ self.apiclient,
+ zoneid=router.zoneid,
+ type='Routing',
+ state='Up',
+ id=router.hostid
+ )
+ self.assertEqual(
+ isinstance(hosts, list),
+ True,
+ "Check list host returns a valid list"
+ )
+ host = hosts[0]
+
+ self.debug("Router ID: %s, state: %s" % (router.id, router.state))
+
+ self.assertEqual(
+ router.state,
+ 'Running',
+ "Check list router response for router state"
+ )
+
+ alertSubject = "Monitoring Service on VR " + router.name
+
+ if self.apiclient.hypervisor.lower() == 'vmware':
+ result = get_process_status(
+ self.apiclient.connection.mgtSvr,
+ 22,
+ self.apiclient.connection.user,
+ self.apiclient.connection.passwd,
+ router.linklocalip,
+ "service dnsmasq status",
+ hypervisor=self.apiclient.hypervisor
+ )
+ else:
+ try:
+ host.user, host.passwd = get_host_credentials(self.config, host.ipaddress)
+ result = get_process_status(
+ host.ipaddress,
+ 22,
+ host.user,
+ host.passwd,
+ router.linklocalip,
+ "service apache2 stop"
+ )
+ except KeyError:
+ self.skipTest("Marvin configuration has no host credentials to check router services")
+
+ res = str(result)
+ self.debug("apache process status: %s" % res)
+
+ time.sleep(300) #wait for 5 minutes meanwhile monitor service on VR starts the apache service
+
+ qresultset = self.dbclient.execute(
+ "select id from alert where subject = '%s' ORDER BY id DESC LIMIT 1;" \
+ % str(alertSubject)
+ )
+ self.assertNotEqual(
+ len(qresultset),
+ 0,
+ "Check DB Query result set"
+ )
+
+ return
[26/50] [abbrv] git commit: updated refs/heads/4.4 to 48f8a95
Posted by hu...@apache.org.
CLOUDSTACK-6052: List VM enhancement to support querying with multiple VM IDs
Annotated the 'ids' parameter with "since = 4.4"
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/16ddc341
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/16ddc341
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/16ddc341
Branch: refs/heads/4.4
Commit: 16ddc3414ae0269ecb8903f670496e45f68d6ef6
Parents: 4399e24
Author: Koushik Das <ko...@apache.org>
Authored: Fri Mar 14 11:04:42 2014 +0530
Committer: Koushik Das <ko...@apache.org>
Committed: Fri Mar 14 11:04:42 2014 +0530
----------------------------------------------------------------------
api/src/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/16ddc341/api/src/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java
index e5576e7..6c95a12 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java
@@ -68,8 +68,7 @@ public class ListVMsCmd extends BaseListTaggedResourcesCmd {
@Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = UserVmResponse.class, description = "the ID of the virtual machine")
private Long id;
- @Parameter(name=ApiConstants.IDS, type=CommandType.LIST, collectionType=CommandType.UUID, entityType=UserVmResponse.class,
- description="the IDs of the virtual machines, mutually exclusive with id")
+ @Parameter(name=ApiConstants.IDS, type=CommandType.LIST, collectionType=CommandType.UUID, entityType=UserVmResponse.class, description="the IDs of the virtual machines, mutually exclusive with id", since = "4.4")
private List<Long> ids;
@Parameter(name = ApiConstants.NAME, type = CommandType.STRING, description = "name of the virtual machine")
[37/50] [abbrv] git commit: updated refs/heads/4.4 to 48f8a95
Posted by hu...@apache.org.
make Ovs as VPC provider
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/32ac0210
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/32ac0210
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/32ac0210
Branch: refs/heads/4.4
Commit: 32ac021043c82a636d154d244bc4e8d0f18e8b4f
Parents: 3139b35
Author: Murali Reddy <mu...@gmail.com>
Authored: Wed Mar 5 01:26:53 2014 +0530
Committer: Murali Reddy <mu...@gmail.com>
Committed: Fri Mar 14 16:56:36 2014 +0530
----------------------------------------------------------------------
server/src/com/cloud/network/vpc/VpcManagerImpl.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/32ac0210/server/src/com/cloud/network/vpc/VpcManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpc/VpcManagerImpl.java b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
index 6da1a55..c5a048c 100644
--- a/server/src/com/cloud/network/vpc/VpcManagerImpl.java
+++ b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
@@ -205,7 +205,9 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis
private final ScheduledExecutorService _executor = Executors.newScheduledThreadPool(1, new NamedThreadFactory("VpcChecker"));
private List<VpcProvider> vpcElements = null;
private final List<Service> nonSupportedServices = Arrays.asList(Service.SecurityGroup, Service.Firewall);
- private final List<Provider> supportedProviders = Arrays.asList(Provider.VPCVirtualRouter, Provider.NiciraNvp, Provider.InternalLbVm, Provider.Netscaler, Provider.JuniperContrailVpcRouter);
+ private final List<Provider> supportedProviders = Arrays.asList(Provider.VPCVirtualRouter,
+ Provider.NiciraNvp, Provider.InternalLbVm, Provider.Netscaler, Provider.JuniperContrailVpcRouter,
+ Provider.Ovs);
int _cleanupInterval;
int _maxNetworks;
[21/50] [abbrv] git commit: updated refs/heads/4.4 to 48f8a95
Posted by hu...@apache.org.
Restore to old HA logic, but suppress VM state change on resource state report to avoid interferring HA.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6ad245e6
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6ad245e6
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6ad245e6
Branch: refs/heads/4.4
Commit: 6ad245e6756176eb0ca374f121f30877498b9225
Parents: 4312d88
Author: Kelven Yang <ke...@gmail.com>
Authored: Wed Mar 5 17:03:02 2014 -0800
Committer: Kelven Yang <ke...@gmail.com>
Committed: Thu Mar 13 16:59:56 2014 -0700
----------------------------------------------------------------------
.../src/com/cloud/ha/HighAvailabilityManager.java | 2 ++
.../src/com/cloud/vm/VirtualMachineManagerImpl.java | 4 ++--
server/src/com/cloud/ha/HighAvailabilityManagerImpl.java | 9 +++++++++
3 files changed, 13 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6ad245e6/engine/components-api/src/com/cloud/ha/HighAvailabilityManager.java
----------------------------------------------------------------------
diff --git a/engine/components-api/src/com/cloud/ha/HighAvailabilityManager.java b/engine/components-api/src/com/cloud/ha/HighAvailabilityManager.java
index eb60f3e..ecfb6f6 100644
--- a/engine/components-api/src/com/cloud/ha/HighAvailabilityManager.java
+++ b/engine/components-api/src/com/cloud/ha/HighAvailabilityManager.java
@@ -100,6 +100,8 @@ public interface HighAvailabilityManager extends Manager {
void cancelScheduledMigrations(HostVO host);
+ boolean hasPendingHaWork(long vmId);
+
/**
* @return
*/
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6ad245e6/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
index 0ca0d30..e344001 100755
--- a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -4100,7 +4100,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
List<VmWorkJobVO> pendingWorkJobs = _workJobDao.listPendingWorkJobs(
VirtualMachine.Type.Instance, vmId);
- if (pendingWorkJobs.size() == 0) {
+ if (pendingWorkJobs.size() == 0 || _haMgr.hasPendingHaWork(vmId)) {
// there is no pending operation job
VMInstanceVO vm = _vmDao.findById(vmId);
if (vm != null) {
@@ -4125,7 +4125,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
s_logger.warn("VM " + vmId + " no longer exists when processing VM state report");
}
} else {
- s_logger.info("There is pending job working on the VM. vm id: " + vmId + ", postpone power-change report by resetting power-change counters");
+ s_logger.info("There is pending job or HA tasks working on the VM. vm id: " + vmId + ", postpone power-change report by resetting power-change counters");
// reset VM power state tracking so that we won't lost signal when VM has
// been translated to
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6ad245e6/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java b/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
index 8bd569a..29f1e7b 100755
--- a/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
+++ b/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
@@ -962,6 +962,9 @@ public class HighAvailabilityManagerImpl extends ManagerBase implements HighAvai
if (oldState == State.Running && event == VirtualMachine.Event.FollowAgentPowerOffReport && newState == State.Stopped) {
final VMInstanceVO vm = _instanceDao.findById(vo.getId());
if (vm.isHaEnabled()) {
+ if (vm.getState() == State.Stopped)
+ s_logger.warn("Sanity check failed. postStateTransitionEvent reports transited to Stopped but VM " + vm + " is still at state " + vm.getState());
+
s_logger.info("Detected out-of-band stop of a HA enabled VM " + vm.getInstanceName() + ", will schedule restart");
_executor.submit(new ManagedContextRunnable() {
@Override
@@ -977,4 +980,10 @@ public class HighAvailabilityManagerImpl extends ManagerBase implements HighAvai
}
return true;
}
+
+ @Override
+ public boolean hasPendingHaWork(long vmId) {
+ List<HaWorkVO> haWorks = _haDao.listRunningHaWorkForVm(vmId);
+ return haWorks.size() > 0;
+ }
}
[33/50] [abbrv] git commit: updated refs/heads/4.4 to 48f8a95
Posted by hu...@apache.org.
-introduces 'DistributedRouter' as capability to 'Connectivity' service.
-create VPC offering to permit 'DistributedRouter' as capability to
connectivity service
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7c4443e2
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7c4443e2
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7c4443e2
Branch: refs/heads/4.4
Commit: 7c4443e233b936820d375b28f348e6613ae5ad93
Parents: 2aff39f
Author: Murali Reddy <mu...@gmail.com>
Authored: Tue Mar 4 16:42:17 2014 +0530
Committer: Murali Reddy <mu...@gmail.com>
Committed: Fri Mar 14 16:56:35 2014 +0530
----------------------------------------------------------------------
api/src/com/cloud/network/Network.java | 3 +-
api/src/com/cloud/network/vpc/VpcOffering.java | 5 ++
.../network/vpc/VpcProvisioningService.java | 6 +-
.../org/apache/cloudstack/api/ApiConstants.java | 1 +
.../command/admin/vpc/CreateVPCOfferingCmd.java | 10 ++-
.../api/response/VpcOfferingResponse.java | 8 +++
.../com/cloud/network/vpc/VpcOfferingVO.java | 12 +++-
.../management/ContrailManagerImpl.java | 2 +-
server/src/com/cloud/api/ApiResponseHelper.java | 1 +
.../com/cloud/network/vpc/VpcManagerImpl.java | 65 +++++++++++++++++---
setup/db/db/schema-430to440.sql | 2 +-
11 files changed, 99 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7c4443e2/api/src/com/cloud/network/Network.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/Network.java b/api/src/com/cloud/network/Network.java
index 6dc6752..3283a55 100644
--- a/api/src/com/cloud/network/Network.java
+++ b/api/src/com/cloud/network/Network.java
@@ -57,7 +57,7 @@ public interface Network extends ControlledEntity, StateObject<Network.State>, I
public static final Service PortForwarding = new Service("PortForwarding");
public static final Service SecurityGroup = new Service("SecurityGroup");
public static final Service NetworkACL = new Service("NetworkACL", Capability.SupportedProtocols);
- public static final Service Connectivity = new Service("Connectivity");
+ public static final Service Connectivity = new Service("Connectivity", Capability.DistributedRouter);
private final String name;
private final Capability[] caps;
@@ -186,6 +186,7 @@ public interface Network extends ControlledEntity, StateObject<Network.State>, I
public static final Capability SslTermination = new Capability("SslTermination");
public static final Capability LbSchemes = new Capability("LbSchemes");
public static final Capability DhcpAccrossMultipleSubnets = new Capability("DhcpAccrossMultipleSubnets");
+ public static final Capability DistributedRouter = new Capability("DistributedRouter");
private final String name;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7c4443e2/api/src/com/cloud/network/vpc/VpcOffering.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/vpc/VpcOffering.java b/api/src/com/cloud/network/vpc/VpcOffering.java
index 6e75a2f..a0a1b15 100644
--- a/api/src/com/cloud/network/vpc/VpcOffering.java
+++ b/api/src/com/cloud/network/vpc/VpcOffering.java
@@ -55,4 +55,9 @@ public interface VpcOffering extends InternalIdentity, Identity {
*/
Long getServiceOfferingId();
+ /**
+ *
+ * @return true if the offering provides a distributed router capable of one-hop forwarding
+ */
+ boolean supportsDistributedRouter();
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7c4443e2/api/src/com/cloud/network/vpc/VpcProvisioningService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/vpc/VpcProvisioningService.java b/api/src/com/cloud/network/vpc/VpcProvisioningService.java
index 174b71f..e545275 100644
--- a/api/src/com/cloud/network/vpc/VpcProvisioningService.java
+++ b/api/src/com/cloud/network/vpc/VpcProvisioningService.java
@@ -23,8 +23,10 @@ public interface VpcProvisioningService {
public VpcOffering getVpcOffering(long vpcOfferingId);
- public VpcOffering createVpcOffering(String name, String displayText, List<String> supportedServices, Map<String, List<String>> serviceProviders,
- Long serviceOfferingId);
+ public VpcOffering createVpcOffering(String name, String displayText, List<String> supportedServices,
+ Map<String, List<String>> serviceProviders,
+ Map serviceCapabilitystList,
+ Long serviceOfferingId);
List<? extends VpcOffering> listVpcOfferings(Long id, String name, String displayText, List<String> supportedServicesStr, Boolean isDefault, String keyword,
String state, Long startIndex, Long pageSizeVal);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7c4443e2/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 239b8cd..32107ed 100755
--- a/api/src/org/apache/cloudstack/api/ApiConstants.java
+++ b/api/src/org/apache/cloudstack/api/ApiConstants.java
@@ -588,6 +588,7 @@ public class ApiConstants {
public static final String VGPU = "vgpu";
public static final String VGPUTYPE = "vgputype";
public static final String REMAININGCAPACITY = "remainingcapacity";
+ public static final String DISTRIBUTED_VPC_ROUTER = "distributedvpcrouter";
public enum HostDetails {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7c4443e2/api/src/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmd.java
index 6b2c4ba..5b3090b 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmd.java
@@ -66,6 +66,9 @@ public class CreateVPCOfferingCmd extends BaseAsyncCreateCmd {
+ "If not specified, the provider for the service will be mapped to the default provider on the physical network")
private Map<String, String> serviceProviderList;
+ @Parameter(name = ApiConstants.SERVICE_CAPABILITY_LIST, type = CommandType.MAP, description = "desired service capabilities as part of vpc offering")
+ private Map serviceCapabilitystList;
+
@Parameter(name = ApiConstants.SERVICE_OFFERING_ID,
type = CommandType.UUID,
entityType = ServiceOfferingResponse.class,
@@ -112,13 +115,18 @@ public class CreateVPCOfferingCmd extends BaseAsyncCreateCmd {
return serviceProviderMap;
}
+ public Map<String, List<String>> getServiceCapabilitystList() {
+ return serviceCapabilitystList;
+ }
+
public Long getServiceOfferingId() {
return serviceOfferingId;
}
@Override
public void create() throws ResourceAllocationException {
- VpcOffering vpcOff = _vpcProvSvc.createVpcOffering(getVpcOfferingName(), getDisplayText(), getSupportedServices(), getServiceProviders(), getServiceOfferingId());
+ VpcOffering vpcOff = _vpcProvSvc.createVpcOffering(getVpcOfferingName(), getDisplayText(),
+ getSupportedServices(), getServiceProviders(), getServiceCapabilitystList(), getServiceOfferingId());
if (vpcOff != null) {
setEntityId(vpcOff.getId());
setEntityUuid(vpcOff.getUuid());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7c4443e2/api/src/org/apache/cloudstack/api/response/VpcOfferingResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/VpcOfferingResponse.java b/api/src/org/apache/cloudstack/api/response/VpcOfferingResponse.java
index 17e4dfd..89697f0 100644
--- a/api/src/org/apache/cloudstack/api/response/VpcOfferingResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/VpcOfferingResponse.java
@@ -59,6 +59,10 @@ public class VpcOfferingResponse extends BaseResponse {
@Param(description = "the list of supported services", responseObject = ServiceResponse.class)
private List<ServiceResponse> services;
+ @SerializedName(ApiConstants.DISTRIBUTED_VPC_ROUTER)
+ @Param(description = " indicates if the vpc offering supports distributed router for one-hop forwarding")
+ private Boolean supportsDistributedRouter;
+
public void setId(String id) {
this.id = id;
}
@@ -86,4 +90,8 @@ public class VpcOfferingResponse extends BaseResponse {
public void setState(String state) {
this.state = state;
}
+
+ public void setSupportsDistributedRouter(Boolean supportsDistributedRouter) {
+ this.supportsDistributedRouter = supportsDistributedRouter;
+ }
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7c4443e2/engine/schema/src/com/cloud/network/vpc/VpcOfferingVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/vpc/VpcOfferingVO.java b/engine/schema/src/com/cloud/network/vpc/VpcOfferingVO.java
index 3a676e6..53f6f60 100644
--- a/engine/schema/src/com/cloud/network/vpc/VpcOfferingVO.java
+++ b/engine/schema/src/com/cloud/network/vpc/VpcOfferingVO.java
@@ -67,6 +67,9 @@ public class VpcOfferingVO implements VpcOffering {
@Column(name = "service_offering_id")
Long serviceOfferingId;
+ @Column(name = "supports_distributed_router")
+ boolean supportsDistributedRouter=false;
+
public VpcOfferingVO() {
this.uuid = UUID.randomUUID().toString();
}
@@ -80,9 +83,11 @@ public class VpcOfferingVO implements VpcOffering {
this.state = State.Disabled;
}
- public VpcOfferingVO(String name, String displayText, boolean isDefault, Long serviceOfferingId) {
+ public VpcOfferingVO(String name, String displayText, boolean isDefault, Long serviceOfferingId,
+ boolean supportsDistributedRouter) {
this(name, displayText, serviceOfferingId);
this.isDefault = isDefault;
+ this.supportsDistributedRouter = supportsDistributedRouter;
}
@Override
@@ -145,4 +150,9 @@ public class VpcOfferingVO implements VpcOffering {
public Long getServiceOfferingId() {
return serviceOfferingId;
}
+
+ @Override
+ public boolean supportsDistributedRouter() {
+ return supportsDistributedRouter;
+ }
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7c4443e2/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailManagerImpl.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailManagerImpl.java b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailManagerImpl.java
index 01be7db..bf083fd 100644
--- a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailManagerImpl.java
+++ b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailManagerImpl.java
@@ -281,7 +281,7 @@ public class ContrailManagerImpl extends ManagerBase implements ContrailManager
for (String svc: services) {
serviceProviderMap.put(svc, providerSet);
}
- vpcOffer = _vpcProvSvc.createVpcOffering(juniperVPCOfferingName, juniperVPCOfferingDisplayText, services, serviceProviderMap, null);
+ vpcOffer = _vpcProvSvc.createVpcOffering(juniperVPCOfferingName, juniperVPCOfferingDisplayText, services, serviceProviderMap, null, null);
((VpcOfferingVO)vpcOffer).setState(VpcOffering.State.Enabled);
long id = vpcOffer.getId();
_vpcOffDao.update(id, (VpcOfferingVO)vpcOffer);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7c4443e2/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 f500909..e87c3e0 100755
--- a/server/src/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/com/cloud/api/ApiResponseHelper.java
@@ -2765,6 +2765,7 @@ public class ApiResponseHelper implements ResponseGenerator {
response.setDisplayText(offering.getDisplayText());
response.setIsDefault(offering.isDefault());
response.setState(offering.getState().name());
+ response.setSupportsDistributedRouter(offering.supportsDistributedRouter());
Map<Service, Set<Provider>> serviceProviderMap = ApiDBUtils.listVpcOffServices(offering.getId());
List<ServiceResponse> serviceResponses = new ArrayList<ServiceResponse>();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7c4443e2/server/src/com/cloud/network/vpc/VpcManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpc/VpcManagerImpl.java b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
index 99dbfde..8c7b5fb 100644
--- a/server/src/com/cloud/network/vpc/VpcManagerImpl.java
+++ b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
@@ -18,8 +18,10 @@ package com.cloud.network.vpc;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
@@ -231,7 +233,7 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis
svcProviderMap.put(svc, defaultProviders);
}
}
- createVpcOffering(VpcOffering.defaultVPCOfferingName, VpcOffering.defaultVPCOfferingName, svcProviderMap, true, State.Enabled, null);
+ createVpcOffering(VpcOffering.defaultVPCOfferingName, VpcOffering.defaultVPCOfferingName, svcProviderMap, true, State.Enabled, null, false);
}
//configure default vpc offering with Netscaler as LB Provider
@@ -250,7 +252,7 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis
svcProviderMap.put(svc, defaultProviders);
}
}
- createVpcOffering(VpcOffering.defaultVPCNSOfferingName, VpcOffering.defaultVPCNSOfferingName, svcProviderMap, false, State.Enabled, null);
+ createVpcOffering(VpcOffering.defaultVPCNSOfferingName, VpcOffering.defaultVPCNSOfferingName, svcProviderMap, false, State.Enabled, null, false);
}
}
});
@@ -299,8 +301,10 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis
@Override
@ActionEvent(eventType = EventTypes.EVENT_VPC_OFFERING_CREATE, eventDescription = "creating vpc offering", create = true)
- public VpcOffering createVpcOffering(String name, String displayText, List<String> supportedServices, Map<String, List<String>> serviceProviders,
- Long serviceOfferingId) {
+ public VpcOffering createVpcOffering(String name, String displayText, List<String> supportedServices,
+ Map<String, List<String>> serviceProviders,
+ Map serviceCapabilitystList,
+ Long serviceOfferingId) {
Map<Network.Service, Set<Network.Provider>> svcProviderMap = new HashMap<Network.Service, Set<Network.Provider>>();
Set<Network.Provider> defaultProviders = new HashSet<Network.Provider>();
defaultProviders.add(Provider.VPCVirtualRouter);
@@ -372,20 +376,25 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis
}
}
- VpcOffering offering = createVpcOffering(name, displayText, svcProviderMap, false, null, serviceOfferingId);
+ boolean supportsDistributedRouter = isVpcOfferingSupportsDistributedRouter(serviceCapabilitystList);
+
+ VpcOffering offering = createVpcOffering(name, displayText, svcProviderMap, false, null,
+ serviceOfferingId,supportsDistributedRouter);
CallContext.current().setEventDetails(" Id: " + offering.getId() + " Name: " + name);
return offering;
}
@DB
- protected VpcOffering createVpcOffering(final String name, final String displayText, final Map<Network.Service, Set<Network.Provider>> svcProviderMap,
- final boolean isDefault, final State state, final Long serviceOfferingId) {
+ protected VpcOffering createVpcOffering(final String name, final String displayText,
+ final Map<Network.Service, Set<Network.Provider>> svcProviderMap,
+ final boolean isDefault, final State state, final Long serviceOfferingId,
+ final boolean supportsDistributedRouter) {
return Transaction.execute(new TransactionCallback<VpcOffering>() {
@Override
public VpcOffering doInTransaction(TransactionStatus status) {
- // create vpc offering object
- VpcOfferingVO offering = new VpcOfferingVO(name, displayText, isDefault, serviceOfferingId);
+ // create vpc offering object
+ VpcOfferingVO offering = new VpcOfferingVO(name, displayText, isDefault, serviceOfferingId, supportsDistributedRouter);
if (state != null) {
offering.setState(state);
@@ -413,6 +422,44 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis
});
}
+ private boolean isVpcOfferingSupportsDistributedRouter(Map serviceCapabilitystList) {
+ boolean supportsDistributedRouter = false;
+ if (serviceCapabilitystList != null && !serviceCapabilitystList.isEmpty()) {
+ Collection serviceCapabilityCollection = serviceCapabilitystList.values();
+ Iterator iter = serviceCapabilityCollection.iterator();
+ Map<Network.Capability, String> capabilityMap = null;
+
+ while (iter.hasNext()) {
+ HashMap<String, String> svcCapabilityMap = (HashMap<String, String>)iter.next();
+ Network.Capability capability = null;
+ String svc = svcCapabilityMap.get("service");
+ String capabilityName = svcCapabilityMap.get("capabilitytype");
+ String capabilityValue = svcCapabilityMap.get("capabilityvalue");
+ if (capabilityName != null) {
+ capability = Network.Capability.getCapability(capabilityName);
+ }
+
+ if ((capability == null) || (capabilityName == null) || (capabilityValue == null)) {
+ throw new InvalidParameterValueException("Invalid capability:" + capabilityName + " capability value:" + capabilityValue);
+ }
+
+ if (!svc.equalsIgnoreCase(Service.Connectivity.getName())) {
+ throw new InvalidParameterValueException("Invalid Service:" + svc + " specified. Only for 'Connectivity' service capabilities can be specified");
+ }
+
+ if (!capabilityName.equalsIgnoreCase("DistributedRouter")) {
+ throw new InvalidParameterValueException("Invalid Capability:" + capabilityName + " specified. Only 'DistributedRouter' capability can be specified.");
+ }
+
+ if (!capabilityValue.equalsIgnoreCase("true") && capabilityValue.equalsIgnoreCase("false")) {
+ throw new InvalidParameterValueException("Invalid Capability value:" + capabilityValue + " specified.");
+ }
+ supportsDistributedRouter = capabilityValue.equalsIgnoreCase("true");
+ }
+ }
+ return supportsDistributedRouter;
+ }
+
@Override
public Vpc getActiveVpc(long vpcId) {
return _vpcDao.getActiveVpcById(vpcId);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7c4443e2/setup/db/db/schema-430to440.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-430to440.sql b/setup/db/db/schema-430to440.sql
index 51bce2d..ac398e5 100644
--- a/setup/db/db/schema-430to440.sql
+++ b/setup/db/db/schema-430to440.sql
@@ -739,5 +739,5 @@ UPDATE `cloud`.`guest_os_hypervisor` SET `created` = now();
ALTER TABLE `cloud`.`guest_os` ADD COLUMN `created` datetime COMMENT 'Time when Guest OS was created in system';
ALTER TABLE `cloud`.`guest_os` ADD COLUMN `removed` datetime COMMENT 'Time when Guest OS was removed if deleted, else NULL';
UPDATE `cloud`.`guest_os` SET `created` = now();
-
ALTER TABLE `cloud`.`vm_reservation` ADD COLUMN `deployment_planner` varchar(40) DEFAULT NULL COMMENT 'Preferred deployment planner for the vm';
+ALTER TABLE `cloud`.`vpc_offerings` ADD COLUMN supports_distributed_router boolean default false;
[19/50] [abbrv] git commit: updated refs/heads/4.4 to 48f8a95
Posted by hu...@apache.org.
Handle a race-condition in VirtualNetworkManagerImpl.java in the process of starting it parallelly.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/42d63737
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/42d63737
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/42d63737
Branch: refs/heads/4.4
Commit: 42d637376bba7a975830d695f14be7678dc6e110
Parents: 5a75a3e
Author: Kelven Yang <ke...@gmail.com>
Authored: Wed Mar 12 16:09:51 2014 -0700
Committer: Kelven Yang <ke...@gmail.com>
Committed: Thu Mar 13 16:59:56 2014 -0700
----------------------------------------------------------------------
.../VirtualNetworkApplianceManagerImpl.java | 117 ++++++++++++-------
1 file changed, 76 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/42d63737/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 74cfd74..eeab91d 100755
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -17,6 +17,44 @@
package com.cloud.network.router;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TimeZone;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+
+import javax.ejb.Local;
+import javax.inject.Inject;
+import javax.naming.ConfigurationException;
+import org.apache.log4j.Logger;
+import org.apache.cloudstack.api.command.admin.router.RebootRouterCmd;
+import org.apache.cloudstack.api.command.admin.router.UpgradeRouterCmd;
+import org.apache.cloudstack.api.command.admin.router.UpgradeRouterTemplateCmd;
+import org.apache.cloudstack.context.CallContext;
+import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
+import org.apache.cloudstack.framework.config.ConfigDepot;
+import org.apache.cloudstack.framework.config.ConfigKey;
+import org.apache.cloudstack.framework.config.Configurable;
+import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
+import org.apache.cloudstack.framework.jobs.AsyncJobManager;
+import org.apache.cloudstack.framework.jobs.impl.AsyncJobVO;
+import org.apache.cloudstack.managed.context.ManagedContextRunnable;
+import org.apache.cloudstack.utils.identity.ManagementServerNode;
import com.cloud.agent.AgentManager;
import com.cloud.agent.Listener;
import com.cloud.agent.api.AgentControlAnswer;
@@ -238,45 +276,7 @@ import com.cloud.vm.dao.NicIpAliasVO;
import com.cloud.vm.dao.UserVmDao;
import com.cloud.vm.dao.UserVmDetailsDao;
import com.cloud.vm.dao.VMInstanceDao;
-import org.apache.cloudstack.api.command.admin.router.RebootRouterCmd;
-import org.apache.cloudstack.api.command.admin.router.UpgradeRouterCmd;
-import org.apache.cloudstack.api.command.admin.router.UpgradeRouterTemplateCmd;
import org.apache.cloudstack.config.ApiServiceConfiguration;
-import org.apache.cloudstack.context.CallContext;
-import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
-import org.apache.cloudstack.framework.config.ConfigDepot;
-import org.apache.cloudstack.framework.config.ConfigKey;
-import org.apache.cloudstack.framework.config.Configurable;
-import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
-import org.apache.cloudstack.framework.jobs.AsyncJobManager;
-import org.apache.cloudstack.framework.jobs.impl.AsyncJobVO;
-import org.apache.cloudstack.managed.context.ManagedContextRunnable;
-import org.apache.cloudstack.utils.identity.ManagementServerNode;
-import org.apache.log4j.Logger;
-
-import javax.ejb.Local;
-import javax.inject.Inject;
-import javax.naming.ConfigurationException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TimeZone;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
/**
* VirtualNetworkApplianceManagerImpl manages the different types of virtual network appliances available in the Cloud Stack.
@@ -1885,8 +1885,35 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V
return new Pair<DeploymentPlan, List<DomainRouterVO>>(plan, routers);
}
- private DomainRouterVO startVirtualRouter(final DomainRouterVO router, final User user, final Account caller, final Map<Param, Object> params) throws StorageUnavailableException,
- InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException {
+ private DomainRouterVO waitRouter(DomainRouterVO router) {
+ DomainRouterVO vm = _routerDao.findById(router.getId());
+
+ if (s_logger.isDebugEnabled())
+ s_logger.debug("Router " + router.getInstanceName() + " is not fully up yet, we will wait");
+ while (vm.getState() == State.Starting) {
+ try {
+ Thread.sleep(1000);
+ } catch (InterruptedException e) {
+ }
+
+ // reload to get the latest state info
+ vm = _routerDao.findById(router.getId());
+ }
+
+ if (vm.getState() == State.Running) {
+ if (s_logger.isDebugEnabled())
+ s_logger.debug("Router " + router.getInstanceName() + " is now fully up");
+
+ return router;
+ }
+
+ s_logger.warn("Router " + router.getInstanceName() + " failed to start. current state: " + vm.getState());
+ return null;
+ }
+
+ private DomainRouterVO startVirtualRouter(DomainRouterVO router, User user, Account caller, Map<Param, Object> params)
+ throws StorageUnavailableException, InsufficientCapacityException,
+ ConcurrentOperationException, ResourceUnavailableException {
if (router.getRole() != Role.VIRTUAL_ROUTER || !router.getIsRedundantRouter()) {
return this.start(router, user, caller, params, null);
@@ -1897,7 +1924,15 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V
return router;
}
- final DataCenterDeployment plan = new DataCenterDeployment(0, null, null, null, null, null);
+ //
+ // If another thread has already requested a VR start, there is a transition period for VR to transit from
+ // Starting to Running, there exist a race conditioning window here
+ // We will wait until VR is up or fail
+ if (router.getState() == State.Starting) {
+ return waitRouter(router);
+ }
+
+ DataCenterDeployment plan = new DataCenterDeployment(0, null, null, null, null, null);
DomainRouterVO result = null;
assert router.getIsRedundantRouter();
final List<Long> networkIds = _routerDao.getRouterNetworks(router.getId());
[06/50] [abbrv] git commit: updated refs/heads/4.4 to 48f8a95
Posted by hu...@apache.org.
After merge, fix isRootAdmin() calls to use accountId instead of type
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d9696b26
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d9696b26
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d9696b26
Branch: refs/heads/4.4
Commit: d9696b26e101af6596b60bc3d22b01acf9e88677
Parents: 99bdc8d
Author: Prachi Damle <pr...@cloud.com>
Authored: Thu Mar 13 13:27:04 2014 -0700
Committer: Prachi Damle <pr...@cloud.com>
Committed: Thu Mar 13 13:28:40 2014 -0700
----------------------------------------------------------------------
api/src/com/cloud/user/AccountService.java | 4 +-
.../com/cloud/api/query/QueryManagerImpl.java | 2 +-
.../deploy/DeploymentPlanningManagerImpl.java | 2 +-
.../com/cloud/network/NetworkServiceImpl.java | 2 +-
.../com/cloud/storage/VolumeApiServiceImpl.java | 2 +-
.../src/com/cloud/user/AccountManagerImpl.java | 45 +++++++++++---------
.../com/cloud/uuididentity/UUIDManagerImpl.java | 2 +-
.../com/cloud/user/MockAccountManagerImpl.java | 5 ++-
.../iam/RoleBasedEntityAccessChecker.java | 3 ++
9 files changed, 37 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d9696b26/api/src/com/cloud/user/AccountService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/user/AccountService.java b/api/src/com/cloud/user/AccountService.java
index 85c71ca..7e37b38 100755
--- a/api/src/com/cloud/user/AccountService.java
+++ b/api/src/com/cloud/user/AccountService.java
@@ -88,9 +88,9 @@ public interface AccountService {
User getUserIncludingRemoved(long userId);
- boolean isRootAdmin(long accountId);
+ boolean isRootAdmin(Long accountId);
- boolean isDomainAdmin(long accountId);
+ boolean isDomainAdmin(Long accountId);
boolean isNormalUser(long accountId);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d9696b26/server/src/com/cloud/api/query/QueryManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/query/QueryManagerImpl.java b/server/src/com/cloud/api/query/QueryManagerImpl.java
index 0554e3a..b932d42 100644
--- a/server/src/com/cloud/api/query/QueryManagerImpl.java
+++ b/server/src/com/cloud/api/query/QueryManagerImpl.java
@@ -520,7 +520,7 @@ public class QueryManagerImpl extends ManagerBase implements QueryService {
_accountMgr.buildACLViewSearchCriteria(sc, aclSc, isRecursive, permittedDomains, permittedAccounts, permittedResources, listProjectResourcesCriteria);
// For end users display only enabled events
- if(!_accountMgr.isRootAdmin(caller.getType())){
+ if (!_accountMgr.isRootAdmin(caller.getId())) {
sc.setParameters("displayEvent", true);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d9696b26/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java b/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
index 74c141e..c1f336c 100644
--- a/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
+++ b/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
@@ -508,7 +508,7 @@ public class DeploymentPlanningManagerImpl extends ManagerBase implements Deploy
// check if zone is dedicated. if yes check if vm owner has acess to it.
DedicatedResourceVO dedicatedZone = _dedicatedDao.findByZoneId(dc.getId());
- if (dedicatedZone != null && !_accountMgr.isRootAdmin(vmProfile.getOwner().getType())) {
+ if (dedicatedZone != null && !_accountMgr.isRootAdmin(vmProfile.getOwner().getId())) {
long accountDomainId = vmProfile.getOwner().getDomainId();
long accountId = vmProfile.getOwner().getAccountId();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d9696b26/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 be95a36..9185d84 100755
--- a/server/src/com/cloud/network/NetworkServiceImpl.java
+++ b/server/src/com/cloud/network/NetworkServiceImpl.java
@@ -1805,7 +1805,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService {
// Perform permission check
_accountMgr.checkAccess(caller, null, true, network);
- if (forced && !_accountMgr.isRootAdmin(caller.getType())) {
+ if (forced && !_accountMgr.isRootAdmin(caller.getId())) {
throw new InvalidParameterValueException("Delete network with 'forced' option can only be called by root admins");
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d9696b26/server/src/com/cloud/storage/VolumeApiServiceImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/VolumeApiServiceImpl.java b/server/src/com/cloud/storage/VolumeApiServiceImpl.java
index 5ce07f0..30b5479 100644
--- a/server/src/com/cloud/storage/VolumeApiServiceImpl.java
+++ b/server/src/com/cloud/storage/VolumeApiServiceImpl.java
@@ -386,7 +386,7 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic
if (displayVolume == null) {
displayVolume = true;
} else {
- if (!_accountMgr.isRootAdmin(caller.getType())) {
+ if (!_accountMgr.isRootAdmin(caller.getId())) {
throw new PermissionDeniedException("Cannot update parameter displayvolume, only admin permitted ");
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d9696b26/server/src/com/cloud/user/AccountManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/user/AccountManagerImpl.java b/server/src/com/cloud/user/AccountManagerImpl.java
index 04d3e23..1b68b0c 100755
--- a/server/src/com/cloud/user/AccountManagerImpl.java
+++ b/server/src/com/cloud/user/AccountManagerImpl.java
@@ -366,37 +366,40 @@ public class AccountManagerImpl extends ManagerBase implements AccountManager, M
}
@Override
- public boolean isRootAdmin(long accountId) {
- AccountVO acct = _accountDao.findById(accountId);
- for (SecurityChecker checker : _securityCheckers) {
- try {
- if (checker.checkAccess(acct, null, null, "SystemCapability")) {
- if (s_logger.isDebugEnabled()) {
- s_logger.debug("Root Access granted to " + acct + " by " + checker.getName());
+ public boolean isRootAdmin(Long accountId) {
+ if (accountId != null) {
+ AccountVO acct = _accountDao.findById(accountId);
+ for (SecurityChecker checker : _securityCheckers) {
+ try {
+ if (checker.checkAccess(acct, null, null, "SystemCapability")) {
+ if (s_logger.isDebugEnabled()) {
+ s_logger.debug("Root Access granted to " + acct + " by " + checker.getName());
+ }
+ return true;
}
- return true;
+ } catch (PermissionDeniedException ex) {
+ return false;
}
- } catch (PermissionDeniedException ex) {
- return false;
}
}
-
return false;
}
@Override
- public boolean isDomainAdmin(long accountId) {
- AccountVO acct = _accountDao.findById(accountId);
- for (SecurityChecker checker : _securityCheckers) {
- try {
- if (checker.checkAccess(acct, null, null, "DomainCapability")) {
- if (s_logger.isDebugEnabled()) {
- s_logger.debug("Root Access granted to " + acct + " by " + checker.getName());
+ public boolean isDomainAdmin(Long accountId) {
+ if (accountId != null) {
+ AccountVO acct = _accountDao.findById(accountId);
+ for (SecurityChecker checker : _securityCheckers) {
+ try {
+ if (checker.checkAccess(acct, null, null, "DomainCapability")) {
+ if (s_logger.isDebugEnabled()) {
+ s_logger.debug("Root Access granted to " + acct + " by " + checker.getName());
+ }
+ return true;
}
- return true;
+ } catch (PermissionDeniedException ex) {
+ return false;
}
- } catch (PermissionDeniedException ex) {
- return false;
}
}
return false;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d9696b26/server/src/com/cloud/uuididentity/UUIDManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/uuididentity/UUIDManagerImpl.java b/server/src/com/cloud/uuididentity/UUIDManagerImpl.java
index c514746..a1d1452 100644
--- a/server/src/com/cloud/uuididentity/UUIDManagerImpl.java
+++ b/server/src/com/cloud/uuididentity/UUIDManagerImpl.java
@@ -50,7 +50,7 @@ public class UUIDManagerImpl implements UUIDManager {
Account caller = CallContext.current().getCallingAccount();
// Only admin and system allowed to do this
- if (!(caller.getId() == Account.ACCOUNT_ID_SYSTEM || _accountMgr.isRootAdmin(caller.getType()))) {
+ if (!(caller.getId() == Account.ACCOUNT_ID_SYSTEM || _accountMgr.isRootAdmin(caller.getId()))) {
throw new PermissionDeniedException("Please check your permissions, you are not allowed to create/update custom id");
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d9696b26/server/test/com/cloud/user/MockAccountManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/test/com/cloud/user/MockAccountManagerImpl.java b/server/test/com/cloud/user/MockAccountManagerImpl.java
index b411b18..f373cba 100644
--- a/server/test/com/cloud/user/MockAccountManagerImpl.java
+++ b/server/test/com/cloud/user/MockAccountManagerImpl.java
@@ -162,7 +162,7 @@ public class MockAccountManagerImpl extends ManagerBase implements Manager, Acco
}
@Override
- public boolean isRootAdmin(long accountId) {
+ public boolean isRootAdmin(Long accountId) {
// TODO Auto-generated method stub
return false;
}
@@ -298,7 +298,7 @@ public class MockAccountManagerImpl extends ManagerBase implements Manager, Acco
}
@Override
- public boolean isDomainAdmin(long accountId) {
+ public boolean isDomainAdmin(Long accountId) {
// TODO Auto-generated method stub
return false;
}
@@ -356,4 +356,5 @@ public class MockAccountManagerImpl extends ManagerBase implements Manager, Acco
return null;
}
+
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d9696b26/services/iam/plugin/src/org/apache/cloudstack/iam/RoleBasedEntityAccessChecker.java
----------------------------------------------------------------------
diff --git a/services/iam/plugin/src/org/apache/cloudstack/iam/RoleBasedEntityAccessChecker.java b/services/iam/plugin/src/org/apache/cloudstack/iam/RoleBasedEntityAccessChecker.java
index 02bb702..3fe854a 100644
--- a/services/iam/plugin/src/org/apache/cloudstack/iam/RoleBasedEntityAccessChecker.java
+++ b/services/iam/plugin/src/org/apache/cloudstack/iam/RoleBasedEntityAccessChecker.java
@@ -63,6 +63,9 @@ public class RoleBasedEntityAccessChecker extends DomainChecker implements Secur
public boolean checkAccess(Account caller, ControlledEntity entity, AccessType accessType, String action)
throws PermissionDeniedException {
+ if (caller == null) {
+ throw new InvalidParameterValueException("Caller cannot be passed as NULL to IAM!");
+ }
if (entity == null && action != null) {
// check if caller can do this action
List<IAMPolicy> policies = _iamSrv.listIAMPolicies(caller.getAccountId());
[47/50] [abbrv] git commit: updated refs/heads/4.4 to 48f8a95
Posted by hu...@apache.org.
fix unit-test failure
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/794b38a7
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/794b38a7
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/794b38a7
Branch: refs/heads/4.4
Commit: 794b38a789a68e539dbecfc76bc861e959730411
Parents: 7d20b08
Author: Murali Reddy <mu...@gmail.com>
Authored: Fri Mar 14 17:19:27 2014 +0530
Committer: Murali Reddy <mu...@gmail.com>
Committed: Fri Mar 14 17:19:27 2014 +0530
----------------------------------------------------------------------
server/test/com/cloud/vpc/NetworkACLManagerTest.java | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/794b38a7/server/test/com/cloud/vpc/NetworkACLManagerTest.java
----------------------------------------------------------------------
diff --git a/server/test/com/cloud/vpc/NetworkACLManagerTest.java b/server/test/com/cloud/vpc/NetworkACLManagerTest.java
index f812a55..ff38b5e 100644
--- a/server/test/com/cloud/vpc/NetworkACLManagerTest.java
+++ b/server/test/com/cloud/vpc/NetworkACLManagerTest.java
@@ -26,6 +26,7 @@ import junit.framework.TestCase;
import org.apache.cloudstack.context.CallContext;
import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
+import org.apache.cloudstack.framework.messagebus.MessageBus;
import org.apache.cloudstack.test.utils.SpringUtils;
import org.junit.After;
import org.junit.Before;
@@ -308,6 +309,11 @@ public class NetworkACLManagerTest extends TestCase {
return Mockito.mock(VpcService.class);
}
+ @Bean
+ public MessageBus messageBus() {
+ return Mockito.mock(MessageBus.class);
+ }
+
public static class Library implements TypeFilter {
@Override
public boolean match(MetadataReader mdr, MetadataReaderFactory arg1) throws IOException {
[46/50] [abbrv] git commit: updated refs/heads/4.4 to 48f8a95
Posted by hu...@apache.org.
findbug fixes, added some comments, bug fixes
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9a97ba76
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9a97ba76
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9a97ba76
Branch: refs/heads/4.4
Commit: 9a97ba76d382d9f13d2bde73aed6dfdeb4047118
Parents: e487b24
Author: Murali Reddy <mu...@gmail.com>
Authored: Fri Mar 14 15:51:49 2014 +0530
Committer: Murali Reddy <mu...@gmail.com>
Committed: Fri Mar 14 16:56:39 2014 +0530
----------------------------------------------------------------------
.../xen/resource/CitrixResourceBase.java | 11 +-
.../cloud/network/guru/OvsGuestNetworkGuru.java | 1 +
.../network/ovs/OvsNetworkTopologyGuruImpl.java | 21 +-
.../cloud/network/ovs/OvsTunnelManagerImpl.java | 56 +++--
.../xenserver/cloudstack_pluginlib.py | 236 +++++++++++--------
5 files changed, 193 insertions(+), 132 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9a97ba76/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 57debc6..d1e1716 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
@@ -1147,7 +1147,11 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
if (vmSpec != null) {
vifr.otherConfig.put("cloudstack-vm-id", vmSpec.getUuid());
}
+
+ // OVS plugin looks at network UUID in the vif 'otherconfig' details to group VIF's & tunnel ports as part of tier
+ // when bridge is setup for distributed routing
vifr.otherConfig.put("cloudstack-network-id", nic.getNetworkUuid());
+
vifr.network = getNetwork(conn, nic);
if (nic.getNetworkRateMbps() != null && nic.getNetworkRateMbps().intValue() != -1) {
@@ -5285,7 +5289,7 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
Connection conn = getConnection();
try {
Network nw = findOrCreateTunnelNetwork(conn, cmd.getBridgeName());
- String bridgeName = nw.getBridge(conn);;
+ String bridgeName = nw.getBridge(conn);
String result = callHostPlugin(conn, "ovstunnel", "configure_ovs_bridge_for_network_topology", "bridge",
bridgeName, "config", cmd.getVpcConfigInJson(), "host-id", ((Long)cmd.getHostId()).toString());
if (result.startsWith("SUCCESS")) {
@@ -5302,8 +5306,11 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
public Answer execute(OvsVpcRoutingPolicyConfigCommand cmd) {
Connection conn = getConnection();
try {
+ Network nw = findOrCreateTunnelNetwork(conn, cmd.getBridgeName());
+ String bridgeName = nw.getBridge(conn);
+
String result = callHostPlugin(conn, "ovstunnel", "configure_ovs_bridge_for_routing_policies", "bridge",
- cmd.getBridgeName(), "host-id", ((Long)cmd.getHostId()).toString(), "config",
+ bridgeName, "host-id", ((Long)cmd.getHostId()).toString(), "config",
cmd.getVpcConfigInJson());
if (result.startsWith("SUCCESS")) {
return new Answer(cmd, true, result);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9a97ba76/plugins/network-elements/ovs/src/com/cloud/network/guru/OvsGuestNetworkGuru.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/ovs/src/com/cloud/network/guru/OvsGuestNetworkGuru.java b/plugins/network-elements/ovs/src/com/cloud/network/guru/OvsGuestNetworkGuru.java
index 9d2efe6..de74108 100644
--- a/plugins/network-elements/ovs/src/com/cloud/network/guru/OvsGuestNetworkGuru.java
+++ b/plugins/network-elements/ovs/src/com/cloud/network/guru/OvsGuestNetworkGuru.java
@@ -151,6 +151,7 @@ public class OvsGuestNetworkGuru extends GuestNetworkGuru {
implemented.setBroadcastDomainType(BroadcastDomainType.Vswitch);
+ // for the networks that are part of VPC enabled for distributed routing use scheme vs://vpcid.GRE key for network
if (network.getVpcId() != null && isVpcEnabledForDistributedRouter(network.getVpcId())) {
String keyStr = BroadcastDomainType.getValue(implemented.getBroadcastUri());
Long vpcid= network.getVpcId();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9a97ba76/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsNetworkTopologyGuruImpl.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsNetworkTopologyGuruImpl.java b/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsNetworkTopologyGuruImpl.java
index 740df80..ab08d26 100644
--- a/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsNetworkTopologyGuruImpl.java
+++ b/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsNetworkTopologyGuruImpl.java
@@ -91,6 +91,9 @@ public class OvsNetworkTopologyGuruImpl extends ManagerBase implements OvsNetwor
return vpcHostIds;
}
+ /**
+ * get the list of VPC id's of the vpc's for which one or more VM's from the VPC are running on the host
+ */
@Override
public List<Long> getVpcOnHost(long hostId) {
List<Long> vpcIds = new ArrayList<>();
@@ -109,6 +112,9 @@ public class OvsNetworkTopologyGuruImpl extends ManagerBase implements OvsNetwor
return vpcIds;
}
+ /**
+ * get the list of all active Vm id's in a network
+ */
@Override
public List<Long> getAllActiveVmsInNetwork(long networkId) {
List <Long> vmIds = new ArrayList<>();
@@ -117,7 +123,6 @@ public class OvsNetworkTopologyGuruImpl extends ManagerBase implements OvsNetwor
VirtualMachine.State.Migrating);
// Find routers for the network
List<DomainRouterVO> routers = _routerDao.findByNetwork(networkId);
- List<VMInstanceVO> ins = new ArrayList<VMInstanceVO>();
if (vms != null) {
for (UserVmVO vm : vms) {
@@ -132,6 +137,9 @@ public class OvsNetworkTopologyGuruImpl extends ManagerBase implements OvsNetwor
return vmIds;
}
+ /**
+ * get the list of all active Vm id's in the VPC for all ther tiers
+ */
@Override
public List<Long> getAllActiveVmsInVpc(long vpcId) {
@@ -148,6 +156,9 @@ public class OvsNetworkTopologyGuruImpl extends ManagerBase implements OvsNetwor
return vmIds;
}
+ /**
+ * get the list of all Vm id's in the VPC for all the tiers that are running on the host
+ */
@Override
public List<Long> getActiveVmsInVpcOnHost(long vpcId, long hostId) {
Set<Long> vmIdsSet = new HashSet<>();
@@ -163,6 +174,9 @@ public class OvsNetworkTopologyGuruImpl extends ManagerBase implements OvsNetwor
return vmIds;
}
+ /**
+ * get the list of all Vm id's in the network that are running on the host
+ */
@Override
public List<Long> getActiveVmsInNetworkOnHost(long networkId, long hostId) {
List <Long> vmIds = new ArrayList<>();
@@ -171,7 +185,6 @@ public class OvsNetworkTopologyGuruImpl extends ManagerBase implements OvsNetwor
VirtualMachine.State.Migrating);
// Find routers for the network
List<DomainRouterVO> routers = _routerDao.findByNetwork(networkId);
- List<VMInstanceVO> ins = new ArrayList<VMInstanceVO>();
if (vms != null) {
for (UserVmVO vm : vms) {
@@ -188,13 +201,15 @@ public class OvsNetworkTopologyGuruImpl extends ManagerBase implements OvsNetwor
return vmIds;
}
+ /**
+ * get the list of all Vpc id's in which, a VM has a nic in the network that is part of VPC
+ */
@Override
public List<Long> getVpcIdsVmIsPartOf(long vmId) {
List<Long> vpcIds = new ArrayList<>();
List<NicVO> nics = _nicDao.listByVmId(vmId);
if (nics == null)
return null;
-
for (Nic nic: nics) {
Network network = _networkDao.findById(nic.getNetworkId());
if (network != null && network.getTrafficType() == Networks.TrafficType.Guest && network.getVpcId() != null) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9a97ba76/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java b/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java
index 30088aa..21e9058 100644
--- a/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java
+++ b/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java
@@ -665,7 +665,6 @@ public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManage
public boolean postStateTransitionEvent(VirtualMachine.State oldState, VirtualMachine.Event event,
VirtualMachine.State newState, VirtualMachine vm,
boolean status, Object opaque) {
-
if (!status) {
return false;
}
@@ -720,7 +719,7 @@ public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManage
public boolean sendVpcTopologyChangeUpdate(OvsVpcPhysicalTopologyConfigCommand updateCmd, long hostId, String bridgeName) {
try {
- s_logger.debug("Sending VPC topology update to the host " + hostId);
+ s_logger.debug("Sending VPC topology change update to the host " + hostId);
updateCmd.setHostId(hostId);
updateCmd.setBridgeName(bridgeName);
Answer ans = _agentMgr.send(hostId, updateCmd);
@@ -732,7 +731,7 @@ public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManage
return false;
}
} catch (Exception e) {
- s_logger.debug("Failed to updated the host " + hostId + " with latest VPC topology." );
+ s_logger.debug("Failed to updated the host " + hostId + " with latest VPC topology.", e );
return false;
}
}
@@ -797,6 +796,7 @@ public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManage
vmInstance.getHostId(), vmNics.toArray(new OvsVpcPhysicalTopologyConfigCommand.Nic[vmNics.size()]));
vms.add(vm);
}
+
return new OvsVpcPhysicalTopologyConfigCommand(
hosts.toArray(new OvsVpcPhysicalTopologyConfigCommand.Host[hosts.size()]),
tiers.toArray(new OvsVpcPhysicalTopologyConfigCommand.Tier[tiers.size()]),
@@ -804,47 +804,58 @@ public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManage
vpc.getCidr());
}
- // Subscriber to ACL replace events. On acl replace event, if the vpc is enabled for distributed routing
- // send the ACL update to all the hosts on which VPC spans
+ // Subscriber to ACL replace events. On acl replace event, if the vpc for the tier is enabled for
+ // distributed routing send the ACL update to all the hosts on which VPC spans
public class NetworkAclEventsSubscriber implements MessageSubscriber {
@Override
public void onPublishMessage(String senderAddress, String subject, Object args) {
- NetworkVO network = (NetworkVO) args;
- String bridgeName=generateBridgeNameForVpc(network.getVpcId());
- if (network.getVpcId() != null & isVpcEnabledForDistributedRouter(network.getVpcId())) {
- long vpcId = network.getVpcId();
- OvsVpcRoutingPolicyConfigCommand cmd = prepareVpcRoutingPolicyUpdate(vpcId);
- List<Long> vpcSpannedHostIds = _ovsNetworkToplogyGuru.getVpcSpannedHosts(vpcId);
- for (Long id: vpcSpannedHostIds) {
- if (!sendVpcRoutingPolicyChangeUpdate(cmd, id, bridgeName)) {
- s_logger.debug("Failed to send VPC routing policy change update to host : " + id +
- ". But moving on with sending the host updates to the rest of the hosts.");
+ try {
+ NetworkVO network = (NetworkVO) args;
+ String bridgeName=generateBridgeNameForVpc(network.getVpcId());
+ if (network.getVpcId() != null & isVpcEnabledForDistributedRouter(network.getVpcId())) {
+ long vpcId = network.getVpcId();
+ OvsVpcRoutingPolicyConfigCommand cmd = prepareVpcRoutingPolicyUpdate(vpcId);
+ List<Long> vpcSpannedHostIds = _ovsNetworkToplogyGuru.getVpcSpannedHosts(vpcId);
+ for (Long id: vpcSpannedHostIds) {
+ if (!sendVpcRoutingPolicyChangeUpdate(cmd, id, bridgeName)) {
+ s_logger.debug("Failed to send VPC routing policy change update to host : " + id +
+ ". But moving on with sending the updates to the rest of the hosts.");
+ }
}
}
+ } catch (Exception e) {
+ s_logger.debug("Failed to send VPC routing policy change updates all hosts in vpc", e);
}
}
}
private OvsVpcRoutingPolicyConfigCommand prepareVpcRoutingPolicyUpdate(long vpcId) {
- VpcVO vpc = _vpcDao.findById(vpcId);
- assert (vpc != null): "invalid vpc id";
+
List<OvsVpcRoutingPolicyConfigCommand.Acl> acls = new ArrayList<>();
List<OvsVpcRoutingPolicyConfigCommand.Tier> tiers = new ArrayList<>();
+ VpcVO vpc = _vpcDao.findById(vpcId);
List<? extends Network> vpcNetworks = _vpcMgr.getVpcNetworks(vpcId);
+ assert (vpc != null && (vpcNetworks != null && !vpcNetworks.isEmpty())): "invalid vpc id";
+
for (Network network : vpcNetworks) {
Long networkAclId = network.getNetworkACLId();
+ if (networkAclId == null)
+ continue;
NetworkACLVO networkAcl = _networkACLDao.findById(networkAclId);
List<OvsVpcRoutingPolicyConfigCommand.AclItem> aclItems = new ArrayList<>();
List<NetworkACLItemVO> aclItemVos = _networkACLItemDao.listByACL(networkAclId);
for (NetworkACLItemVO aclItem : aclItemVos) {
String[] sourceCidrs = aclItem.getSourceCidrList().toArray(new String[aclItem.getSourceCidrList().size()]);
+
aclItems.add(new OvsVpcRoutingPolicyConfigCommand.AclItem(
aclItem.getNumber(), aclItem.getUuid(), aclItem.getAction().name(),
aclItem.getTrafficType().name(),
- aclItem.getSourcePortStart().toString(), aclItem.getSourcePortEnd().toString(),
- aclItem.getProtocol(), sourceCidrs));
+ ((aclItem.getSourcePortStart() != null) ?aclItem.getSourcePortStart().toString() :null),
+ ((aclItem.getSourcePortEnd() != null) ?aclItem.getSourcePortEnd().toString() :null),
+ aclItem.getProtocol(),
+ sourceCidrs));
}
OvsVpcRoutingPolicyConfigCommand.Acl acl = new OvsVpcRoutingPolicyConfigCommand.Acl(networkAcl.getUuid(),
@@ -862,10 +873,9 @@ public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManage
return cmd;
}
-
public boolean sendVpcRoutingPolicyChangeUpdate(OvsVpcRoutingPolicyConfigCommand updateCmd, long hostId, String bridgeName) {
try {
- s_logger.debug("Sending VPC routing policy change update to the host " + hostId);
+ s_logger.debug("Sending VPC routing policies change update to the host " + hostId);
updateCmd.setHostId(hostId);
updateCmd.setBridgeName(bridgeName);
Answer ans = _agentMgr.send(hostId, updateCmd);
@@ -873,11 +883,11 @@ public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManage
s_logger.debug("Successfully updated the host " + hostId + " with latest VPC routing policies." );
return true;
} else {
- s_logger.debug("Failed to update the host " + hostId + " with latest routing policy." );
+ s_logger.debug("Failed to update the host " + hostId + " with latest routing policies." );
return false;
}
} catch (Exception e) {
- s_logger.debug("Failed to updated the host " + hostId + " with latest routing policy." );
+ s_logger.debug("Failed to updated the host " + hostId + " with latest routing policies due to" , e );
return false;
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9a97ba76/scripts/vm/hypervisor/xenserver/cloudstack_pluginlib.py
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/xenserver/cloudstack_pluginlib.py b/scripts/vm/hypervisor/xenserver/cloudstack_pluginlib.py
index 1c9d513..4ebb435 100644
--- a/scripts/vm/hypervisor/xenserver/cloudstack_pluginlib.py
+++ b/scripts/vm/hypervisor/xenserver/cloudstack_pluginlib.py
@@ -321,62 +321,66 @@ def configure_bridge_for_network_topology(bridge, this_host_id, json_config):
logging.debug("WARNING:Can't find VPC info in json config file")
return "FAILURE:IMPROPER_JSON_CONFG_FILE"
- # get the list of Vm's in the VPC from the JSON config
- this_host_vms = get_vms_on_host(vpconfig, this_host_id)
-
- for vm in this_host_vms:
- for nic in vm.nics:
- mac_addr = nic.macaddress
- ip = nic.ipaddress
- vif_name = get_vif_name_from_macaddress(mac_addr)
- of_port = get_ofport_for_vif(vif_name)
- network = get_network_details(vpconfig, nic.networkuuid)
-
- # Add flow rule in L2 look up table, if the destination mac = MAC of the nic send packet on the found OFPORT
- add_mac_lookup_table_entry(bridge, mac_addr, of_port)
-
- # Add flow rule in L3 look up table: if the destination IP = VM's IP then modify the packet
- # to set DST MAC = VM's MAC, SRC MAC=tier gateway MAC and send to egress table
- add_ip_lookup_table_entry(bridge, ip, network.gatewaymac, mac_addr)
-
- # Add flow entry to send with intra tier traffic from the NIC to L2 lookup path)
- action_str = "table=0, in_port=%s," %of_port + " ip, nw_dst=%s," %network.cidr + " actions=resubmit(,1)"
- addflow = [OFCTL_PATH, "add-flow", bridge, action_str]
- do_cmd(addflow)
-
- #add flow entry to send inter-tier traffic from the NIC to egress ACL table(to L3 lookup path)
- action_str = "table=0, in_port=%s," % of_port + " ip, dl_dst=%s," %network.gatewaymac +\
- "nw_dst=%s," %vpconfig.cidr + "actions=resubmit(,3)"
- addflow = [OFCTL_PATH, "add-flow", bridge, action_str]
-
- do_cmd(addflow)
-
- # get the list of hosts on which VPC spans from the JSON config
- vpc_spanning_hosts = vpconfig.hosts
-
- for host in vpc_spanning_hosts:
- if str(this_host_id) == str(host.hostid):
- continue
- other_host_vms = get_vms_on_host(vpconfig, host.hostid)
- for vm in other_host_vms:
+ try:
+ # get the list of Vm's in the VPC from the JSON config
+ this_host_vms = get_vms_on_host(vpconfig, this_host_id)
+
+ for vm in this_host_vms:
for nic in vm.nics:
mac_addr = nic.macaddress
ip = nic.ipaddress
+ vif_name = get_vif_name_from_macaddress(mac_addr)
+ of_port = get_ofport_for_vif(vif_name)
network = get_network_details(vpconfig, nic.networkuuid)
- gre_key = network.grekey
- # generate tunnel name from tunnel naming convention
- tunnel_name = "t%s-%s-%s" % (gre_key, this_host_id, host.hostid)
- of_port = get_ofport_for_vif(tunnel_name)
-
- # Add flow rule in L2 look up table, if the destination mac = MAC of the nic send packet tunnel port
+ # Add flow rule in L2 look up table, if the destination mac = MAC of the nic send packet on the found OFPORT
add_mac_lookup_table_entry(bridge, mac_addr, of_port)
- # Add flow tule in L3 look up table: if the destination IP = VM's IP then modify the packet
- # set DST MAC = VM's MAC, SRC MAC=tier gateway MAC and send to egress table
+ # Add flow rule in L3 look up table: if the destination IP = VM's IP then modify the packet
+ # to set DST MAC = VM's MAC, SRC MAC=tier gateway MAC and send to egress table
add_ip_lookup_table_entry(bridge, ip, network.gatewaymac, mac_addr)
- return "SUCCESS: successfully configured bridge as per the VPC topology"
+ # Add flow entry to send with intra tier traffic from the NIC to L2 lookup path)
+ action_str = "table=0, in_port=%s," %of_port + " ip, nw_dst=%s," %network.cidr + " actions=resubmit(,1)"
+ addflow = [OFCTL_PATH, "add-flow", bridge, action_str]
+ do_cmd(addflow)
+
+ #add flow entry to send inter-tier traffic from the NIC to egress ACL table(to L3 lookup path)
+ action_str = "table=0, in_port=%s," % of_port + " ip, dl_dst=%s," %network.gatewaymac +\
+ "nw_dst=%s," %vpconfig.cidr + "actions=resubmit(,3)"
+ addflow = [OFCTL_PATH, "add-flow", bridge, action_str]
+
+ do_cmd(addflow)
+
+ # get the list of hosts on which VPC spans from the JSON config
+ vpc_spanning_hosts = vpconfig.hosts
+
+ for host in vpc_spanning_hosts:
+ if str(this_host_id) == str(host.hostid):
+ continue
+ other_host_vms = get_vms_on_host(vpconfig, host.hostid)
+ for vm in other_host_vms:
+ for nic in vm.nics:
+ mac_addr = nic.macaddress
+ ip = nic.ipaddress
+ network = get_network_details(vpconfig, nic.networkuuid)
+ gre_key = network.grekey
+
+ # generate tunnel name from tunnel naming convention
+ tunnel_name = "t%s-%s-%s" % (gre_key, this_host_id, host.hostid)
+ of_port = get_ofport_for_vif(tunnel_name)
+
+ # Add flow rule in L2 look up table, if the destination mac = MAC of the nic send packet tunnel port
+ add_mac_lookup_table_entry(bridge, mac_addr, of_port)
+
+ # Add flow tule in L3 look up table: if the destination IP = VM's IP then modify the packet
+ # set DST MAC = VM's MAC, SRC MAC=tier gateway MAC and send to egress table
+ add_ip_lookup_table_entry(bridge, ip, network.gatewaymac, mac_addr)
+
+ return "SUCCESS: successfully configured bridge as per the VPC topology"
+ except:
+ logging.debug("An unexpected error occurred while configuring bridge as per VPC topology.")
+ raise
def get_acl(vpcconfig, required_acl_id):
acls = vpcconfig.acls
@@ -392,60 +396,84 @@ def configure_ovs_bridge_for_routing_policies(bridge, json_config):
logging.debug("WARNING:Can't find VPC info in json config file")
return "FAILURE:IMPROPER_JSON_CONFG_FILE"
- # First flush current egress ACL's before re-applying the ACL's
- del_flows(bridge, table=3)
-
- egress_rules_added = False
- ingress_rules_added = False
-
- tiers = vpconfig.tiers
- for tier in tiers:
- tier_cidr = tier.cidr
- acl = get_acl(vpconfig, tier.aclid)
- acl_items = acl.aclitems
-
- for acl_item in acl_items:
- number = acl_item.number
- action = acl_item.action
- direction = acl_item.direction
- source_port_start = acl_item.sourceportstart
- source_port_end = acl_item.sourceportend
- protocol = acl_item.protocol
- source_cidrs = acl_item.sourcecidrs
- acl_priority = 1000 + number
- for source_cidr in source_cidrs:
- if direction is "ingress":
- ingress_rules_added = True
- # add flow rule to do action (allow/deny) for flows where source IP of the packet is in
- # source_cidr and destination ip is in tier_cidr
- port = source_port_start
- while (port < source_port_end):
- if action is "deny":
- add_flow(bridge, priority= acl_priority, table=5, nw_src=source_cidr, nw_dst=tier_cidr, tp_dst=port,
- nw_proto=protocol, actions='drop')
- if action is "allow":
- add_flow(bridge, priority= acl_priority,table=5, nw_src=source_cidr, nw_dst=tier_cidr, tp_dst=port,
- nw_proto=protocol, actions='resubmit(,1)')
- port = port + 1
-
- elif direction in "egress":
- egress_rules_added = True
- # add flow rule to do action (allow/deny) for flows where destination IP of the packet is in
- # source_cidr and source ip is in tier_cidr
- port = source_port_start
- while (port < source_port_end):
- if action is "deny":
- add_flow(bridge, priority= acl_priority, table=5, nw_src=tier_cidr, nw_dst=source_cidr, tp_dst=port,
- nw_proto=protocol, actions='drop')
- if action is "allow":
- add_flow(bridge, priority= acl_priority, table=5, nw_src=tier_cidr, nw_dst=source_cidr, tp_dst=port,
- nw_proto=protocol, actions='resubmit(,1)')
- port = port + 1
-
- if egress_rules_added is False:
- # add a default rule in egress table to forward packet to L3 lookup table
- add_flow(bridge, priority=0, table=3, actions='resubmit(,4)')
-
- if ingress_rules_added is False:
- # add a default rule in egress table drop packets
- add_flow(bridge, priority=0, table=5, actions='drop')
\ No newline at end of file
+ try:
+ # First flush current egress ACL's before re-applying the ACL's
+ del_flows(bridge, table=3)
+
+ egress_rules_added = False
+ ingress_rules_added = False
+
+ tiers = vpconfig.tiers
+ for tier in tiers:
+ tier_cidr = tier.cidr
+ acl = get_acl(vpconfig, tier.aclid)
+ acl_items = acl.aclitems
+
+ for acl_item in acl_items:
+ number = acl_item.number
+ action = acl_item.action
+ direction = acl_item.direction
+ source_port_start = acl_item.sourceportstart
+ source_port_end = acl_item.sourceportend
+ protocol = acl_item.protocol
+ source_cidrs = acl_item.sourcecidrs
+ acl_priority = 1000 + number
+ for source_cidr in source_cidrs:
+ if direction is "ingress":
+ ingress_rules_added = True
+
+ if source_port_start is None and source_port_end is None:
+ if action is "deny":
+ add_flow(bridge, priority= acl_priority, table=5, nw_src=source_cidr, nw_dst=tier_cidr,
+ nw_proto=protocol, actions='drop')
+ if action is "allow":
+ add_flow(bridge, priority= acl_priority,table=5, nw_src=source_cidr, nw_dst=tier_cidr,
+ nw_proto=protocol, actions='resubmit(,1)')
+ continue
+
+ # add flow rule to do action (allow/deny) for flows where source IP of the packet is in
+ # source_cidr and destination ip is in tier_cidr
+ port = source_port_start
+ while (port < source_port_end):
+ if action is "deny":
+ add_flow(bridge, priority= acl_priority, table=5, nw_src=source_cidr, nw_dst=tier_cidr, tp_dst=port,
+ nw_proto=protocol, actions='drop')
+ if action is "allow":
+ add_flow(bridge, priority= acl_priority,table=5, nw_src=source_cidr, nw_dst=tier_cidr, tp_dst=port,
+ nw_proto=protocol, actions='resubmit(,1)')
+ port = port + 1
+
+ elif direction in "egress":
+ egress_rules_added = True
+
+ if source_port_start is None and source_port_end is None:
+ if action is "deny":
+ add_flow(bridge, priority= acl_priority, table=3, nw_src=source_cidr, nw_dst=tier_cidr,
+ nw_proto=protocol, actions='drop')
+ if action is "allow":
+ add_flow(bridge, priority= acl_priority,table=3, nw_src=source_cidr, nw_dst=tier_cidr,
+ nw_proto=protocol, actions='resubmit(,1)')
+ continue
+
+ # add flow rule to do action (allow/deny) for flows where destination IP of the packet is in
+ # source_cidr and source ip is in tier_cidr
+ port = source_port_start
+ while (port < source_port_end):
+ if action is "deny":
+ add_flow(bridge, priority= acl_priority, table=3, nw_src=tier_cidr, nw_dst=source_cidr, tp_dst=port,
+ nw_proto=protocol, actions='drop')
+ if action is "allow":
+ add_flow(bridge, priority= acl_priority, table=3, nw_src=tier_cidr, nw_dst=source_cidr, tp_dst=port,
+ nw_proto=protocol, actions='resubmit(,1)')
+ port = port + 1
+
+ if egress_rules_added is False:
+ # add a default rule in egress table to forward packet to L3 lookup table
+ add_flow(bridge, priority=0, table=3, actions='resubmit(,4)')
+
+ if ingress_rules_added is False:
+ # add a default rule in egress table drop packets
+ add_flow(bridge, priority=0, table=5, actions='drop')
+ except:
+ logging.debug("An unexpected error occurred while configuring bridge as per VPC's routing policies.")
+ raise
\ No newline at end of file
[27/50] [abbrv] git commit: updated refs/heads/4.4 to 48f8a95
Posted by hu...@apache.org.
CLOUDSTACK-6215: Updating test case to accomodate condition for VMware
Signed-off-by: SrikanteswaraRao Talluri <ta...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/28697448
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/28697448
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/28697448
Branch: refs/heads/4.4
Commit: 286974488eab03efddfea35962161a224e997ab0
Parents: 16ddc34
Author: Gaurav Aradhye <ga...@clogeny.com>
Authored: Mon Mar 10 03:44:43 2014 -0400
Committer: SrikanteswaraRao Talluri <ta...@apache.org>
Committed: Fri Mar 14 11:34:52 2014 +0530
----------------------------------------------------------------------
.../component/test_base_image_updation.py | 19 ++++++++++++++-----
1 file changed, 14 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/28697448/test/integration/component/test_base_image_updation.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_base_image_updation.py b/test/integration/component/test_base_image_updation.py
index af968cc..e31aacf 100644
--- a/test/integration/component/test_base_image_updation.py
+++ b/test/integration/component/test_base_image_updation.py
@@ -25,11 +25,10 @@
"""
#Import Local Modules
-import marvin
from marvin.codes import (PASS,
RECURRING)
from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
from marvin.integration.lib.base import (ServiceOffering,
Account,
@@ -51,7 +50,6 @@ from marvin.integration.lib.utils import (validateList,
cleanup_resources)
import time
-from datetime import datetime, timedelta
class Services:
"""Test Base Image Updation
@@ -117,6 +115,18 @@ class Services:
"ispublic": True,
"isextractable": True,
+ },
+ "VMware": {
+ "displaytext": "Public Template - VMware",
+ "name": "Public template -VMware",
+ "ostype": "CentOS 5.3 (64-bit)",
+ "url": "http://download.cloud.com/releases/2.2.0/CentOS5.3-x86_64.ova",
+ "hypervisor": "vmware",
+ "format": "ova",
+ "isfeatured": True,
+ "ispublic": True,
+ "isextractable": True,
+
}
},
"template": {
@@ -503,8 +513,7 @@ class TestBaseImageUpdate(cloudstackTestCase):
"VM created with IsVolatile=False doesn't have same ip after restore. Got : %s Expected : %s"
%(vm_without_reset.nic[0].ipaddress, self.vm_without_reset.nic[0].ipaddress)
)
-
- return
+ return
@attr(tags=["advanced", "basic"])
def test_04_reoccuring_snapshot_rules(self):
[22/50] [abbrv] git commit: updated refs/heads/4.4 to 48f8a95
Posted by hu...@apache.org.
Send StopCommand(Cleanup) if out-of-band power-off VM is detected.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/53f306e8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/53f306e8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/53f306e8
Branch: refs/heads/4.4
Commit: 53f306e8e20023eace74c3644a20be4066ca7ca9
Parents: 8ff9460
Author: Kelven Yang <ke...@gmail.com>
Authored: Tue Mar 4 15:09:07 2014 -0800
Committer: Kelven Yang <ke...@gmail.com>
Committed: Thu Mar 13 16:59:56 2014 -0700
----------------------------------------------------------------------
.../src/com/cloud/vm/VirtualMachineManagerImpl.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/53f306e8/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
index 2cbde35..0ca0d30 100755
--- a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -4221,6 +4221,10 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
case Stopped:
case Migrating:
s_logger.info("VM " + vm.getInstanceName() + " is at " + vm.getState() + " and we received a power-off report while there is no pending jobs on it");
+ VirtualMachineGuru vmGuru = getVmGuru(vm);
+ VirtualMachineProfile profile = new VirtualMachineProfileImpl(vm);
+ sendStop(vmGuru, profile, true);
+
try {
stateTransitTo(vm, VirtualMachine.Event.FollowAgentPowerOffReport, null);
} catch (NoTransitionException e) {
@@ -4233,9 +4237,6 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
s_logger.info("VM " + vm.getInstanceName() + " is sync-ed to at Stopped state according to power-off report from hypervisor");
- VirtualMachineGuru vmGuru = getVmGuru(vm);
- VirtualMachineProfile profile = new VirtualMachineProfileImpl(vm);
- sendStop(vmGuru, profile, true);
break;
case Destroyed:
[03/50] [abbrv] git commit: updated refs/heads/4.4 to 48f8a95
Posted by hu...@apache.org.
Merge branch 'master' into rbac.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/99bdc8d8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/99bdc8d8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/99bdc8d8
Branch: refs/heads/4.4
Commit: 99bdc8d8752a37f629bd86b842312e420b87b0af
Parents: f2d4b4d 5779292
Author: Min Chen <mi...@citrix.com>
Authored: Thu Mar 13 11:05:03 2014 -0700
Committer: Min Chen <mi...@citrix.com>
Committed: Thu Mar 13 11:05:03 2014 -0700
----------------------------------------------------------------------
agent/conf/agent.properties | 11 +
.../SYSCONFDIR/rc.d/init.d/cloud-agent.in | 2 +-
.../SYSCONFDIR/rc.d/init.d/cloud-agent.in | 2 +-
.../sles/SYSCONFDIR/init.d/cloud-agent.in | 2 +-
.../rhel/SYSCONFDIR/rc.d/init.d/cloud-agent.in | 2 +-
.../sles/SYSCONFDIR/init.d/cloud-agent.in | 2 +-
.../cloud/agent/api/HostVmStateReportEntry.java | 10 +-
api/src/com/cloud/agent/api/to/GPUDeviceTO.java | 56 ++
.../cloud/agent/api/to/VirtualMachineTO.java | 9 +
api/src/com/cloud/event/EventTypes.java | 42 +-
api/src/com/cloud/gpu/GPU.java | 49 ++
.../VpcVirtualNetworkApplianceService.java | 8 +-
.../element/AggregatedCommandExecutor.java | 28 +
.../com/cloud/offering/DiskOfferingInfo.java | 65 ++
api/src/com/cloud/server/ManagementService.java | 77 ++-
api/src/com/cloud/storage/GuestOS.java | 6 +
.../com/cloud/storage/GuestOSHypervisor.java | 10 +
api/src/com/cloud/storage/VolumeApiService.java | 2 +
api/src/com/cloud/user/AccountService.java | 2 +
api/src/com/cloud/vm/UserVmService.java | 6 +
.../cloudstack/api/ApiCommandJobType.java | 6 +-
.../org/apache/cloudstack/api/ApiConstants.java | 22 +-
.../org/apache/cloudstack/api/BaseAsyncCmd.java | 36 -
.../apache/cloudstack/api/BaseAsyncVMCmd.java | 30 +
.../cloudstack/api/BaseAsyncVolumeCmd.java | 30 +
api/src/org/apache/cloudstack/api/BaseCmd.java | 239 +++----
.../org/apache/cloudstack/api/BaseListCmd.java | 30 +-
.../org/apache/cloudstack/api/Parameter.java | 2 -
.../cloudstack/api/ResponseGenerator.java | 4 +
.../api/command/admin/guest/AddGuestOsCmd.java | 136 ++++
.../admin/guest/AddGuestOsMappingCmd.java | 146 ++++
.../admin/guest/ListGuestOsMappingCmd.java | 101 +++
.../command/admin/guest/RemoveGuestOsCmd.java | 98 +++
.../admin/guest/RemoveGuestOsMappingCmd.java | 98 +++
.../command/admin/guest/UpdateGuestOsCmd.java | 104 +++
.../admin/guest/UpdateGuestOsMappingCmd.java | 102 +++
.../admin/offering/CreateDiskOfferingCmd.java | 6 +-
.../offering/CreateServiceOfferingCmd.java | 54 +-
.../api/command/admin/user/CreateUserCmd.java | 3 +-
.../affinitygroup/DeleteAffinityGroupCmd.java | 1 +
.../user/autoscale/CreateConditionCmd.java | 2 +-
.../api/command/user/iso/ListIsosCmd.java | 3 +-
.../api/command/user/iso/RegisterIsoCmd.java | 5 +-
.../command/user/network/CreateNetworkCmd.java | 2 +-
.../gslb/CreateGlobalLoadBalancerRuleCmd.java | 5 +-
.../user/resource/ListResourceLimitsCmd.java | 5 +-
.../user/resource/UpdateResourceCountCmd.java | 5 +-
.../user/resource/UpdateResourceLimitCmd.java | 7 +-
.../AuthorizeSecurityGroupEgressCmd.java | 2 +-
.../AuthorizeSecurityGroupIngressCmd.java | 2 +-
.../securitygroup/DeleteSecurityGroupCmd.java | 2 +-
.../command/user/ssh/CreateSSHKeyPairCmd.java | 2 +-
.../command/user/ssh/DeleteSSHKeyPairCmd.java | 1 +
.../command/user/ssh/RegisterSSHKeyPairCmd.java | 2 +-
.../command/user/template/ListTemplatesCmd.java | 3 +-
.../user/template/RegisterTemplateCmd.java | 5 +-
.../api/command/user/vm/DeployVMCmd.java | 62 +-
.../api/command/user/vm/DestroyVMCmd.java | 4 +-
.../api/command/user/vm/ListVMsCmd.java | 8 +
.../api/command/user/vm/RebootVMCmd.java | 4 +-
.../api/command/user/vm/ResetVMPasswordCmd.java | 4 +-
.../api/command/user/vm/ResetVMSSHKeyCmd.java | 4 +-
.../api/command/user/vm/RestoreVMCmd.java | 10 +-
.../api/command/user/vm/ScaleVMCmd.java | 4 +-
.../api/command/user/vm/StartVMCmd.java | 4 +-
.../api/command/user/vm/StopVMCmd.java | 4 +-
.../api/command/user/vm/UpgradeVMCmd.java | 5 +
.../command/user/vmgroup/CreateVMGroupCmd.java | 2 +-
.../command/user/volume/AttachVolumeCmd.java | 15 +-
.../command/user/volume/CreateVolumeCmd.java | 14 +-
.../command/user/volume/DeleteVolumeCmd.java | 5 +
.../command/user/volume/DetachVolumeCmd.java | 6 +-
.../command/user/volume/ExtractVolumeCmd.java | 4 +-
.../command/user/volume/MigrateVolumeCmd.java | 10 +-
.../command/user/volume/ResizeVolumeCmd.java | 10 +-
.../command/user/volume/UpdateVolumeCmd.java | 5 +
.../command/user/volume/UploadVolumeCmd.java | 2 +-
.../api/command/user/vpc/CreateVPCCmd.java | 2 +-
.../api/command/user/vpn/AddVpnUserCmd.java | 2 +-
.../user/vpn/CreateVpnCustomerGatewayCmd.java | 2 +-
.../api/command/user/vpn/RemoveVpnUserCmd.java | 2 +-
.../command/user/vpn/ResetVpnConnectionCmd.java | 2 +-
.../user/vpn/UpdateVpnCustomerGatewayCmd.java | 2 +-
.../api/response/DiskOfferingResponse.java | 12 +
.../cloudstack/api/response/GpuResponse.java | 46 ++
.../api/response/GuestOsMappingResponse.java | 102 +++
.../cloudstack/api/response/HostResponse.java | 8 +
.../api/response/ServiceOfferingResponse.java | 48 ++
.../cloudstack/api/response/UserVmResponse.java | 10 +
.../cloudstack/api/response/VgpuResponse.java | 52 ++
.../org/apache/cloudstack/api/BaseCmdTest.java | 69 ++
.../classes/resources/messages.properties | 209 ++++++
.../classes/resources/messages_ja_JP.properties | 272 +++++++-
.../classes/resources/messages_zh_CN.properties | 572 +++++++++++-----
client/tomcatconf/commands.properties.in | 9 +
.../com/cloud/agent/api/ClusterSyncAnswer.java | 10 +-
.../agent/api/ClusterVMMetaDataSyncAnswer.java | 52 ++
.../agent/api/ClusterVMMetaDataSyncCommand.java | 47 ++
.../com/cloud/agent/api/GetGPUStatsAnswer.java | 36 +
.../com/cloud/agent/api/GetGPUStatsCommand.java | 47 ++
.../cloud/agent/api/StartupRoutingCommand.java | 17 +-
core/src/com/cloud/agent/api/StopCommand.java | 9 +
.../api/routing/AggregationControlCommand.java | 44 ++
.../virtualnetwork/VirtualRoutingResource.java | 210 ++++--
core/src/com/cloud/info/ConsoleProxyInfo.java | 19 +-
.../storage/to/PrimaryDataStoreTO.java | 18 +
.../VirtualRoutingResourceTest.java | 467 ++++++++++---
.../src/com/cloud/vm/VirtualMachineManager.java | 4 +-
.../service/VolumeOrchestrationService.java | 2 +-
.../api/storage/DataMotionService.java | 2 +
.../api/storage/DataMotionStrategy.java | 2 +
.../api/storage/PrimaryDataStoreInfo.java | 18 +
.../subsystem/api/storage/VolumeService.java | 6 +-
.../src/com/cloud/resource/ResourceManager.java | 41 ++
.../cloud/agent/manager/DirectAgentAttache.java | 2 -
.../com/cloud/vm/VirtualMachineManagerImpl.java | 123 ++--
.../engine/orchestration/CloudOrchestrator.java | 40 +-
.../orchestration/NetworkOrchestrator.java | 33 +-
.../orchestration/VolumeOrchestrator.java | 29 +-
.../spring-engine-schema-core-daos-context.xml | 2 +
engine/schema/src/com/cloud/event/EventVO.java | 12 +-
.../src/com/cloud/gpu/HostGpuGroupsVO.java | 70 ++
.../schema/src/com/cloud/gpu/VGPUTypesVO.java | 82 +++
.../src/com/cloud/gpu/dao/HostGpuGroupsDao.java | 60 ++
.../com/cloud/gpu/dao/HostGpuGroupsDaoImpl.java | 94 +++
.../src/com/cloud/gpu/dao/VGPUTypesDao.java | 48 ++
.../src/com/cloud/gpu/dao/VGPUTypesDaoImpl.java | 95 +++
engine/schema/src/com/cloud/host/HostVO.java | 13 +
.../src/com/cloud/host/dao/HostDaoImpl.java | 18 +
.../com/cloud/network/vpc/NetworkACLItemVO.java | 14 +-
.../cloud/service/ServiceOfferingDetailsVO.java | 4 +
.../com/cloud/storage/GuestOSHypervisorVO.java | 62 +-
.../schema/src/com/cloud/storage/GuestOSVO.java | 25 +-
.../cloud/storage/dao/GuestOSHypervisorDao.java | 3 +
.../storage/dao/GuestOSHypervisorDaoImpl.java | 27 +
.../cloud/upgrade/dao/DatabaseAccessObject.java | 99 +++
.../com/cloud/upgrade/dao/DbUpgradeUtils.java | 76 +--
.../datastore/db/SnapshotDataStoreVO.java | 11 +-
.../datastore/db/TemplateDataStoreVO.java | 11 +-
.../storage/datastore/db/VolumeDataStoreVO.java | 11 +-
.../upgrade/dao/DatabaseAccessObjectTest.java | 463 +++++++++++++
.../cloud/upgrade/dao/DbUpgradeUtilsTest.java | 162 +++++
.../motion/AncientDataMotionStrategy.java | 25 +-
.../storage/motion/DataMotionServiceImpl.java | 9 +-
.../storage/image/TemplateServiceImpl.java | 13 +-
.../storage/image/store/TemplateObject.java | 15 +
.../storage/test/MockStorageMotionStrategy.java | 5 +
.../storage/datastore/PrimaryDataStoreImpl.java | 20 +-
.../datastore/provider/DefaultHostListener.java | 2 +-
.../storage/volume/VolumeServiceImpl.java | 156 ++++-
packaging/centos63/cloud-agent.rc | 2 +-
packaging/centos63/cloud-ipallocator.rc | 2 +-
.../networkservice/BareMetalResourceBase.java | 3 +-
.../hypervisor/hyperv/guru/HypervGuru.java | 9 +-
.../resource/HypervDirectConnectResource.java | 218 +++++-
.../kvm/resource/LibvirtComputingResource.java | 110 ++-
.../cloud/ovm/hypervisor/OvmResourceBase.java | 2 +-
.../cloud/resource/AgentRoutingResource.java | 2 +-
.../motion/SimulatorDataMotionStrategy.java | 5 +
.../vmware/resource/VmwareResource.java | 2 +-
.../network/element/CiscoNexusVSMElement.java | 5 +-
.../motion/VmwareStorageMotionStrategy.java | 5 +
.../src/com/cloud/hypervisor/XenServerGuru.java | 33 +-
.../xen/resource/CitrixResourceBase.java | 256 +++++--
.../xen/resource/XenServer610Resource.java | 8 -
.../xen/resource/XenServerPoolVms.java | 41 +-
.../xen/resource/XenServerStorageProcessor.java | 126 +++-
.../xenserver/XenServerResourceNewBase.java | 20 +-
.../motion/XenServerStorageMotionStrategy.java | 5 +
.../api/command/CreateServiceInstanceCmd.java | 2 +-
.../contrail/management/MockAccountManager.java | 5 +
.../driver/CloudStackImageStoreDriverImpl.java | 12 +-
.../apache/cloudstack/ldap/LdapUserManager.java | 8 +-
.../cloudstack/ldap/LdapUserManagerSpec.groovy | 263 ++++----
.../SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in | 2 +-
.../SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in | 2 +-
.../SYSCONFDIR/init.d/cloud-ipallocator.in | 2 +-
.../SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in | 2 +-
.../sles/SYSCONFDIR/init.d/cloud-ipallocator.in | 2 +-
.../SYSCONFDIR/init.d/cloud-ipallocator.in | 2 +-
.../vm/hypervisor/xenserver/createipAlias.sh | 25 -
.../vm/hypervisor/xenserver/deleteipAlias.sh | 24 -
scripts/vm/hypervisor/xenserver/vmops | 16 -
scripts/vm/hypervisor/xenserver/xcposs/patch | 12 -
scripts/vm/hypervisor/xenserver/xcpserver/patch | 9 -
.../vm/hypervisor/xenserver/xenserver56/patch | 7 -
.../hypervisor/xenserver/xenserver56fp1/patch | 7 -
.../vm/hypervisor/xenserver/xenserver60/patch | 7 -
.../vm/hypervisor/xenserver/xenserver62/patch | 7 -
.../core/spring-server-core-misc-context.xml | 12 +
.../allocator/impl/FirstFitAllocator.java | 17 +-
server/src/com/cloud/api/ApiDBUtils.java | 30 +
server/src/com/cloud/api/ApiDispatcher.java | 481 ++------------
server/src/com/cloud/api/ApiResponseHelper.java | 26 +-
server/src/com/cloud/api/ApiServer.java | 413 ++++++------
server/src/com/cloud/api/ApiServlet.java | 133 ++--
.../api/dispatch/CommandCreationWorker.java | 56 ++
.../com/cloud/api/dispatch/DispatchChain.java | 40 ++
.../api/dispatch/DispatchChainFactory.java | 72 ++
.../com/cloud/api/dispatch/DispatchTask.java | 58 ++
.../com/cloud/api/dispatch/DispatchWorker.java | 30 +
.../dispatch/ParamGenericValidationWorker.java | 103 +++
.../cloud/api/dispatch/ParamProcessWorker.java | 428 ++++++++++++
.../cloud/api/dispatch/ParamUnpackWorker.java | 114 ++++
.../dispatch/SpecificCmdValidationWorker.java | 34 +
.../com/cloud/api/query/QueryManagerImpl.java | 22 +-
.../api/query/dao/DiskOfferingJoinDaoImpl.java | 1 +
.../cloud/api/query/dao/HostJoinDaoImpl.java | 25 +
.../query/dao/ServiceOfferingJoinDaoImpl.java | 4 +
.../api/query/dao/TemplateJoinDaoImpl.java | 3 +-
.../cloud/api/query/dao/UserVmJoinDaoImpl.java | 6 +
.../cloud/api/query/vo/DiskOfferingJoinVO.java | 7 +-
.../src/com/cloud/api/query/vo/EventJoinVO.java | 8 +-
.../api/query/vo/ServiceOfferingJoinVO.java | 28 +
server/src/com/cloud/configuration/Config.java | 4 +-
.../configuration/ConfigurationManagerImpl.java | 104 ++-
.../consoleproxy/ConsoleProxyManagerImpl.java | 11 +-
.../deploy/DeploymentPlanningManagerImpl.java | 12 +
.../src/com/cloud/event/ActionEventUtils.java | 18 +-
.../cloud/hypervisor/HypervisorGuruBase.java | 15 +
.../com/cloud/network/IpAddressManagerImpl.java | 4 +-
.../src/com/cloud/network/NetworkModelImpl.java | 14 +-
.../com/cloud/network/NetworkServiceImpl.java | 5 +-
.../cloud/network/NetworkUsageManagerImpl.java | 4 +
.../cloud/network/as/AutoScaleManagerImpl.java | 7 +-
.../network/element/VirtualRouterElement.java | 71 +-
.../element/VpcVirtualRouterElement.java | 14 +-
.../router/VirtualNetworkApplianceManager.java | 16 +-
.../VirtualNetworkApplianceManagerImpl.java | 129 ++--
.../VpcVirtualNetworkApplianceManagerImpl.java | 76 ++-
.../com/cloud/network/vpc/VpcManagerImpl.java | 5 +-
.../com/cloud/resource/ResourceManagerImpl.java | 97 ++-
.../src/com/cloud/server/ManagementServer.java | 3 +
.../com/cloud/server/ManagementServerImpl.java | 257 ++++++-
server/src/com/cloud/server/StatsCollector.java | 21 +
.../com/cloud/storage/VolumeApiServiceImpl.java | 17 +
.../storage/snapshot/SnapshotSchedulerImpl.java | 105 +--
.../src/com/cloud/user/AccountManagerImpl.java | 46 ++
server/src/com/cloud/vm/UserVmManagerImpl.java | 21 +-
.../test/com/cloud/api/ApiDispatcherTest.java | 106 ---
.../api/dispatch/CommandCreationWorkerTest.java | 48 ++
.../api/dispatch/DispatchChainFactoryTest.java | 55 ++
.../ParamGenericValidationWorkerTest.java | 195 ++++++
.../api/dispatch/ParamProcessWorkerTest.java | 107 +++
.../SpecificCmdValidationWorkerTest.java | 48 ++
.../cloud/network/vpc/VpcManagerImplTest.java | 66 ++
.../cloud/resource/MockResourceManagerImpl.java | 31 +
.../com/cloud/user/MockAccountManagerImpl.java | 5 +
.../vm/DeploymentPlanningManagerImplTest.java | 12 +
.../MockVpcVirtualNetworkApplianceManager.java | 39 +-
server/test/resources/createNetworkOffering.xml | 4 +-
.../SecondaryStorageManagerImpl.java | 7 +
setup/db/db/schema-421to430.sql | 4 +
setup/db/db/schema-430to440.sql | 37 +-
systemvm/conf/consoleproxy.properties | 2 +-
.../rc.d/init.d/cloud-console-proxy.in | 2 +-
.../rc.d/init.d/cloud-console-proxy.in | 2 +-
.../rc.d/init.d/cloud-console-proxy.in | 2 +-
.../SYSCONFDIR/init.d/cloud-console-proxy.in | 2 +-
.../debian/config/etc/init.d/cloud-early-config | 18 +-
.../debian/config/opt/cloud/bin/vr_cfg.sh | 96 +++
.../component/test_cpu_domain_limits.py | 11 +-
test/integration/component/test_cpu_limits.py | 15 +-
.../component/test_cpu_project_limits.py | 7 +-
.../component/test_dynamic_compute_offering.py | 409 ++++++++++++
.../integration/component/test_memory_limits.py | 15 +-
.../component/test_mm_domain_limits.py | 7 +-
.../component/test_mm_project_limits.py | 7 +-
test/integration/component/test_routers.py | 28 +-
.../component/test_vpc_vm_life_cycle.py | 108 +--
.../smoke/test_deploy_vgpu_enabled_vm.py | 227 +++++++
test/integration/smoke/test_deploy_vm.py | 52 +-
tools/marvin/marvin/codes.py | 1 +
tools/marvin/marvin/configGenerator.py | 5 +-
tools/marvin/marvin/integration/lib/base.py | 32 +-
tools/marvin/marvin/integration/lib/common.py | 39 +-
tools/marvin/marvin/integration/lib/utils.py | 3 +-
.../marvin/sandbox/advanced/advanced_env.py | 23 +-
.../marvin/sandbox/advancedsg/advancedsg_env.py | 18 +-
tools/marvin/marvin/sandbox/basic/basic_env.py | 16 +-
.../sandbox/demo/simulator/simulator_setup.py | 16 +-
tools/ngui/static/js/app/accounts/accounts.js | 16 +-
tools/ngui/static/js/app/storage/storage.js | 2 +-
ui/css/cloudstack3.css | 42 +-
ui/dictionary.jsp | 220 +++++-
ui/images/sprites.png | Bin 212515 -> 211543 bytes
ui/index.jsp | 11 +
.../vnmcNetworkProvider/vnmcNetworkProvider.js | 50 +-
ui/scripts/configuration.js | 350 ++++++++--
ui/scripts/installWizard.js | 6 +-
ui/scripts/instanceWizard.js | 16 +-
ui/scripts/instances.js | 24 +-
ui/scripts/network.js | 62 +-
ui/scripts/sharedFunctions.js | 28 +-
ui/scripts/storage.js | 6 +-
ui/scripts/system.js | 662 ++++++++++---------
ui/scripts/templates.js | 6 +-
ui/scripts/ui-custom/instanceWizard.js | 8 +
ui/scripts/ui-custom/zoneChart.js | 16 +-
ui/scripts/ui/core.js | 2 +-
ui/scripts/ui/dialog.js | 2 +-
ui/scripts/ui/widgets/multiEdit.js | 2 +-
ui/scripts/ui/widgets/tagger.js | 4 +-
ui/scripts/vpc.js | 16 +-
ui/scripts/zoneWizard.js | 12 +-
utils/src/com/cloud/utils/ReflectUtil.java | 13 +
306 files changed, 11294 insertions(+), 2990 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99bdc8d8/api/src/com/cloud/storage/VolumeApiService.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99bdc8d8/api/src/com/cloud/user/AccountService.java
----------------------------------------------------------------------
diff --cc api/src/com/cloud/user/AccountService.java
index 37f6105,de0b470..85c71ca
--- a/api/src/com/cloud/user/AccountService.java
+++ b/api/src/com/cloud/user/AccountService.java
@@@ -108,9 -103,6 +108,11 @@@ public interface AccountService
void checkAccess(Account account, AccessType accessType, boolean sameOwner, ControlledEntity... entities) throws PermissionDeniedException;
- Long finalyzeAccountId(String accountName, Long domainId, Long projectId, boolean enabledOnly);
+ void checkAccess(Account account, AccessType accessType, boolean sameOwner, String apiName,
+ ControlledEntity... entities) throws PermissionDeniedException;
+ //TO be implemented, to check accessibility for an entity owned by domain
+ void checkAccess(Account account, AccessType accessType, boolean sameOwner, PartOf... entities) throws PermissionDeniedException;
++
++ Long finalyzeAccountId(String accountName, Long domainId, Long projectId, boolean enabledOnly);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99bdc8d8/api/src/org/apache/cloudstack/api/ApiConstants.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/ApiConstants.java
index 62191fc,089affb..239b8cd
--- a/api/src/org/apache/cloudstack/api/ApiConstants.java
+++ b/api/src/org/apache/cloudstack/api/ApiConstants.java
@@@ -568,8 -583,12 +583,13 @@@ public class ApiConstants
public static final String PASSIVE = "passive";
public static final String VERSION = "version";
public static final String START = "start";
+ public static final String GPUGROUP = "gpugroup";
+ public static final String GPUGROUPNAME = "gpugroupname";
+ public static final String VGPU = "vgpu";
+ public static final String VGPUTYPE = "vgputype";
+ public static final String REMAININGCAPACITY = "remainingcapacity";
+
public enum HostDetails {
all, capacity, events, stats, min;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99bdc8d8/api/src/org/apache/cloudstack/api/BaseCmd.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/BaseCmd.java
index 7c720c9,937ccc2..f6f21ae
--- a/api/src/org/apache/cloudstack/api/BaseCmd.java
+++ b/api/src/org/apache/cloudstack/api/BaseCmd.java
@@@ -26,22 -29,21 +29,22 @@@ import java.util.regex.Pattern
import javax.inject.Inject;
++import org.apache.log4j.Logger;
++
+ import org.apache.cloudstack.acl.RoleType;
import org.apache.cloudstack.affinity.AffinityGroupService;
import org.apache.cloudstack.alert.AlertService;
+ import org.apache.cloudstack.context.CallContext;
import org.apache.cloudstack.network.element.InternalLoadBalancerElementService;
import org.apache.cloudstack.network.lb.ApplicationLoadBalancerService;
import org.apache.cloudstack.network.lb.InternalLoadBalancerVMService;
import org.apache.cloudstack.query.QueryService;
import org.apache.cloudstack.usage.UsageService;
--import org.apache.log4j.Logger;
import com.cloud.configuration.ConfigurationService;
- import com.cloud.domain.Domain;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.InsufficientCapacityException;
- import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.NetworkRuleConflictException;
- import com.cloud.exception.PermissionDeniedException;
import com.cloud.exception.ResourceAllocationException;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.NetworkModel;
@@@ -264,92 -279,68 +280,68 @@@ public abstract class BaseCmd
return formattedString;
}
- // FIXME: move this to a utils method so that maps can be unpacked and integer/long values can be appropriately cast
- @SuppressWarnings({"unchecked", "rawtypes"})
- public Map<String, Object> unpackParams(Map<String, String> params) {
- Map<String, Object> lowercaseParams = new HashMap<String, Object>();
- for (String key : params.keySet()) {
- int arrayStartIndex = key.indexOf('[');
- int arrayStartLastIndex = key.lastIndexOf('[');
- if (arrayStartIndex != arrayStartLastIndex) {
- throw new ServerApiException(ApiErrorCode.MALFORMED_PARAMETER_ERROR, "Unable to decode parameter " + key +
- "; if specifying an object array, please use parameter[index].field=XXX, e.g. userGroupList[0].group=httpGroup");
- }
-
- if (arrayStartIndex > 0) {
- int arrayEndIndex = key.indexOf(']');
- int arrayEndLastIndex = key.lastIndexOf(']');
- if ((arrayEndIndex < arrayStartIndex) || (arrayEndIndex != arrayEndLastIndex)) {
- // malformed parameter
- throw new ServerApiException(ApiErrorCode.MALFORMED_PARAMETER_ERROR, "Unable to decode parameter " + key +
- "; if specifying an object array, please use parameter[index].field=XXX, e.g. userGroupList[0].group=httpGroup");
- }
+ protected List<Field> getAllFieldsForClass(final Class<?> clazz) {
+ List<Field> filteredFields = fieldsForCmdClass.get(clazz);
- // Now that we have an array object, check for a field name in the case of a complex object
- int fieldIndex = key.indexOf('.');
- String fieldName = null;
- if (fieldIndex < arrayEndIndex) {
- throw new ServerApiException(ApiErrorCode.MALFORMED_PARAMETER_ERROR, "Unable to decode parameter " + key +
- "; if specifying an object array, please use parameter[index].field=XXX, e.g. userGroupList[0].group=httpGroup");
- } else {
- fieldName = key.substring(fieldIndex + 1);
- }
+ // If list of fields was not cached yet
+ if (filteredFields == null) {
+ final List<Field> allFields = ReflectUtil.getAllFieldsForClass(this.getClass(), BaseCmd.class);
+ filteredFields = new ArrayList<Field>();
- // parse the parameter name as the text before the first '[' character
- String paramName = key.substring(0, arrayStartIndex);
- paramName = paramName.toLowerCase();
-
- Map<Integer, Map> mapArray = null;
- Map<String, Object> mapValue = null;
- String indexStr = key.substring(arrayStartIndex + 1, arrayEndIndex);
- int index = 0;
- boolean parsedIndex = false;
- try {
- if (indexStr != null) {
- index = Integer.parseInt(indexStr);
- parsedIndex = true;
+ for (final Field field : allFields) {
+ final Parameter parameterAnnotation = field.getAnnotation(Parameter.class);
+ if ((parameterAnnotation != null) && parameterAnnotation.expose()) {
+ filteredFields.add(field);
+ }
- } catch (NumberFormatException nfe) {
- s_logger.warn("Invalid parameter " + key + " received, unable to parse object array, returning an error.");
}
- }
- if (!parsedIndex) {
- throw new ServerApiException(ApiErrorCode.MALFORMED_PARAMETER_ERROR, "Unable to decode parameter " + key +
- "; if specifying an object array, please use parameter[index].field=XXX, e.g. userGroupList[0].group=httpGroup");
+ // Cache the prepared list for future use
+ fieldsForCmdClass.put(clazz, filteredFields);
- }
++ }
+ return filteredFields;
- }
+ }
- Object value = lowercaseParams.get(paramName);
- if (value == null) {
- // for now, assume object array with sub fields
- mapArray = new HashMap<Integer, Map>();
- mapValue = new HashMap<String, Object>();
- mapArray.put(Integer.valueOf(index), mapValue);
- } else if (value instanceof Map) {
- mapArray = (HashMap)value;
- mapValue = mapArray.get(Integer.valueOf(index));
- if (mapValue == null) {
- mapValue = new HashMap<String, Object>();
- mapArray.put(Integer.valueOf(index), mapValue);
+ /**
+ * This method doesn't return all the @{link Parameter}, but only the ones exposed
+ * and allowed for current @{link RoleType}. This method will get the fields for a given
+ * Cmd class only once and never again, so in case of a dynamic update the result would
+ * be obsolete (this might be a plugin update. It is agreed upon that we will not do
+ * upgrades dynamically but in case we come back on that decision we need to revisit this)
+ *
+ * @return
+ */
+ public List<Field> getParamFields() {
+ final List<Field> allFields = getAllFieldsForClass(this.getClass());
+ final List<Field> validFields = new ArrayList<Field>();
+ final Account caller = CallContext.current().getCallingAccount();
+
+ for (final Field field : allFields) {
+ final Parameter parameterAnnotation = field.getAnnotation(Parameter.class);
+
+ //TODO: Annotate @Validate on API Cmd classes, FIXME how to process Validate
+ final RoleType[] allowedRoles = parameterAnnotation.authorized();
+ boolean roleIsAllowed = true;
+ if (allowedRoles.length > 0) {
+ roleIsAllowed = false;
+ for (final RoleType allowedRole : allowedRoles) {
+ if (allowedRole.getValue() == caller.getType()) {
+ roleIsAllowed = true;
+ break;
}
}
+ }
- // we are ready to store the value for a particular field into the map for this object
- mapValue.put(fieldName, params.get(key));
-
- lowercaseParams.put(paramName, mapArray);
+ if (roleIsAllowed) {
+ validFields.add(field);
} else {
- lowercaseParams.put(key.toLowerCase(), params.get(key));
+ s_logger.debug("Ignoring paremeter " + parameterAnnotation.name() + " as the caller is not authorized to pass it in");
}
}
- return lowercaseParams;
- }
- protected long getInstanceIdFromJobSuccessResult(String result) {
- s_logger.debug("getInstanceIdFromJobSuccessResult not overridden in subclass " + this.getClass().getName());
- return 0;
+ return validFields;
}
- public void setFullUrlParams(Map<String, String> map) {
+ public void setFullUrlParams(final Map<String, String> map) {
fullUrlParams = map;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99bdc8d8/api/src/org/apache/cloudstack/api/ResponseGenerator.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99bdc8d8/api/src/org/apache/cloudstack/api/command/user/affinitygroup/DeleteAffinityGroupCmd.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/command/user/affinitygroup/DeleteAffinityGroupCmd.java
index eb9145c,6a6dd25..378a826
--- a/api/src/org/apache/cloudstack/api/command/user/affinitygroup/DeleteAffinityGroupCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/affinitygroup/DeleteAffinityGroupCmd.java
@@@ -16,12 -16,7 +16,13 @@@
// under the License.
package org.apache.cloudstack.api.command.user.affinitygroup;
++
+import org.apache.log4j.Logger;
+
+import org.apache.cloudstack.acl.IAMEntityType;
+import org.apache.cloudstack.acl.SecurityChecker.AccessType;
import org.apache.cloudstack.affinity.AffinityGroupResponse;
+import org.apache.cloudstack.api.ACL;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99bdc8d8/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateConditionCmd.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99bdc8d8/api/src/org/apache/cloudstack/api/command/user/iso/ListIsosCmd.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99bdc8d8/api/src/org/apache/cloudstack/api/command/user/iso/RegisterIsoCmd.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99bdc8d8/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkCmd.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99bdc8d8/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupEgressCmd.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99bdc8d8/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupIngressCmd.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99bdc8d8/api/src/org/apache/cloudstack/api/command/user/securitygroup/DeleteSecurityGroupCmd.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99bdc8d8/api/src/org/apache/cloudstack/api/command/user/ssh/CreateSSHKeyPairCmd.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99bdc8d8/api/src/org/apache/cloudstack/api/command/user/ssh/DeleteSSHKeyPairCmd.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/command/user/ssh/DeleteSSHKeyPairCmd.java
index 19b29bd,92105c1..d0a5234
--- a/api/src/org/apache/cloudstack/api/command/user/ssh/DeleteSSHKeyPairCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/ssh/DeleteSSHKeyPairCmd.java
@@@ -16,9 -16,6 +16,10 @@@
// under the License.
package org.apache.cloudstack.api.command.user.ssh;
++
+import org.apache.log4j.Logger;
+
+import org.apache.cloudstack.acl.IAMEntityType;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseCmd;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99bdc8d8/api/src/org/apache/cloudstack/api/command/user/ssh/RegisterSSHKeyPairCmd.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99bdc8d8/api/src/org/apache/cloudstack/api/command/user/template/ListTemplatesCmd.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99bdc8d8/api/src/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99bdc8d8/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99bdc8d8/api/src/org/apache/cloudstack/api/command/user/vm/DestroyVMCmd.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/command/user/vm/DestroyVMCmd.java
index b8ac561,e9a5213..4c3a415
--- a/api/src/org/apache/cloudstack/api/command/user/vm/DestroyVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vm/DestroyVMCmd.java
@@@ -18,18 -18,14 +18,18 @@@ package org.apache.cloudstack.api.comma
import java.util.List;
+ import org.apache.cloudstack.api.BaseAsyncVMCmd;
import org.apache.log4j.Logger;
+import org.apache.cloudstack.acl.IAMEntityType;
+import org.apache.cloudstack.acl.SecurityChecker.AccessType;
+import org.apache.cloudstack.api.ACL;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
- import org.apache.cloudstack.api.BaseAsyncCmd;
import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ResponseObject.ResponseView;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.UserVmResponse;
import org.apache.cloudstack.context.CallContext;
@@@ -40,10 -36,12 +40,10 @@@ import com.cloud.exception.ResourceUnav
import com.cloud.user.Account;
import com.cloud.uservm.UserVm;
-@APICommand(name = "destroyVirtualMachine",
- description = "Destroys a virtual machine. Once destroyed, only the administrator can recover it.",
- responseObject = UserVmResponse.class,
+@APICommand(name = "destroyVirtualMachine", description = "Destroys a virtual machine. Once destroyed, only the administrator can recover it.", responseObject = UserVmResponse.class, responseView = ResponseView.Restricted, entityType = {IAMEntityType.VirtualMachine},
requestHasSensitiveInfo = false,
responseHasSensitiveInfo = true)
- public class DestroyVMCmd extends BaseAsyncCmd {
+ public class DestroyVMCmd extends BaseAsyncVMCmd {
public static final Logger s_logger = Logger.getLogger(DestroyVMCmd.class.getName());
private static final String s_name = "destroyvirtualmachineresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99bdc8d8/api/src/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99bdc8d8/api/src/org/apache/cloudstack/api/command/user/vm/RebootVMCmd.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/command/user/vm/RebootVMCmd.java
index 8f04430,c547d62..0f04114
--- a/api/src/org/apache/cloudstack/api/command/user/vm/RebootVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vm/RebootVMCmd.java
@@@ -16,18 -16,14 +16,18 @@@
// under the License.
package org.apache.cloudstack.api.command.user.vm;
+ import org.apache.cloudstack.api.BaseAsyncVMCmd;
import org.apache.log4j.Logger;
+import org.apache.cloudstack.acl.IAMEntityType;
+import org.apache.cloudstack.acl.SecurityChecker.AccessType;
+import org.apache.cloudstack.api.ACL;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
- import org.apache.cloudstack.api.BaseAsyncCmd;
import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ResponseObject.ResponseView;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.UserVmResponse;
import org.apache.cloudstack.context.CallContext;
@@@ -38,9 -34,9 +38,9 @@@ import com.cloud.exception.ResourceUnav
import com.cloud.user.Account;
import com.cloud.uservm.UserVm;
-@APICommand(name = "rebootVirtualMachine", description = "Reboots a virtual machine.", responseObject = UserVmResponse.class,
+@APICommand(name = "rebootVirtualMachine", description = "Reboots a virtual machine.", responseObject = UserVmResponse.class, responseView = ResponseView.Restricted, entityType = {IAMEntityType.VirtualMachine},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
- public class RebootVMCmd extends BaseAsyncCmd {
+ public class RebootVMCmd extends BaseAsyncVMCmd {
public static final Logger s_logger = Logger.getLogger(RebootVMCmd.class.getName());
private static final String s_name = "rebootvirtualmachineresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99bdc8d8/api/src/org/apache/cloudstack/api/command/user/vm/ResetVMPasswordCmd.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/command/user/vm/ResetVMPasswordCmd.java
index 2fd508b,461ce7f..615ef69
--- a/api/src/org/apache/cloudstack/api/command/user/vm/ResetVMPasswordCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vm/ResetVMPasswordCmd.java
@@@ -16,18 -16,14 +16,18 @@@
// under the License.
package org.apache.cloudstack.api.command.user.vm;
+ import org.apache.cloudstack.api.BaseAsyncVMCmd;
import org.apache.log4j.Logger;
+import org.apache.cloudstack.acl.IAMEntityType;
+import org.apache.cloudstack.acl.SecurityChecker.AccessType;
+import org.apache.cloudstack.api.ACL;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
- import org.apache.cloudstack.api.BaseAsyncCmd;
import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ResponseObject.ResponseView;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.UserVmResponse;
import org.apache.cloudstack.context.CallContext;
@@@ -38,11 -34,10 +38,11 @@@ import com.cloud.exception.ResourceUnav
import com.cloud.user.Account;
import com.cloud.uservm.UserVm;
-@APICommand(name = "resetPasswordForVirtualMachine", responseObject = UserVmResponse.class, description = "Resets the password for virtual machine. "
- + "The virtual machine must be in a \"Stopped\" state and the template must already " + "support this feature for this command to take effect. [async]",
+@APICommand(name = "resetPasswordForVirtualMachine", responseObject=UserVmResponse.class, description="Resets the password for virtual machine. " +
+ "The virtual machine must be in a \"Stopped\" state and the template must already " +
+ "support this feature for this command to take effect. [async]", responseView = ResponseView.Restricted, entityType = {IAMEntityType.VirtualMachine},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
- public class ResetVMPasswordCmd extends BaseAsyncCmd {
+ public class ResetVMPasswordCmd extends BaseAsyncVMCmd {
public static final Logger s_logger = Logger.getLogger(ResetVMPasswordCmd.class.getName());
private static final String s_name = "resetpasswordforvirtualmachineresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99bdc8d8/api/src/org/apache/cloudstack/api/command/user/vm/ResetVMSSHKeyCmd.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/command/user/vm/ResetVMSSHKeyCmd.java
index 288eed7,b7ab357..7d43853
--- a/api/src/org/apache/cloudstack/api/command/user/vm/ResetVMSSHKeyCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vm/ResetVMSSHKeyCmd.java
@@@ -17,18 -17,14 +17,18 @@@
package org.apache.cloudstack.api.command.user.vm;
+ import org.apache.cloudstack.api.BaseAsyncVMCmd;
import org.apache.log4j.Logger;
+import org.apache.cloudstack.acl.IAMEntityType;
+import org.apache.cloudstack.acl.SecurityChecker.AccessType;
+import org.apache.cloudstack.api.ACL;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
- import org.apache.cloudstack.api.BaseAsyncCmd;
import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ResponseObject.ResponseView;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.DomainResponse;
import org.apache.cloudstack.api.response.ProjectResponse;
@@@ -41,10 -37,10 +41,10 @@@ import com.cloud.exception.ResourceUnav
import com.cloud.user.Account;
import com.cloud.uservm.UserVm;
-@APICommand(name = "resetSSHKeyForVirtualMachine", responseObject = UserVmResponse.class, description = "Resets the SSH Key for virtual machine. "
- + "The virtual machine must be in a \"Stopped\" state. [async]",
+@APICommand(name = "resetSSHKeyForVirtualMachine", responseObject = UserVmResponse.class, description = "Resets the SSH Key for virtual machine. " +
+ "The virtual machine must be in a \"Stopped\" state. [async]", responseView = ResponseView.Restricted, entityType = {IAMEntityType.VirtualMachine},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
- public class ResetVMSSHKeyCmd extends BaseAsyncCmd {
+ public class ResetVMSSHKeyCmd extends BaseAsyncVMCmd {
public static final Logger s_logger = Logger.getLogger(ResetVMSSHKeyCmd.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99bdc8d8/api/src/org/apache/cloudstack/api/command/user/vm/RestoreVMCmd.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/command/user/vm/RestoreVMCmd.java
index 9befc67,81c40ec..0d5ef70
--- a/api/src/org/apache/cloudstack/api/command/user/vm/RestoreVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vm/RestoreVMCmd.java
@@@ -16,17 -16,13 +16,17 @@@
// under the License.
package org.apache.cloudstack.api.command.user.vm;
+ import org.apache.cloudstack.api.BaseAsyncVMCmd;
import org.apache.log4j.Logger;
+import org.apache.cloudstack.acl.IAMEntityType;
+import org.apache.cloudstack.acl.SecurityChecker.AccessType;
+import org.apache.cloudstack.api.ACL;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
- import org.apache.cloudstack.api.BaseAsyncCmd;
import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ResponseObject.ResponseView;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.TemplateResponse;
import org.apache.cloudstack.api.response.UserVmResponse;
@@@ -40,10 -36,13 +40,10 @@@ import com.cloud.exception.ResourceUnav
import com.cloud.user.Account;
import com.cloud.uservm.UserVm;
-@APICommand(name = "restoreVirtualMachine",
- description = "Restore a VM to original template/ISO or new template/ISO",
- responseObject = UserVmResponse.class,
- since = "3.0.0",
+@APICommand(name = "restoreVirtualMachine", description = "Restore a VM to original template/ISO or new template/ISO", responseObject = UserVmResponse.class, since = "3.0.0", responseView = ResponseView.Restricted, entityType = {IAMEntityType.VirtualMachine},
requestHasSensitiveInfo = false,
responseHasSensitiveInfo = true)
- public class RestoreVMCmd extends BaseAsyncCmd {
+ public class RestoreVMCmd extends BaseAsyncVMCmd {
public static final Logger s_logger = Logger.getLogger(RestoreVMCmd.class);
private static final String s_name = "restorevmresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99bdc8d8/api/src/org/apache/cloudstack/api/command/user/vm/ScaleVMCmd.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/command/user/vm/ScaleVMCmd.java
index cd658cb,07672c0..d668ad4
--- a/api/src/org/apache/cloudstack/api/command/user/vm/ScaleVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vm/ScaleVMCmd.java
@@@ -30,10 -26,9 +30,10 @@@ import org.apache.cloudstack.api.ACL
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
- import org.apache.cloudstack.api.BaseAsyncCmd;
+ import org.apache.cloudstack.api.BaseAsyncVMCmd;
import org.apache.cloudstack.api.BaseCmd;
import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ResponseObject.ResponseView;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.ServiceOfferingResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
@@@ -47,10 -43,9 +47,10 @@@ import com.cloud.exception.VirtualMachi
import com.cloud.user.Account;
import com.cloud.uservm.UserVm;
-@APICommand(name = "scaleVirtualMachine", description = "Scales the virtual machine to a new service offering.", responseObject = SuccessResponse.class,
+
+@APICommand(name = "scaleVirtualMachine", description = "Scales the virtual machine to a new service offering.", responseObject = SuccessResponse.class, responseView = ResponseView.Restricted, entityType = {IAMEntityType.VirtualMachine},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
- public class ScaleVMCmd extends BaseAsyncCmd {
+ public class ScaleVMCmd extends BaseAsyncVMCmd {
public static final Logger s_logger = Logger.getLogger(ScaleVMCmd.class.getName());
private static final String s_name = "scalevirtualmachineresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99bdc8d8/api/src/org/apache/cloudstack/api/command/user/vm/StartVMCmd.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/command/user/vm/StartVMCmd.java
index 2e4187d,553b753..4e91c7b
--- a/api/src/org/apache/cloudstack/api/command/user/vm/StartVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vm/StartVMCmd.java
@@@ -16,18 -16,14 +16,18 @@@
// under the License.
package org.apache.cloudstack.api.command.user.vm;
+ import org.apache.cloudstack.api.BaseAsyncVMCmd;
import org.apache.log4j.Logger;
+import org.apache.cloudstack.acl.IAMEntityType;
+import org.apache.cloudstack.acl.SecurityChecker.AccessType;
+import org.apache.cloudstack.api.ACL;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
- import org.apache.cloudstack.api.BaseAsyncCmd;
import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ResponseObject.ResponseView;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.HostResponse;
import org.apache.cloudstack.api.response.UserVmResponse;
@@@ -44,9 -40,9 +44,9 @@@ import com.cloud.user.Account
import com.cloud.uservm.UserVm;
import com.cloud.utils.exception.ExecutionException;
-@APICommand(name = "startVirtualMachine", responseObject = UserVmResponse.class, description = "Starts a virtual machine.",
+@APICommand(name = "startVirtualMachine", responseObject = UserVmResponse.class, description = "Starts a virtual machine.", responseView = ResponseView.Restricted, entityType = {IAMEntityType.VirtualMachine},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
- public class StartVMCmd extends BaseAsyncCmd {
+ public class StartVMCmd extends BaseAsyncVMCmd {
public static final Logger s_logger = Logger.getLogger(StartVMCmd.class.getName());
private static final String s_name = "startvirtualmachineresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99bdc8d8/api/src/org/apache/cloudstack/api/command/user/vm/StopVMCmd.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/command/user/vm/StopVMCmd.java
index fe94964,e9fa97b..6db5d18
--- a/api/src/org/apache/cloudstack/api/command/user/vm/StopVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vm/StopVMCmd.java
@@@ -16,18 -16,15 +16,18 @@@
// under the License.
package org.apache.cloudstack.api.command.user.vm;
+ import org.apache.cloudstack.api.BaseAsyncVMCmd;
import org.apache.log4j.Logger;
+import org.apache.cloudstack.acl.IAMEntityType;
+import org.apache.cloudstack.acl.SecurityChecker.AccessType;
import org.apache.cloudstack.api.ACL;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
- import org.apache.cloudstack.api.BaseAsyncCmd;
import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ResponseObject.ResponseView;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.UserVmResponse;
import org.apache.cloudstack.context.CallContext;
@@@ -37,9 -34,9 +37,9 @@@ import com.cloud.exception.ConcurrentOp
import com.cloud.user.Account;
import com.cloud.uservm.UserVm;
-@APICommand(name = "stopVirtualMachine", responseObject = UserVmResponse.class, description = "Stops a virtual machine.",
+@APICommand(name = "stopVirtualMachine", responseObject = UserVmResponse.class, description = "Stops a virtual machine.", responseView = ResponseView.Restricted, entityType = {IAMEntityType.VirtualMachine},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
- public class StopVMCmd extends BaseAsyncCmd {
+ public class StopVMCmd extends BaseAsyncVMCmd {
public static final Logger s_logger = Logger.getLogger(StopVMCmd.class.getName());
private static final String s_name = "stopvirtualmachineresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99bdc8d8/api/src/org/apache/cloudstack/api/command/user/vm/UpgradeVMCmd.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99bdc8d8/api/src/org/apache/cloudstack/api/command/user/vmgroup/CreateVMGroupCmd.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99bdc8d8/api/src/org/apache/cloudstack/api/command/user/volume/AttachVolumeCmd.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/command/user/volume/AttachVolumeCmd.java
index 553e2e9,7939edf..f9d9081
--- a/api/src/org/apache/cloudstack/api/command/user/volume/AttachVolumeCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/volume/AttachVolumeCmd.java
@@@ -15,18 -15,15 +15,19 @@@
// specific language governing permissions and limitations
// under the License.
package org.apache.cloudstack.api.command.user.volume;
+
-import org.apache.cloudstack.api.BaseAsyncVolumeCmd;
import org.apache.log4j.Logger;
+import org.apache.cloudstack.acl.IAMEntityType;
+import org.apache.cloudstack.acl.SecurityChecker.AccessType;
+import org.apache.cloudstack.api.ACL;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
- import org.apache.cloudstack.api.BaseAsyncCmd;
++import org.apache.cloudstack.api.BaseAsyncVolumeCmd;
import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ResponseObject.ResponseView;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.UserVmResponse;
import org.apache.cloudstack.api.response.VolumeResponse;
@@@ -36,9 -33,9 +37,9 @@@ import com.cloud.event.EventTypes
import com.cloud.storage.Volume;
import com.cloud.user.Account;
-@APICommand(name = "attachVolume", description = "Attaches a disk volume to a virtual machine.", responseObject = VolumeResponse.class,
+@APICommand(name = "attachVolume", description = "Attaches a disk volume to a virtual machine.", responseObject = VolumeResponse.class, responseView = ResponseView.Restricted, entityType = {IAMEntityType.VirtualMachine},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
- public class AttachVolumeCmd extends BaseAsyncCmd {
+ public class AttachVolumeCmd extends BaseAsyncVolumeCmd {
public static final Logger s_logger = Logger.getLogger(AttachVolumeCmd.class.getName());
private static final String s_name = "attachvolumeresponse";
@@@ -67,6 -66,6 +68,7 @@@
return deviceId;
}
++ @Override
public Long getId() {
return id;
}
@@@ -109,17 -108,8 +111,8 @@@
}
@Override
- public boolean isDisplayResourceEnabled(){
- Volume volume = _responseGenerator.findVolumeById(getId());
- if (volume == null) {
- return true; // bad id given, parent this command to true so ERROR events are tracked
- }
- return volume.isDisplayVolume();
- }
-
- @Override
public String getEventDescription() {
- return "attaching volume: " + getId() + " to vm: " + getVirtualMachineId();
+ return "attaching volume: " + getId() + " to vm: " + getVirtualMachineId();
}
@Override
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99bdc8d8/api/src/org/apache/cloudstack/api/command/user/volume/CreateVolumeCmd.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/command/user/volume/CreateVolumeCmd.java
index ad06bc2,31d75d8..9b83f61
--- a/api/src/org/apache/cloudstack/api/command/user/volume/CreateVolumeCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/volume/CreateVolumeCmd.java
@@@ -221,10 -221,9 +222,9 @@@ public class CreateVolumeCmd extends Ba
@Override
public void execute() {
CallContext.current().setEventDetails("Volume Id: " + getEntityId() + ((getSnapshotId() == null) ? "" : " from snapshot: " + getSnapshotId()));
- CallContext.current().setEventDisplayEnabled(getDisplayVolume());
Volume volume = _volumeService.createVolume(this);
if (volume != null) {
- VolumeResponse response = _responseGenerator.createVolumeResponse(volume);
+ VolumeResponse response = _responseGenerator.createVolumeResponse(ResponseView.Restricted, volume);
//FIXME - have to be moved to ApiResponseHelper
if (getSnapshotId() != null) {
Snapshot snap = _entityMgr.findById(Snapshot.class, getSnapshotId());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99bdc8d8/api/src/org/apache/cloudstack/api/command/user/volume/DeleteVolumeCmd.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/command/user/volume/DeleteVolumeCmd.java
index 546a9d5,eff7a35..6ca96b0
--- a/api/src/org/apache/cloudstack/api/command/user/volume/DeleteVolumeCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/volume/DeleteVolumeCmd.java
@@@ -81,12 -77,17 +81,17 @@@ public class DeleteVolumeCmd extends Ba
}
@Override
+ public boolean isDisplayResourceEnabled(){
+ return _volumeService.isDisplayResourceEnabled(getId());
+ }
+
+ @Override
public void execute() throws ConcurrentOperationException {
CallContext.current().setEventDetails("Volume Id: " + getId());
- boolean result = this._volumeService.deleteVolume(id, CallContext.current().getCallingAccount());
+ boolean result = _volumeService.deleteVolume(id, CallContext.current().getCallingAccount());
if (result) {
SuccessResponse response = new SuccessResponse(getCommandName());
- this.setResponseObject(response);
+ setResponseObject(response);
} else {
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to delete volume");
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99bdc8d8/api/src/org/apache/cloudstack/api/command/user/volume/DetachVolumeCmd.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/command/user/volume/DetachVolumeCmd.java
index 1a874e1,b45ad0b..bfd0322
--- a/api/src/org/apache/cloudstack/api/command/user/volume/DetachVolumeCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/volume/DetachVolumeCmd.java
@@@ -15,18 -15,15 +15,19 @@@
// specific language governing permissions and limitations
// under the License.
package org.apache.cloudstack.api.command.user.volume;
+
-import org.apache.cloudstack.api.BaseAsyncVolumeCmd;
import org.apache.log4j.Logger;
+import org.apache.cloudstack.acl.IAMEntityType;
+import org.apache.cloudstack.acl.SecurityChecker.AccessType;
+import org.apache.cloudstack.api.ACL;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
- import org.apache.cloudstack.api.BaseAsyncCmd;
++import org.apache.cloudstack.api.BaseAsyncVolumeCmd;
import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ResponseObject.ResponseView;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.UserVmResponse;
import org.apache.cloudstack.api.response.VolumeResponse;
@@@ -37,9 -34,9 +38,9 @@@ import com.cloud.storage.Volume
import com.cloud.user.Account;
import com.cloud.uservm.UserVm;
-@APICommand(name = "detachVolume", description = "Detaches a disk volume from a virtual machine.", responseObject = VolumeResponse.class,
+@APICommand(name = "detachVolume", description = "Detaches a disk volume from a virtual machine.", responseObject = VolumeResponse.class, responseView = ResponseView.Restricted, entityType = {IAMEntityType.Volume},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
- public class DetachVolumeCmd extends BaseAsyncCmd {
+ public class DetachVolumeCmd extends BaseAsyncVolumeCmd {
public static final Logger s_logger = Logger.getLogger(DetachVolumeCmd.class.getName());
private static final String s_name = "detachvolumeresponse";
@@@ -65,6 -60,6 +66,7 @@@
/////////////////// Accessors ///////////////////////
/////////////////////////////////////////////////////
++ @Override
public Long getId() {
return id;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99bdc8d8/api/src/org/apache/cloudstack/api/command/user/volume/ExtractVolumeCmd.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/command/user/volume/ExtractVolumeCmd.java
index b9883cc,7f5cd0d..cc7f56c
--- a/api/src/org/apache/cloudstack/api/command/user/volume/ExtractVolumeCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/volume/ExtractVolumeCmd.java
@@@ -16,11 -16,9 +16,12 @@@
// under the License.
package org.apache.cloudstack.api.command.user.volume;
+ import org.apache.cloudstack.api.BaseAsyncVolumeCmd;
import org.apache.log4j.Logger;
+import org.apache.cloudstack.acl.IAMEntityType;
+import org.apache.cloudstack.acl.SecurityChecker.AccessType;
+import org.apache.cloudstack.api.ACL;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@@ -39,9 -36,9 +39,9 @@@ import com.cloud.storage.Upload
import com.cloud.storage.Volume;
import com.cloud.user.Account;
-@APICommand(name = "extractVolume", description = "Extracts volume", responseObject = ExtractResponse.class,
+@APICommand(name = "extractVolume", description = "Extracts volume", responseObject = ExtractResponse.class, entityType = {IAMEntityType.Volume},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
- public class ExtractVolumeCmd extends BaseAsyncCmd {
+ public class ExtractVolumeCmd extends BaseAsyncVolumeCmd {
public static final Logger s_logger = Logger.getLogger(ExtractVolumeCmd.class.getName());
private static final String s_name = "extractvolumeresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99bdc8d8/api/src/org/apache/cloudstack/api/command/user/volume/MigrateVolumeCmd.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/command/user/volume/MigrateVolumeCmd.java
index 820d73d,126f1f3..d80595a
--- a/api/src/org/apache/cloudstack/api/command/user/volume/MigrateVolumeCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/volume/MigrateVolumeCmd.java
@@@ -20,9 -19,8 +20,9 @@@ import org.apache.cloudstack.acl.IAMEnt
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
- import org.apache.cloudstack.api.BaseAsyncCmd;
+ import org.apache.cloudstack.api.BaseAsyncVolumeCmd;
import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ResponseObject.ResponseView;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.StoragePoolResponse;
import org.apache.cloudstack.api.response.VolumeResponse;
@@@ -31,12 -29,12 +31,12 @@@ import com.cloud.event.EventTypes
import com.cloud.storage.Volume;
import com.cloud.user.Account;
-@APICommand(name = "migrateVolume", description = "Migrate volume", responseObject = VolumeResponse.class, since = "3.0.0",
+@APICommand(name = "migrateVolume", description = "Migrate volume", responseObject = VolumeResponse.class, since = "3.0.0", responseView = ResponseView.Restricted, entityType = {IAMEntityType.Volume},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
- public class MigrateVolumeCmd extends BaseAsyncCmd {
+ public class MigrateVolumeCmd extends BaseAsyncVolumeCmd {
private static final String s_name = "migratevolumeresponse";
- /////////////////////////////////////////////////////
+ /////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
/////////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99bdc8d8/api/src/org/apache/cloudstack/api/command/user/volume/ResizeVolumeCmd.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/command/user/volume/ResizeVolumeCmd.java
index 2f34c75,d51cdc5..d5cd62b
--- a/api/src/org/apache/cloudstack/api/command/user/volume/ResizeVolumeCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/volume/ResizeVolumeCmd.java
@@@ -24,9 -20,8 +24,9 @@@ import org.apache.cloudstack.api.APICom
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
- import org.apache.cloudstack.api.BaseAsyncCmd;
+ import org.apache.cloudstack.api.BaseAsyncVolumeCmd;
import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ResponseObject.ResponseView;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.DiskOfferingResponse;
import org.apache.cloudstack.api.response.VolumeResponse;
@@@ -40,10 -36,9 +40,10 @@@ import com.cloud.projects.Project
import com.cloud.storage.Volume;
import com.cloud.user.Account;
-@APICommand(name = "resizeVolume", description = "Resizes a volume", responseObject = VolumeResponse.class,
+
+@APICommand(name = "resizeVolume", description = "Resizes a volume", responseObject = VolumeResponse.class, responseView = ResponseView.Restricted, entityType = {IAMEntityType.Volume},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
- public class ResizeVolumeCmd extends BaseAsyncCmd {
+ public class ResizeVolumeCmd extends BaseAsyncVolumeCmd {
public static final Logger s_logger = Logger.getLogger(ResizeVolumeCmd.class.getName());
private static final String s_name = "resizevolumeresponse";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99bdc8d8/api/src/org/apache/cloudstack/api/command/user/volume/UpdateVolumeCmd.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99bdc8d8/api/src/org/apache/cloudstack/api/command/user/volume/UploadVolumeCmd.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99bdc8d8/api/src/org/apache/cloudstack/api/command/user/vpc/CreateVPCCmd.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99bdc8d8/api/src/org/apache/cloudstack/api/command/user/vpn/AddVpnUserCmd.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99bdc8d8/api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnCustomerGatewayCmd.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99bdc8d8/api/src/org/apache/cloudstack/api/command/user/vpn/RemoveVpnUserCmd.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99bdc8d8/api/src/org/apache/cloudstack/api/command/user/vpn/ResetVpnConnectionCmd.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99bdc8d8/api/src/org/apache/cloudstack/api/command/user/vpn/UpdateVpnCustomerGatewayCmd.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99bdc8d8/client/tomcatconf/commands.properties.in
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99bdc8d8/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
----------------------------------------------------------------------
diff --cc engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
index 6e55bd2,e36dc62..6aa1e36
--- a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
+++ b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
@@@ -16,41 -16,6 +16,43 @@@
// under the License.
package org.apache.cloudstack.engine.orchestration;
++
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+
+import javax.ejb.Local;
+import javax.inject.Inject;
+import javax.naming.ConfigurationException;
+
- import org.apache.cloudstack.acl.IAMEntityType;
++import org.apache.log4j.Logger;
++
+import org.apache.cloudstack.acl.ControlledEntity.ACLType;
++import org.apache.cloudstack.acl.IAMEntityType;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.context.CallContext;
+import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
+import org.apache.cloudstack.framework.config.ConfigDepot;
+import org.apache.cloudstack.framework.config.ConfigKey;
+import org.apache.cloudstack.framework.config.Configurable;
+import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
+import org.apache.cloudstack.framework.messagebus.MessageBus;
+import org.apache.cloudstack.framework.messagebus.PublishScope;
+import org.apache.cloudstack.managed.context.ManagedContextRunnable;
+import org.apache.cloudstack.region.PortableIpDao;
- import org.apache.log4j.Logger;
+
import com.cloud.agent.AgentManager;
import com.cloud.agent.Listener;
import com.cloud.agent.api.AgentControlAnswer;
@@@ -1082,16 -1067,42 +1085,42 @@@ public class NetworkOrchestrator extend
}
}
+ for (NetworkElement element : networkElements) {
+ if ((element instanceof AggregatedCommandExecutor) && (providersToImplement.contains(element.getProvider()))) {
+ ((AggregatedCommandExecutor)element).prepareAggregatedExecution(network, dest);
+ }
+ }
+
+ try {
- // reapply all the firewall/staticNat/lb rules
- s_logger.debug("Reprogramming network " + network + " as a part of network implement");
- if (!reprogramNetworkRules(network.getId(), CallContext.current().getCallingAccount(), network)) {
- s_logger.warn("Failed to re-program the network as a part of network " + network + " implement");
- // see DataCenterVO.java
- ResourceUnavailableException ex = new ResourceUnavailableException("Unable to apply network rules as a part of network " + network + " implement", DataCenter.class,
- network.getDataCenterId());
- ex.addProxyObject(_entityMgr.findById(DataCenter.class, network.getDataCenterId()).getUuid());
- throw ex;
- }
+ // reapply all the firewall/staticNat/lb rules
+ s_logger.debug("Reprogramming network " + network + " as a part of network implement");
+ if (!reprogramNetworkRules(network.getId(), CallContext.current().getCallingAccount(), network)) {
+ s_logger.warn("Failed to re-program the network as a part of network " + network + " implement");
+ // see DataCenterVO.java
+ ResourceUnavailableException ex = new ResourceUnavailableException("Unable to apply network rules as a part of network " + network + " implement", DataCenter.class,
+ network.getDataCenterId());
+ ex.addProxyObject(_entityMgr.findById(DataCenter.class, network.getDataCenterId()).getUuid());
+ throw ex;
+ }
+ for (NetworkElement element : networkElements) {
+ if ((element instanceof AggregatedCommandExecutor) && (providersToImplement.contains(element.getProvider()))) {
+ if (!((AggregatedCommandExecutor)element).completeAggregatedExecution(network, dest)) {
+ s_logger.warn("Failed to re-program the network as a part of network " + network + " implement due to aggregated commands execution failure!");
+ // see DataCenterVO.java
+ ResourceUnavailableException ex = new ResourceUnavailableException("Unable to apply network rules as a part of network " + network + " implement", DataCenter.class,
+ network.getDataCenterId());
+ ex.addProxyObject(_entityMgr.findById(DataCenter.class, network.getDataCenterId()).getUuid());
+ throw ex;
+ }
+ }
+ }
+ } finally {
+ for (NetworkElement element : networkElements) {
+ if ((element instanceof AggregatedCommandExecutor) && (providersToImplement.contains(element.getProvider()))) {
+ ((AggregatedCommandExecutor)element).cleanupAggregatedExecution(network, dest);
+ }
+ }
+ }
}
// This method re-programs the rules/ips for existing network
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99bdc8d8/engine/schema/src/com/cloud/event/EventVO.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99bdc8d8/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java
----------------------------------------------------------------------
diff --cc plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java
index 6e2d70d,fb08dc6..c0b9ee5
--- a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java
+++ b/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java
@@@ -370,10 -347,9 +370,15 @@@ public class MockAccountManager extend
}
@Override
+ public void checkAccess(Account account, AccessType accessType, boolean sameOwner, String apiName,
+ ControlledEntity... entities) throws PermissionDeniedException {
+ // TODO Auto-generated method stub
++ }
+
++ @Override
+ public Long finalyzeAccountId(String accountName, Long domainId, Long projectId, boolean enabledOnly) {
+ // TODO Auto-generated method stub
+ return null;
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99bdc8d8/server/src/com/cloud/api/ApiDBUtils.java
----------------------------------------------------------------------
diff --cc server/src/com/cloud/api/ApiDBUtils.java
index 859ca01,539eb70..432eb94
--- a/server/src/com/cloud/api/ApiDBUtils.java
+++ b/server/src/com/cloud/api/ApiDBUtils.java
@@@ -727,6 -743,9 +743,8 @@@ public class ApiDBUtils
s_networkACLDao = networkACLDao;
s_accountService = accountService;
s_resourceDetailsService = resourceDetailsService;
+ s_hostGpuGroupsDao = hostGpuGroupsDao;
+ s_vgpuTypesDao = vgpuTypesDao;
-
}
// ///////////////////////////////////////////////////////////
[32/50] [abbrv] git commit: updated refs/heads/4.4 to 48f8a95
Posted by hu...@apache.org.
CLOUDSTACK-6143: Storage motion support for hyper-v. With these changes a volume on a shared
storage pool (SMB) and attached to a running vm can be live migrated to another shared storage
pool. Also a vm and its volumes can be live migrated to another host and storage pool respectively.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2aff39f8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2aff39f8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2aff39f8
Branch: refs/heads/4.4
Commit: 2aff39f8c75d20ea086dbb873030f3e513fc6719
Parents: f293c94
Author: Devdeep Singh <de...@gmail.com>
Authored: Wed Mar 12 02:22:22 2014 +0530
Committer: Devdeep Singh <de...@gmail.com>
Committed: Fri Mar 14 16:27:58 2014 +0530
----------------------------------------------------------------------
.../agent/api/MigrateWithStorageCommand.java | 16 ++
.../subsystem/api/storage/StorageAction.java | 3 +-
...ngine-storage-datamotion-storage-context.xml | 3 +-
.../motion/AncientDataMotionStrategy.java | 2 +-
.../endpoint/DefaultEndPointSelector.java | 9 +
.../storage/volume/VolumeServiceImpl.java | 10 +-
.../HypervResource/CloudStackTypes.cs | 51 ++++--
.../HypervResource/HypervResourceController.cs | 139 +++++++++++++-
.../HypervResource/IWmiCallsV2.cs | 2 +
.../ServerResource/HypervResource/WmiCallsV2.cs | 139 ++++++++++++++
...tion.v2.Msvm_StorageAllocationSettingData.cs | 2 +-
.../motion/HypervStorageMotionStrategy.java | 179 +++++++++++++++++++
server/src/com/cloud/vm/UserVmManagerImpl.java | 3 +-
setup/db/db/schema-430to440.sql | 1 +
14 files changed, 530 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2aff39f8/core/src/com/cloud/agent/api/MigrateWithStorageCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/MigrateWithStorageCommand.java b/core/src/com/cloud/agent/api/MigrateWithStorageCommand.java
index a94697a..43ae854 100644
--- a/core/src/com/cloud/agent/api/MigrateWithStorageCommand.java
+++ b/core/src/com/cloud/agent/api/MigrateWithStorageCommand.java
@@ -16,26 +16,38 @@
// under the License.
package com.cloud.agent.api;
+import java.util.List;
import java.util.Map;
import com.cloud.agent.api.to.StorageFilerTO;
import com.cloud.agent.api.to.VirtualMachineTO;
import com.cloud.agent.api.to.VolumeTO;
+import com.cloud.utils.Pair;
public class MigrateWithStorageCommand extends Command {
VirtualMachineTO vm;
Map<VolumeTO, StorageFilerTO> volumeToFiler;
+ List<Pair<VolumeTO, StorageFilerTO>> volumeToFilerAsList;
String tgtHost;
public MigrateWithStorageCommand(VirtualMachineTO vm, Map<VolumeTO, StorageFilerTO> volumeToFiler) {
this.vm = vm;
this.volumeToFiler = volumeToFiler;
+ this.volumeToFilerAsList = null;
this.tgtHost = null;
}
public MigrateWithStorageCommand(VirtualMachineTO vm, Map<VolumeTO, StorageFilerTO> volumeToFiler, String tgtHost) {
this.vm = vm;
this.volumeToFiler = volumeToFiler;
+ this.volumeToFilerAsList = null;
+ this.tgtHost = tgtHost;
+ }
+
+ public MigrateWithStorageCommand(VirtualMachineTO vm, List<Pair<VolumeTO, StorageFilerTO>> volumeToFilerAsList, String tgtHost) {
+ this.vm = vm;
+ this.volumeToFiler = null;
+ this.volumeToFilerAsList = volumeToFilerAsList;
this.tgtHost = tgtHost;
}
@@ -47,6 +59,10 @@ public class MigrateWithStorageCommand extends Command {
return volumeToFiler;
}
+ public List<Pair<VolumeTO, StorageFilerTO>> getVolumeToFilerAsList() {
+ return volumeToFilerAsList;
+ }
+
public String getTargetHost() {
return tgtHost;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2aff39f8/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/StorageAction.java
----------------------------------------------------------------------
diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/StorageAction.java b/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/StorageAction.java
index 4fbb20e..965df84 100644
--- a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/StorageAction.java
+++ b/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/StorageAction.java
@@ -21,5 +21,6 @@ package org.apache.cloudstack.engine.subsystem.api.storage;
public enum StorageAction {
TAKESNAPSHOT,
BACKUPSNAPSHOT,
- DELETESNAPSHOT
+ DELETESNAPSHOT,
+ MIGRATEVOLUME
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2aff39f8/engine/storage/datamotion/resources/META-INF/cloudstack/storage/spring-engine-storage-datamotion-storage-context.xml
----------------------------------------------------------------------
diff --git a/engine/storage/datamotion/resources/META-INF/cloudstack/storage/spring-engine-storage-datamotion-storage-context.xml b/engine/storage/datamotion/resources/META-INF/cloudstack/storage/spring-engine-storage-datamotion-storage-context.xml
index 725f7d3..ade22db 100644
--- a/engine/storage/datamotion/resources/META-INF/cloudstack/storage/spring-engine-storage-datamotion-storage-context.xml
+++ b/engine/storage/datamotion/resources/META-INF/cloudstack/storage/spring-engine-storage-datamotion-storage-context.xml
@@ -30,5 +30,6 @@
class="org.apache.cloudstack.storage.motion.AncientDataMotionStrategy" />
<bean id="xenserverStorageMotionStrategy"
class="org.apache.cloudstack.storage.motion.XenServerStorageMotionStrategy" />
-
+ <bean id="hypervStorageMotionStrategy"
+ class="org.apache.cloudstack.storage.motion.HypervStorageMotionStrategy" />
</beans>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2aff39f8/engine/storage/datamotion/src/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java
----------------------------------------------------------------------
diff --git a/engine/storage/datamotion/src/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java b/engine/storage/datamotion/src/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java
index df81199..fbdacfa 100644
--- a/engine/storage/datamotion/src/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java
+++ b/engine/storage/datamotion/src/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java
@@ -372,7 +372,7 @@ public class AncientDataMotionStrategy implements DataMotionStrategy {
VolumeInfo volume = (VolumeInfo)srcData;
StoragePool destPool = (StoragePool)dataStoreMgr.getDataStore(destData.getDataStore().getId(), DataStoreRole.Primary);
MigrateVolumeCommand command = new MigrateVolumeCommand(volume.getId(), volume.getPath(), destPool, volume.getAttachedVmName());
- EndPoint ep = selector.select(volume.getDataStore());
+ EndPoint ep = selector.select(srcData, StorageAction.MIGRATEVOLUME);
Answer answer = null;
if (ep == null) {
String errMsg = "No remote endpoint to send command, check if host or ssvm is down?";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2aff39f8/engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java
----------------------------------------------------------------------
diff --git a/engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java b/engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java
index d64f755..304f959 100644
--- a/engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java
+++ b/engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java
@@ -305,6 +305,15 @@ public class DefaultEndPointSelector implements EndPointSelector {
return getEndPointFromHostId(hostId);
}
}
+ } else if (action == StorageAction.MIGRATEVOLUME) {
+ VolumeInfo volume = (VolumeInfo)object;
+ if (volume.getHypervisorType() == Hypervisor.HypervisorType.Hyperv) {
+ VirtualMachine vm = volume.getAttachedVM();
+ if ((vm != null) && (vm.getState() == VirtualMachine.State.Running)) {
+ Long hostId = vm.getHostId();
+ return getEndPointFromHostId(hostId);
+ }
+ }
}
return select(object);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2aff39f8/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 1c01401..68e5a56 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
@@ -77,6 +77,7 @@ import com.cloud.host.Host;
import com.cloud.host.dao.HostDao;
import com.cloud.storage.DataStoreRole;
import com.cloud.storage.ScopeType;
+import com.cloud.storage.Storage.StoragePoolType;
import com.cloud.storage.StoragePool;
import com.cloud.storage.VMTemplateStoragePoolVO;
import com.cloud.storage.VMTemplateStorageResourceAssoc;
@@ -814,9 +815,16 @@ public class VolumeServiceImpl implements VolumeService {
protected VolumeVO duplicateVolumeOnAnotherStorage(Volume volume, StoragePool pool) {
Long lastPoolId = volume.getPoolId();
+ String folder = pool.getPath();
+ // For SMB, pool credentials are also stored in the uri query string. We trim the query string
+ // part here to make sure the credentials do not get stored in the db unencrypted.
+ if (pool.getPoolType() == StoragePoolType.SMB && folder != null && folder.contains("?")) {
+ folder = folder.substring(0, folder.indexOf("?"));
+ }
+
VolumeVO newVol = new VolumeVO(volume);
newVol.setPoolId(pool.getId());
- newVol.setFolder(pool.getPath());
+ newVol.setFolder(folder);
newVol.setPodId(pool.getPodId());
newVol.setPoolId(pool.getId());
newVol.setLastPoolId(lastPoolId);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2aff39f8/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/CloudStackTypes.cs
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/CloudStackTypes.cs b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/CloudStackTypes.cs
index 869f108..c222102 100644
--- a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/CloudStackTypes.cs
+++ b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/CloudStackTypes.cs
@@ -173,33 +173,35 @@ namespace HypervResource
PrimaryDataStoreTO store = this.primaryDataStore;
if (store.isLocal)
{
- fileName = Path.Combine(store.Path, this.uuid);
+ String volume = this.path;
+ if (String.IsNullOrEmpty(volume))
+ {
+ volume = this.uuid;
+ }
+ fileName = Path.Combine(store.Path, volume);
}
else
{
- fileName = @"\\" + store.uri.Host + store.uri.LocalPath + @"\" + this.uuid;
+ String volume = this.path;
+ if (String.IsNullOrEmpty(volume))
+ {
+ volume = this.uuid;
+ }
+ fileName = @"\\" + store.uri.Host + store.uri.LocalPath + @"\" + volume;
fileName = Utils.NormalizePath(fileName);
}
}
else if (this.nfsDataStore != null)
{
- if (this.path != null && File.Exists(this.path))
+ fileName = this.nfsDataStore.UncPath;
+ if (this.path != null)
{
- fileName = this.path;
+ fileName = Utils.NormalizePath(fileName + @"\" + this.path);
}
- else
- {
- fileName = this.nfsDataStore.UncPath;
- if (this.path != null)
- {
- fileName += @"\" + this.path;
- }
- fileName = Utils.NormalizePath(fileName);
- if (Directory.Exists(fileName))
- {
- fileName = Utils.NormalizePath(fileName + @"\" + this.uuid);
- }
+ if (fileName != null && !File.Exists(fileName))
+ {
+ fileName = Utils.NormalizePath(fileName + @"\" + this.uuid);
}
}
else
@@ -344,8 +346,17 @@ namespace HypervResource
}
else if (this.nfsDataStoreTO != null)
{
- NFSTO store = this.nfsDataStoreTO;
- fileName = store.UncPath + @"\" + this.path + @"\" + this.uuid;
+ fileName = this.nfsDataStoreTO.UncPath;
+ if (this.path != null)
+ {
+ fileName = Utils.NormalizePath(fileName + @"\" + this.path);
+ }
+
+ if (fileName != null && !File.Exists(fileName))
+ {
+ fileName = Utils.NormalizePath(fileName + @"\" + this.uuid);
+ }
+
if (!this.format.Equals("RAW"))
{
fileName = fileName + '.' + this.format.ToLowerInvariant();
@@ -769,6 +780,8 @@ namespace HypervResource
public const string ManageSnapshotCommand = "com.cloud.agent.api.ManageSnapshotCommand";
public const string MigrateAnswer = "com.cloud.agent.api.MigrateAnswer";
public const string MigrateCommand = "com.cloud.agent.api.MigrateCommand";
+ public const string MigrateWithStorageAnswer = "com.cloud.agent.api.MigrateWithStorageAnswer";
+ public const string MigrateWithStorageCommand = "com.cloud.agent.api.MigrateWithStorageCommand";
public const string ModifySshKeysCommand = "com.cloud.agent.api.ModifySshKeysCommand";
public const string ModifyStoragePoolAnswer = "com.cloud.agent.api.ModifyStoragePoolAnswer";
public const string ModifyStoragePoolCommand = "com.cloud.agent.api.ModifyStoragePoolCommand";
@@ -853,6 +866,8 @@ namespace HypervResource
public const string CreateCommand = "com.cloud.agent.api.storage.CreateCommand";
public const string CreatePrivateTemplateAnswer = "com.cloud.agent.api.storage.CreatePrivateTemplateAnswer";
public const string DestroyCommand = "com.cloud.agent.api.storage.DestroyCommand";
+ public const string MigrateVolumeAnswer = "com.cloud.agent.api.storage.MigrateVolumeAnswer";
+ public const string MigrateVolumeCommand = "com.cloud.agent.api.storage.MigrateVolumeCommand";
public const string PrimaryStorageDownloadAnswer = "com.cloud.agent.api.storage.PrimaryStorageDownloadAnswer";
public const string PrimaryStorageDownloadCommand = "com.cloud.agent.api.storage.PrimaryStorageDownloadCommand";
public const string ResizeVolumeAnswer = "com.cloud.agent.api.storage.ResizeVolumeAnswer";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2aff39f8/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs
index e233d03..2d44753 100644
--- a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs
+++ b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs
@@ -1187,7 +1187,7 @@ namespace HypervResource
volumePath = Utils.NormalizePath(volumePath);
Utils.ConnectToRemote(primary.UncPath, primary.Domain, primary.User, primary.Password);
}
- volume.path = volumePath;
+ volume.path = volume.uuid;
wmiCallsV2.CreateDynamicVirtualHardDisk(volumeSize, volumePath);
if (File.Exists(volumePath))
{
@@ -1578,7 +1578,7 @@ namespace HypervResource
{
// TODO: thin provision instead of copying the full file.
File.Copy(srcFile, destFile);
- destVolumeObjectTO.path = destFile;
+ destVolumeObjectTO.path = destVolumeObjectTO.uuid;
JObject ansObj = Utils.CreateCloudStackObject(CloudStackTypes.VolumeObjectTO, destVolumeObjectTO);
newData = ansObj;
result = true;
@@ -1612,8 +1612,25 @@ namespace HypervResource
// doesn't do anything if the directory is already present.
Directory.CreateDirectory(Path.GetDirectoryName(destFile));
File.Copy(srcFile, destFile);
+
+ if (srcVolumeObjectTO.nfsDataStore != null && srcVolumeObjectTO.primaryDataStore == null)
+ {
+ logger.Info("Copied volume from secondary data store to primary. Path: " + destVolumeObjectTO.path);
+ }
+ else if (srcVolumeObjectTO.primaryDataStore != null && srcVolumeObjectTO.nfsDataStore == null)
+ {
+ destVolumeObjectTO.path = destVolumeObjectTO.path + "/" + destVolumeObjectTO.uuid;
+ if (destVolumeObjectTO.format != null)
+ {
+ destVolumeObjectTO.path += "." + destVolumeObjectTO.format.ToLower();
+ }
+ }
+ else
+ {
+ logger.Error("Destination volume path wasn't set. Unsupported source volume data store.");
+ }
+
// Create volumeto object deserialize and send it
- destVolumeObjectTO.path = destFile;
JObject ansObj = Utils.CreateCloudStackObject(CloudStackTypes.VolumeObjectTO, destVolumeObjectTO);
newData = ansObj;
result = true;
@@ -1656,7 +1673,11 @@ namespace HypervResource
TemplateObjectTO destTemplateObject = new TemplateObjectTO();
destTemplateObject.size = srcVolumeObjectTO.size.ToString();
destTemplateObject.format = srcVolumeObjectTO.format;
- destTemplateObject.path = destFile;
+ destTemplateObject.path = destTemplateObjectTO.path + "/" + destTemplateObjectTO.uuid;
+ if (destTemplateObject.format != null)
+ {
+ destTemplateObject.path += "." + destTemplateObject.format.ToLower();
+ }
destTemplateObject.nfsDataStoreTO = destTemplateObjectTO.nfsDataStoreTO;
destTemplateObject.checksum = destTemplateObjectTO.checksum;
newData = destTemplateObject;
@@ -1990,6 +2011,113 @@ namespace HypervResource
}
}
+ // POST api/HypervResource/MigrateVolumeCommand
+ [HttpPost]
+ [ActionName(CloudStackTypes.MigrateVolumeCommand)]
+ public JContainer MigrateVolumeCommand([FromBody]dynamic cmd)
+ {
+ using (log4net.NDC.Push(Guid.NewGuid().ToString()))
+ {
+ logger.Info(CloudStackTypes.MigrateVolumeCommand + cmd.ToString());
+
+ string details = null;
+ bool result = false;
+
+ try
+ {
+ string vm = (string)cmd.attachedVmName;
+ string volume = (string)cmd.volumePath;
+ wmiCallsV2.MigrateVolume(vm, volume, GetStoragePoolPath(cmd.pool));
+ result = true;
+ }
+ catch (Exception sysEx)
+ {
+ details = CloudStackTypes.MigrateVolumeCommand + " failed due to " + sysEx.Message;
+ logger.Error(details, sysEx);
+ }
+
+ object ansContent = new
+ {
+ result = result,
+ volumePath = (string)cmd.volumePath,
+ details = details,
+ contextMap = contextMap
+ };
+
+ return ReturnCloudStackTypedJArray(ansContent, CloudStackTypes.MigrateVolumeAnswer);
+ }
+ }
+
+ // POST api/HypervResource/MigrateWithStorageCommand
+ [HttpPost]
+ [ActionName(CloudStackTypes.MigrateWithStorageCommand)]
+ public JContainer MigrateWithStorageCommand([FromBody]dynamic cmd)
+ {
+ using (log4net.NDC.Push(Guid.NewGuid().ToString()))
+ {
+ logger.Info(CloudStackTypes.MigrateWithStorageCommand + cmd.ToString());
+
+ string details = null;
+ bool result = false;
+ List<dynamic> volumeTos = new List<dynamic>();
+
+ try
+ {
+ string vm = (string)cmd.vm.name;
+ string destination = (string)cmd.tgtHost;
+ var volumeToPoolList = cmd.volumeToFilerAsList;
+ var volumeToPool = new Dictionary<string, string>();
+ foreach (var item in volumeToPoolList)
+ {
+ volumeTos.Add(item.t);
+ string poolPath = GetStoragePoolPath(item.u);
+ volumeToPool.Add((string)item.t.path, poolPath);
+ }
+
+ wmiCallsV2.MigrateVmWithVolume(vm, destination, volumeToPool);
+ result = true;
+ }
+ catch (Exception sysEx)
+ {
+ details = CloudStackTypes.MigrateWithStorageCommand + " failed due to " + sysEx.Message;
+ logger.Error(details, sysEx);
+ }
+
+ object ansContent = new
+ {
+ result = result,
+ volumeTos = JArray.FromObject(volumeTos),
+ details = details,
+ contextMap = contextMap
+ };
+
+ return ReturnCloudStackTypedJArray(ansContent, CloudStackTypes.MigrateWithStorageAnswer);
+ }
+ }
+
+ private string GetStoragePoolPath(dynamic pool)
+ {
+ string poolTypeStr = pool.type;
+ StoragePoolType poolType;
+ if (!Enum.TryParse<StoragePoolType>(poolTypeStr, out poolType))
+ {
+ throw new ArgumentException("Invalid pool type " + poolTypeStr);
+ }
+ else if (poolType == StoragePoolType.SMB)
+ {
+ NFSTO share = new NFSTO();
+ String uriStr = "cifs://" + (string)pool.host + (string)pool.path;
+ share.uri = new Uri(uriStr);
+ return Utils.NormalizePath(share.UncPath);
+ }
+ else if (poolType == StoragePoolType.Filesystem)
+ {
+ return pool.path;
+ }
+
+ throw new ArgumentException("Couldn't parse path for pool type " + poolTypeStr);
+ }
+
// POST api/HypervResource/StartupCommand
[HttpPost]
[ActionName(CloudStackTypes.StartupCommand)]
@@ -2016,7 +2144,8 @@ namespace HypervResource
strtRouteCmd.storageNetmask = subnet;
strtRouteCmd.storageMacAddress = storageNic.GetPhysicalAddress().ToString();
strtRouteCmd.gatewayIpAddress = storageNic.GetPhysicalAddress().ToString();
-
+ strtRouteCmd.hypervisorVersion = System.Environment.OSVersion.Version.Major.ToString() + "." +
+ System.Environment.OSVersion.Version.Minor.ToString();
strtRouteCmd.caps = "hvm";
dynamic details = strtRouteCmd.hostDetails;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2aff39f8/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/IWmiCallsV2.cs
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/IWmiCallsV2.cs b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/IWmiCallsV2.cs
index da6ad83..6018896 100644
--- a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/IWmiCallsV2.cs
+++ b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/IWmiCallsV2.cs
@@ -40,6 +40,8 @@ namespace HypervResource
void DestroyVm(dynamic jsonObj);
void DestroyVm(string displayName);
void MigrateVm(string vmName, string destination);
+ void MigrateVolume(string vmName, string volume, string destination);
+ void MigrateVmWithVolume(string vmName, string destination, Dictionary<string, string> volumeToPool);
void DetachDisk(string displayName, string diskFileName);
ComputerSystem GetComputerSystem(string displayName);
ComputerSystem.ComputerSystemCollection GetComputerSystemCollection();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2aff39f8/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/WmiCallsV2.cs
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/WmiCallsV2.cs b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/WmiCallsV2.cs
index d2b9ce1..73156c5 100644
--- a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/WmiCallsV2.cs
+++ b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/WmiCallsV2.cs
@@ -1059,6 +1059,125 @@ namespace HypervResource
}
/// <summary>
+ /// Migrates the volume of a vm to a given destination storage
+ /// </summary>
+ /// <param name="displayName"></param>
+ /// <param name="volume"></param>
+ /// <param name="destination storage pool"></param>
+ public void MigrateVolume(string vmName, string volume, string destination)
+ {
+ ComputerSystem vm = GetComputerSystem(vmName);
+ VirtualSystemSettingData vmSettings = GetVmSettings(vm);
+ VirtualSystemMigrationSettingData migrationSettingData = VirtualSystemMigrationSettingData.CreateInstance();
+ VirtualSystemMigrationService service = GetVirtualisationSystemMigrationService();
+ StorageAllocationSettingData[] sasd = GetStorageSettings(vm);
+
+ string[] rasds = null;
+ if (sasd != null)
+ {
+ rasds = new string[sasd.Length];
+ uint index = 0;
+ foreach (StorageAllocationSettingData item in sasd)
+ {
+ string vhdFileName = Path.GetFileNameWithoutExtension(item.HostResource[0]);
+ if (!String.IsNullOrEmpty(vhdFileName) && vhdFileName.Equals(volume))
+ {
+ string newVhdPath = Path.Combine(destination, Path.GetFileName(item.HostResource[0]));
+ item.LateBoundObject["HostResource"] = new string[] { newVhdPath };
+ item.LateBoundObject["PoolId"] = "";
+ }
+
+ rasds[index++] = item.LateBoundObject.GetText(System.Management.TextFormat.CimDtd20);
+ }
+ }
+
+ migrationSettingData.LateBoundObject["MigrationType"] = MigrationType.Storage;
+ migrationSettingData.LateBoundObject["TransportType"] = TransportType.TCP;
+ string migrationSettings = migrationSettingData.LateBoundObject.GetText(System.Management.TextFormat.CimDtd20);
+
+ ManagementPath jobPath;
+ var ret_val = service.MigrateVirtualSystemToHost(vm.Path, null, migrationSettings, rasds, null, out jobPath);
+ if (ret_val == ReturnCode.Started)
+ {
+ MigrationJobCompleted(jobPath);
+ }
+ else if (ret_val != ReturnCode.Completed)
+ {
+ var errMsg = string.Format(
+ "Failed migrating volume {0} of VM {1} (GUID {2}) due to {3}",
+ volume,
+ vm.ElementName,
+ vm.Name,
+ ReturnCode.ToString(ret_val));
+ var ex = new WmiException(errMsg);
+ logger.Error(errMsg, ex);
+ throw ex;
+ }
+ }
+
+ /// <summary>
+ /// Migrates the volume of a vm to a given destination storage
+ /// </summary>
+ /// <param name="displayName"></param>
+ /// <param name="destination host"></param>
+ /// <param name="volumeToPool"> volume to me migrated to which pool</param>
+ public void MigrateVmWithVolume(string vmName, string destination, Dictionary<string, string> volumeToPool)
+ {
+ ComputerSystem vm = GetComputerSystem(vmName);
+ VirtualSystemSettingData vmSettings = GetVmSettings(vm);
+ VirtualSystemMigrationSettingData migrationSettingData = VirtualSystemMigrationSettingData.CreateInstance();
+ VirtualSystemMigrationService service = GetVirtualisationSystemMigrationService();
+ StorageAllocationSettingData[] sasd = GetStorageSettings(vm);
+
+ string[] rasds = null;
+ if (sasd != null)
+ {
+ rasds = new string[sasd.Length];
+ uint index = 0;
+ foreach (StorageAllocationSettingData item in sasd)
+ {
+ string vhdFileName = Path.GetFileNameWithoutExtension(item.HostResource[0]);
+ if (!String.IsNullOrEmpty(vhdFileName) && volumeToPool.ContainsKey(vhdFileName))
+ {
+ string newVhdPath = Path.Combine(volumeToPool[vhdFileName], Path.GetFileName(item.HostResource[0]));
+ item.LateBoundObject["HostResource"] = new string[] { newVhdPath };
+ item.LateBoundObject["PoolId"] = "";
+ }
+
+ rasds[index++] = item.LateBoundObject.GetText(System.Management.TextFormat.CimDtd20);
+ }
+ }
+
+ IPAddress addr = IPAddress.Parse(destination);
+ IPHostEntry entry = Dns.GetHostEntry(addr);
+ string[] destinationHost = new string[] { destination };
+
+ migrationSettingData.LateBoundObject["MigrationType"] = MigrationType.VirtualSystemAndStorage;
+ migrationSettingData.LateBoundObject["TransportType"] = TransportType.TCP;
+ migrationSettingData.LateBoundObject["DestinationIPAddressList"] = destinationHost;
+ string migrationSettings = migrationSettingData.LateBoundObject.GetText(System.Management.TextFormat.CimDtd20);
+
+ ManagementPath jobPath;
+ var ret_val = service.MigrateVirtualSystemToHost(vm.Path, entry.HostName, migrationSettings, rasds, null, out jobPath);
+ if (ret_val == ReturnCode.Started)
+ {
+ MigrationJobCompleted(jobPath);
+ }
+ else if (ret_val != ReturnCode.Completed)
+ {
+ var errMsg = string.Format(
+ "Failed migrating VM {0} and its volumes to destination {1} (GUID {2}) due to {3}",
+ vm.ElementName,
+ destination,
+ vm.Name,
+ ReturnCode.ToString(ret_val));
+ var ex = new WmiException(errMsg);
+ logger.Error(errMsg, ex);
+ throw ex;
+ }
+ }
+
+ /// <summary>
/// Create new storage media resources, e.g. hard disk images and ISO disk images
/// see http://msdn.microsoft.com/en-us/library/hh859775(v=vs.85).aspx
/// </summary>
@@ -2081,6 +2200,26 @@ namespace HypervResource
return result.ToArray();
}
+ public StorageAllocationSettingData[] GetStorageSettings(ComputerSystem vm)
+ {
+ // ComputerSystem -> VirtualSystemSettingData -> EthernetPortAllocationSettingData
+ VirtualSystemSettingData vmSettings = GetVmSettings(vm);
+
+ var wmiObjQuery = new RelatedObjectQuery(vmSettings.Path.Path, StorageAllocationSettingData.CreatedClassName);
+
+ // NB: default scope of ManagementObjectSearcher is '\\.\root\cimv2', which does not contain
+ // the virtualisation objects.
+ var wmiObjectSearch = new ManagementObjectSearcher(vmSettings.Scope, wmiObjQuery);
+ var wmiObjCollection = new StorageAllocationSettingData.StorageAllocationSettingDataCollection(wmiObjectSearch.Get());
+
+ var result = new List<StorageAllocationSettingData>(wmiObjCollection.Count);
+ foreach (StorageAllocationSettingData item in wmiObjCollection)
+ {
+ result.Add(item);
+ }
+ return result.ToArray();
+ }
+
public EthernetSwitchPortVlanSettingData GetVlanSettings(EthernetPortAllocationSettingData ethernetConnection)
{
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2aff39f8/plugins/hypervisors/hyperv/DotNet/ServerResource/WmiWrappers/ROOT.virtualization.v2.Msvm_StorageAllocationSettingData.cs
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/hyperv/DotNet/ServerResource/WmiWrappers/ROOT.virtualization.v2.Msvm_StorageAllocationSettingData.cs b/plugins/hypervisors/hyperv/DotNet/ServerResource/WmiWrappers/ROOT.virtualization.v2.Msvm_StorageAllocationSettingData.cs
index 8553fed..602347f 100644
--- a/plugins/hypervisors/hyperv/DotNet/ServerResource/WmiWrappers/ROOT.virtualization.v2.Msvm_StorageAllocationSettingData.cs
+++ b/plugins/hypervisors/hyperv/DotNet/ServerResource/WmiWrappers/ROOT.virtualization.v2.Msvm_StorageAllocationSettingData.cs
@@ -36,7 +36,7 @@ namespace CloudStack.Plugin.WmiWrappers.ROOT.VIRTUALIZATION.V2 {
private static string CreatedWmiNamespace = "ROOT\\virtualization\\v2";
// Private property to hold the name of WMI class which created this class.
- private static string CreatedClassName = "Msvm_StorageAllocationSettingData";
+ public static string CreatedClassName = "Msvm_StorageAllocationSettingData";
// Private member variable to hold the ManagementScope which is used by the various methods.
private static System.Management.ManagementScope statMgmtScope = null;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2aff39f8/plugins/hypervisors/hyperv/src/org/apache/cloudstack/storage/motion/HypervStorageMotionStrategy.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/hyperv/src/org/apache/cloudstack/storage/motion/HypervStorageMotionStrategy.java b/plugins/hypervisors/hyperv/src/org/apache/cloudstack/storage/motion/HypervStorageMotionStrategy.java
new file mode 100644
index 0000000..011bd12
--- /dev/null
+++ b/plugins/hypervisors/hyperv/src/org/apache/cloudstack/storage/motion/HypervStorageMotionStrategy.java
@@ -0,0 +1,179 @@
+/*
+ * 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.
+ */
+package org.apache.cloudstack.storage.motion;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import javax.inject.Inject;
+
+import org.apache.cloudstack.engine.subsystem.api.storage.CopyCommandResult;
+import org.apache.cloudstack.engine.subsystem.api.storage.DataMotionStrategy;
+import org.apache.cloudstack.engine.subsystem.api.storage.DataObject;
+import org.apache.cloudstack.engine.subsystem.api.storage.DataStore;
+import org.apache.cloudstack.engine.subsystem.api.storage.StrategyPriority;
+import org.apache.cloudstack.engine.subsystem.api.storage.VolumeDataFactory;
+import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo;
+import org.apache.cloudstack.framework.async.AsyncCompletionCallback;
+import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
+import org.apache.cloudstack.storage.to.VolumeObjectTO;
+import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
+
+import com.cloud.agent.AgentManager;
+import com.cloud.agent.api.Answer;
+import com.cloud.agent.api.MigrateWithStorageAnswer;
+import com.cloud.agent.api.MigrateWithStorageCommand;
+import com.cloud.agent.api.to.StorageFilerTO;
+import com.cloud.agent.api.to.VirtualMachineTO;
+import com.cloud.agent.api.to.VolumeTO;
+import com.cloud.exception.AgentUnavailableException;
+import com.cloud.exception.OperationTimedoutException;
+import com.cloud.host.Host;
+import com.cloud.hypervisor.Hypervisor.HypervisorType;
+import com.cloud.storage.StoragePool;
+import com.cloud.storage.VolumeVO;
+import com.cloud.storage.dao.VolumeDao;
+import com.cloud.utils.Pair;
+import com.cloud.utils.exception.CloudRuntimeException;
+import com.cloud.vm.VMInstanceVO;
+import com.cloud.vm.dao.VMInstanceDao;
+
+@Component
+public class HypervStorageMotionStrategy implements DataMotionStrategy {
+ private static final Logger s_logger = Logger.getLogger(HypervStorageMotionStrategy.class);
+ @Inject AgentManager agentMgr;
+ @Inject VolumeDao volDao;
+ @Inject VolumeDataFactory volFactory;
+ @Inject PrimaryDataStoreDao storagePoolDao;
+ @Inject VMInstanceDao instanceDao;
+
+ @Override
+ public StrategyPriority canHandle(DataObject srcData, DataObject destData) {
+ return StrategyPriority.CANT_HANDLE;
+ }
+
+ @Override
+ public StrategyPriority canHandle(Map<VolumeInfo, DataStore> volumeMap, Host srcHost, Host destHost) {
+ if (srcHost.getHypervisorType() == HypervisorType.Hyperv &&
+ destHost.getHypervisorType() == HypervisorType.Hyperv) {
+ return StrategyPriority.HYPERVISOR;
+ }
+
+ return StrategyPriority.CANT_HANDLE;
+ }
+
+ @Override
+ public Void copyAsync(DataObject srcData, DataObject destData, Host destHost, AsyncCompletionCallback<CopyCommandResult> callback) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public Void copyAsync(DataObject srcData, DataObject destData, AsyncCompletionCallback<CopyCommandResult> callback) {
+ CopyCommandResult result = new CopyCommandResult(null, null);
+ result.setResult("Unsupported operation requested for copying data.");
+ callback.complete(result);
+
+ return null;
+ }
+
+ @Override
+ public Void copyAsync(Map<VolumeInfo, DataStore> volumeMap, VirtualMachineTO vmTo, Host srcHost, Host destHost,
+ AsyncCompletionCallback<CopyCommandResult> callback) {
+ Answer answer = null;
+ String errMsg = null;
+ try {
+ VMInstanceVO instance = instanceDao.findById(vmTo.getId());
+ if (instance != null) {
+ answer = migrateVmWithVolumes(instance, vmTo, srcHost, destHost, volumeMap);
+ } else {
+ throw new CloudRuntimeException("Unsupported operation requested for moving data.");
+ }
+ } catch (Exception e) {
+ s_logger.error("copy failed", e);
+ errMsg = e.toString();
+ }
+
+ CopyCommandResult result = new CopyCommandResult(null, answer);
+ result.setResult(errMsg);
+ callback.complete(result);
+ return null;
+ }
+
+ private Answer migrateVmWithVolumes(VMInstanceVO vm, VirtualMachineTO to, Host srcHost,
+ Host destHost, Map<VolumeInfo, DataStore> volumeToPool) throws AgentUnavailableException {
+
+ // Initiate migration of a virtual machine with it's volumes.
+ try {
+ List<Pair<VolumeTO, StorageFilerTO>> volumeToFilerto = new ArrayList<Pair<VolumeTO, StorageFilerTO>>();
+ for (Map.Entry<VolumeInfo, DataStore> entry : volumeToPool.entrySet()) {
+ VolumeInfo volume = entry.getKey();
+ VolumeTO volumeTo = new VolumeTO(volume, storagePoolDao.findById(volume.getPoolId()));
+ StorageFilerTO filerTo = new StorageFilerTO((StoragePool)entry.getValue());
+ volumeToFilerto.add(new Pair<VolumeTO, StorageFilerTO>(volumeTo, filerTo));
+ }
+
+ MigrateWithStorageCommand command = new MigrateWithStorageCommand(to, volumeToFilerto, destHost.getPrivateIpAddress());
+ MigrateWithStorageAnswer answer = (MigrateWithStorageAnswer) agentMgr.send(srcHost.getId(), command);
+ if (answer == null) {
+ s_logger.error("Migration with storage of vm " + vm + " failed.");
+ throw new CloudRuntimeException("Error while migrating the vm " + vm + " to host " + destHost);
+ } else if (!answer.getResult()) {
+ s_logger.error("Migration with storage of vm " + vm+ " failed. Details: " + answer.getDetails());
+ throw new CloudRuntimeException("Error while migrating the vm " + vm + " to host " + destHost +
+ ". " + answer.getDetails());
+ } else {
+ // Update the volume details after migration.
+ updateVolumePathsAfterMigration(volumeToPool, answer.getVolumeTos());
+ }
+
+ return answer;
+ } catch (OperationTimedoutException e) {
+ s_logger.error("Error while migrating vm " + vm + " to host " + destHost, e);
+ throw new AgentUnavailableException("Operation timed out on storage motion for " + vm, destHost.getId());
+ }
+ }
+
+ private void updateVolumePathsAfterMigration(Map<VolumeInfo, DataStore> volumeToPool, List<VolumeObjectTO> volumeTos) {
+ for (Map.Entry<VolumeInfo, DataStore> entry : volumeToPool.entrySet()) {
+ boolean updated = false;
+ VolumeInfo volume = entry.getKey();
+ StoragePool pool = (StoragePool)entry.getValue();
+ for (VolumeObjectTO volumeTo : volumeTos) {
+ if (volume.getId() == volumeTo.getId()) {
+ VolumeVO volumeVO = volDao.findById(volume.getId());
+ Long oldPoolId = volumeVO.getPoolId();
+ volumeVO.setPath(volumeTo.getPath());
+ volumeVO.setFolder(pool.getPath());
+ volumeVO.setPodId(pool.getPodId());
+ volumeVO.setPoolId(pool.getId());
+ volumeVO.setLastPoolId(oldPoolId);
+ volDao.update(volume.getId(), volumeVO);
+ updated = true;
+ break;
+ }
+ }
+
+ if (!updated) {
+ s_logger.error("Volume path wasn't updated for volume " + volume + " after it was migrated.");
+ }
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2aff39f8/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 0e4fb5e..393613a 100755
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -3996,7 +3996,8 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
}
if (!vm.getHypervisorType().equals(HypervisorType.XenServer) && !vm.getHypervisorType().equals(HypervisorType.VMware) && !vm.getHypervisorType().equals(HypervisorType.KVM)
- && !vm.getHypervisorType().equals(HypervisorType.Ovm) && !vm.getHypervisorType().equals(HypervisorType.Simulator)) {
+ && !vm.getHypervisorType().equals(HypervisorType.Ovm) && !vm.getHypervisorType().equals(HypervisorType.Hyperv)
+ && !vm.getHypervisorType().equals(HypervisorType.Simulator)) {
throw new InvalidParameterValueException("Unsupported hypervisor type for vm migration, we support" + " XenServer/VMware/KVM only");
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2aff39f8/setup/db/db/schema-430to440.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-430to440.sql b/setup/db/db/schema-430to440.sql
index 9d41fe9..51bce2d 100644
--- a/setup/db/db/schema-430to440.sql
+++ b/setup/db/db/schema-430to440.sql
@@ -26,6 +26,7 @@ ALTER TABLE `cloud`.`disk_offering` ADD `cache_mode` VARCHAR( 16 ) DEFAULT 'none
UPDATE `cloud`.`hypervisor_capabilities` set max_guests_limit='150' WHERE hypervisor_version='6.1.0';
UPDATE `cloud`.`hypervisor_capabilities` set max_guests_limit='500' WHERE hypervisor_version='6.2.0';
+UPDATE `cloud`.`hypervisor_capabilities` set storage_motion_supported='1' WHERE hypervisor_version='6.2' AND hypervisor_type="Hyperv";
DROP VIEW IF EXISTS `cloud`.`disk_offering_view`;
CREATE VIEW `cloud`.`disk_offering_view` AS
[42/50] [abbrv] git commit: updated refs/heads/4.4 to 48f8a95
Posted by hu...@apache.org.
integration tests for VPC's enabled for distributed routing
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/015b667c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/015b667c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/015b667c
Branch: refs/heads/4.4
Commit: 015b667c6a19cc0591ffb5038dac4557f9469c58
Parents: 36541a2
Author: Murali Reddy <mu...@gmail.com>
Authored: Tue Mar 11 18:29:36 2014 +0530
Committer: Murali Reddy <mu...@gmail.com>
Committed: Fri Mar 14 16:56:38 2014 +0530
----------------------------------------------------------------------
build/simulator.properties | 28 -
.../test_vpc_distributed_routing_offering.py | 512 +++++++++++++++++++
tools/marvin/marvin/integration/lib/base.py | 15 +
3 files changed, 527 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/015b667c/build/simulator.properties
----------------------------------------------------------------------
diff --git a/build/simulator.properties b/build/simulator.properties
deleted file mode 100644
index d65d05c..0000000
--- a/build/simulator.properties
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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.
-
-DBUSER=cloud
-DBPW=cloud
-MSLOG=vmops.log
-APISERVERLOG=api.log
-DBHOST=localhost
-DBROOTPW=
-AGENTLOGDIR=logs
-AGENTLOG=logs/agent.log
-MSMNTDIR=/mnt
-COMPONENTS-SPEC=components-simulator.xml
-AWSAPILOG=awsapi.log
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/015b667c/test/integration/component/test_vpc_distributed_routing_offering.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc_distributed_routing_offering.py b/test/integration/component/test_vpc_distributed_routing_offering.py
new file mode 100644
index 0000000..0fa7de7
--- /dev/null
+++ b/test/integration/component/test_vpc_distributed_routing_offering.py
@@ -0,0 +1,512 @@
+# 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.
+import unittest
+
+""" Component tests for inter VLAN functionality
+"""
+#Import Local Modules
+import marvin
+from nose.plugins.attrib import attr
+from marvin.cloudstackTestCase import *
+from marvin.cloudstackAPI import *
+from marvin.integration.lib.utils import *
+from marvin.integration.lib.base import *
+from marvin.integration.lib.common import *
+from marvin.sshClient import SshClient
+import datetime
+
+
+class Services:
+ """Test inter VLAN services
+ """
+
+ def __init__(self):
+ self.services = {
+ "account": {
+ "email": "test@test.com",
+ "firstname": "Test",
+ "lastname": "User",
+ "username": "test",
+ # Random characters are appended for unique
+ # username
+ "password": "password",
+ },
+ "service_offering": {
+ "name": "Tiny Instance",
+ "displaytext": "Tiny Instance",
+ "cpunumber": 1,
+ "cpuspeed": 100,
+ "memory": 128,
+ },
+ "network_offering": {
+ "name": 'VPC Network offering',
+ "displaytext": 'VPC Network off',
+ "guestiptype": 'Isolated',
+ "supportedservices": 'Vpn,Dhcp,Dns,SourceNat,PortForwarding,Lb,UserData,StaticNat,NetworkACL, Connectivity',
+ "traffictype": 'GUEST',
+ "availability": 'Optional',
+ "useVpc": 'on',
+ "serviceProviderList": {
+ "Vpn": 'VpcVirtualRouter',
+ "Dhcp": 'VpcVirtualRouter',
+ "Dns": 'VpcVirtualRouter',
+ "SourceNat": 'VpcVirtualRouter',
+ "PortForwarding": 'VpcVirtualRouter',
+ "Lb": 'VpcVirtualRouter',
+ "UserData": 'VpcVirtualRouter',
+ "StaticNat": 'VpcVirtualRouter',
+ "NetworkACL": 'VpcVirtualRouter',
+ "Connectivity": 'Ovs'
+ },
+ },
+ "vpc_offering": {
+ "name": 'VPC off',
+ "displaytext": 'VPC off',
+ "supportedservices": 'Dhcp,Dns,SourceNat,PortForwarding,Vpn,Lb,UserData,StaticNat,Connectivity',
+ "serviceProviderList": {
+ "Vpn": 'VpcVirtualRouter',
+ "Dhcp": 'VpcVirtualRouter',
+ "Dns": 'VpcVirtualRouter',
+ "SourceNat": 'VpcVirtualRouter',
+ "PortForwarding": 'VpcVirtualRouter',
+ "Lb": 'VpcVirtualRouter',
+ "UserData": 'VpcVirtualRouter',
+ "StaticNat": 'VpcVirtualRouter',
+ "Connectivity": 'Ovs'
+ },
+ "serviceCapabilityList": {
+ "Connectivity": {
+ "DistributedRouter": "true"
+ },
+ },
+ },
+ "vpc": {
+ "name": "TestVPC",
+ "displaytext": "TestVPC",
+ "cidr": '10.0.0.1/24'
+ },
+ "network": {
+ "name": "Test Network",
+ "displaytext": "Test Network",
+ "netmask": '255.255.255.0'
+ },
+ "lbrule": {
+ "name": "SSH",
+ "alg": "leastconn",
+ # Algorithm used for load balancing
+ "privateport": 22,
+ "publicport": 2222,
+ "openfirewall": False,
+ "startport": 2222,
+ "endport": 2222,
+ "cidrlist": '0.0.0.0/0',
+ "protocol": 'TCP'
+ },
+ "natrule": {
+ "privateport": 22,
+ "publicport": 22,
+ "startport": 22,
+ "endport": 22,
+ "protocol": "TCP",
+ "cidrlist": '0.0.0.0/0',
+ },
+ "fw_rule": {
+ "startport": 1,
+ "endport": 6000,
+ "cidr": '0.0.0.0/0',
+ # Any network (For creating FW rule)
+ "protocol": "TCP"
+ },
+ "virtual_machine": {
+ "displayname": "Test VM",
+ "username": "root",
+ "password": "password",
+ "ssh_port": 22,
+ "hypervisor": 'XenServer',
+ # Hypervisor type should be same as
+ # hypervisor type of cluster
+ "privateport": 22,
+ "publicport": 22,
+ "protocol": 'TCP',
+ },
+ "ostype": 'CentOS 5.3 (64-bit)',
+ # Cent OS 5.3 (64 bit)
+ "sleep": 60,
+ "timeout": 10,
+ }
+
+
+class TestVPCDistributedRouterOffering(cloudstackTestCase):
+
+ @classmethod
+ def setUpClass(cls):
+ cls.api_client = super(
+ TestVPCDistributedRouterOffering,
+ cls
+ ).getClsTestClient().getApiClient()
+ cls.services = Services().services
+ # Get Zone, Domain and templates
+ cls.domain = get_domain(cls.api_client, cls.services)
+ cls.zone = get_zone(cls.api_client, cls.services)
+ cls.template = get_template(
+ cls.api_client,
+ cls.zone.id,
+ cls.services["ostype"]
+ )
+ cls.services["virtual_machine"]["zoneid"] = cls.zone.id
+ cls.services["virtual_machine"]["template"] = cls.template.id
+
+ cls.service_offering = ServiceOffering.create(
+ cls.api_client,
+ cls.services["service_offering"]
+ )
+ cls._cleanup = [
+ cls.service_offering,
+ ]
+ return
+
+ @classmethod
+ def tearDownClass(cls):
+ try:
+ #Cleanup resources used
+ cleanup_resources(cls.api_client, cls._cleanup)
+ except Exception as e:
+ raise Exception("Warning: Exception during cleanup : %s" % e)
+ return
+
+ def setUp(self):
+ self.apiclient = self.testClient.getApiClient()
+ self.dbclient = self.testClient.getDbConnection()
+ self.account = Account.create(
+ self.apiclient,
+ self.services["account"],
+ admin=True,
+ domainid=self.domain.id
+ )
+ self.cleanup = []
+ self.cleanup.insert(0, self.account)
+ return
+
+ def tearDown(self):
+ try:
+ cleanup_resources(self.apiclient, self.cleanup)
+ except Exception as e:
+ raise Exception("Warning: Exception during cleanup : %s" % e)
+ return
+
+ def validate_vpc_offering(self, vpc_offering):
+ """Validates the VPC offering"""
+
+ self.debug("Check if the VPC offering is created successfully?")
+ vpc_offs = VpcOffering.list(
+ self.apiclient,
+ id=vpc_offering.id
+ )
+ self.assertEqual(
+ isinstance(vpc_offs, list),
+ True,
+ "List VPC offerings should return a valid list"
+ )
+ self.assertEqual(
+ vpc_offering.name,
+ vpc_offs[0].name,
+ "Name of the VPC offering should match with listVPCOff data"
+ )
+ self.assertEqual(
+ vpc_offering.name,
+ vpc_offs[0].name,
+ "Name of the VPC offering should match with listVPCOff data"
+ )
+ self.assertEqual(
+ vpc_offs[0].distributedvpcrouter,True,
+ "VPC offering is not set up for Distributed routing"
+ )
+ self.debug(
+ "VPC offering is created successfully - %s" %
+ vpc_offering.name)
+ return
+
+ def validate_vpc_network(self, network):
+ """Validates the VPC network"""
+
+ self.debug("Check if the VPC network is created successfully?")
+ vpc_networks = VPC.list(
+ self.apiclient,
+ id=network.id
+ )
+ self.assertEqual(
+ isinstance(vpc_networks, list),
+ True,
+ "List VPC network should return a valid list"
+ )
+ self.assertEqual(
+ network.name,
+ vpc_networks[0].name,
+ "Name of the VPC network should match with listVPC data"
+ )
+ self.debug("VPC network created successfully - %s" % network.name)
+ return
+
+ @attr(tags=["advanced", "intervlan"])
+ def test_01_create_vpc_offering_with_distributedrouter_service_capability(self):
+ """ Test create VPC offering
+ """
+
+ # Steps for validation
+ # 1. Create VPC Offering by specifying all supported Services
+ # 2. VPC offering should be created successfully.
+
+ self.debug("Creating inter VPC offering")
+ vpc_off = VpcOffering.create(
+ self.apiclient,
+ self.services["vpc_offering"]
+ )
+
+ self.debug("Check if the VPC offering is created successfully?")
+ self.cleanup.append(vpc_off)
+ self.validate_vpc_offering(vpc_off)
+ return
+
+ @attr(tags=["advanced", "intervlan"])
+ def test_02_create_vpc_from_offering_with_distributedrouter_service_capability(self):
+ """ Test create VPC offering
+ """
+
+ # Steps for validation
+ # 1. Create VPC Offering by specifying all supported Services
+ # 2. VPC offering should be created successfully.
+
+ self.debug("Creating inter VPC offering")
+ vpc_off = VpcOffering.create(
+ self.apiclient,
+ self.services["vpc_offering"]
+ )
+ vpc_off.update(self.apiclient, state='Enabled')
+ vpc = VPC.create(
+ self.apiclient,
+ self.services["vpc"],
+ vpcofferingid=vpc_off.id,
+ zoneid=self.zone.id,
+ account=self.account.name,
+ domainid=self.account.domainid
+ )
+ self.assertEqual(vpc.distributedvpcrouter, True, "VPC created should have 'distributedvpcrouter' set to True")
+
+ try:
+ vpc.delete(self.apiclient)
+ except Exception as e:
+ self.fail("Failed to delete VPC network - %s" % e)
+ return
+
+ @attr(tags=["advanced", "intervlan"])
+ def test_03_deploy_vms_in_vpc_with_distributedrouter(self):
+ """Test deploy virtual machines in VPC networks"""
+
+ # 1. Create VPC Offering by specifying all supported Services
+ # (Vpn,dhcpdns,UserData, SourceNat,Static NAT and PF,LB,NetworkAcl)
+ # 2. Create a VPC using the above VPC offering
+ # 3. Create a network as part of this VPC.
+ # 4. Deploy few Vms.
+ # 5. Create a LB rule for this VM.
+ # 6. Create a PF rule for this VM.
+ # 7. Create a Static Nat rule for this VM.
+ # 8. Create Ingress rules on the network to open the above created
+ # LB PF and Static Nat rule
+ # 9. Create Egress Network ACL for this network to access google.com.
+ # 10. Enable VPN services
+
+ self.debug("Creating a VPC offering..")
+ vpc_off = VpcOffering.create(
+ self.apiclient,
+ self.services["vpc_offering"]
+ )
+
+ vpc_off.update(self.apiclient, state='Enabled')
+
+ self.debug("creating a VPC network in the account: %s" %
+ self.account.name)
+ vpc = VPC.create(
+ self.apiclient,
+ self.services["vpc"],
+ vpcofferingid=vpc_off.id,
+ zoneid=self.zone.id,
+ account=self.account.name,
+ domainid=self.account.domainid
+ )
+ self.validate_vpc_network(vpc)
+
+ self.network_offering = NetworkOffering.create(
+ self.apiclient,
+ self.services["network_offering"],
+ conservemode=False
+ )
+ # Enable Network offering
+ self.network_offering.update(self.apiclient, state='Enabled')
+
+ gateway = vpc.cidr.split('/')[0]
+ # Split the cidr to retrieve gateway
+ # for eg. cidr = 10.0.0.1/24
+ # Gateway = 10.0.0.1
+
+ # Creating network using the network offering created
+ self.debug("Creating network with network offering: %s" %
+ self.network_offering.id)
+ network = Network.create(
+ self.apiclient,
+ self.services["network"],
+ accountid=self.account.name,
+ domainid=self.account.domainid,
+ networkofferingid=self.network_offering.id,
+ zoneid=self.zone.id,
+ gateway=gateway,
+ vpcid=vpc.id
+ )
+ self.debug("Created network with ID: %s" % network.id)
+ # Spawn an instance in that network
+ virtual_machine = VirtualMachine.create(
+ self.apiclient,
+ self.services["virtual_machine"],
+ accountid=self.account.name,
+ domainid=self.account.domainid,
+ serviceofferingid=self.service_offering.id,
+ networkids=[str(network.id)]
+ )
+ self.debug("Deployed VM in network: %s" % network.id)
+
+ self.debug("Associating public IP for network: %s" % network.name)
+ public_ip = PublicIPAddress.create(
+ self.apiclient,
+ accountid=self.account.name,
+ zoneid=self.zone.id,
+ domainid=self.account.domainid,
+ networkid=network.id,
+ vpcid=vpc.id
+ )
+ self.debug("Associated %s with network %s" % (
+ public_ip.ipaddress.ipaddress,
+ network.id
+ ))
+
+ self.debug("Creating LB rule for IP address: %s" %
+ public_ip.ipaddress.ipaddress)
+
+ lb_rule = LoadBalancerRule.create(
+ self.apiclient,
+ self.services["lbrule"],
+ ipaddressid=public_ip.ipaddress.id,
+ accountid=self.account.name,
+ networkid=network.id,
+ vpcid=vpc.id,
+ domainid=self.account.domainid
+ )
+
+ self.debug("Associating public IP for network: %s" % vpc.name)
+ public_ip_2 = PublicIPAddress.create(
+ self.apiclient,
+ accountid=self.account.name,
+ zoneid=self.zone.id,
+ domainid=self.account.domainid,
+ networkid=network.id,
+ vpcid=vpc.id
+ )
+ self.debug("Associated %s with network %s" % (
+ public_ip_2.ipaddress.ipaddress,
+ network.id
+ ))
+
+ nat_rule = NATRule.create(
+ self.apiclient,
+ virtual_machine,
+ self.services["natrule"],
+ ipaddressid=public_ip_2.ipaddress.id,
+ openfirewall=False,
+ networkid=network.id,
+ vpcid=vpc.id
+ )
+
+ self.debug("Adding NetwrokACl rules to make PF and LB accessible")
+ networkacl_1 = NetworkACL.create(
+ self.apiclient,
+ networkid=network.id,
+ services=self.services["natrule"],
+ traffictype='Ingress'
+ )
+
+ networkacl_2 = NetworkACL.create(
+ self.apiclient,
+ networkid=network.id,
+ services=self.services["lbrule"],
+ traffictype='Ingress'
+ )
+ self.debug("Checking if we can SSH into VM?")
+ try:
+ virtual_machine.get_ssh_client(
+ ipaddress=public_ip_2.ipaddress.ipaddress,
+ )
+ self.debug("SSH into VM is successfully")
+ except Exception as e:
+ self.fail("Failed to SSH into VM - %s, %s" %
+ (public_ip_2.ipaddress.ipaddress, e))
+
+ self.debug("Associating public IP for network: %s" % network.name)
+ public_ip_3 = PublicIPAddress.create(
+ self.apiclient,
+ accountid=self.account.name,
+ zoneid=self.zone.id,
+ domainid=self.account.domainid,
+ networkid=network.id,
+ vpcid=vpc.id
+ )
+ self.debug("Associated %s with network %s" % (
+ public_ip_3.ipaddress.ipaddress,
+ network.id
+ ))
+ self.debug("Enabling static NAT for IP: %s" %
+ public_ip_3.ipaddress.ipaddress)
+ try:
+ StaticNATRule.enable(
+ self.apiclient,
+ ipaddressid=public_ip_3.ipaddress.id,
+ virtualmachineid=virtual_machine.id,
+ networkid=network.id
+ )
+ self.debug("Static NAT enabled for IP: %s" %
+ public_ip_3.ipaddress.ipaddress)
+ except Exception as e:
+ self.fail("Failed to enable static NAT on IP: %s - %s" % (
+ public_ip_3.ipaddress.ipaddress, e))
+
+ public_ips = PublicIPAddress.list(
+ self.apiclient,
+ networkid=network.id,
+ listall=True,
+ isstaticnat=True,
+ account=self.account.name,
+ domainid=self.account.domainid
+ )
+ self.assertEqual(
+ isinstance(public_ips, list),
+ True,
+ "List public Ip for network should list the Ip addr"
+ )
+ self.assertEqual(
+ public_ips[0].ipaddress,
+ public_ip_3.ipaddress.ipaddress,
+ "List public Ip for network should list the Ip addr"
+ )
+ # TODO: Remote Access VPN is not yet supported in VPC
+ return
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/015b667c/tools/marvin/marvin/integration/lib/base.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base.py b/tools/marvin/marvin/integration/lib/base.py
index 72a6926..b7e2be4 100755
--- a/tools/marvin/marvin/integration/lib/base.py
+++ b/tools/marvin/marvin/integration/lib/base.py
@@ -3081,6 +3081,21 @@ class VpcOffering:
cmd.name = "-".join([services["name"], random_gen()])
cmd.displaytext = services["displaytext"]
cmd.supportedServices = services["supportedservices"]
+ if "serviceProviderList" in services:
+ for service, provider in services["serviceProviderList"].items():
+ cmd.serviceproviderlist.append({
+ 'service': service,
+ 'provider': provider
+ })
+ if "serviceCapabilityList" in services:
+ cmd.servicecapabilitylist = []
+ for service, capability in services["serviceCapabilityList"].items():
+ for ctype, value in capability.items():
+ cmd.servicecapabilitylist.append({
+ 'service': service,
+ 'capabilitytype': ctype,
+ 'capabilityvalue': value
+ })
return VpcOffering(apiclient.createVPCOffering(cmd).__dict__)
def update(self, apiclient, name=None, displaytext=None, state=None):
[44/50] [abbrv] git commit: updated refs/heads/4.4 to 48f8a95
Posted by hu...@apache.org.
findbug fixes
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7d20b08a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7d20b08a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7d20b08a
Branch: refs/heads/4.4
Commit: 7d20b08aa9a05e20079e5c21ac7950f2b8879507
Parents: 81f6e66
Author: Murali Reddy <mu...@gmail.com>
Authored: Fri Mar 14 16:54:12 2014 +0530
Committer: Murali Reddy <mu...@gmail.com>
Committed: Fri Mar 14 16:56:39 2014 +0530
----------------------------------------------------------------------
.../ovs/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7d20b08a/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java b/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java
index 21e9058..53607fc 100644
--- a/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java
+++ b/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java
@@ -531,7 +531,7 @@ public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManage
}
}
} catch (Exception e) {
- s_logger.warn(String.format("Destroy tunnel failed", e));
+ s_logger.warn("Destroy tunnel failed", e);
}
}
}
@@ -812,7 +812,7 @@ public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManage
try {
NetworkVO network = (NetworkVO) args;
String bridgeName=generateBridgeNameForVpc(network.getVpcId());
- if (network.getVpcId() != null & isVpcEnabledForDistributedRouter(network.getVpcId())) {
+ if (network.getVpcId() != null && isVpcEnabledForDistributedRouter(network.getVpcId())) {
long vpcId = network.getVpcId();
OvsVpcRoutingPolicyConfigCommand cmd = prepareVpcRoutingPolicyUpdate(vpcId);
List<Long> vpcSpannedHostIds = _ovsNetworkToplogyGuru.getVpcSpannedHosts(vpcId);
[50/50] [abbrv] git commit: updated refs/heads/4.4 to 48f8a95
Posted by hu...@apache.org.
Fixed all findbugs in hyperv plugin code
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6a4927f6
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6a4927f6
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6a4927f6
Branch: refs/heads/4.4
Commit: 6a4927f660f776bcbd12ae45f4e63ae2c2e96774
Parents: 4523f5d
Author: Rajesh Battala <ra...@citrix.com>
Authored: Wed Mar 12 11:32:44 2014 +0530
Committer: Rajesh Battala <ra...@citrix.com>
Committed: Fri Mar 14 17:36:43 2014 +0530
----------------------------------------------------------------------
.../hyperv/src/com/cloud/ha/HypervInvestigator.java | 4 ++--
.../hypervisor/hyperv/discoverer/HypervServerDiscoverer.java | 5 +++--
.../hyperv/resource/HypervDirectConnectResource.java | 7 ++++---
3 files changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6a4927f6/plugins/hypervisors/hyperv/src/com/cloud/ha/HypervInvestigator.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/hyperv/src/com/cloud/ha/HypervInvestigator.java b/plugins/hypervisors/hyperv/src/com/cloud/ha/HypervInvestigator.java
index cebfb7a..01d75fa 100644
--- a/plugins/hypervisors/hyperv/src/com/cloud/ha/HypervInvestigator.java
+++ b/plugins/hypervisors/hyperv/src/com/cloud/ha/HypervInvestigator.java
@@ -45,9 +45,9 @@ public class HypervInvestigator extends AdapterBase implements Investigator {
public Boolean isVmAlive(com.cloud.vm.VirtualMachine vm, Host host) {
Status status = isAgentAlive(host);
if (status == null) {
- return null;
+ return false;
}
- return status == Status.Up ? true : null;
+ return status == Status.Up ? true : false;
}
@Override
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6a4927f6/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/discoverer/HypervServerDiscoverer.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/discoverer/HypervServerDiscoverer.java b/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/discoverer/HypervServerDiscoverer.java
index c3d79c5..f4c15f6 100644
--- a/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/discoverer/HypervServerDiscoverer.java
+++ b/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/discoverer/HypervServerDiscoverer.java
@@ -19,6 +19,7 @@ package com.cloud.hypervisor.hyperv.discoverer;
import java.net.InetAddress;
import java.net.URI;
import java.net.UnknownHostException;
+import java.nio.charset.Charset;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -254,7 +255,7 @@ public class HypervServerDiscoverer extends DiscovererBase implements Discoverer
// pool in the database
// This GUID may change.
if (cluster.getGuid() == null) {
- cluster.setGuid(UUID.nameUUIDFromBytes(String.valueOf(clusterId).getBytes()).toString());
+ cluster.setGuid(UUID.nameUUIDFromBytes(String.valueOf(clusterId).getBytes(Charset.forName("UTF-8"))).toString());
_clusterDao.update(clusterId, cluster);
}
@@ -318,7 +319,7 @@ public class HypervServerDiscoverer extends DiscovererBase implements Discoverer
* @return GUID in form of a string.
*/
public static String calcServerResourceGuid(final String uuidSeed) {
- String guid = UUID.nameUUIDFromBytes(uuidSeed.getBytes()).toString();
+ String guid = UUID.nameUUIDFromBytes(uuidSeed.getBytes(Charset.forName("UTF-8"))).toString();
return guid;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6a4927f6/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/resource/HypervDirectConnectResource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/resource/HypervDirectConnectResource.java b/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/resource/HypervDirectConnectResource.java
index b1f5a67..13254a5 100644
--- a/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/resource/HypervDirectConnectResource.java
+++ b/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/resource/HypervDirectConnectResource.java
@@ -24,6 +24,7 @@ import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
import java.nio.channels.SocketChannel;
+import java.nio.charset.Charset;
import java.rmi.RemoteException;
import java.security.KeyManagementException;
import java.security.KeyStoreException;
@@ -597,7 +598,7 @@ public class HypervDirectConnectResource extends ServerResourceBase implements S
public ExecutionResult createFileInVR(String routerIp, String filePath, String fileName, String content) {
File keyFile = getSystemVMKeyFile();
try {
- SshHelper.scpTo(routerIp, 3922, "root", keyFile, null, filePath, content.getBytes(), fileName, null);
+ SshHelper.scpTo(routerIp, 3922, "root", keyFile, null, filePath, content.getBytes(Charset.forName("UTF-8")), fileName, null);
} catch (Exception e) {
s_logger.warn("Fail to create file " + filePath + fileName + " in VR " + routerIp, e);
return new ExecutionResult(false, e.getMessage());
@@ -1262,7 +1263,7 @@ public class HypervDirectConnectResource extends ServerResourceBase implements S
}
try {
- SshHelper.scpTo(controlIp, DEFAULT_DOMR_SSHPORT, "root", keyFile, null, "/tmp/", tmpCfgFileContents.toString().getBytes(), routerIp.replace('.', '_') +
+ SshHelper.scpTo(controlIp, DEFAULT_DOMR_SSHPORT, "root", keyFile, null, "/tmp/", tmpCfgFileContents.toString().getBytes(Charset.forName("UTF-8")), routerIp.replace('.', '_') +
".cfg", null);
try {
@@ -1459,7 +1460,7 @@ public class HypervDirectConnectResource extends ServerResourceBase implements S
String json = new Gson().toJson(data);
s_logger.debug("VM data JSON IS:" + json);
- json = Base64.encodeBase64String(json.getBytes());
+ json = Base64.encodeBase64String(json.getBytes(Charset.forName("UTF-8")));
String args = "-d " + json;