Skip to content

Commit 2e5bb63

Browse files
author
Alex Huang
committed
Moved NetworkManagerImpl to NetworkOrchestrator
1 parent 8e5249d commit 2e5bb63

48 files changed

Lines changed: 170 additions & 335 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.

server/src/com/cloud/network/NetworkRuleApplier.java renamed to api/src/com/cloud/network/NetworkRuleApplier.java

File renamed without changes.

‎api/src/com/cloud/network/guru/NetworkGuru.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import com.cloud.utils.component.Adapter;
3030
import com.cloud.vm.NicProfile;
3131
import com.cloud.vm.ReservationContext;
32-
import com.cloud.vm.VirtualMachine;
3332
import com.cloud.vm.VirtualMachineProfile;
3433

3534
/**
@@ -196,10 +195,9 @@ public interface NetworkGuru extends Adapter {
196195
*
197196
* @param network guest network being destroyed.
198197
* @param offering network offering the guest network was created with.
199-
* @param owner owner of the network.
200198
* @return true if trash was successful; false if not.
201199
*/
202-
boolean trash(Network network, NetworkOffering offering, Account owner);
200+
boolean trash(Network network, NetworkOffering offering);
203201

204202
void updateNetworkProfile(NetworkProfile networkProfile);
205203

‎engine/api/src/org/apache/cloudstack/engine/orchestration/service/VolumeOrchestrationService.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import com.cloud.host.Host;
3434
import com.cloud.hypervisor.Hypervisor.HypervisorType;
3535
import com.cloud.offering.DiskOffering;
36+
import com.cloud.storage.Snapshot;
3637
import com.cloud.storage.StoragePool;
3738
import com.cloud.storage.Volume;
3839
import com.cloud.storage.Volume.Type;
@@ -61,6 +62,8 @@ public interface VolumeOrchestrationService {
6162

6263
String getVmNameOnVolume(Volume volume);
6364

65+
VolumeInfo createVolumeFromSnapshot(Volume volume, Snapshot snapshot) throws StorageUnavailableException;
66+
6467
Volume migrateVolume(Volume volume, StoragePool destPool) throws StorageUnavailableException;
6568

6669
void destroyVolume(Volume volume);

‎engine/components-api/pom.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,21 @@
3333
<artifactId>cloud-engine-api</artifactId>
3434
<version>${project.version}</version>
3535
</dependency>
36+
<dependency>
37+
<groupId>org.apache.cloudstack</groupId>
38+
<artifactId>cloud-engine-schema</artifactId>
39+
<version>${project.version}</version>
40+
</dependency>
3641
<dependency>
3742
<groupId>org.apache.cloudstack</groupId>
3843
<artifactId>cloud-framework-ipc</artifactId>
3944
<version>${project.version}</version>
4045
</dependency>
46+
<dependency>
47+
<groupId>org.apache.cloudstack</groupId>
48+
<artifactId>cloud-framework-events</artifactId>
49+
<version>${project.version}</version>
50+
</dependency>
4151
<dependency>
4252
<groupId>org.apache.cloudstack</groupId>
4353
<artifactId>cloud-framework-jobs</artifactId>

server/src/com/cloud/deploy/DeploymentPlanningManager.java renamed to engine/components-api/src/com/cloud/deploy/DeploymentPlanningManager.java

File renamed without changes.

server/src/com/cloud/event/UsageEventUtils.java renamed to engine/components-api/src/com/cloud/event/UsageEventUtils.java

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,28 +17,28 @@
1717

1818
package com.cloud.event;
1919

20+
import java.text.SimpleDateFormat;
21+
import java.util.Date;
22+
import java.util.HashMap;
23+
import java.util.Map;
24+
25+
import javax.annotation.PostConstruct;
26+
import javax.inject.Inject;
27+
28+
import org.apache.log4j.Logger;
29+
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
30+
31+
import org.apache.cloudstack.framework.events.Event;
32+
import org.apache.cloudstack.framework.events.EventBus;
33+
import org.apache.cloudstack.framework.events.EventBusException;
34+
2035
import com.cloud.dc.DataCenterVO;
2136
import com.cloud.dc.dao.DataCenterDao;
2237
import com.cloud.event.dao.UsageEventDao;
23-
import com.cloud.server.ManagementServer;
2438
import com.cloud.user.Account;
2539
import com.cloud.user.dao.AccountDao;
2640
import com.cloud.utils.component.ComponentContext;
27-
import org.apache.cloudstack.framework.events.Event;
28-
import org.apache.cloudstack.framework.events.EventBus;
29-
import org.apache.cloudstack.framework.events.EventBusException;
30-
import org.apache.log4j.Logger;
31-
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
32-
import org.springframework.stereotype.Component;
33-
34-
import javax.annotation.PostConstruct;
35-
import javax.inject.Inject;
36-
import java.text.SimpleDateFormat;
37-
import java.util.Date;
38-
import java.util.HashMap;
39-
import java.util.Map;
4041

41-
@Component
4242
public class UsageEventUtils {
4343

4444
private static UsageEventDao _usageEventDao;
@@ -141,7 +141,7 @@ private static void publishUsageEvent(String usageEventType, Long accountId, Lon
141141
if (account == null)
142142
return;
143143

144-
Event event = new Event(ManagementServer.Name, EventCategory.USAGE_EVENT.getName(), usageEventType,
144+
Event event = new Event(Name, EventCategory.USAGE_EVENT.getName(), usageEventType,
145145
resourceType, resourceUUID);
146146

147147
Map<String, String> eventDescription = new HashMap<String, String>();
@@ -162,4 +162,7 @@ private static void publishUsageEvent(String usageEventType, Long accountId, Lon
162162
s_logger.warn("Failed to publish usage event on the the event bus.");
163163
}
164164
}
165+
166+
static final String Name = "management-server";
167+
165168
}

server/src/com/cloud/network/IpAddressManager.java renamed to engine/components-api/src/com/cloud/network/IpAddressManager.java

File renamed without changes.

server/src/com/cloud/network/addr/PublicIp.java renamed to engine/components-api/src/com/cloud/network/addr/PublicIp.java

File renamed without changes.

server/src/com/cloud/network/lb/LoadBalancingRulesManager.java renamed to engine/components-api/src/com/cloud/network/lb/LoadBalancingRulesManager.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
import com.cloud.network.rules.LoadBalancerContainer.Scheme;
3131
import com.cloud.user.Account;
3232

33-
public interface LoadBalancingRulesManager extends LoadBalancingRulesService {
33+
public interface LoadBalancingRulesManager {
3434

35-
LoadBalancer createPublicLoadBalancer(String xId, String name, String description,
35+
LoadBalancer createPublicLoadBalancer(String xId, String name, String description,
3636
int srcPort, int destPort, long sourceIpId, String protocol, String algorithm, boolean openFirewall, CallContext caller)
3737
throws NetworkRuleConflictException;
3838

server/src/com/cloud/template/TemplateManager.java renamed to engine/components-api/src/com/cloud/template/TemplateManager.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,11 @@
2121
import org.apache.cloudstack.engine.subsystem.api.storage.DataStore;
2222
import org.apache.cloudstack.engine.subsystem.api.storage.TemplateInfo;
2323
import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
24-
import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreVO;
2524

2625
import com.cloud.dc.DataCenterVO;
2726
import com.cloud.exception.InternalErrorException;
2827
import com.cloud.exception.ResourceAllocationException;
2928
import com.cloud.exception.StorageUnavailableException;
30-
import com.cloud.host.HostVO;
3129
import com.cloud.storage.StoragePool;
3230
import com.cloud.storage.VMTemplateHostVO;
3331
import com.cloud.storage.VMTemplateStoragePoolVO;
@@ -37,7 +35,7 @@
3735
/**
3836
* TemplateManager manages the templates stored on secondary storage. It is responsible for creating private/public templates.
3937
*/
40-
public interface TemplateManager extends TemplateApiService{
38+
public interface TemplateManager {
4139

4240
/**
4341
* Prepares a template for vm creation for a certain storage pool.

0 commit comments

Comments
 (0)