You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ah...@apache.org on 2013/09/07 00:38:56 UTC
[26/36] git commit: updated refs/heads/master to a05ec6d
Revert "Added missing files"
This reverts commit a1dfc227e895d724f68c0206643825b3ba43116c.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/06493d5b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/06493d5b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/06493d5b
Branch: refs/heads/master
Commit: 06493d5b5ccc25bc5653eeb5abd752406e2fbe7b
Parents: 375eadd
Author: Alex Huang <al...@citrix.com>
Authored: Mon Aug 26 14:14:08 2013 -0700
Committer: Alex Huang <al...@citrix.com>
Committed: Fri Sep 6 15:40:35 2013 -0700
----------------------------------------------------------------------
.../framework/config/ScopedConfigStorage.java | 30 -
.../network/rules/RulesApiServiceImpl.java | 1040 ------------------
.../cloud/utils/component/ConfigInjector.java | 27 -
.../com/cloud/utils/component/InjectConfig.java | 29 -
4 files changed, 1126 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/06493d5b/framework/config/src/org/apache/cloudstack/framework/config/ScopedConfigStorage.java
----------------------------------------------------------------------
diff --git a/framework/config/src/org/apache/cloudstack/framework/config/ScopedConfigStorage.java b/framework/config/src/org/apache/cloudstack/framework/config/ScopedConfigStorage.java
deleted file mode 100644
index 5a269d4..0000000
--- a/framework/config/src/org/apache/cloudstack/framework/config/ScopedConfigStorage.java
+++ /dev/null
@@ -1,30 +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 org.apache.cloudstack.framework.config;
-
-import org.apache.cloudstack.framework.config.ConfigKey.Scope;
-
-/**
- *
- * This method is used by individual storage for configuration
- *
- */
-public interface ScopedConfigStorage {
- Scope getScope();
-
- String getConfigValue(long id, ConfigKey<?> key);
-}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/06493d5b/server/src/com/cloud/network/rules/RulesApiServiceImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/rules/RulesApiServiceImpl.java b/server/src/com/cloud/network/rules/RulesApiServiceImpl.java
deleted file mode 100644
index ae0ab34..0000000
--- a/server/src/com/cloud/network/rules/RulesApiServiceImpl.java
+++ /dev/null
@@ -1,1040 +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.network.rules;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import javax.ejb.Local;
-import javax.inject.Inject;
-
-import org.apache.log4j.Logger;
-
-import org.apache.cloudstack.api.command.user.firewall.ListPortForwardingRulesCmd;
-import org.apache.cloudstack.context.CallContext;
-import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
-
-import com.cloud.configuration.ConfigurationManager;
-import com.cloud.domain.dao.DomainDao;
-import com.cloud.event.ActionEvent;
-import com.cloud.event.EventTypes;
-import com.cloud.event.UsageEventUtils;
-import com.cloud.event.dao.EventDao;
-import com.cloud.event.dao.UsageEventDao;
-import com.cloud.exception.InsufficientAddressCapacityException;
-import com.cloud.exception.InvalidParameterValueException;
-import com.cloud.exception.NetworkRuleConflictException;
-import com.cloud.exception.ResourceUnavailableException;
-import com.cloud.network.IpAddress;
-import com.cloud.network.IpAddressManager;
-import com.cloud.network.Network;
-import com.cloud.network.Network.Service;
-import com.cloud.network.NetworkModel;
-import com.cloud.network.dao.FirewallRulesCidrsDao;
-import com.cloud.network.dao.FirewallRulesDao;
-import com.cloud.network.dao.IPAddressDao;
-import com.cloud.network.dao.IPAddressVO;
-import com.cloud.network.dao.LoadBalancerVMMapDao;
-import com.cloud.network.rules.FirewallRule.FirewallRuleType;
-import com.cloud.network.rules.FirewallRule.Purpose;
-import com.cloud.network.rules.dao.PortForwardingRulesDao;
-import com.cloud.network.vpc.VpcManager;
-import com.cloud.network.vpc.VpcService;
-import com.cloud.offering.NetworkOffering;
-import com.cloud.projects.Project.ListProjectResourcesCriteria;
-import com.cloud.server.ResourceTag.TaggedResourceType;
-import com.cloud.tags.ResourceTagVO;
-import com.cloud.tags.dao.ResourceTagDao;
-import com.cloud.user.Account;
-import com.cloud.user.AccountManager;
-import com.cloud.user.DomainManager;
-import com.cloud.uservm.UserVm;
-import com.cloud.utils.Pair;
-import com.cloud.utils.Ternary;
-import com.cloud.utils.component.ManagerBase;
-import com.cloud.utils.db.DB;
-import com.cloud.utils.db.Filter;
-import com.cloud.utils.db.JoinBuilder;
-import com.cloud.utils.db.SearchBuilder;
-import com.cloud.utils.db.SearchCriteria;
-import com.cloud.utils.db.SearchCriteria.Op;
-import com.cloud.utils.db.Transaction;
-import com.cloud.utils.exception.CloudRuntimeException;
-import com.cloud.utils.net.Ip;
-import com.cloud.vm.Nic;
-import com.cloud.vm.NicSecondaryIp;
-import com.cloud.vm.UserVmVO;
-import com.cloud.vm.VMInstanceVO;
-import com.cloud.vm.VirtualMachine;
-import com.cloud.vm.dao.NicDao;
-import com.cloud.vm.dao.NicSecondaryIpDao;
-import com.cloud.vm.dao.NicSecondaryIpVO;
-import com.cloud.vm.dao.UserVmDao;
-import com.cloud.vm.dao.VMInstanceDao;
-
-@Local(value = {RulesService.class})
-public class RulesApiServiceImpl extends ManagerBase implements RulesService {
- private static final Logger s_logger = Logger.getLogger(RulesApiServiceImpl.class);
-
- @Inject
- IpAddressManager _ipAddrMgr;
-
- @Inject
- PortForwardingRulesDao _portForwardingDao;
- @Inject
- FirewallRulesCidrsDao _firewallCidrsDao;
- @Inject
- FirewallRulesDao _firewallDao;
- @Inject
- IPAddressDao _ipAddressDao;
- @Inject
- UserVmDao _vmDao;
- @Inject
- VMInstanceDao _vmInstanceDao;
- @Inject
- AccountManager _accountMgr;
- @Inject
- NetworkOrchestrationService _networkMgr;
- @Inject
- NetworkModel _networkModel;
- @Inject
- EventDao _eventDao;
- @Inject
- UsageEventDao _usageEventDao;
- @Inject
- DomainDao _domainDao;
- @Inject
- FirewallManager _firewallMgr;
- @Inject
- DomainManager _domainMgr;
- @Inject
- ConfigurationManager _configMgr;
- @Inject
- NicDao _nicDao;
- @Inject
- ResourceTagDao _resourceTagDao;
- @Inject
- VpcManager _vpcMgr;
- @Inject
- NicSecondaryIpDao _nicSecondaryDao;
- @Inject
- LoadBalancerVMMapDao _loadBalancerVMMapDao;
- @Inject
- VpcService _vpcService;
-
- protected void checkIpAndUserVm(IpAddress ipAddress, UserVm userVm, Account caller, Boolean ignoreVmState) {
- if (ipAddress == null || ipAddress.getAllocatedTime() == null || ipAddress.getAllocatedToAccountId() == null) {
- throw new InvalidParameterValueException("Unable to create ip forwarding rule on address " + ipAddress + ", invalid IP address specified.");
- }
-
- if (userVm == null) {
- return;
- }
-
- if (userVm.getState() == VirtualMachine.State.Destroyed || userVm.getState() == VirtualMachine.State.Expunging) {
- if (!ignoreVmState) {
- throw new InvalidParameterValueException("Invalid user vm: " + userVm.getId());
- }
- }
-
- _accountMgr.checkAccess(caller, null, true, ipAddress, userVm);
-
- // validate that IP address and userVM belong to the same account
- if (ipAddress.getAllocatedToAccountId().longValue() != userVm.getAccountId()) {
- throw new InvalidParameterValueException("Unable to create ip forwarding rule, IP address " + ipAddress + " owner is not the same as owner of virtual machine " +
- userVm.toString());
- }
-
- // validate that userVM is in the same availability zone as the IP address
- if (ipAddress.getDataCenterId() != userVm.getDataCenterId()) {
- //make an exception for portable IP
- if (!ipAddress.isPortable()) {
- throw new InvalidParameterValueException("Unable to create ip forwarding rule, IP address " + ipAddress +
- " is not in the same availability zone as virtual machine " + userVm.toString());
- }
- }
-
- }
-
- public void checkRuleAndUserVm(FirewallRule rule, UserVm userVm, Account caller) {
- if (userVm == null || rule == null) {
- return;
- }
-
- _accountMgr.checkAccess(caller, null, true, rule, userVm);
-
- if (userVm.getState() == VirtualMachine.State.Destroyed || userVm.getState() == VirtualMachine.State.Expunging) {
- throw new InvalidParameterValueException("Invalid user vm: " + userVm.getId());
- }
-
- if (rule.getAccountId() != userVm.getAccountId()) {
- throw new InvalidParameterValueException("New rule " + rule + " and vm id=" + userVm.getId() + " belong to different accounts");
- }
- }
-
- @Override
- @DB
- @ActionEvent(eventType = EventTypes.EVENT_NET_RULE_ADD, eventDescription = "creating forwarding rule", create = true)
- public PortForwardingRule createPortForwardingRule(PortForwardingRule rule, Long vmId, Ip vmIp, boolean openFirewall) throws NetworkRuleConflictException {
- CallContext ctx = CallContext.current();
- Account caller = ctx.getCallingAccount();
-
- Long ipAddrId = rule.getSourceIpAddressId();
-
- IPAddressVO ipAddress = _ipAddressDao.findById(ipAddrId);
-
- // Validate ip address
- if (ipAddress == null) {
- throw new InvalidParameterValueException("Unable to create port forwarding rule; ip id=" + ipAddrId + " doesn't exist in the system");
- } else if (ipAddress.isOneToOneNat()) {
- throw new InvalidParameterValueException("Unable to create port forwarding rule; ip id=" + ipAddrId + " has static nat enabled");
- }
-
- Long networkId = rule.getNetworkId();
- Network network = _networkModel.getNetwork(networkId);
- //associate ip address to network (if needed)
- boolean performedIpAssoc = false;
- Nic guestNic;
- if (ipAddress.getAssociatedWithNetworkId() == null) {
- boolean assignToVpcNtwk = network.getVpcId() != null && ipAddress.getVpcId() != null && ipAddress.getVpcId().longValue() == network.getVpcId();
- if (assignToVpcNtwk) {
- _networkModel.checkIpForService(ipAddress, Service.PortForwarding, networkId);
-
- s_logger.debug("The ip is not associated with the VPC network id=" + networkId + ", so assigning");
- try {
- ipAddress = _ipAddrMgr.associateIPToGuestNetwork(ipAddrId, networkId, false);
- performedIpAssoc = true;
- } catch (Exception ex) {
- throw new CloudRuntimeException("Failed to associate ip to VPC network as " + "a part of port forwarding rule creation");
- }
- }
- } else {
- _networkModel.checkIpForService(ipAddress, Service.PortForwarding, null);
- }
-
- if (ipAddress.getAssociatedWithNetworkId() == null) {
- throw new InvalidParameterValueException("Ip address " + ipAddress + " is not assigned to the network " + network);
- }
-
- try {
- _firewallMgr.validateFirewallRule(caller, ipAddress, rule.getSourcePortStart(), rule.getSourcePortEnd(), rule.getProtocol(), Purpose.PortForwarding,
- FirewallRuleType.User, networkId, rule.getTrafficType());
-
- Long accountId = ipAddress.getAllocatedToAccountId();
- Long domainId = ipAddress.getAllocatedInDomainId();
-
- // start port can't be bigger than end port
- if (rule.getDestinationPortStart() > rule.getDestinationPortEnd()) {
- throw new InvalidParameterValueException("Start port can't be bigger than end port");
- }
-
- // check that the port ranges are of equal size
- if ((rule.getDestinationPortEnd() - rule.getDestinationPortStart()) != (rule.getSourcePortEnd() - rule.getSourcePortStart())) {
- throw new InvalidParameterValueException("Source port and destination port ranges should be of equal sizes.");
- }
-
- // validate user VM exists
- UserVm vm = _vmDao.findById(vmId);
- if (vm == null) {
- throw new InvalidParameterValueException("Unable to create port forwarding rule on address " + ipAddress + ", invalid virtual machine id specified (" + vmId + ").");
- } else {
- checkRuleAndUserVm(rule, vm, caller);
- }
-
- // Verify that vm has nic in the network
- Ip dstIp = rule.getDestinationIpAddress();
- guestNic = _networkModel.getNicInNetwork(vmId, networkId);
- if (guestNic == null || guestNic.getIp4Address() == null) {
- throw new InvalidParameterValueException("Vm doesn't belong to network associated with ipAddress");
- } else {
- dstIp = new Ip(guestNic.getIp4Address());
- }
-
- if (vmIp != null) {
- //vm ip is passed so it can be primary or secondary ip addreess.
- if (!dstIp.equals(vmIp)) {
- //the vm ip is secondary ip to the nic.
- // is vmIp is secondary ip or not
- NicSecondaryIp secondaryIp = _nicSecondaryDao.findByIp4AddressAndNicId(vmIp.toString(), guestNic.getId());
- if (secondaryIp == null) {
- throw new InvalidParameterValueException("IP Address is not in the VM nic's network ");
- }
- dstIp = vmIp;
- }
- }
-
- //if start port and end port are passed in, and they are not equal to each other, perform the validation
- boolean validatePortRange = false;
- if (rule.getSourcePortStart().intValue() != rule.getSourcePortEnd().intValue() || rule.getDestinationPortStart() != rule.getDestinationPortEnd()) {
- validatePortRange = true;
- }
-
- if (validatePortRange) {
- //source start port and source dest port should be the same. The same applies to dest ports
- if (rule.getSourcePortStart().intValue() != rule.getDestinationPortStart()) {
- throw new InvalidParameterValueException("Private port start should be equal to public port start");
- }
-
- if (rule.getSourcePortEnd().intValue() != rule.getDestinationPortEnd()) {
- throw new InvalidParameterValueException("Private port end should be equal to public port end");
- }
- }
-
- Transaction txn = Transaction.currentTxn();
- txn.start();
-
- PortForwardingRuleVO newRule = new PortForwardingRuleVO(rule.getXid(),
- rule.getSourceIpAddressId(),
- rule.getSourcePortStart(),
- rule.getSourcePortEnd(),
- dstIp,
- rule.getDestinationPortStart(),
- rule.getDestinationPortEnd(),
- rule.getProtocol().toLowerCase(),
- networkId,
- accountId,
- domainId,
- vmId);
- newRule = _portForwardingDao.persist(newRule);
-
- // create firewallRule for 0.0.0.0/0 cidr
- if (openFirewall) {
- _firewallMgr.createRuleForAllCidrs(ipAddrId, caller, rule.getSourcePortStart(), rule.getSourcePortEnd(), rule.getProtocol(), null, null, newRule.getId(), networkId);
- }
-
- try {
- _firewallMgr.detectRulesConflict(newRule);
- if (!_firewallDao.setStateToAdd(newRule)) {
- throw new CloudRuntimeException("Unable to update the state to add for " + newRule);
- }
- CallContext.current().setEventDetails("Rule Id: " + newRule.getId());
- UsageEventUtils.publishUsageEvent(EventTypes.EVENT_NET_RULE_ADD, newRule.getAccountId(), ipAddress.getDataCenterId(), newRule.getId(), null,
- PortForwardingRule.class.getName(), newRule.getUuid());
- txn.commit();
- return newRule;
- } catch (Exception e) {
- if (newRule != null) {
- txn.start();
- // no need to apply the rule as it wasn't programmed on the backend yet
- _firewallMgr.revokeRelatedFirewallRule(newRule.getId(), false);
- removePFRule(newRule);
- txn.commit();
- }
-
- if (e instanceof NetworkRuleConflictException) {
- throw (NetworkRuleConflictException)e;
- }
-
- throw new CloudRuntimeException("Unable to add rule for the ip id=" + ipAddrId, e);
- }
- } finally {
- // release ip address if ipassoc was perfored
- if (performedIpAssoc) {
- //if the rule is the last one for the ip address assigned to VPC, unassign it from the network
- IpAddress ip = _ipAddressDao.findById(ipAddress.getId());
- _vpcMgr.unassignIPFromVpcNetwork(ip.getId(), networkId);
- }
- }
- }
-
- @Override
- @DB
- @ActionEvent(eventType = EventTypes.EVENT_NET_RULE_ADD, eventDescription = "creating static nat rule", create = true)
- public StaticNatRule createStaticNatRule(StaticNatRule rule, boolean openFirewall) throws NetworkRuleConflictException {
- Account caller = CallContext.current().getCallingAccount();
-
- Long ipAddrId = rule.getSourceIpAddressId();
-
- IPAddressVO ipAddress = _ipAddressDao.findById(ipAddrId);
-
- // Validate ip address
- if (ipAddress == null) {
- throw new InvalidParameterValueException("Unable to create static nat rule; ip id=" + ipAddrId + " doesn't exist in the system");
- } else if (ipAddress.isSourceNat() || !ipAddress.isOneToOneNat() || ipAddress.getAssociatedWithVmId() == null) {
- throw new NetworkRuleConflictException("Can't do static nat on ip address: " + ipAddress.getAddress());
- }
-
- _firewallMgr.validateFirewallRule(caller, ipAddress, rule.getSourcePortStart(), rule.getSourcePortEnd(), rule.getProtocol(), Purpose.StaticNat, FirewallRuleType.User,
- null, rule.getTrafficType());
-
- Long networkId = ipAddress.getAssociatedWithNetworkId();
- Long accountId = ipAddress.getAllocatedToAccountId();
- Long domainId = ipAddress.getAllocatedInDomainId();
-
- _networkModel.checkIpForService(ipAddress, Service.StaticNat, null);
-
- Network network = _networkModel.getNetwork(networkId);
- NetworkOffering off = _configMgr.getNetworkOffering(network.getNetworkOfferingId());
- if (off.getElasticIp()) {
- throw new InvalidParameterValueException("Can't create ip forwarding rules for the network where elasticIP service is enabled");
- }
-
- //String dstIp = _networkModel.getIpInNetwork(ipAddress.getAssociatedWithVmId(), networkId);
- String dstIp = ipAddress.getVmIp();
- Transaction txn = Transaction.currentTxn();
- txn.start();
-
- FirewallRuleVO newRule = new FirewallRuleVO(rule.getXid(), rule.getSourceIpAddressId(), rule.getSourcePortStart(), rule.getSourcePortEnd(), rule.getProtocol()
- .toLowerCase(), networkId, accountId, domainId, rule.getPurpose(), null, null, null, null, null);
-
- newRule = _firewallDao.persist(newRule);
-
- // create firewallRule for 0.0.0.0/0 cidr
- if (openFirewall) {
- _firewallMgr.createRuleForAllCidrs(ipAddrId, caller, rule.getSourcePortStart(), rule.getSourcePortEnd(), rule.getProtocol(), null, null, newRule.getId(), networkId);
- }
-
- try {
- _firewallMgr.detectRulesConflict(newRule);
- if (!_firewallDao.setStateToAdd(newRule)) {
- throw new CloudRuntimeException("Unable to update the state to add for " + newRule);
- }
- CallContext.current().setEventDetails("Rule Id: " + newRule.getId());
- UsageEventUtils.publishUsageEvent(EventTypes.EVENT_NET_RULE_ADD, newRule.getAccountId(), 0, newRule.getId(), null, FirewallRule.class.getName(), newRule.getUuid());
-
- txn.commit();
- StaticNatRule staticNatRule = new StaticNatRuleImpl(newRule, dstIp);
-
- return staticNatRule;
- } catch (Exception e) {
-
- if (newRule != null) {
- txn.start();
- // no need to apply the rule as it wasn't programmed on the backend yet
- _firewallMgr.revokeRelatedFirewallRule(newRule.getId(), false);
- _firewallMgr.removeRule(newRule);
- txn.commit();
- }
-
- if (e instanceof NetworkRuleConflictException) {
- throw (NetworkRuleConflictException)e;
- }
- throw new CloudRuntimeException("Unable to add static nat rule for the ip id=" + newRule.getSourceIpAddressId(), e);
- }
- }
-
- @Override
- @ActionEvent(eventType = EventTypes.EVENT_ENABLE_STATIC_NAT, eventDescription = "enabling static nat")
- public boolean enableStaticNat(long ipId, long vmId, long networkId, String vmGuestIp) throws NetworkRuleConflictException, ResourceUnavailableException {
- return enableStaticNat(ipId, vmId, networkId, false, vmGuestIp);
- }
-
- private boolean enableStaticNat(long ipId, long vmId, long networkId, boolean isSystemVm, String vmGuestIp) throws NetworkRuleConflictException, ResourceUnavailableException {
- CallContext ctx = CallContext.current();
- Account caller = ctx.getCallingAccount();
- CallContext.current().setEventDetails("Ip Id: " + ipId);
-
- // Verify input parameters
- IPAddressVO ipAddress = _ipAddressDao.findById(ipId);
- if (ipAddress == null) {
- throw new InvalidParameterValueException("Unable to find ip address by id " + ipId);
- }
-
- // Verify input parameters
- boolean performedIpAssoc = false;
- boolean isOneToOneNat = ipAddress.isOneToOneNat();
- Long associatedWithVmId = ipAddress.getAssociatedWithVmId();
- Nic guestNic;
- NicSecondaryIpVO nicSecIp = null;
- String dstIp = null;
-
- try {
- Network network = _networkModel.getNetwork(networkId);
- if (network == null) {
- throw new InvalidParameterValueException("Unable to find network by id");
- }
-
- // Check that vm has a nic in the network
- guestNic = _networkModel.getNicInNetwork(vmId, networkId);
- if (guestNic == null) {
- throw new InvalidParameterValueException("Vm doesn't belong to the network with specified id");
- }
- dstIp = guestNic.getIp4Address();
-
- if (!_networkModel.areServicesSupportedInNetwork(network.getId(), Service.StaticNat)) {
- throw new InvalidParameterValueException("Unable to create static nat rule; StaticNat service is not " + "supported in network with specified id");
- }
-
- if (!isSystemVm) {
- UserVmVO vm = _vmDao.findById(vmId);
- if (vm == null) {
- throw new InvalidParameterValueException("Can't enable static nat for the address id=" + ipId + ", invalid virtual machine id specified (" + vmId + ").");
- }
- //associate ip address to network (if needed)
- if (ipAddress.getAssociatedWithNetworkId() == null) {
- boolean assignToVpcNtwk = network.getVpcId() != null && ipAddress.getVpcId() != null && ipAddress.getVpcId().longValue() == network.getVpcId();
- if (assignToVpcNtwk) {
- _networkModel.checkIpForService(ipAddress, Service.StaticNat, networkId);
-
- s_logger.debug("The ip is not associated with the VPC network id=" + networkId + ", so assigning");
- try {
- ipAddress = _ipAddrMgr.associateIPToGuestNetwork(ipId, networkId, false);
- } catch (Exception ex) {
- s_logger.warn("Failed to associate ip id=" + ipId + " to VPC network id=" + networkId + " as " + "a part of enable static nat");
- return false;
- }
- } else if (ipAddress.isPortable()) {
- s_logger.info("Portable IP " + ipAddress.getUuid() + " is not associated with the network yet " + " so associate IP with the network " + networkId);
- try {
- // check if StaticNat service is enabled in the network
- _networkModel.checkIpForService(ipAddress, Service.StaticNat, networkId);
-
- // associate portable IP to vpc, if network is part of VPC
- if (network.getVpcId() != null) {
- _vpcService.associateIPToVpc(ipId, network.getVpcId());
- }
-
- // associate portable IP with guest network
- ipAddress = _ipAddrMgr.associatePortableIPToGuestNetwork(ipId, networkId, false);
- } catch (Exception e) {
- s_logger.warn("Failed to associate portable id=" + ipId + " to network id=" + networkId + " as " + "a part of enable static nat");
- return false;
- }
- }
- } else if (ipAddress.getAssociatedWithNetworkId() != networkId) {
- if (ipAddress.isPortable()) {
- // check if destination network has StaticNat service enabled
- _networkModel.checkIpForService(ipAddress, Service.StaticNat, networkId);
-
- // check if portable IP can be transferred across the networks
- if (_ipAddrMgr.isPortableIpTransferableFromNetwork(ipId, ipAddress.getAssociatedWithNetworkId())) {
- try {
- // transfer the portable IP and refresh IP details
- _ipAddrMgr.transferPortableIP(ipId, ipAddress.getAssociatedWithNetworkId(), networkId);
- ipAddress = _ipAddressDao.findById(ipId);
- } catch (Exception e) {
- s_logger.warn("Failed to associate portable id=" + ipId + " to network id=" + networkId + " as " + "a part of enable static nat");
- return false;
- }
- } else {
- throw new InvalidParameterValueException("Portable IP: " + ipId + " has associated services " + "in network " + ipAddress.getAssociatedWithNetworkId() +
- " so can not be transferred to " + " network " + networkId);
- }
- } else {
- throw new InvalidParameterValueException("Invalid network Id=" + networkId + ". IP is associated with" + " a different network than passed network id");
- }
- } else {
- _networkModel.checkIpForService(ipAddress, Service.StaticNat, null);
- }
-
- if (ipAddress.getAssociatedWithNetworkId() == null) {
- throw new InvalidParameterValueException("Ip address " + ipAddress + " is not assigned to the network " + network);
- }
-
- // Check permissions
- if (ipAddress.getSystem()) {
- // when system is enabling static NAT on system IP's (for EIP) ignore VM state
- checkIpAndUserVm(ipAddress, vm, caller, true);
- } else {
- checkIpAndUserVm(ipAddress, vm, caller, false);
- }
-
- //is static nat is for vm secondary ip
- //dstIp = guestNic.getIp4Address();
- if (vmGuestIp != null) {
- //dstIp = guestNic.getIp4Address();
-
- if (!dstIp.equals(vmGuestIp)) {
- //check whether the secondary ip set to the vm or not
- boolean secondaryIpSet = _networkMgr.isSecondaryIpSetForNic(guestNic.getId());
- if (!secondaryIpSet) {
- throw new InvalidParameterValueException("VM ip " + vmGuestIp + " address not belongs to the vm");
- }
- //check the ip belongs to the vm or not
- nicSecIp = _nicSecondaryDao.findByIp4AddressAndNicId(vmGuestIp, guestNic.getId());
- if (nicSecIp == null) {
- throw new InvalidParameterValueException("VM ip " + vmGuestIp + " address not belongs to the vm");
- }
- dstIp = nicSecIp.getIp4Address();
- // Set public ip column with the vm ip
- }
- }
-
- // Verify ip address parameter
- // checking vm id is not sufficient, check for the vm ip
- isIpReadyForStaticNat(vmId, ipAddress, dstIp, caller, ctx.getCallingUserId());
- }
-
- ipAddress.setOneToOneNat(true);
- ipAddress.setAssociatedWithVmId(vmId);
-
- ipAddress.setVmIp(dstIp);
- if (_ipAddressDao.update(ipAddress.getId(), ipAddress)) {
- // enable static nat on the backend
- s_logger.trace("Enabling static nat for ip address " + ipAddress + " and vm id=" + vmId + " on the backend");
- if (applyStaticNatForIp(ipId, false, caller, false)) {
- performedIpAssoc = false; // ignor unassignIPFromVpcNetwork in finally block
- return true;
- } else {
- s_logger.warn("Failed to enable static nat rule for ip address " + ipId + " on the backend");
- ipAddress.setOneToOneNat(isOneToOneNat);
- ipAddress.setAssociatedWithVmId(associatedWithVmId);
- ipAddress.setVmIp(null);
- _ipAddressDao.update(ipAddress.getId(), ipAddress);
- }
- } else {
- s_logger.warn("Failed to update ip address " + ipAddress + " in the DB as a part of enableStaticNat");
-
- }
- } finally {
- if (performedIpAssoc) {
- //if the rule is the last one for the ip address assigned to VPC, unassign it from the network
- IpAddress ip = _ipAddressDao.findById(ipAddress.getId());
- _vpcMgr.unassignIPFromVpcNetwork(ip.getId(), networkId);
- }
- }
- return false;
- }
-
- protected void isIpReadyForStaticNat(long vmId, IPAddressVO ipAddress, String vmIp, Account caller, long callerUserId) throws NetworkRuleConflictException,
- ResourceUnavailableException {
- if (ipAddress.isSourceNat()) {
- throw new InvalidParameterValueException("Can't enable static, ip address " + ipAddress + " is a sourceNat ip address");
- }
-
- if (!ipAddress.isOneToOneNat()) { // Dont allow to enable static nat if PF/LB rules exist for the IP
- List<FirewallRuleVO> portForwardingRules = _firewallDao.listByIpAndPurposeAndNotRevoked(ipAddress.getId(), Purpose.PortForwarding);
- if (portForwardingRules != null && !portForwardingRules.isEmpty()) {
- throw new NetworkRuleConflictException("Failed to enable static nat for the ip address " + ipAddress + " as it already has PortForwarding rules assigned");
- }
-
- List<FirewallRuleVO> loadBalancingRules = _firewallDao.listByIpAndPurposeAndNotRevoked(ipAddress.getId(), Purpose.LoadBalancing);
- if (loadBalancingRules != null && !loadBalancingRules.isEmpty()) {
- throw new NetworkRuleConflictException("Failed to enable static nat for the ip address " + ipAddress + " as it already has LoadBalancing rules assigned");
- }
- } else if (ipAddress.getAssociatedWithVmId() != null && ipAddress.getAssociatedWithVmId().longValue() != vmId) {
- throw new NetworkRuleConflictException("Failed to enable static for the ip address " + ipAddress + " and vm id=" + vmId + " as it's already assigned to antoher vm");
- }
-
- //check wether the vm ip is alreday associated with any public ip address
- IPAddressVO oldIP = _ipAddressDao.findByAssociatedVmIdAndVmIp(vmId, vmIp);
-
- if (oldIP != null) {
- // If elasticIP functionality is supported in the network, we always have to disable static nat on the old
-// ip in order to re-enable it on the new one
- Long networkId = oldIP.getAssociatedWithNetworkId();
- boolean reassignStaticNat = false;
- if (networkId != null) {
- Network guestNetwork = _networkModel.getNetwork(networkId);
- NetworkOffering offering = _configMgr.getNetworkOffering(guestNetwork.getNetworkOfferingId());
- if (offering.getElasticIp()) {
- reassignStaticNat = true;
- }
- }
-
- // If there is public ip address already associated with the vm, throw an exception
- if (!reassignStaticNat) {
- throw new InvalidParameterValueException("Failed to enable static nat for the ip address id=" + ipAddress.getId() + " as vm id=" + vmId +
- " is already associated with ip id=" + oldIP.getId());
- }
- // unassign old static nat rule
- s_logger.debug("Disassociating static nat for ip " + oldIP);
- if (!disableStaticNat(oldIP.getId(), caller, callerUserId, true)) {
- throw new CloudRuntimeException("Failed to disable old static nat rule for vm id=" + vmId + " and ip " + oldIP);
- }
- }
- }
-
- @Override
- @ActionEvent(eventType = EventTypes.EVENT_NET_RULE_DELETE, eventDescription = "revoking forwarding rule", async = true)
- public boolean revokePortForwardingRule(long ruleId, boolean apply) {
- CallContext ctx = CallContext.current();
- Account caller = ctx.getCallingAccount();
-
- PortForwardingRuleVO rule = _portForwardingDao.findById(ruleId);
- if (rule == null) {
- throw new InvalidParameterValueException("Unable to find " + ruleId);
- }
-
- _accountMgr.checkAccess(caller, null, true, rule);
-
- if (!revokePortForwardingRuleInternal(ruleId, caller, ctx.getCallingUserId(), apply)) {
- throw new CloudRuntimeException("Failed to delete port forwarding rule");
- }
- return true;
- }
-
- private boolean revokePortForwardingRuleInternal(long ruleId, Account caller, long userId, boolean apply) {
- PortForwardingRuleVO rule = _portForwardingDao.findById(ruleId);
-
- _firewallMgr.revokeRule(rule, caller, userId, true);
-
- boolean success = false;
-
- if (apply) {
- success = applyPortForwardingRules(rule.getSourceIpAddressId(), true, caller);
- } else {
- success = true;
- }
-
- return success;
- }
-
- @Override
- @ActionEvent(eventType = EventTypes.EVENT_NET_RULE_DELETE, eventDescription = "revoking forwarding rule", async = true)
- public boolean revokeStaticNatRule(long ruleId, boolean apply) {
- CallContext ctx = CallContext.current();
- Account caller = ctx.getCallingAccount();
-
- FirewallRuleVO rule = _firewallDao.findById(ruleId);
- if (rule == null) {
- throw new InvalidParameterValueException("Unable to find " + ruleId);
- }
-
- _accountMgr.checkAccess(caller, null, true, rule);
-
- if (!revokeStaticNatRuleInternal(ruleId, caller, ctx.getCallingUserId(), apply)) {
- throw new CloudRuntimeException("Failed to revoke forwarding rule");
- }
- return true;
- }
-
- private boolean revokeStaticNatRuleInternal(long ruleId, Account caller, long userId, boolean apply) {
- FirewallRuleVO rule = _firewallDao.findById(ruleId);
-
- _firewallMgr.revokeRule(rule, caller, userId, true);
-
- boolean success = false;
-
- if (apply) {
- success = applyStaticNatRulesForIp(rule.getSourceIpAddressId(), true, caller, true);
- } else {
- success = true;
- }
-
- return success;
- }
-
- @Override
- public Pair<List<? extends PortForwardingRule>, Integer> listPortForwardingRules(ListPortForwardingRulesCmd cmd) {
- Long ipId = cmd.getIpAddressId();
- Long id = cmd.getId();
- Map<String, String> tags = cmd.getTags();
-
- Account caller = CallContext.current().getCallingAccount();
- List<Long> permittedAccounts = new ArrayList<Long>();
-
- if (ipId != null) {
- IPAddressVO ipAddressVO = _ipAddressDao.findById(ipId);
- if (ipAddressVO == null || !ipAddressVO.readyToUse()) {
- throw new InvalidParameterValueException("Ip address id=" + ipId + " not ready for port forwarding rules yet");
- }
- _accountMgr.checkAccess(caller, null, true, ipAddressVO);
- }
-
- Ternary<Long, Boolean, ListProjectResourcesCriteria> domainIdRecursiveListProject = new Ternary<Long, Boolean, ListProjectResourcesCriteria>(cmd.getDomainId(),
- cmd.isRecursive(),
- null);
- _accountMgr.buildACLSearchParameters(caller, id, cmd.getAccountName(), cmd.getProjectId(), permittedAccounts, domainIdRecursiveListProject, cmd.listAll(), false);
- Long domainId = domainIdRecursiveListProject.first();
- Boolean isRecursive = domainIdRecursiveListProject.second();
- ListProjectResourcesCriteria listProjectResourcesCriteria = domainIdRecursiveListProject.third();
-
- Filter filter = new Filter(PortForwardingRuleVO.class, "id", false, cmd.getStartIndex(), cmd.getPageSizeVal());
- SearchBuilder<PortForwardingRuleVO> sb = _portForwardingDao.createSearchBuilder();
- _accountMgr.buildACLSearchBuilder(sb, domainId, isRecursive, permittedAccounts, listProjectResourcesCriteria);
-
- sb.and("id", sb.entity().getId(), Op.EQ);
- sb.and("ip", sb.entity().getSourceIpAddressId(), Op.EQ);
- sb.and("purpose", sb.entity().getPurpose(), Op.EQ);
-
- if (tags != null && !tags.isEmpty()) {
- SearchBuilder<ResourceTagVO> tagSearch = _resourceTagDao.createSearchBuilder();
- for (int count = 0; count < tags.size(); count++) {
- tagSearch.or().op("key" + String.valueOf(count), tagSearch.entity().getKey(), SearchCriteria.Op.EQ);
- tagSearch.and("value" + String.valueOf(count), tagSearch.entity().getValue(), SearchCriteria.Op.EQ);
- tagSearch.cp();
- }
- tagSearch.and("resourceType", tagSearch.entity().getResourceType(), SearchCriteria.Op.EQ);
- sb.groupBy(sb.entity().getId());
- sb.join("tagSearch", tagSearch, sb.entity().getId(), tagSearch.entity().getResourceId(), JoinBuilder.JoinType.INNER);
- }
-
- SearchCriteria<PortForwardingRuleVO> sc = sb.create();
- _accountMgr.buildACLSearchCriteria(sc, domainId, isRecursive, permittedAccounts, listProjectResourcesCriteria);
-
- if (id != null) {
- sc.setParameters("id", id);
- }
-
- if (tags != null && !tags.isEmpty()) {
- int count = 0;
- sc.setJoinParameters("tagSearch", "resourceType", TaggedResourceType.PortForwardingRule.toString());
- for (String key : tags.keySet()) {
- sc.setJoinParameters("tagSearch", "key" + String.valueOf(count), key);
- sc.setJoinParameters("tagSearch", "value" + String.valueOf(count), tags.get(key));
- count++;
- }
- }
-
- if (ipId != null) {
- sc.setParameters("ip", ipId);
- }
-
- sc.setParameters("purpose", Purpose.PortForwarding);
-
- Pair<List<PortForwardingRuleVO>, Integer> result = _portForwardingDao.searchAndCount(sc, filter);
- return new Pair<List<? extends PortForwardingRule>, Integer>(result.first(), result.second());
- }
-
- protected boolean applyPortForwardingRules(long ipId, boolean continueOnError, Account caller) {
- List<PortForwardingRuleVO> rules = _portForwardingDao.listForApplication(ipId);
-
- if (rules.size() == 0) {
- s_logger.debug("There are no port forwarding rules to apply for ip id=" + ipId);
- return true;
- }
-
- if (caller != null) {
- _accountMgr.checkAccess(caller, null, true, rules.toArray(new PortForwardingRuleVO[rules.size()]));
- }
-
- try {
- if (!_firewallMgr.applyRules(rules, continueOnError, true)) {
- return false;
- }
- } catch (ResourceUnavailableException ex) {
- s_logger.warn("Failed to apply port forwarding rules for ip due to ", ex);
- return false;
- }
-
- return true;
- }
-
- protected boolean applyStaticNatRulesForIp(long sourceIpId, boolean continueOnError, Account caller, boolean forRevoke) {
- List<? extends FirewallRule> rules = _firewallDao.listByIpAndPurpose(sourceIpId, Purpose.StaticNat);
- List<StaticNatRule> staticNatRules = new ArrayList<StaticNatRule>();
-
- if (rules.size() == 0) {
- s_logger.debug("There are no static nat rules to apply for ip id=" + sourceIpId);
- return true;
- }
-
- for (FirewallRule rule : rules) {
- staticNatRules.add(buildStaticNatRule(rule, forRevoke));
- }
-
- if (caller != null) {
- _accountMgr.checkAccess(caller, null, true, staticNatRules.toArray(new StaticNatRule[staticNatRules.size()]));
- }
-
- try {
- if (!_firewallMgr.applyRules(staticNatRules, continueOnError, true)) {
- return false;
- }
- } catch (ResourceUnavailableException ex) {
- s_logger.warn("Failed to apply static nat rules for ip due to ", ex);
- return false;
- }
-
- return true;
- }
- @Override
- public Pair<List<? extends FirewallRule>, Integer> searchStaticNatRules(Long ipId, Long id, Long vmId, Long start, Long size, String accountName, Long domainId,
- Long projectId, boolean isRecursive, boolean listAll) {
- Account caller = CallContext.current().getCallingAccount();
- List<Long> permittedAccounts = new ArrayList<Long>();
-
- if (ipId != null) {
- IPAddressVO ipAddressVO = _ipAddressDao.findById(ipId);
- if (ipAddressVO == null || !ipAddressVO.readyToUse()) {
- throw new InvalidParameterValueException("Ip address id=" + ipId + " not ready for port forwarding rules yet");
- }
- _accountMgr.checkAccess(caller, null, true, ipAddressVO);
- }
-
- Ternary<Long, Boolean, ListProjectResourcesCriteria> domainIdRecursiveListProject = new Ternary<Long, Boolean, ListProjectResourcesCriteria>(domainId, isRecursive, null);
- _accountMgr.buildACLSearchParameters(caller, id, accountName, projectId, permittedAccounts, domainIdRecursiveListProject, listAll, false);
- domainId = domainIdRecursiveListProject.first();
- isRecursive = domainIdRecursiveListProject.second();
- ListProjectResourcesCriteria listProjectResourcesCriteria = domainIdRecursiveListProject.third();
-
- Filter filter = new Filter(PortForwardingRuleVO.class, "id", false, start, size);
- SearchBuilder<FirewallRuleVO> sb = _firewallDao.createSearchBuilder();
- _accountMgr.buildACLSearchBuilder(sb, domainId, isRecursive, permittedAccounts, listProjectResourcesCriteria);
-
- sb.and("ip", sb.entity().getSourceIpAddressId(), Op.EQ);
- sb.and("purpose", sb.entity().getPurpose(), Op.EQ);
- sb.and("id", sb.entity().getId(), Op.EQ);
-
- if (vmId != null) {
- SearchBuilder<IPAddressVO> ipSearch = _ipAddressDao.createSearchBuilder();
- ipSearch.and("associatedWithVmId", ipSearch.entity().getAssociatedWithVmId(), Op.EQ);
- sb.join("ipSearch", ipSearch, sb.entity().getSourceIpAddressId(), ipSearch.entity().getId(), JoinBuilder.JoinType.INNER);
- }
-
- SearchCriteria<FirewallRuleVO> sc = sb.create();
- _accountMgr.buildACLSearchCriteria(sc, domainId, isRecursive, permittedAccounts, listProjectResourcesCriteria);
- sc.setParameters("purpose", Purpose.StaticNat);
-
- if (id != null) {
- sc.setParameters("id", id);
- }
-
- if (ipId != null) {
- sc.setParameters("ip", ipId);
- }
-
- if (vmId != null) {
- sc.setJoinParameters("ipSearch", "associatedWithVmId", vmId);
- }
-
- Pair<List<FirewallRuleVO>, Integer> result = _firewallDao.searchAndCount(sc, filter);
- return new Pair<List<? extends FirewallRule>, Integer>(result.first(), result.second());
- }
-
- @Override
- @ActionEvent(eventType = EventTypes.EVENT_NET_RULE_ADD, eventDescription = "applying port forwarding rule", async = true)
- public boolean applyPortForwardingRules(long ipId, Account caller) throws ResourceUnavailableException {
- if (!applyPortForwardingRules(ipId, false, caller)) {
- throw new CloudRuntimeException("Failed to apply port forwarding rule");
- }
- return true;
- }
-
- @Override
- @ActionEvent(eventType = EventTypes.EVENT_NET_RULE_ADD, eventDescription = "applying static nat rule", async = true)
- public boolean applyStaticNatRules(long ipId, Account caller) throws ResourceUnavailableException {
- if (!applyStaticNatRulesForIp(ipId, false, caller, false)) {
- throw new CloudRuntimeException("Failed to apply static nat rule");
- }
- return true;
- }
- @Override
- @ActionEvent(eventType = EventTypes.EVENT_DISABLE_STATIC_NAT, eventDescription = "disabling static nat", async = true)
- public boolean disableStaticNat(long ipId) throws ResourceUnavailableException, NetworkRuleConflictException, InsufficientAddressCapacityException {
- CallContext ctx = CallContext.current();
- Account caller = ctx.getCallingAccount();
- IPAddressVO ipAddress = _ipAddressDao.findById(ipId);
- checkIpAndUserVm(ipAddress, null, caller, false);
-
- if (ipAddress.getSystem()) {
- InvalidParameterValueException ex = new InvalidParameterValueException("Can't disable static nat for system IP address with specified id");
- ex.addProxyObject(ipAddress.getUuid(), "ipId");
- throw ex;
- }
-
- Long vmId = ipAddress.getAssociatedWithVmId();
- if (vmId == null) {
- InvalidParameterValueException ex = new InvalidParameterValueException("Specified IP address id is not associated with any vm Id");
- ex.addProxyObject(ipAddress.getUuid(), "ipId");
- throw ex;
- }
-
- // if network has elastic IP functionality supported, we first have to disable static nat on old ip in order to
- // re-enable it on the new one enable static nat takes care of that
- Network guestNetwork = _networkModel.getNetwork(ipAddress.getAssociatedWithNetworkId());
- NetworkOffering offering = _configMgr.getNetworkOffering(guestNetwork.getNetworkOfferingId());
- if (offering.getElasticIp()) {
- if (offering.getAssociatePublicIP()) {
- getSystemIpAndEnableStaticNatForVm(_vmDao.findById(vmId), true);
- return true;
- }
- }
-
- return disableStaticNat(ipId, caller, ctx.getCallingUserId(), false);
- }
-
- @Override
- public StaticNatRule buildStaticNatRule(FirewallRule rule, boolean forRevoke) {
- IpAddress ip = _ipAddressDao.findById(rule.getSourceIpAddressId());
- FirewallRuleVO ruleVO = _firewallDao.findById(rule.getId());
-
- if (ip == null || !ip.isOneToOneNat() || ip.getAssociatedWithVmId() == null) {
- InvalidParameterValueException ex = new InvalidParameterValueException("Source ip address of the specified firewall rule id is not static nat enabled");
- ex.addProxyObject(ruleVO.getUuid(), "ruleId");
- throw ex;
- }
-
- String dstIp = ip.getVmIp();
- if (dstIp == null) {
- InvalidParameterValueException ex = new InvalidParameterValueException("VM ip address of the specified public ip is not set ");
- ex.addProxyObject(ruleVO.getUuid(), "ruleId");
- throw ex;
- }
-
- return new StaticNatRuleImpl(ruleVO, dstIp);
- }
-
- protected boolean applyStaticNatForIp(long sourceIpId, boolean continueOnError, Account caller, boolean forRevoke) {
- IpAddress sourceIp = _ipAddressDao.findById(sourceIpId);
-
- List<StaticNat> staticNats = createStaticNatForIp(sourceIp, caller, forRevoke);
-
- if (staticNats != null && !staticNats.isEmpty()) {
- try {
- if (!_ipAddrMgr.applyStaticNats(staticNats, continueOnError, forRevoke)) {
- return false;
- }
- } catch (ResourceUnavailableException ex) {
- s_logger.warn("Failed to create static nat rule due to ", ex);
- return false;
- }
- }
-
- return true;
- }
-
- protected List<StaticNat> createStaticNatForIp(IpAddress sourceIp, Account caller, boolean forRevoke) {
- List<StaticNat> staticNats = new ArrayList<StaticNat>();
- if (!sourceIp.isOneToOneNat()) {
- s_logger.debug("Source ip id=" + sourceIp + " is not one to one nat");
- return staticNats;
- }
-
- Long networkId = sourceIp.getAssociatedWithNetworkId();
- if (networkId == null) {
- throw new CloudRuntimeException("Ip address is not associated with any network");
- }
-
- VMInstanceVO vm = _vmInstanceDao.findById(sourceIp.getAssociatedWithVmId());
- Network network = _networkModel.getNetwork(networkId);
- if (network == null) {
- CloudRuntimeException ex = new CloudRuntimeException("Unable to find an ip address to map to specified vm id");
- ex.addProxyObject(vm.getUuid(), "vmId");
- throw ex;
- }
-
- if (caller != null) {
- _accountMgr.checkAccess(caller, null, true, sourceIp);
- }
-
- // create new static nat rule
- // Get nic IP4 address
- Nic guestNic = _networkModel.getNicInNetworkIncludingRemoved(vm.getId(), networkId);
- if (guestNic == null) {
- throw new InvalidParameterValueException("Vm doesn't belong to the network with specified id");
- }
-
- String dstIp;
-
- dstIp = sourceIp.getVmIp();
- if (dstIp == null) {
- throw new InvalidParameterValueException("Vm ip is not set as dnat ip for this public ip");
- }
-
- StaticNatImpl staticNat = new StaticNatImpl(sourceIp.getAllocatedToAccountId(), sourceIp.getAllocatedInDomainId(), networkId, sourceIp.getId(), dstIp, forRevoke);
- staticNats.add(staticNat);
- return staticNats;
- }
-
- protected void removePFRule(PortForwardingRuleVO rule) {
- _portForwardingDao.remove(rule.getId());
- }
-
-}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/06493d5b/utils/src/com/cloud/utils/component/ConfigInjector.java
----------------------------------------------------------------------
diff --git a/utils/src/com/cloud/utils/component/ConfigInjector.java b/utils/src/com/cloud/utils/component/ConfigInjector.java
deleted file mode 100644
index b1c6531..0000000
--- a/utils/src/com/cloud/utils/component/ConfigInjector.java
+++ /dev/null
@@ -1,27 +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.utils.component;
-
-import java.lang.reflect.Field;
-
-/**
- * This interface can be implemented by someone who knows how to inject configurations.
- *
- */
-public interface ConfigInjector {
- void inject(Field field, Object obj, String key);
-}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/06493d5b/utils/src/com/cloud/utils/component/InjectConfig.java
----------------------------------------------------------------------
diff --git a/utils/src/com/cloud/utils/component/InjectConfig.java b/utils/src/com/cloud/utils/component/InjectConfig.java
deleted file mode 100644
index b4afd7a..0000000
--- a/utils/src/com/cloud/utils/component/InjectConfig.java
+++ /dev/null
@@ -1,29 +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.utils.component;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-@Target({FIELD})
-@Retention(RUNTIME)
-public @interface InjectConfig {
- String key();
-}