cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alena1...@apache.org
Subject [2/2] git commit: updated refs/heads/4.3 to 8c61117
Date Tue, 12 Nov 2013 19:16:09 GMT
Added resource metadata support for PF rules


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8c611173
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8c611173
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8c611173

Branch: refs/heads/4.3
Commit: 8c61117369c6dc39c233bd6665f6c94bc8e812e0
Parents: 1585b23
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Authored: Tue Nov 12 09:20:28 2013 -0800
Committer: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Committed: Tue Nov 12 11:03:10 2013 -0800

----------------------------------------------------------------------
 api/src/com/cloud/server/ResourceTag.java                      | 2 +-
 server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8c611173/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 47e00be..35efcf0 100644
--- a/api/src/com/cloud/server/ResourceTag.java
+++ b/api/src/com/cloud/server/ResourceTag.java
@@ -32,7 +32,7 @@ public interface ResourceTag extends ControlledEntity, Identity, InternalIdentit
         Network (true, true),
         Nic (false, true),
         LoadBalancer (true, false),
-        PortForwardingRule (true, false),
+        PortForwardingRule (true, true),
         FirewallRule (true, true),
         SecurityGroup (true, false),
         PublicIpAddress (true, true),

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8c611173/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 4ebc43e..8c4415c 100644
--- a/server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
+++ b/server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
@@ -95,6 +95,7 @@ public class ResourceMetaDataManagerImpl extends ManagerBase implements
Resource
         _daoMap.put(ResourceObjectType.Storage, _storageDetailsDao);
         _daoMap.put(ResourceObjectType.FirewallRule, _firewallRuleDetailsDao);
         _daoMap.put(ResourceObjectType.PublicIpAddress, _userIpAddressDetailsDao);
+        _daoMap.put(ResourceObjectType.PortForwardingRule, _firewallRuleDetailsDao);
 
         return true;
     }


Mime
View raw message