You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2013/10/08 02:13:03 UTC
[1/6] git commit: updated refs/heads/ui-restyle to 019e075
Updated Branches:
refs/heads/ui-restyle 63335cfd5 -> 019e07598
CLOUDSTACK-4672: UI > Network > details tab > add new field "broadcasturi" to show Primary VLAN, Secondary Isolated VLAN.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d1a536a4
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d1a536a4
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d1a536a4
Branch: refs/heads/ui-restyle
Commit: d1a536a4e3ec338987706b7b26385481d8333d2d
Parents: da814c6
Author: Jessica Wang <je...@apache.org>
Authored: Mon Oct 7 11:30:31 2013 -0700
Committer: Jessica Wang <je...@apache.org>
Committed: Mon Oct 7 11:32:56 2013 -0700
----------------------------------------------------------------------
ui/scripts/network.js | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d1a536a4/ui/scripts/network.js
----------------------------------------------------------------------
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index 67ba278..d0f6a92 100755
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -1086,7 +1086,11 @@
vlan: {
label: 'label.vlan.id'
},
-
+
+ broadcasturi: {
+ label: 'broadcasturi'
+ },
+
networkofferingid: {
label: 'label.network.offering',
isEditable: true,
[4/6] git commit: updated refs/heads/ui-restyle to 019e075
Posted by bf...@apache.org.
CLOUDSTACK4515: UI > Settings tab of zone/cluster/account/primaryStorage detailView > add Description field.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4f932d04
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4f932d04
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4f932d04
Branch: refs/heads/ui-restyle
Commit: 4f932d048ecb786321cfc04cc759ff01439b1694
Parents: 977a75f
Author: Jessica Wang <je...@apache.org>
Authored: Mon Oct 7 13:33:17 2013 -0700
Committer: Jessica Wang <je...@apache.org>
Committed: Mon Oct 7 13:35:26 2013 -0700
----------------------------------------------------------------------
ui/scripts/ui-custom/granularSettings.js | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4f932d04/ui/scripts/ui-custom/granularSettings.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui-custom/granularSettings.js b/ui/scripts/ui-custom/granularSettings.js
index 06aa82a..5ab60b7 100644
--- a/ui/scripts/ui-custom/granularSettings.js
+++ b/ui/scripts/ui-custom/granularSettings.js
@@ -29,6 +29,9 @@
name: {
label: 'label.name'
},
+ description: {
+ label: 'label.description'
+ },
value: {
label: 'label.value',
editable: true
[6/6] git commit: updated refs/heads/ui-restyle to 019e075
Posted by bf...@apache.org.
Merge branch 'master' into ui-restyle
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/019e0759
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/019e0759
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/019e0759
Branch: refs/heads/ui-restyle
Commit: 019e075987a65ff0b14244f1a63fc57fca2c456b
Parents: 63335cf 6e80bb0
Author: Brian Federle <br...@citrix.com>
Authored: Mon Oct 7 17:12:51 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Mon Oct 7 17:12:51 2013 -0700
----------------------------------------------------------------------
api/src/com/cloud/server/ResourceTag.java | 3 +-
.../src/com/cloud/dc/dao/DcDetailsDao.java | 5 ++
.../src/com/cloud/dc/dao/DcDetailsDaoImpl.java | 25 ++++++++-
.../com/cloud/api/query/QueryManagerImpl.java | 37 ++++++++++++--
.../cloud/api/query/vo/StoragePoolJoinVO.java | 18 ++++---
.../metadata/ResourceMetaDataManagerImpl.java | 16 +++++-
.../cloud/tags/TaggedResourceManagerImpl.java | 4 ++
setup/db/db/schema-420to430.sql | 54 ++++++++++++++++++++
ui/scripts/network.js | 6 ++-
ui/scripts/ui-custom/granularSettings.js | 3 ++
usage/src/com/cloud/usage/UsageManagerImpl.java | 8 +--
11 files changed, 160 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
[3/6] git commit: updated refs/heads/ui-restyle to 019e075
Posted by bf...@apache.org.
UsageManagerInternal fix
aed5e9dc2a6882139bc38073923be5a3bacfd9d2 seems to inroduce some typo to run
Signed-off-by: Laszlo Hornyak <la...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/977a75f1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/977a75f1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/977a75f1
Branch: refs/heads/ui-restyle
Commit: 977a75f1be98d696dd70638b614918751b96fdfd
Parents: 4c2e40a
Author: Laszlo Hornyak <la...@gmail.com>
Authored: Mon Oct 7 19:37:26 2013 +0200
Committer: Darren Shepherd <da...@gmail.com>
Committed: Mon Oct 7 13:13:40 2013 -0700
----------------------------------------------------------------------
usage/src/com/cloud/usage/UsageManagerImpl.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/977a75f1/usage/src/com/cloud/usage/UsageManagerImpl.java
----------------------------------------------------------------------
diff --git a/usage/src/com/cloud/usage/UsageManagerImpl.java b/usage/src/com/cloud/usage/UsageManagerImpl.java
index 5f28674..3ff53e0 100644
--- a/usage/src/com/cloud/usage/UsageManagerImpl.java
+++ b/usage/src/com/cloud/usage/UsageManagerImpl.java
@@ -281,15 +281,15 @@ public class UsageManagerImpl extends ManagerBase implements UsageManager, Runna
@Override
public void run() {
- new ManagedContextRunnable() {
+ (new ManagedContextRunnable() {
@Override
protected void runInContext() {
- runInContext();
+ runInContextInternal();
}
- };
+ }).run();
}
- protected void runInContext() {
+ protected void runInContextInternal() {
if (s_logger.isInfoEnabled()) {
s_logger.info("starting usage job...");
}
[2/6] git commit: updated refs/heads/ui-restyle to 019e075
Posted by bf...@apache.org.
Added storage_provider_name to storage_pool_view
Signed-off-by: Edison Su <su...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4c2e40ac
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4c2e40ac
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4c2e40ac
Branch: refs/heads/ui-restyle
Commit: 4c2e40ac37c55634f06ccb12a5b0094c033abb26
Parents: d1a536a
Author: Chris Suich <ch...@netapp.com>
Authored: Mon Oct 7 08:38:47 2013 -0400
Committer: Edison Su <su...@gmail.com>
Committed: Mon Oct 7 11:51:32 2013 -0700
----------------------------------------------------------------------
.../cloud/api/query/vo/StoragePoolJoinVO.java | 18 ++++---
setup/db/db/schema-420to430.sql | 54 ++++++++++++++++++++
2 files changed, 65 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4c2e40ac/server/src/com/cloud/api/query/vo/StoragePoolJoinVO.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/query/vo/StoragePoolJoinVO.java b/server/src/com/cloud/api/query/vo/StoragePoolJoinVO.java
index 69f2204..d98bb3b 100644
--- a/server/src/com/cloud/api/query/vo/StoragePoolJoinVO.java
+++ b/server/src/com/cloud/api/query/vo/StoragePoolJoinVO.java
@@ -24,17 +24,16 @@ import javax.persistence.EnumType;
import javax.persistence.Enumerated;
import javax.persistence.Id;
import javax.persistence.Table;
-import com.cloud.org.Cluster;
-import com.cloud.storage.ScopeType;
-import com.cloud.storage.StoragePoolStatus;
-import com.cloud.storage.Storage.StoragePoolType;
-import com.cloud.utils.db.GenericDao;
import org.apache.cloudstack.api.Identity;
import org.apache.cloudstack.api.InternalIdentity;
-
import com.cloud.hypervisor.Hypervisor.HypervisorType;
+import com.cloud.org.Cluster;
+import com.cloud.storage.ScopeType;
+import com.cloud.storage.Storage.StoragePoolType;
+import com.cloud.storage.StoragePoolStatus;
+import com.cloud.utils.db.GenericDao;
/**
* Storage Pool DB view.
@@ -137,6 +136,9 @@ public class StoragePoolJoinVO extends BaseViewVO implements InternalIdentity, I
@Enumerated(value = EnumType.STRING)
private HypervisorType hypervisor;
+ @Column(name = "storage_provider_name")
+ private String storageProviderName;
+
/**
* @return the scope
*/
@@ -378,5 +380,7 @@ public class StoragePoolJoinVO extends BaseViewVO implements InternalIdentity, I
this.jobStatus = jobStatus;
}
-
+ public String getStorageProviderName() {
+ return storageProviderName;
+ }
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4c2e40ac/setup/db/db/schema-420to430.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-420to430.sql b/setup/db/db/schema-420to430.sql
index 653ff77..a765189 100644
--- a/setup/db/db/schema-420to430.sql
+++ b/setup/db/db/schema-420to430.sql
@@ -281,6 +281,7 @@ CREATE VIEW `cloud`.`template_view` AS
and (resource_tags.resource_type = 'Template' or resource_tags.resource_type='ISO')
where
vm_template.state='Active';
+
DROP VIEW IF EXISTS `cloud`.`volume_view`;
CREATE VIEW `cloud`.`volume_view` AS
select
@@ -392,3 +393,56 @@ CREATE VIEW `cloud`.`volume_view` AS
INSERT IGNORE INTO `cloud`.`configuration`(category, instance, component, name, value, description, default_value) VALUES ('Advanced', 'DEFAULT', 'management-server', 's3.multipart.enabled', 'true', 'enable s3 multipart upload', 'true');
+DROP VIEW IF EXISTS `cloud`.`storage_pool_view`;
+CREATE VIEW `cloud`.`storage_pool_view` AS
+ select
+ storage_pool.id,
+ storage_pool.uuid,
+ storage_pool.name,
+ storage_pool.status,
+ storage_pool.path,
+ storage_pool.pool_type,
+ storage_pool.host_address,
+ storage_pool.created,
+ storage_pool.removed,
+ storage_pool.capacity_bytes,
+ storage_pool.capacity_iops,
+ storage_pool.scope,
+ storage_pool.hypervisor,
+ storage_pool.storage_provider_name,
+ cluster.id cluster_id,
+ cluster.uuid cluster_uuid,
+ cluster.name cluster_name,
+ cluster.cluster_type,
+ data_center.id data_center_id,
+ data_center.uuid data_center_uuid,
+ data_center.name data_center_name,
+ data_center.networktype data_center_type,
+ host_pod_ref.id pod_id,
+ host_pod_ref.uuid pod_uuid,
+ host_pod_ref.name pod_name,
+ storage_pool_details.name tag,
+ op_host_capacity.used_capacity disk_used_capacity,
+ op_host_capacity.reserved_capacity disk_reserved_capacity,
+ async_job.id job_id,
+ async_job.uuid job_uuid,
+ async_job.job_status job_status,
+ async_job.account_id job_account_id
+ from
+ `cloud`.`storage_pool`
+ left join
+ `cloud`.`cluster` ON storage_pool.cluster_id = cluster.id
+ left join
+ `cloud`.`data_center` ON storage_pool.data_center_id = data_center.id
+ left join
+ `cloud`.`host_pod_ref` ON storage_pool.pod_id = host_pod_ref.id
+ left join
+ `cloud`.`storage_pool_details` ON storage_pool_details.pool_id = storage_pool.id
+ and storage_pool_details.value = 'true'
+ left join
+ `cloud`.`op_host_capacity` ON storage_pool.id = op_host_capacity.host_id
+ and op_host_capacity.capacity_type = 3
+ left join
+ `cloud`.`async_job` ON async_job.instance_id = storage_pool.id
+ and async_job.instance_type = 'StoragePool'
+ and async_job.job_status = 0;
[5/6] git commit: updated refs/heads/ui-restyle to 019e075
Posted by bf...@apache.org.
CLOUDSTACK-4824:
Add support for adding zone details
Signed off by : nitin mehta<ni...@citrix.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6e80bb00
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6e80bb00
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6e80bb00
Branch: refs/heads/ui-restyle
Commit: 6e80bb001c3a4b721c071bc120d662ad8cf3f422
Parents: 4f932d0
Author: Nitin Mehta <ni...@citrix.com>
Authored: Mon Oct 7 15:48:43 2013 -0700
Committer: Nitin Mehta <ni...@citrix.com>
Committed: Mon Oct 7 15:48:43 2013 -0700
----------------------------------------------------------------------
api/src/com/cloud/server/ResourceTag.java | 3 +-
.../src/com/cloud/dc/dao/DcDetailsDao.java | 5 +++
.../src/com/cloud/dc/dao/DcDetailsDaoImpl.java | 25 ++++++++++++-
.../com/cloud/api/query/QueryManagerImpl.java | 37 +++++++++++++++++---
.../metadata/ResourceMetaDataManagerImpl.java | 16 ++++++++-
.../cloud/tags/TaggedResourceManagerImpl.java | 4 +++
6 files changed, 83 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6e80bb00/api/src/com/cloud/server/ResourceTag.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/server/ResourceTag.java b/api/src/com/cloud/server/ResourceTag.java
index f1d31e4..1c16f25 100644
--- a/api/src/com/cloud/server/ResourceTag.java
+++ b/api/src/com/cloud/server/ResourceTag.java
@@ -40,7 +40,8 @@ public interface ResourceTag extends ControlledEntity, Identity, InternalIdentit
NetworkACL,
StaticRoute,
VMSnapshot,
- RemoteAccessVpn
+ RemoteAccessVpn,
+ Zone
}
/**
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6e80bb00/engine/schema/src/com/cloud/dc/dao/DcDetailsDao.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/dc/dao/DcDetailsDao.java b/engine/schema/src/com/cloud/dc/dao/DcDetailsDao.java
index a3b72a8..814c7af 100644
--- a/engine/schema/src/com/cloud/dc/dao/DcDetailsDao.java
+++ b/engine/schema/src/com/cloud/dc/dao/DcDetailsDao.java
@@ -16,6 +16,7 @@
// under the License.
package com.cloud.dc.dao;
+import java.util.List;
import java.util.Map;
import com.cloud.dc.DcDetailVO;
@@ -29,4 +30,8 @@ public interface DcDetailsDao extends GenericDao<DcDetailVO, Long> {
DcDetailVO findDetail(long dcId, String name);
void deleteDetails(long dcId);
+
+ void removeDetails(Long id, String key);
+
+ List<DcDetailVO> findDetailsList(long dcId);
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6e80bb00/engine/schema/src/com/cloud/dc/dao/DcDetailsDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/dc/dao/DcDetailsDaoImpl.java b/engine/schema/src/com/cloud/dc/dao/DcDetailsDaoImpl.java
index 7f5723f..88c326b 100644
--- a/engine/schema/src/com/cloud/dc/dao/DcDetailsDaoImpl.java
+++ b/engine/schema/src/com/cloud/dc/dao/DcDetailsDaoImpl.java
@@ -22,6 +22,7 @@ import java.util.Map;
import javax.ejb.Local;
+import com.cloud.vm.UserVmDetailVO;
import org.apache.cloudstack.framework.config.ConfigKey;
import org.apache.cloudstack.framework.config.ConfigKey.Scope;
import org.apache.cloudstack.framework.config.ScopedConfigStorage;
@@ -69,7 +70,17 @@ public class DcDetailsDaoImpl extends GenericDaoBase<DcDetailVO, Long> implement
}
return details;
}
-
+
+ @Override
+ public List<DcDetailVO> findDetailsList(long dcId) {
+ SearchCriteria<DcDetailVO> sc = DcSearch.create();
+ sc.setParameters("dcId", dcId);
+
+ List<DcDetailVO> results = search(sc, null);
+ return results;
+ }
+
+
@Override
public void deleteDetails(long dcId) {
SearchCriteria<DcDetailVO> sc = DcSearch.create();
@@ -82,6 +93,18 @@ public class DcDetailsDaoImpl extends GenericDaoBase<DcDetailVO, Long> implement
}
@Override
+ public void removeDetails(Long id, String key) {
+ if(key != null){
+ DcDetailVO detail = findDetail(id, key);
+ if(detail != null){
+ remove(detail.getId());
+ }
+ }else {
+ deleteDetails(id);
+ }
+ }
+
+ @Override
public void persist(long dcId, Map<String, String> details) {
Transaction txn = Transaction.currentTxn();
txn.start();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6e80bb00/server/src/com/cloud/api/query/QueryManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/query/QueryManagerImpl.java b/server/src/com/cloud/api/query/QueryManagerImpl.java
index bd4f158..9ff37a6 100644
--- a/server/src/com/cloud/api/query/QueryManagerImpl.java
+++ b/server/src/com/cloud/api/query/QueryManagerImpl.java
@@ -27,6 +27,8 @@ import java.util.Set;
import javax.ejb.Local;
import javax.inject.Inject;
+import com.cloud.dc.DcDetailVO;
+import com.cloud.dc.dao.DcDetailsDao;
import com.cloud.vm.UserVmDetailVO;
import com.cloud.vm.dao.UserVmDetailsDao;
import org.apache.log4j.Logger;
@@ -327,6 +329,9 @@ public class QueryManagerImpl extends ManagerBase implements QueryService {
private DedicatedResourceDao _dedicatedDao;
@Inject
+ DcDetailsDao _dcDetailsDao;
+
+ @Inject
DomainManager _domainMgr;
@Inject
@@ -3271,7 +3276,31 @@ public class QueryManagerImpl extends ManagerBase implements QueryService {
return nicDetailResponseList;
- } else {
+ } else if (resourceType == ResourceTag.TaggedResourceType.Zone){
+
+ List<DcDetailVO> dcDetailList;
+ if (key == null) {
+ dcDetailList = _dcDetailsDao.findDetailsList(id);
+ } else {
+ DcDetailVO nicDetail = _dcDetailsDao.findDetail(id, key);
+ dcDetailList = new LinkedList<DcDetailVO>();
+ dcDetailList.add(nicDetail);
+ }
+
+ List<ResourceDetailResponse> dcDetailResponseList = new ArrayList<ResourceDetailResponse>();
+ for (DcDetailVO dcDetail : dcDetailList) {
+ ResourceDetailResponse dcDetailResponse = new ResourceDetailResponse();
+ // String uuid = ApiDBUtils.findN
+ dcDetailResponse.setName(dcDetail.getName());
+ dcDetailResponse.setValue(dcDetail.getValue());
+ dcDetailResponse.setResourceType(ResourceTag.TaggedResourceType.Nic.toString());
+ dcDetailResponse.setObjectName("zonedetail");
+ dcDetailResponseList.add(dcDetailResponse);
+ }
+
+ return dcDetailResponseList;
+
+ }else {
List<UserVmDetailVO> userVmDetailList;
if (key == null) {
@@ -3282,17 +3311,17 @@ public class QueryManagerImpl extends ManagerBase implements QueryService {
userVmDetailList.add(nicDetail);
}
- List<ResourceDetailResponse> nicDetailResponseList = new ArrayList<ResourceDetailResponse>();
+ List<ResourceDetailResponse> userVmDetailResponseList = new ArrayList<ResourceDetailResponse>();
for (UserVmDetailVO nicDetail : userVmDetailList) {
ResourceDetailResponse userVmDetailResponse = new ResourceDetailResponse();
userVmDetailResponse.setName(nicDetail.getName());
userVmDetailResponse.setValue(nicDetail.getValue());
userVmDetailResponse.setResourceType(ResourceTag.TaggedResourceType.Nic.toString());
userVmDetailResponse.setObjectName("uservmdetail");
- nicDetailResponseList.add(userVmDetailResponse);
+ userVmDetailResponseList.add(userVmDetailResponse);
}
- return nicDetailResponseList;
+ return userVmDetailResponseList;
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6e80bb00/server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java b/server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
index 80d5055..8367863 100644
--- a/server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
+++ b/server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
@@ -23,6 +23,9 @@ import javax.ejb.Local;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
+import com.cloud.dc.DcDetailVO;
+import com.cloud.dc.dao.DataCenterDao;
+import com.cloud.dc.dao.DcDetailsDao;
import com.cloud.server.ResourceMetaDataService;
import com.cloud.storage.VolumeDetailVO;
import com.cloud.storage.dao.VolumeDetailsDao;
@@ -95,6 +98,8 @@ public class ResourceMetaDataManagerImpl extends ManagerBase implements Resource
@Inject
NetworkDao _networkDao;
@Inject
+ DataCenterDao _dataCenterDao;
+ @Inject
LoadBalancerDao _lbDao;
@Inject
PortForwardingRulesDao _pfDao;
@@ -123,6 +128,8 @@ public class ResourceMetaDataManagerImpl extends ManagerBase implements Resource
@Inject
NicDao _nicDao;
@Inject
+ DcDetailsDao _dcDetailsDao;
+ @Inject
TaggedResourceService _taggedResourceMgr;
@Inject
UserVmDetailsDao _userVmDetail;
@@ -148,6 +155,7 @@ public class ResourceMetaDataManagerImpl extends ManagerBase implements Resource
_daoMap.put(TaggedResourceType.StaticRoute, _staticRouteDao);
_daoMap.put(TaggedResourceType.VMSnapshot, _vmSnapshotDao);
_daoMap.put(TaggedResourceType.RemoteAccessVpn, _vpnDao);
+ _daoMap.put(TaggedResourceType.Zone, _dataCenterDao);
return true;
}
@@ -208,6 +216,9 @@ public class ResourceMetaDataManagerImpl extends ManagerBase implements Resource
}else if (resourceType == TaggedResourceType.UserVm){
UserVmDetailVO userVmDetail = new UserVmDetailVO(id, key, value);
_userVmDetailDao.persist(userVmDetail);
+ } else if (resourceType == TaggedResourceType.Zone){
+ DcDetailVO dataCenterDetail = new DcDetailVO(id, key, value);
+ _dcDetailsDao.persist(dataCenterDetail);
} else {
throw new InvalidParameterValueException("The resource type " + resourceType + " is not supported by the API yet");
}
@@ -233,7 +244,10 @@ public class ResourceMetaDataManagerImpl extends ManagerBase implements Resource
_nicDetailDao.removeDetails(id, key);
} else if(resourceType == TaggedResourceType.UserVm){
_userVmDetailDao.removeDetails(id, key);
- } else {
+ } else if (resourceType == TaggedResourceType.Zone){
+ _dcDetailsDao.removeDetails(id, key);
+ }
+ else{
throw new InvalidParameterValueException("The resource type " + resourceType + " is not supported by the API yet");
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6e80bb00/server/src/com/cloud/tags/TaggedResourceManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/tags/TaggedResourceManagerImpl.java b/server/src/com/cloud/tags/TaggedResourceManagerImpl.java
index e90481c..795a970 100644
--- a/server/src/com/cloud/tags/TaggedResourceManagerImpl.java
+++ b/server/src/com/cloud/tags/TaggedResourceManagerImpl.java
@@ -25,6 +25,7 @@ import javax.ejb.Local;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
+import com.cloud.dc.dao.DataCenterDao;
import com.cloud.vm.dao.NicDao;
import com.cloud.network.vpc.NetworkACLItemDao;
@@ -125,6 +126,8 @@ public class TaggedResourceManagerImpl extends ManagerBase implements TaggedReso
NicDao _nicDao;
@Inject
NetworkACLItemDao _networkACLItemDao;
+ @Inject
+ DataCenterDao _dataCenterDao;
@Override
@@ -147,6 +150,7 @@ public class TaggedResourceManagerImpl extends ManagerBase implements TaggedReso
_daoMap.put(TaggedResourceType.StaticRoute, _staticRouteDao);
_daoMap.put(TaggedResourceType.VMSnapshot, _vmSnapshotDao);
_daoMap.put(TaggedResourceType.RemoteAccessVpn, _vpnDao);
+ _daoMap.put(TaggedResourceType.Zone, _dataCenterDao);
return true;
}