You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ch...@apache.org on 2013/01/08 00:22:53 UTC
[5/7] git commit: Clean up some unused imports
Clean up some unused imports
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/c876f02c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/c876f02c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/c876f02c
Branch: refs/heads/network-refactor
Commit: c876f02c6f5368d210879a90a0ac8fc1b798f5d9
Parents: cf90685
Author: Chiradeep Vittal <ch...@apache.org>
Authored: Mon Jan 7 13:32:45 2013 -0800
Committer: Chiradeep Vittal <ch...@apache.org>
Committed: Mon Jan 7 15:21:36 2013 -0800
----------------------------------------------------------------------
.../src/com/cloud/network/NetworkManagerImpl.java | 4 ----
.../network/element/VpcVirtualRouterElement.java | 7 ++-----
.../src/com/cloud/network/vpc/VpcManagerImpl.java | 7 +++++--
3 files changed, 7 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c876f02c/server/src/com/cloud/network/NetworkManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java
index 592613e..d17b9a6 100755
--- a/server/src/com/cloud/network/NetworkManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkManagerImpl.java
@@ -118,12 +118,9 @@ import com.cloud.network.dao.PhysicalNetworkServiceProviderVO;
import com.cloud.network.dao.PhysicalNetworkTrafficTypeDao;
import com.cloud.network.dao.PhysicalNetworkTrafficTypeVO;
import com.cloud.network.element.DhcpServiceProvider;
-import com.cloud.network.element.FirewallServiceProvider;
import com.cloud.network.element.IpDeployer;
import com.cloud.network.element.LoadBalancingServiceProvider;
-import com.cloud.network.element.NetworkACLServiceProvider;
import com.cloud.network.element.NetworkElement;
-import com.cloud.network.element.PortForwardingServiceProvider;
import com.cloud.network.element.StaticNatServiceProvider;
import com.cloud.network.element.UserDataServiceProvider;
import com.cloud.network.guru.NetworkGuru;
@@ -135,7 +132,6 @@ import com.cloud.network.rules.FirewallManager;
import com.cloud.network.rules.FirewallRule;
import com.cloud.network.rules.FirewallRule.Purpose;
import com.cloud.network.rules.FirewallRuleVO;
-import com.cloud.network.rules.PortForwardingRule;
import com.cloud.network.rules.PortForwardingRuleVO;
import com.cloud.network.rules.RulesManager;
import com.cloud.network.rules.StaticNat;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c876f02c/server/src/com/cloud/network/element/VpcVirtualRouterElement.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/element/VpcVirtualRouterElement.java b/server/src/com/cloud/network/element/VpcVirtualRouterElement.java
index 71da967..ab748b2 100644
--- a/server/src/com/cloud/network/element/VpcVirtualRouterElement.java
+++ b/server/src/com/cloud/network/element/VpcVirtualRouterElement.java
@@ -36,7 +36,6 @@ import com.cloud.network.Network;
import com.cloud.network.Network.Capability;
import com.cloud.network.Network.Provider;
import com.cloud.network.Network.Service;
-import com.cloud.network.NetworkService;
import com.cloud.network.PublicIpAddress;
import com.cloud.network.Site2SiteVpnConnection;
import com.cloud.network.Site2SiteVpnGateway;
@@ -64,8 +63,6 @@ import com.cloud.vm.VirtualMachineProfile;
@Local(value = {NetworkElement.class, Site2SiteVpnServiceProvider.class})
public class VpcVirtualRouterElement extends VirtualRouterElement implements VpcProvider, Site2SiteVpnServiceProvider, NetworkACLServiceProvider{
private static final Logger s_logger = Logger.getLogger(VpcVirtualRouterElement.class);
- @Inject
- NetworkService _ntwkService;
@Inject
VpcManager _vpcMgr;
@Inject
@@ -234,7 +231,7 @@ public class VpcVirtualRouterElement extends VirtualRouterElement implements Vpc
List<? extends VirtualRouter> routers = _routerDao.listByVpcId(vpcId);
for (VirtualRouter router : routers) {
//1) Check if router is already a part of the network
- if (!_ntwkService.isVmPartOfNetwork(router.getId(), network.getId())) {
+ if (!_networkMgr.isVmPartOfNetwork(router.getId(), network.getId())) {
s_logger.debug("Router " + router + " is not a part the network " + network);
continue;
}
@@ -262,7 +259,7 @@ public class VpcVirtualRouterElement extends VirtualRouterElement implements Vpc
List<? extends VirtualRouter> routers = _routerDao.listByVpcId(vpcId);
for (VirtualRouter router : routers) {
//1) Check if router is already a part of the network
- if (!_ntwkService.isVmPartOfNetwork(router.getId(), config.getId())) {
+ if (!_networkMgr.isVmPartOfNetwork(router.getId(), config.getId())) {
s_logger.debug("Router " + router + " is not a part the network " + config);
continue;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c876f02c/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 dbaecbb..f974d4f 100644
--- a/server/src/com/cloud/network/vpc/VpcManagerImpl.java
+++ b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
@@ -62,6 +62,7 @@ import com.cloud.network.Network.GuestType;
import com.cloud.network.Network.Provider;
import com.cloud.network.Network.Service;
import com.cloud.network.NetworkManager;
+import com.cloud.network.NetworkService;
import com.cloud.network.NetworkVO;
import com.cloud.network.Networks.BroadcastDomainType;
import com.cloud.network.Networks.TrafficType;
@@ -137,6 +138,8 @@ public class VpcManagerImpl implements VpcManager, Manager{
@Inject
NetworkManager _ntwkMgr;
@Inject
+ NetworkService _ntwkSvc;
+ @Inject
IPAddressDao _ipAddressDao;
@Inject
DomainRouterDao _routerDao;
@@ -1255,7 +1258,7 @@ public class VpcManagerImpl implements VpcManager, Manager{
s_logger.debug("Creating Private gateway for VPC " + vpc);
//1) create private network
String networkName = "vpc-" + vpc.getName() + "-privateNetwork";
- Network privateNtwk = _ntwkMgr.createPrivateNetwork(networkName, networkName, physicalNetworkId,
+ Network privateNtwk = _ntwkSvc.createPrivateNetwork(networkName, networkName, physicalNetworkId,
vlan, ipAddress, null, gateway, netmask, gatewayOwnerId, vpcId);
//2) create gateway entry
@@ -1953,7 +1956,7 @@ public class VpcManagerImpl implements VpcManager, Manager{
validateNtkwOffForVpc(ntwkOffId, null, null, null, vpc, networkId, null);
}
- return _ntwkMgr.updateGuestNetwork(networkId, name, displayText, callerAccount, callerUser, domainSuffix,
+ return _ntwkSvc.updateGuestNetwork(networkId, name, displayText, callerAccount, callerUser, domainSuffix,
ntwkOffId, changeCidr);
}