etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Some further naming refactoring.

This commit is contained in:
Min Chen 2013-03-29 17:22:54 -07:00
parent a5416797ab
commit 5b31a45ebc
13 changed files with 40 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/tomcatconf/applicationContext.xml.in
View File

@ -731,7 +731,7 @@
<bean id="dataObjectManagerImpl" class="org.apache.cloudstack.storage.datastore.DataObjectManagerImpl" />
<bean id="dataStoreManagerImpl" class="org.apache.cloudstack.storage.datastore.DataStoreManagerImpl" />
<bean id="defaultEndPointSelector" class="org.apache.cloudstack.storage.endpoint.DefaultEndPointSelector" />
<bean id="defaultPrimaryDataStoreProviderManagerImpl" class="org.apache.cloudstack.storage.datastore.manager.DefaultPrimaryDataStoreProviderManagerImpl" />
<bean id="primaryDataStoreProviderManagerImpl" class="org.apache.cloudstack.storage.datastore.manager.PrimaryDataStoreProviderManagerImpl" />
<bean id="eventUtils" class="com.cloud.event.EventUtils" />
<bean id="globalLoadBalancingRulesServiceImpl" class="org.apache.cloudstack.region.gslb.GlobalLoadBalancingRulesServiceImpl" />
<bean id="hypervsiorHostEndPointRpcServer" class="org.apache.cloudstack.storage.HypervsiorHostEndPointRpcServer" />

8
engine/storage/image/src/org/apache/cloudstack/storage/image/manager/ImageDataStoreManagerImpl.java → engine/storage/image/src/org/apache/cloudstack/storage/image/manager/ImageDataStoreProviderManagerImpl.java
View File

@ -31,16 +31,16 @@ import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreProviderManag
import org.apache.cloudstack.engine.subsystem.api.storage.ImageDataStoreProvider;
import org.apache.cloudstack.storage.image.ImageDataStoreDriver;
import org.apache.cloudstack.storage.image.datastore.ImageDataStore;
import org.apache.cloudstack.storage.image.datastore.ImageDataStoreManager;
import org.apache.cloudstack.storage.image.datastore.ImageDataStoreProviderManager;
import org.apache.cloudstack.storage.image.db.ImageDataStoreDao;
import org.apache.cloudstack.storage.image.db.ImageDataStoreVO;
import org.apache.cloudstack.storage.image.store.DefaultImageDataStoreImpl;
import org.apache.cloudstack.storage.image.store.ImageDataStoreImpl;
import org.springframework.stereotype.Component;
import com.cloud.storage.dao.VMTemplateDao;
@Component
public class ImageDataStoreManagerImpl implements ImageDataStoreManager {
public class ImageDataStoreProviderManagerImpl implements ImageDataStoreProviderManager {
@Inject
ImageDataStoreDao dataStoreDao;
@Inject
@ -59,7 +59,7 @@ public class ImageDataStoreManagerImpl implements ImageDataStoreManager {
ImageDataStoreVO dataStore = dataStoreDao.findById(dataStoreId);
String providerName = dataStore.getProviderName();
ImageDataStoreProvider provider = (ImageDataStoreProvider)providerManager.getDataStoreProvider(providerName);
ImageDataStore imgStore = DefaultImageDataStoreImpl.getDataStore(dataStore,
ImageDataStore imgStore = ImageDataStoreImpl.getDataStore(dataStore,
driverMaps.get(provider.getName()), provider
);
// TODO Auto-generated method stub

6
engine/storage/image/src/org/apache/cloudstack/storage/image/store/DefaultImageDataStoreImpl.java → engine/storage/image/src/org/apache/cloudstack/storage/image/store/ImageDataStoreImpl.java
View File

@ -41,7 +41,7 @@ import com.cloud.utils.component.ComponentContext;
import com.cloud.utils.storage.encoding.EncodingType;
public class DefaultImageDataStoreImpl implements ImageDataStore {
public class ImageDataStoreImpl implements ImageDataStore {
@Inject
VMTemplateDao imageDao;
@Inject
@ -51,7 +51,7 @@ public class DefaultImageDataStoreImpl implements ImageDataStore {
protected ImageDataStoreProvider provider;
boolean needDownloadToCacheStorage = false;
public DefaultImageDataStoreImpl() {
public ImageDataStoreImpl() {
}
@ -64,7 +64,7 @@ public class DefaultImageDataStoreImpl implements ImageDataStore {
public static ImageDataStore getDataStore(ImageDataStoreVO dataStoreVO, ImageDataStoreDriver imageDataStoreDriver,
ImageDataStoreProvider provider) {
DefaultImageDataStoreImpl instance = (DefaultImageDataStoreImpl)ComponentContext.inject(DefaultImageDataStoreImpl.class);
ImageDataStoreImpl instance = (ImageDataStoreImpl)ComponentContext.inject(ImageDataStoreImpl.class);
instance.configure(dataStoreVO, imageDataStoreDriver, provider);
return instance;
}

4
engine/storage/src/org/apache/cloudstack/storage/datastore/DataStoreManagerImpl.java
View File

@ -27,7 +27,7 @@ import org.apache.cloudstack.engine.subsystem.api.storage.DataStore;
import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager;
import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreRole;
import org.apache.cloudstack.engine.subsystem.api.storage.Scope;
import org.apache.cloudstack.storage.image.datastore.ImageDataStoreManager;
import org.apache.cloudstack.storage.image.datastore.ImageDataStoreProviderManager;
import org.springframework.stereotype.Component;
import com.cloud.utils.exception.CloudRuntimeException;
@ -37,7 +37,7 @@ public class DataStoreManagerImpl implements DataStoreManager {
@Inject
PrimaryDataStoreProviderManager primaryStorMgr;
@Inject
ImageDataStoreManager imageDataStoreMgr;
ImageDataStoreProviderManager imageDataStoreMgr;
@Override
public DataStore getDataStore(long storeId, DataStoreRole role) {

19
engine/storage/src/org/apache/cloudstack/storage/datastore/provider/DataStoreProviderManagerImpl.java
View File

@ -34,8 +34,10 @@ import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreProviderManag
import org.apache.cloudstack.engine.subsystem.api.storage.ImageDataStoreProvider;
import org.apache.cloudstack.engine.subsystem.api.storage.PrimaryDataStoreDriver;
import org.apache.cloudstack.engine.subsystem.api.storage.PrimaryDataStoreProvider;
import org.apache.cloudstack.storage.image.ImageDataStoreDriver;
import org.apache.cloudstack.storage.datastore.PrimaryDataStoreProviderManager;
import org.apache.cloudstack.storage.datastore.db.DataStoreProviderDao;
import org.apache.cloudstack.storage.image.datastore.ImageDataStoreProviderManager;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
@ -53,6 +55,8 @@ public class DataStoreProviderManagerImpl extends ManagerBase implements DataSto
protected Map<String, DataStoreProvider> providerMap = new HashMap<String, DataStoreProvider>();
@Inject
PrimaryDataStoreProviderManager primaryDataStoreProviderMgr;
@Inject
ImageDataStoreProviderManager imageDataStoreProviderMgr;
@Override
public DataStoreProvider getDataStoreProvider(String name) {
return providerMap.get(name);
@ -63,7 +67,7 @@ public class DataStoreProviderManagerImpl extends ManagerBase implements DataSto
// TODO Auto-generated method stub
return null;
}
public List<StorageProviderResponse> getPrimayrDataStoreProviders() {
List<StorageProviderResponse> providers = new ArrayList<StorageProviderResponse>();
for (DataStoreProvider provider : providerMap.values()) {
@ -76,7 +80,7 @@ public class DataStoreProviderManagerImpl extends ManagerBase implements DataSto
}
return providers;
}
public List<StorageProviderResponse> getImageDataStoreProviders() {
List<StorageProviderResponse> providers = new ArrayList<StorageProviderResponse>();
for (DataStoreProvider provider : providerMap.values()) {
@ -101,9 +105,9 @@ public class DataStoreProviderManagerImpl extends ManagerBase implements DataSto
s_logger.debug("Failed to register data store provider, provider name: " + providerName + " is not unique");
return false;
}
s_logger.debug("registering data store provider:" + provider.getName());
providerMap.put(providerName, provider);
try {
boolean registrationResult = provider.configure(copyParams);
@ -112,18 +116,21 @@ public class DataStoreProviderManagerImpl extends ManagerBase implements DataSto
s_logger.debug("Failed to register data store provider: " + providerName);
return false;
}
Set<DataStoreProviderType> types = provider.getTypes();
if (types.contains(DataStoreProviderType.PRIMARY)) {
primaryDataStoreProviderMgr.registerDriver(provider.getName(), (PrimaryDataStoreDriver)provider.getDataStoreDriver());
primaryDataStoreProviderMgr.registerHostListener(provider.getName(), provider.getHostListener());
}
else if (types.contains(DataStoreProviderType.IMAGE)) {
imageDataStoreProviderMgr.registerDriver(provider.getName(), (ImageDataStoreDriver)provider.getDataStoreDriver());
}
} catch(Exception e) {
s_logger.debug("configure provider failed", e);
providerMap.remove(providerName);
}
}
return true;
}

2
engine/storage/src/org/apache/cloudstack/storage/image/datastore/ImageDataStoreManager.java → engine/storage/src/org/apache/cloudstack/storage/image/datastore/ImageDataStoreProviderManager.java
View File

@ -23,7 +23,7 @@ import java.util.List;
import org.apache.cloudstack.engine.subsystem.api.storage.DataStore;
import org.apache.cloudstack.storage.image.ImageDataStoreDriver;
public interface ImageDataStoreManager {
public interface ImageDataStoreProviderManager {
ImageDataStore getImageDataStore(long dataStoreId);
ImageDataStore getImageDataStore(String uuid);
List<DataStore> getList();

10
engine/storage/volume/src/org/apache/cloudstack/storage/datastore/DefaultPrimaryDataStore.java → engine/storage/volume/src/org/apache/cloudstack/storage/datastore/PrimaryDataStoreImpl.java
View File

@ -60,9 +60,9 @@ import com.cloud.utils.component.ComponentContext;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.utils.storage.encoding.EncodingType;
public class DefaultPrimaryDataStore implements PrimaryDataStore {
public class PrimaryDataStoreImpl implements PrimaryDataStore {
private static final Logger s_logger = Logger
.getLogger(DefaultPrimaryDataStore.class);
.getLogger(PrimaryDataStoreImpl.class);
protected PrimaryDataStoreDriver driver;
protected StoragePoolVO pdsv;
@Inject
@ -82,7 +82,7 @@ public class DefaultPrimaryDataStore implements PrimaryDataStore {
private VolumeDao volumeDao;
public DefaultPrimaryDataStore() {
public PrimaryDataStoreImpl() {
}
@ -93,10 +93,10 @@ public class DefaultPrimaryDataStore implements PrimaryDataStore {
this.provider = provider;
}
public static DefaultPrimaryDataStore createDataStore(
public static PrimaryDataStoreImpl createDataStore(
StoragePoolVO pdsv, PrimaryDataStoreDriver driver,
DataStoreProvider provider) {
DefaultPrimaryDataStore dataStore = (DefaultPrimaryDataStore)ComponentContext.inject(DefaultPrimaryDataStore.class);
PrimaryDataStoreImpl dataStore = (PrimaryDataStoreImpl)ComponentContext.inject(PrimaryDataStoreImpl.class);
dataStore.configure(pdsv, driver, provider);
return dataStore;
}

6
engine/storage/volume/src/org/apache/cloudstack/storage/datastore/manager/DefaultPrimaryDataStoreProviderManagerImpl.java → engine/storage/volume/src/org/apache/cloudstack/storage/datastore/manager/PrimaryDataStoreProviderManagerImpl.java
View File

@ -28,7 +28,7 @@ import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreProvider;
import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreProviderManager;
import org.apache.cloudstack.engine.subsystem.api.storage.HypervisorHostListener;
import org.apache.cloudstack.engine.subsystem.api.storage.PrimaryDataStoreDriver;
import org.apache.cloudstack.storage.datastore.DefaultPrimaryDataStore;
import org.apache.cloudstack.storage.datastore.PrimaryDataStoreImpl;
import org.apache.cloudstack.storage.datastore.PrimaryDataStore;
import org.apache.cloudstack.storage.datastore.PrimaryDataStoreProviderManager;
import org.apache.cloudstack.storage.datastore.db.DataStoreProviderDao;
@ -39,7 +39,7 @@ import org.springframework.stereotype.Component;
import com.cloud.storage.StorageManager;
@Component
public class DefaultPrimaryDataStoreProviderManagerImpl implements PrimaryDataStoreProviderManager {
public class PrimaryDataStoreProviderManagerImpl implements PrimaryDataStoreProviderManager {
@Inject
DataStoreProviderDao dataStoreProviderDao;
@Inject
@ -59,7 +59,7 @@ public class DefaultPrimaryDataStoreProviderManagerImpl implements PrimaryDataSt
StoragePoolVO dataStoreVO = dataStoreDao.findById(dataStoreId);
String providerName = dataStoreVO.getStorageProviderName();
DataStoreProvider provider = providerManager.getDataStoreProvider(providerName);
DefaultPrimaryDataStore dataStore = DefaultPrimaryDataStore.createDataStore(dataStoreVO, driverMaps.get(provider.getName()), provider);
PrimaryDataStoreImpl dataStore = PrimaryDataStoreImpl.createDataStore(dataStoreVO, driverMaps.get(provider.getName()), provider);
return dataStore;
}

16
engine/storage/volume/src/org/apache/cloudstack/storage/datastore/provider/PrimaryDataStoreProviderManager.java
View File

@ -1,16 +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.

4
plugins/storage/image/default/src/org/apache/cloudstack/storage/datastore/lifecycle/CloudStackImageDataStoreLifeCycle.java
View File

@ -25,7 +25,7 @@ import org.apache.cloudstack.engine.subsystem.api.storage.DataStore;
import org.apache.cloudstack.engine.subsystem.api.storage.HostScope;
import org.apache.cloudstack.engine.subsystem.api.storage.ZoneScope;
import org.apache.cloudstack.storage.image.datastore.ImageDataStoreHelper;
import org.apache.cloudstack.storage.image.datastore.ImageDataStoreManager;
import org.apache.cloudstack.storage.image.datastore.ImageDataStoreProviderManager;
import org.apache.cloudstack.storage.image.db.ImageDataStoreDao;
import org.apache.cloudstack.storage.image.db.ImageDataStoreVO;
import org.apache.cloudstack.storage.image.store.lifecycle.ImageDataStoreLifeCycle;
@ -38,7 +38,7 @@ public class CloudStackImageDataStoreLifeCycle implements ImageDataStoreLifeCycl
@Inject
ImageDataStoreHelper imageStoreHelper;
@Inject
ImageDataStoreManager imageStoreMgr;
ImageDataStoreProviderManager imageStoreMgr;
public CloudStackImageDataStoreLifeCycle() {
}

4
plugins/storage/image/default/src/org/apache/cloudstack/storage/datastore/provider/CloudStackImageDataStoreProvider.java
View File

@ -35,7 +35,7 @@ import org.apache.cloudstack.storage.datastore.driver.CloudStackImageDataStoreDr
import org.apache.cloudstack.storage.datastore.lifecycle.CloudStackImageDataStoreLifeCycle;
import org.apache.cloudstack.storage.image.ImageDataStoreDriver;
import org.apache.cloudstack.storage.image.datastore.ImageDataStoreHelper;
import org.apache.cloudstack.storage.image.datastore.ImageDataStoreManager;
import org.apache.cloudstack.storage.image.datastore.ImageDataStoreProviderManager;
import org.apache.cloudstack.storage.image.store.lifecycle.ImageDataStoreLifeCycle;
import org.springframework.stereotype.Component;
@ -48,7 +48,7 @@ public class CloudStackImageDataStoreProvider implements ImageDataStoreProvider
protected ImageDataStoreLifeCycle lifeCycle;
protected ImageDataStoreDriver driver;
@Inject
ImageDataStoreManager storeMgr;
ImageDataStoreProviderManager storeMgr;
@Inject
ImageDataStoreHelper helper;

4
plugins/storage/image/sample/src/org/apache/cloudstack/storage/datastore/lifecycle/SampleImageDataStoreLifeCycle.java
View File

@ -25,7 +25,7 @@ import org.apache.cloudstack.engine.subsystem.api.storage.DataStore;
import org.apache.cloudstack.engine.subsystem.api.storage.HostScope;
import org.apache.cloudstack.engine.subsystem.api.storage.ZoneScope;
import org.apache.cloudstack.storage.image.datastore.ImageDataStoreHelper;
import org.apache.cloudstack.storage.image.datastore.ImageDataStoreManager;
import org.apache.cloudstack.storage.image.datastore.ImageDataStoreProviderManager;
import org.apache.cloudstack.storage.image.db.ImageDataStoreDao;
import org.apache.cloudstack.storage.image.db.ImageDataStoreVO;
import org.apache.cloudstack.storage.image.store.lifecycle.ImageDataStoreLifeCycle;
@ -38,7 +38,7 @@ public class SampleImageDataStoreLifeCycle implements ImageDataStoreLifeCycle {
@Inject
ImageDataStoreHelper imageStoreHelper;
@Inject
ImageDataStoreManager imageStoreMgr;
ImageDataStoreProviderManager imageStoreMgr;
public SampleImageDataStoreLifeCycle() {
}

4
plugins/storage/image/sample/src/org/apache/cloudstack/storage/datastore/provider/SampleImageDataStoreProvider.java
View File

@ -31,7 +31,7 @@ import org.apache.cloudstack.engine.subsystem.api.storage.ImageDataStoreProvider
import org.apache.cloudstack.storage.datastore.driver.SampleImageDataStoreDriverImpl;
import org.apache.cloudstack.storage.datastore.lifecycle.SampleImageDataStoreLifeCycle;
import org.apache.cloudstack.storage.image.ImageDataStoreDriver;
import org.apache.cloudstack.storage.image.datastore.ImageDataStoreManager;
import org.apache.cloudstack.storage.image.datastore.ImageDataStoreProviderManager;
import org.apache.cloudstack.storage.image.store.lifecycle.ImageDataStoreLifeCycle;
import com.cloud.utils.component.ComponentContext;
@ -41,7 +41,7 @@ public class SampleImageDataStoreProvider implements ImageDataStoreProvider {
protected ImageDataStoreLifeCycle lifeCycle;
protected ImageDataStoreDriver driver;
@Inject
ImageDataStoreManager storeMgr;
ImageDataStoreProviderManager storeMgr;
long id;
String uuid;
@Override