apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-9252: Little refactor

Browse Source
This commit is contained in:
nvazquez 2016-02-05 06:22:23 -08:00
parent c5677cf634
commit 64c6debf00
4 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/storage/image/resources/META-INF/cloudstack/core/spring-engine-storage-image-core-context.xml
View File

@ -38,8 +38,6 @@
class="org.apache.cloudstack.storage.image.datastore.ImageStoreHelper" /> class="org.apache.cloudstack.storage.image.datastore.ImageStoreHelper" />
<bean id="imageFormatHelper" <bean id="imageFormatHelper"
class="org.apache.cloudstack.storage.image.format.ImageFormatHelper" /> class="org.apache.cloudstack.storage.image.format.ImageFormatHelper" />
<bean id="imageStoreDetailsUtil"
class="com.cloud.storage.ImageStoreDetailsUtil" />
<bean id="imageStoreProviderMgr" <bean id="imageStoreProviderMgr"
class="org.apache.cloudstack.storage.image.manager.ImageStoreProviderManagerImpl" /> class="org.apache.cloudstack.storage.image.manager.ImageStoreProviderManagerImpl" />

2
engine/storage/resources/META-INF/cloudstack/core/spring-engine-storage-core-context.xml
View File

@ -69,5 +69,7 @@
<property name="snapshotStrategies" value="#{snapshotStrategiesRegistry.registered}" /> <property name="snapshotStrategies" value="#{snapshotStrategiesRegistry.registered}" />
<property name="vmSnapshotStrategies" value="#{vmSnapshotStrategiesRegistry.registered}" /> <property name="vmSnapshotStrategies" value="#{vmSnapshotStrategiesRegistry.registered}" />
</bean> </bean>
<bean id="imageStoreDetailsUtil" class="com.cloud.storage.ImageStoreDetailsUtil" />
</beans> </beans>

4
plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
View File

@ -201,10 +201,8 @@ public class VmwareManagerImpl extends ManagerBase implements VmwareManager, Vmw
private final ScheduledExecutorService _hostScanScheduler = Executors.newScheduledThreadPool(1, new NamedThreadFactory("Vmware-Host-Scan")); private final ScheduledExecutorService _hostScanScheduler = Executors.newScheduledThreadPool(1, new NamedThreadFactory("Vmware-Host-Scan"));
private ApplicationContext applicationContext;
public VmwareManagerImpl() { public VmwareManagerImpl() {
applicationContext = ComponentContext.getApplicationContext(); ApplicationContext applicationContext = ComponentContext.getApplicationContext();
imageStoreDetailsUtil = applicationContext.getBean("imageStoreDetailsUtil", ImageStoreDetailsUtil.class); imageStoreDetailsUtil = applicationContext.getBean("imageStoreDetailsUtil", ImageStoreDetailsUtil.class);
_storageMgr = new VmwareStorageManagerImpl(this); _storageMgr = new VmwareStorageManagerImpl(this);
} }

13
services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
View File

@ -96,7 +96,6 @@ import org.apache.cloudstack.storage.command.UploadStatusAnswer;
import org.apache.cloudstack.storage.command.UploadStatusAnswer.UploadStatus; import org.apache.cloudstack.storage.command.UploadStatusAnswer.UploadStatus;
import org.apache.cloudstack.storage.datastore.db.ImageStoreDao; import org.apache.cloudstack.storage.datastore.db.ImageStoreDao;
import org.apache.cloudstack.storage.datastore.db.ImageStoreDetailsDao; import org.apache.cloudstack.storage.datastore.db.ImageStoreDetailsDao;
import org.apache.cloudstack.storage.datastore.db.ImageStoreVO;
import org.apache.cloudstack.storage.command.UploadStatusCommand; import org.apache.cloudstack.storage.command.UploadStatusCommand;
import org.apache.cloudstack.storage.template.DownloadManager; import org.apache.cloudstack.storage.template.DownloadManager;
import org.apache.cloudstack.storage.template.DownloadManagerImpl; import org.apache.cloudstack.storage.template.DownloadManagerImpl;
@ -229,8 +228,6 @@ public class NfsSecondaryStorageResource extends ServerResourceBase implements S
@Inject @Inject
ImageStoreDetailsDao detailsStoreDao; ImageStoreDetailsDao detailsStoreDao;
public static final String IMAGE_STORE_PARAMETER_ID = "imageStoreId";
public void setParentPath(String path) { public void setParentPath(String path) {
_parent = path; _parent = path;
} }
@ -1316,16 +1313,6 @@ public class NfsSecondaryStorageResource extends ServerResourceBase implements S
} }
} }
private Long getImageStoreId(DataStoreTO dataStore){
Long imgStoreId = null;
if (dataStore.getRole().equals(DataStoreRole.Image)){
String uuid = dataStore.getUuid();
ImageStoreVO imageStoreVO = dataStoreDao.findByUuid(uuid);
imgStoreId = imageStoreVO.getId();
}
return imgStoreId;
}
private Answer execute(SecStorageSetupCommand cmd) { private Answer execute(SecStorageSetupCommand cmd) {
if (!_inSystemVM) { if (!_inSystemVM) {
return new Answer(cmd, true, null); return new Answer(cmd, true, null);