You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by al...@apache.org on 2013/11/12 19:55:41 UTC

git commit: updated refs/heads/master to 9f8f74c

Updated Branches:
  refs/heads/master c3b60fad9 -> 9f8f74c4e


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/9f8f74c4
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9f8f74c4
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9f8f74c4

Branch: refs/heads/master
Commit: 9f8f74c4eddf0d9486a1da0bb16de8223dbb4be9
Parents: c3b60fa
Author: Alena Prokharchyk <al...@citrix.com>
Authored: Tue Nov 12 09:20:28 2013 -0800
Committer: Alena Prokharchyk <al...@citrix.com>
Committed: Tue Nov 12 10:55:27 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/9f8f74c4/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/9f8f74c4/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;
     }