Skip to content

Commit 8e5249d

Browse files
author
Alex Huang
committed
Moved NetworkManager to NetworkOrchestrationService
1 parent bf83efc commit 8e5249d

52 files changed

Lines changed: 147 additions & 149 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

engine/api/src/com/cloud/network/NetworkManager.java renamed to engine/api/src/org/apache/cloudstack/engine/orchestration/service/NetworkOrchestrationService.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
// KIND, either express or implied. See the License for the
1515
// specific language governing permissions and limitations
1616
// under the License.
17-
package com.cloud.network;
17+
package org.apache.cloudstack.engine.orchestration.service;
1818

1919
import java.util.LinkedHashMap;
2020
import java.util.List;
@@ -31,6 +31,9 @@
3131
import com.cloud.exception.InsufficientVirtualNetworkCapcityException;
3232
import com.cloud.exception.ResourceAllocationException;
3333
import com.cloud.exception.ResourceUnavailableException;
34+
import com.cloud.network.Network;
35+
import com.cloud.network.NetworkProfile;
36+
import com.cloud.network.PhysicalNetwork;
3437
import com.cloud.network.Network.Provider;
3538
import com.cloud.network.Network.Service;
3639
import com.cloud.network.element.DhcpServiceProvider;
@@ -54,7 +57,7 @@
5457
* NetworkManager manages the network for the different end users.
5558
*
5659
*/
57-
public interface NetworkManager {
60+
public interface NetworkOrchestrationService {
5861

5962
List<? extends Network> setupNetwork(Account owner, NetworkOffering offering, DeploymentPlan plan, String name, String displayText, boolean isDefault)
6063
throws ConcurrentOperationException;

‎engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939

4040
import org.apache.cloudstack.affinity.dao.AffinityGroupVMMapDao;
4141
import org.apache.cloudstack.context.CallContext;
42+
import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
4243
import org.apache.cloudstack.engine.orchestration.service.VolumeOrchestrationService;
4344
import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager;
4445
import org.apache.cloudstack.engine.subsystem.api.storage.StoragePoolAllocator;
@@ -127,7 +128,6 @@
127128
import com.cloud.hypervisor.HypervisorGuru;
128129
import com.cloud.hypervisor.HypervisorGuruManager;
129130
import com.cloud.network.Network;
130-
import com.cloud.network.NetworkManager;
131131
import com.cloud.network.NetworkModel;
132132
import com.cloud.network.dao.IPAddressDao;
133133
import com.cloud.network.dao.NetworkDao;
@@ -196,7 +196,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
196196
@Inject
197197
DataStoreManager dataStoreMgr;
198198
@Inject
199-
protected NetworkManager _networkMgr;
199+
protected NetworkOrchestrationService _networkMgr;
200200
@Inject
201201
protected NetworkModel _networkModel;
202202
@Inject

‎engine/orchestration/test/com/cloud/vm/VirtualMachineManagerImplTest.java‎

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import java.util.List;
3131
import java.util.Map;
3232

33+
import org.apache.log4j.lf5.viewer.configure.ConfigurationManager;
3334
import org.junit.Before;
3435
import org.junit.Test;
3536
import org.mockito.Mock;
@@ -38,30 +39,13 @@
3839
import org.mockito.Spy;
3940

4041
import org.apache.cloudstack.api.command.user.vm.RestoreVMCmd;
42+
import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
4143
import org.apache.cloudstack.engine.orchestration.service.VolumeOrchestrationService;
4244
import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
4345
import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
4446
import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
4547

46-
import com.cloud.agent.AgentManager;
4748
import com.cloud.agent.api.Answer;
48-
import com.cloud.agent.api.CheckVirtualMachineAnswer;
49-
import com.cloud.agent.api.CheckVirtualMachineCommand;
50-
import com.cloud.agent.api.MigrateWithStorageAnswer;
51-
import com.cloud.agent.api.MigrateWithStorageCommand;
52-
import com.cloud.agent.api.MigrateWithStorageCompleteAnswer;
53-
import com.cloud.agent.api.MigrateWithStorageCompleteCommand;
54-
import com.cloud.agent.api.MigrateWithStorageReceiveAnswer;
55-
import com.cloud.agent.api.MigrateWithStorageReceiveCommand;
56-
import com.cloud.agent.api.MigrateWithStorageSendAnswer;
57-
import com.cloud.agent.api.MigrateWithStorageSendCommand;
58-
import com.cloud.agent.api.PrepareForMigrationAnswer;
59-
import com.cloud.agent.api.PrepareForMigrationCommand;
60-
import com.cloud.agent.api.ScaleVmAnswer;
61-
import com.cloud.agent.api.ScaleVmCommand;
62-
import com.cloud.capacity.CapacityManager;
63-
import com.cloud.configuration.Config;
64-
import com.cloud.configuration.ConfigurationManager;
6549
import com.cloud.dc.dao.ClusterDao;
6650
import com.cloud.dc.dao.DataCenterDao;
6751
import com.cloud.dc.dao.HostPodDao;
@@ -76,10 +60,7 @@
7660
import com.cloud.host.dao.HostDao;
7761
import com.cloud.hypervisor.Hypervisor.HypervisorType;
7862
import com.cloud.hypervisor.HypervisorGuru;
79-
import com.cloud.hypervisor.HypervisorGuruManager;
80-
import com.cloud.network.NetworkManager;
8163
import com.cloud.offering.ServiceOffering;
82-
import com.cloud.server.ConfigurationServer;
8364
import com.cloud.service.ServiceOfferingVO;
8465
import com.cloud.storage.DiskOfferingVO;
8566
import com.cloud.storage.StoragePool;
@@ -92,7 +73,6 @@
9273
import com.cloud.storage.dao.VMTemplateDao;
9374
import com.cloud.storage.dao.VolumeDao;
9475
import com.cloud.user.Account;
95-
import com.cloud.user.AccountManager;
9676
import com.cloud.user.AccountVO;
9777
import com.cloud.user.UserVO;
9878
import com.cloud.user.dao.AccountDao;
@@ -105,7 +85,6 @@
10585
import com.cloud.vm.dao.UserVmDao;
10686
import com.cloud.vm.dao.UserVmDetailsDao;
10787
import com.cloud.vm.dao.VMInstanceDao;
108-
import com.cloud.vm.snapshot.VMSnapshotManager;
10988

11089
public class VirtualMachineManagerImplTest {
11190

@@ -183,7 +162,7 @@ public class VirtualMachineManagerImplTest {
183162
@Mock
184163
StoragePoolHostDao _poolHostDao;
185164
@Mock
186-
NetworkManager _networkMgr;
165+
NetworkOrchestrationService _networkMgr;
187166
@Mock
188167
HypervisorGuruManager _hvGuruMgr;
189168
@Mock

‎plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetaNetworkGuru.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import org.apache.log4j.Logger;
2525

2626
import org.apache.cloudstack.api.ApiConstants;
27+
import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
2728

2829
import com.cloud.dc.DataCenter;
2930
import com.cloud.dc.Pod;
@@ -42,7 +43,6 @@
4243
import com.cloud.hypervisor.Hypervisor.HypervisorType;
4344
import com.cloud.network.IpAddressManager;
4445
import com.cloud.network.Network;
45-
import com.cloud.network.NetworkManager;
4646
import com.cloud.network.Networks.AddressFormat;
4747
import com.cloud.network.Networks.BroadcastDomainType;
4848
import com.cloud.network.Networks.IsolationType;
@@ -67,7 +67,7 @@ public class BaremetaNetworkGuru extends DirectPodBasedNetworkGuru {
6767
@Inject
6868
VlanDao _vlanDao;
6969
@Inject
70-
NetworkManager _networkMgr;
70+
NetworkOrchestrationService _networkMgr;
7171
@Inject
7272
IPAddressDao _ipAddressDao;
7373
@Inject

‎plugins/network-elements/cisco-vnmc/src/com/cloud/network/element/CiscoVnmcElement.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import org.apache.log4j.Logger;
3232

3333
import org.apache.cloudstack.context.CallContext;
34+
import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
3435
import org.apache.cloudstack.network.ExternalNetworkDeviceManager.NetworkDevice;
3536

3637
import com.cloud.agent.AgentManager;
@@ -86,7 +87,6 @@
8687
import com.cloud.network.Network.Capability;
8788
import com.cloud.network.Network.Provider;
8889
import com.cloud.network.Network.Service;
89-
import com.cloud.network.NetworkManager;
9090
import com.cloud.network.NetworkModel;
9191
import com.cloud.network.Networks.BroadcastDomainType;
9292
import com.cloud.network.PhysicalNetworkServiceProvider;
@@ -146,7 +146,7 @@ public class CiscoVnmcElement extends AdapterBase implements SourceNatServicePro
146146
@Inject
147147
ConfigurationManager _configMgr;
148148
@Inject
149-
NetworkManager _networkMgr;
149+
NetworkOrchestrationService _networkMgr;
150150
@Inject
151151
NetworkModel _networkModel;
152152
@Inject

‎plugins/network-elements/cisco-vnmc/test/com/cloud/network/element/CiscoVnmcElementTest.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@
3333
import org.junit.Before;
3434
import org.junit.Test;
3535

36+
import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
37+
3638
import com.cloud.agent.AgentManager;
3739
import com.cloud.agent.api.Answer;
3840
import com.cloud.agent.api.AssociateAsaWithLogicalEdgeFirewallCommand;
@@ -64,7 +66,6 @@
6466
import com.cloud.network.Network.GuestType;
6567
import com.cloud.network.Network.Provider;
6668
import com.cloud.network.Network.Service;
67-
import com.cloud.network.NetworkManager;
6869
import com.cloud.network.NetworkModel;
6970
import com.cloud.network.Networks.BroadcastDomainType;
7071
import com.cloud.network.Networks.TrafficType;
@@ -91,7 +92,7 @@ public class CiscoVnmcElementTest {
9192

9293
CiscoVnmcElement _element = new CiscoVnmcElement();
9394
AgentManager _agentMgr = mock(AgentManager.class);
94-
NetworkManager _networkMgr = mock(NetworkManager.class);
95+
NetworkOrchestrationService _networkMgr = mock(NetworkOrchestrationService.class);
9596
NetworkModel _networkModel = mock(NetworkModel.class);
9697
HostDao _hostDao = mock(HostDao.class);
9798
NetworkServiceMapDao _ntwkSrvcDao = mock(NetworkServiceMapDao.class);

‎plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939

4040
import org.apache.cloudstack.api.command.user.loadbalancer.CreateLoadBalancerRuleCmd;
4141
import org.apache.cloudstack.context.CallContext;
42+
import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
4243
import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
4344

4445
import com.cloud.agent.AgentManager;
@@ -79,7 +80,6 @@
7980
import com.cloud.network.Network;
8081
import com.cloud.network.Network.Provider;
8182
import com.cloud.network.Network.Service;
82-
import com.cloud.network.NetworkManager;
8383
import com.cloud.network.NetworkModel;
8484
import com.cloud.network.Networks.TrafficType;
8585
import com.cloud.network.PhysicalNetworkServiceProvider;
@@ -149,7 +149,7 @@ public class ElasticLoadBalancerManagerImpl extends ManagerBase implements Elast
149149
@Inject
150150
NetworkModel _networkModel;
151151
@Inject
152-
NetworkManager _networkMgr;
152+
NetworkOrchestrationService _networkMgr;
153153
@Inject
154154
LoadBalancerDao _loadBalancerDao = null;
155155
@Inject

‎plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManagerImpl.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import org.apache.log4j.Logger;
3030
import org.springframework.stereotype.Component;
3131

32+
import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
3233
import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
3334
import org.apache.cloudstack.lb.ApplicationLoadBalancerRuleVO;
3435
import org.apache.cloudstack.lb.dao.ApplicationLoadBalancerRuleDao;
@@ -65,7 +66,6 @@
6566
import com.cloud.network.Network;
6667
import com.cloud.network.Network.Provider;
6768
import com.cloud.network.Network.Service;
68-
import com.cloud.network.NetworkManager;
6969
import com.cloud.network.NetworkModel;
7070
import com.cloud.network.Networks.TrafficType;
7171
import com.cloud.network.PhysicalNetworkServiceProvider;
@@ -144,7 +144,7 @@ public class InternalLoadBalancerVMManagerImpl extends ManagerBase implements
144144
@Inject NicDao _nicDao;
145145
@Inject AccountManager _accountMgr;
146146
@Inject NetworkDao _networkDao;
147-
@Inject NetworkManager _ntwkMgr;
147+
@Inject NetworkOrchestrationService _ntwkMgr;
148148
@Inject ServiceOfferingDao _serviceOfferingDao;
149149
@Inject PhysicalNetworkServiceProviderDao _physicalProviderDao;
150150
@Inject NetworkOfferingDao _networkOfferingDao;

‎plugins/network-elements/internal-loadbalancer/test/org/apache/cloudstack/internallbelement/ElementChildTestConfiguration.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@
2828
import org.springframework.core.type.classreading.MetadataReaderFactory;
2929
import org.springframework.core.type.filter.TypeFilter;
3030

31+
import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
3132
import org.apache.cloudstack.lb.dao.ApplicationLoadBalancerRuleDao;
3233
import org.apache.cloudstack.network.lb.InternalLoadBalancerVMManager;
3334
import org.apache.cloudstack.test.utils.SpringUtils;
3435

3536
import com.cloud.configuration.ConfigurationManager;
3637
import com.cloud.dc.dao.DataCenterDao;
3738
import com.cloud.network.IpAddressManager;
38-
import com.cloud.network.NetworkManager;
3939
import com.cloud.network.NetworkModel;
4040
import com.cloud.network.dao.NetworkServiceMapDao;
4141
import com.cloud.network.dao.PhysicalNetworkServiceProviderDao;
@@ -79,8 +79,8 @@ public NetworkModel networkModel() {
7979

8080

8181
@Bean
82-
public NetworkManager networkManager() {
83-
return Mockito.mock(NetworkManager.class);
82+
public NetworkOrchestrationService networkManager() {
83+
return Mockito.mock(NetworkOrchestrationService.class);
8484
}
8585

8686
@Bean

‎plugins/network-elements/internal-loadbalancer/test/org/apache/cloudstack/internallbvmmgr/LbChildTestConfiguration.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@
2828
import org.springframework.core.type.classreading.MetadataReaderFactory;
2929
import org.springframework.core.type.filter.TypeFilter;
3030

31+
import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
3132
import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
3233
import org.apache.cloudstack.lb.dao.ApplicationLoadBalancerRuleDao;
3334
import org.apache.cloudstack.test.utils.SpringUtils;
3435

3536
import com.cloud.agent.AgentManager;
3637
import com.cloud.dc.dao.DataCenterDao;
3738
import com.cloud.network.IpAddressManager;
38-
import com.cloud.network.NetworkManager;
3939
import com.cloud.network.NetworkModel;
4040
import com.cloud.network.dao.NetworkDao;
4141
import com.cloud.network.dao.PhysicalNetworkServiceProviderDao;
@@ -119,8 +119,8 @@ public NetworkDao networkDao() {
119119
}
120120

121121
@Bean
122-
public NetworkManager networkManager() {
123-
return Mockito.mock(NetworkManager.class);
122+
public NetworkOrchestrationService networkManager() {
123+
return Mockito.mock(NetworkOrchestrationService.class);
124124
}
125125

126126
@Bean

0 commit comments

Comments
 (0)