cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ni...@apache.org
Subject git commit: updated refs/heads/master to 1e300b0
Date Fri, 09 May 2014 17:13:44 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master ebc2b8b94 -> 1e300b0d1


CLOUDSTACK-6530: Make more networking entities implement Displayable interface.


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

Branch: refs/heads/master
Commit: 1e300b0d122afa2fd6fb84307df809ac12af0964
Parents: ebc2b8b
Author: Nitin Mehta <nitin.mehta@citrix.com>
Authored: Fri May 9 10:12:56 2014 -0700
Committer: Nitin Mehta <nitin.mehta@citrix.com>
Committed: Fri May 9 10:13:33 2014 -0700

----------------------------------------------------------------------
 api/src/com/cloud/network/IpAddress.java                |  4 +++-
 api/src/com/cloud/network/RemoteAccessVpn.java          |  4 +++-
 api/src/com/cloud/network/Site2SiteVpnConnection.java   |  4 +++-
 api/src/com/cloud/network/Site2SiteVpnGateway.java      |  4 +++-
 api/src/com/cloud/network/as/AutoScaleVmGroup.java      |  4 +++-
 api/src/com/cloud/network/as/AutoScaleVmProfile.java    |  4 +++-
 api/src/com/cloud/network/rules/HealthCheckPolicy.java  |  7 +++----
 api/src/com/cloud/network/rules/StickinessPolicy.java   |  7 +++----
 api/src/com/cloud/network/vpc/NetworkACL.java           |  4 +++-
 api/src/com/cloud/network/vpc/NetworkACLItem.java       |  4 +++-
 .../api/command/user/address/AssociateIPAddrCmd.java    |  9 +++++++++
 .../user/autoscale/CreateAutoScaleVmGroupCmd.java       |  9 +++++++++
 .../user/autoscale/CreateAutoScaleVmProfileCmd.java     |  9 +++++++++
 .../user/loadbalancer/CreateLBHealthCheckPolicyCmd.java |  9 +++++++++
 .../user/loadbalancer/CreateLBStickinessPolicyCmd.java  |  9 +++++++++
 .../user/loadbalancer/CreateLoadBalancerRuleCmd.java    | 11 ++++++++---
 .../api/command/user/network/CreateNetworkACLCmd.java   | 10 ++++++++++
 .../command/user/network/CreateNetworkACLListCmd.java   | 11 ++++++++---
 .../command/user/network/UpdateNetworkACLItemCmd.java   | 12 +++++++++---
 .../api/command/user/vpn/CreateRemoteAccessVpnCmd.java  | 10 +++++++---
 .../api/command/user/vpn/CreateVpnConnectionCmd.java    | 10 ++++++++++
 .../api/command/user/vpn/CreateVpnGatewayCmd.java       | 10 ++++++++++
 22 files changed, 137 insertions(+), 28 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1e300b0d/api/src/com/cloud/network/IpAddress.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/IpAddress.java b/api/src/com/cloud/network/IpAddress.java
index 5aae784..f831e27 100644
--- a/api/src/com/cloud/network/IpAddress.java
+++ b/api/src/com/cloud/network/IpAddress.java
@@ -19,6 +19,7 @@ package com.cloud.network;
 import java.util.Date;
 
 import org.apache.cloudstack.acl.ControlledEntity;
+import org.apache.cloudstack.api.Displayable;
 import org.apache.cloudstack.api.Identity;
 import org.apache.cloudstack.api.InternalIdentity;
 
@@ -35,7 +36,7 @@ import com.cloud.utils.net.Ip;
  * - DomainId = domain of the account owner.
  * - Allocated = time it was allocated.
  */
-public interface IpAddress extends ControlledEntity, Identity, InternalIdentity {
+public interface IpAddress extends ControlledEntity, Identity, InternalIdentity, Displayable
{
     enum State {
         Allocating, // The IP Address is being propagated to other network elements and is
not ready for use yet.
         Allocated, // The IP address is in used.
@@ -85,6 +86,7 @@ public interface IpAddress extends ControlledEntity, Identity, InternalIdentity
 
     Long getNetworkId();
 
+    @Override
     boolean isDisplay();
 
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1e300b0d/api/src/com/cloud/network/RemoteAccessVpn.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/RemoteAccessVpn.java b/api/src/com/cloud/network/RemoteAccessVpn.java
index 4d7e4d4..25b4fbb 100644
--- a/api/src/com/cloud/network/RemoteAccessVpn.java
+++ b/api/src/com/cloud/network/RemoteAccessVpn.java
@@ -17,10 +17,11 @@
 package com.cloud.network;
 
 import org.apache.cloudstack.acl.ControlledEntity;
+import org.apache.cloudstack.api.Displayable;
 import org.apache.cloudstack.api.Identity;
 import org.apache.cloudstack.api.InternalIdentity;
 
-public interface RemoteAccessVpn extends ControlledEntity, InternalIdentity, Identity {
+public interface RemoteAccessVpn extends ControlledEntity, InternalIdentity, Identity, Displayable
{
     enum State {
         Added, Running, Removed
     }
@@ -39,5 +40,6 @@ public interface RemoteAccessVpn extends ControlledEntity, InternalIdentity,
Ide
 
     State getState();
 
+    @Override
     boolean isDisplay();
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1e300b0d/api/src/com/cloud/network/Site2SiteVpnConnection.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/Site2SiteVpnConnection.java b/api/src/com/cloud/network/Site2SiteVpnConnection.java
index 81e8180..cfc439a 100644
--- a/api/src/com/cloud/network/Site2SiteVpnConnection.java
+++ b/api/src/com/cloud/network/Site2SiteVpnConnection.java
@@ -19,9 +19,10 @@ package com.cloud.network;
 import java.util.Date;
 
 import org.apache.cloudstack.acl.ControlledEntity;
+import org.apache.cloudstack.api.Displayable;
 import org.apache.cloudstack.api.InternalIdentity;
 
-public interface Site2SiteVpnConnection extends ControlledEntity, InternalIdentity {
+public interface Site2SiteVpnConnection extends ControlledEntity, InternalIdentity, Displayable
{
     enum State {
         Pending, Connected, Disconnected, Error,
     }
@@ -43,5 +44,6 @@ public interface Site2SiteVpnConnection extends ControlledEntity, InternalIdenti
 
     public boolean isPassive();
 
+    @Override
     boolean isDisplay();
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1e300b0d/api/src/com/cloud/network/Site2SiteVpnGateway.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/Site2SiteVpnGateway.java b/api/src/com/cloud/network/Site2SiteVpnGateway.java
index bae1259..57037d6 100644
--- a/api/src/com/cloud/network/Site2SiteVpnGateway.java
+++ b/api/src/com/cloud/network/Site2SiteVpnGateway.java
@@ -19,16 +19,18 @@ package com.cloud.network;
 import java.util.Date;
 
 import org.apache.cloudstack.acl.ControlledEntity;
+import org.apache.cloudstack.api.Displayable;
 import org.apache.cloudstack.api.Identity;
 import org.apache.cloudstack.api.InternalIdentity;
 
 
-public interface Site2SiteVpnGateway extends ControlledEntity, Identity, InternalIdentity
{
+public interface Site2SiteVpnGateway extends ControlledEntity, Identity, InternalIdentity,
Displayable {
     public long getAddrId();
 
     public long getVpcId();
 
     public Date getRemoved();
 
+    @Override
     boolean isDisplay();
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1e300b0d/api/src/com/cloud/network/as/AutoScaleVmGroup.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/as/AutoScaleVmGroup.java b/api/src/com/cloud/network/as/AutoScaleVmGroup.java
index 14c7615..cf2c15c 100644
--- a/api/src/com/cloud/network/as/AutoScaleVmGroup.java
+++ b/api/src/com/cloud/network/as/AutoScaleVmGroup.java
@@ -20,9 +20,10 @@ package com.cloud.network.as;
 import java.util.Date;
 
 import org.apache.cloudstack.acl.ControlledEntity;
+import org.apache.cloudstack.api.Displayable;
 import org.apache.cloudstack.api.InternalIdentity;
 
-public interface AutoScaleVmGroup extends ControlledEntity, InternalIdentity {
+public interface AutoScaleVmGroup extends ControlledEntity, InternalIdentity, Displayable
{
 
     String State_New = "new";
     String State_Revoke = "revoke";
@@ -53,6 +54,7 @@ public interface AutoScaleVmGroup extends ControlledEntity, InternalIdentity
{
 
     String getUuid();
 
+    @Override
     boolean isDisplay();
 
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1e300b0d/api/src/com/cloud/network/as/AutoScaleVmProfile.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/as/AutoScaleVmProfile.java b/api/src/com/cloud/network/as/AutoScaleVmProfile.java
index 6e0b5ff..495446a 100644
--- a/api/src/com/cloud/network/as/AutoScaleVmProfile.java
+++ b/api/src/com/cloud/network/as/AutoScaleVmProfile.java
@@ -20,6 +20,7 @@ package com.cloud.network.as;
 import java.util.List;
 
 import org.apache.cloudstack.acl.ControlledEntity;
+import org.apache.cloudstack.api.Displayable;
 import org.apache.cloudstack.api.InternalIdentity;
 
 import com.cloud.utils.Pair;
@@ -27,7 +28,7 @@ import com.cloud.utils.Pair;
 /**
  * AutoScaleVmProfile
  */
-public interface AutoScaleVmProfile extends ControlledEntity, InternalIdentity {
+public interface AutoScaleVmProfile extends ControlledEntity, InternalIdentity, Displayable
{
 
     @Override
     public long getId();
@@ -48,6 +49,7 @@ public interface AutoScaleVmProfile extends ControlledEntity, InternalIdentity
{
 
     public long getAutoScaleUserId();
 
+    @Override
     boolean isDisplay();
 
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1e300b0d/api/src/com/cloud/network/rules/HealthCheckPolicy.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/rules/HealthCheckPolicy.java b/api/src/com/cloud/network/rules/HealthCheckPolicy.java
index 2b1b68b..f7562e8 100644
--- a/api/src/com/cloud/network/rules/HealthCheckPolicy.java
+++ b/api/src/com/cloud/network/rules/HealthCheckPolicy.java
@@ -16,12 +16,13 @@
 // under the License.
 package com.cloud.network.rules;
 
+import org.apache.cloudstack.api.Displayable;
 import org.apache.cloudstack.api.Identity;
 import org.apache.cloudstack.api.InternalIdentity;
 
 /**
  */
-public interface HealthCheckPolicy extends InternalIdentity, Identity {
+public interface HealthCheckPolicy extends InternalIdentity, Identity, Displayable {
 
     public long getLoadBalancerId();
 
@@ -39,9 +40,7 @@ public interface HealthCheckPolicy extends InternalIdentity, Identity {
 
     public boolean isRevoke();
 
-    /**
-     * @return
-     */
+    @Override
     boolean isDisplay();
 
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1e300b0d/api/src/com/cloud/network/rules/StickinessPolicy.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/rules/StickinessPolicy.java b/api/src/com/cloud/network/rules/StickinessPolicy.java
index c770071..7f956f9 100644
--- a/api/src/com/cloud/network/rules/StickinessPolicy.java
+++ b/api/src/com/cloud/network/rules/StickinessPolicy.java
@@ -18,6 +18,7 @@ package com.cloud.network.rules;
 
 import java.util.List;
 
+import org.apache.cloudstack.api.Displayable;
 import org.apache.cloudstack.api.Identity;
 import org.apache.cloudstack.api.InternalIdentity;
 
@@ -25,7 +26,7 @@ import com.cloud.utils.Pair;
 
 /**
  */
-public interface StickinessPolicy extends InternalIdentity, Identity {
+public interface StickinessPolicy extends InternalIdentity, Identity, Displayable {
 
     public long getLoadBalancerId();
 
@@ -39,9 +40,7 @@ public interface StickinessPolicy extends InternalIdentity, Identity {
 
     public List<Pair<String, String>> getParams(); /* get params in Map <string,String>
format */
 
-    /**
-     * @return
-     */
+    @Override
     boolean isDisplay();
 
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1e300b0d/api/src/com/cloud/network/vpc/NetworkACL.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/vpc/NetworkACL.java b/api/src/com/cloud/network/vpc/NetworkACL.java
index 3ebee14..193a48c 100644
--- a/api/src/com/cloud/network/vpc/NetworkACL.java
+++ b/api/src/com/cloud/network/vpc/NetworkACL.java
@@ -17,9 +17,10 @@
 
 package com.cloud.network.vpc;
 
+import org.apache.cloudstack.api.Displayable;
 import org.apache.cloudstack.api.InternalIdentity;
 
-public interface NetworkACL extends InternalIdentity {
+public interface NetworkACL extends InternalIdentity, Displayable {
     public static final long DEFAULT_DENY = 1;
     public static final long DEFAULT_ALLOW = 2;
 
@@ -34,5 +35,6 @@ public interface NetworkACL extends InternalIdentity {
 
     String getName();
 
+    @Override
     boolean isDisplay();
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1e300b0d/api/src/com/cloud/network/vpc/NetworkACLItem.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/vpc/NetworkACLItem.java b/api/src/com/cloud/network/vpc/NetworkACLItem.java
index faa4d27..8e288a2 100644
--- a/api/src/com/cloud/network/vpc/NetworkACLItem.java
+++ b/api/src/com/cloud/network/vpc/NetworkACLItem.java
@@ -18,9 +18,10 @@ package com.cloud.network.vpc;
 
 import java.util.List;
 
+import org.apache.cloudstack.api.Displayable;
 import org.apache.cloudstack.api.InternalIdentity;
 
-public interface NetworkACLItem extends InternalIdentity {
+public interface NetworkACLItem extends InternalIdentity, Displayable {
 
     String getUuid();
 
@@ -73,6 +74,7 @@ public interface NetworkACLItem extends InternalIdentity {
      */
     TrafficType getTrafficType();
 
+    @Override
     boolean isDisplay();
 
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1e300b0d/api/src/org/apache/cloudstack/api/command/user/address/AssociateIPAddrCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/address/AssociateIPAddrCmd.java
b/api/src/org/apache/cloudstack/api/command/user/address/AssociateIPAddrCmd.java
index 091229f..48fe43e 100644
--- a/api/src/org/apache/cloudstack/api/command/user/address/AssociateIPAddrCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/address/AssociateIPAddrCmd.java
@@ -202,11 +202,20 @@ public class AssociateIPAddrCmd extends BaseAsyncCreateCmd {
         }
     }
 
+    @Deprecated
     public Boolean getDisplayIp() {
         return display;
     }
 
     @Override
+    public boolean isDisplay() {
+        if(display == null)
+            return true;
+        else
+            return display;
+    }
+
+    @Override
     public long getEntityOwnerId() {
         Account caller = CallContext.current().getCallingAccount();
         if (accountName != null && domainId != null) {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1e300b0d/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmGroupCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmGroupCmd.java
b/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmGroupCmd.java
index 1fd0029..0308c17 100644
--- a/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmGroupCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmGroupCmd.java
@@ -184,11 +184,20 @@ public class CreateAutoScaleVmGroupCmd extends BaseAsyncCreateCmd {
         return ApiCommandJobType.AutoScaleVmGroup;
     }
 
+    @Deprecated
     public Boolean getDisplay() {
         return display;
     }
 
     @Override
+    public boolean isDisplay() {
+        if(display == null)
+            return true;
+        else
+            return display;
+    }
+
+    @Override
     public void create() throws ResourceAllocationException {
         AutoScaleVmGroup result = _autoScaleService.createAutoScaleVmGroup(this);
         if (result != null) {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1e300b0d/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmProfileCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmProfileCmd.java
b/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmProfileCmd.java
index 189217a..447085e 100644
--- a/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmProfileCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmProfileCmd.java
@@ -131,10 +131,19 @@ public class CreateAutoScaleVmProfileCmd extends BaseAsyncCreateCmd
{
         return templateId;
     }
 
+    @Deprecated
     public Boolean getDisplay() {
         return display;
     }
 
+    @Override
+    public boolean isDisplay() {
+        if(display == null)
+            return true;
+        else
+            return display;
+    }
+
     public Map getCounterParamList() {
         return counterParamList;
     }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1e300b0d/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBHealthCheckPolicyCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBHealthCheckPolicyCmd.java
b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBHealthCheckPolicyCmd.java
index b487226..f6eb48e 100644
--- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBHealthCheckPolicyCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBHealthCheckPolicyCmd.java
@@ -97,10 +97,19 @@ public class CreateLBHealthCheckPolicyCmd extends BaseAsyncCreateCmd {
     // ///////////////// Accessors ///////////////////////
     // ///////////////////////////////////////////////////
 
+    @Deprecated
     public Boolean getDisplay() {
         return display;
     }
 
+    @Override
+    public boolean isDisplay() {
+        if(display == null)
+            return true;
+        else
+            return display;
+    }
+
     public Long getLbRuleId() {
         return lbRuleId;
     }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1e300b0d/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBStickinessPolicyCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBStickinessPolicyCmd.java
b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBStickinessPolicyCmd.java
index 5ea5717..152f661 100644
--- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBStickinessPolicyCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBStickinessPolicyCmd.java
@@ -82,10 +82,19 @@ public class CreateLBStickinessPolicyCmd extends BaseAsyncCreateCmd {
     // ///////////////// Accessors ///////////////////////
     // ///////////////////////////////////////////////////
 
+    @Deprecated
     public Boolean getDisplay() {
         return display;
     }
 
+    @Override
+    public boolean isDisplay() {
+        if(display == null)
+            return true;
+        else
+            return display;
+    }
+
     public Long getLbRuleId() {
         return lbRuleId;
     }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1e300b0d/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLoadBalancerRuleCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLoadBalancerRuleCmd.java
b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLoadBalancerRuleCmd.java
index a405913f..7c37192 100644
--- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLoadBalancerRuleCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLoadBalancerRuleCmd.java
@@ -124,8 +124,13 @@ public class CreateLoadBalancerRuleCmd extends BaseAsyncCreateCmd /*implements
L
     /////////////////// Accessors ///////////////////////
     /////////////////////////////////////////////////////
 
-    public Boolean getDisplay() {
-        return display;
+    @Override
+    public boolean isDisplay() {
+        if (display != null) {
+            return display;
+        } else {
+            return true;
+        }
     }
 
     public String getAlgorithm() {
@@ -309,7 +314,7 @@ public class CreateLoadBalancerRuleCmd extends BaseAsyncCreateCmd /*implements
L
         try {
             LoadBalancer result =
                 _lbService.createPublicLoadBalancerRule(getXid(), getName(), getDescription(),
getSourcePortStart(), getSourcePortEnd(), getDefaultPortStart(),
-                    getDefaultPortEnd(), getSourceIpAddressId(), getProtocol(), getAlgorithm(),
getNetworkId(), getEntityOwnerId(), getOpenFirewall(), getLbProtocol(), getDisplay());
+                    getDefaultPortEnd(), getSourceIpAddressId(), getProtocol(), getAlgorithm(),
getNetworkId(), getEntityOwnerId(), getOpenFirewall(), getLbProtocol(), isDisplay());
             this.setEntityId(result.getId());
             this.setEntityUuid(result.getUuid());
         } catch (NetworkRuleConflictException e) {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1e300b0d/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkACLCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkACLCmd.java
b/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkACLCmd.java
index e47fa8b..b4d5489 100644
--- a/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkACLCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkACLCmd.java
@@ -103,10 +103,20 @@ public class CreateNetworkACLCmd extends BaseAsyncCreateCmd {
     // ///////////////////////////////////////////////////
     // ///////////////// Accessors ///////////////////////
     // ///////////////////////////////////////////////////
+    @Deprecated
     public Boolean getDisplay() {
         return display;
     }
 
+    @Override
+    public boolean isDisplay() {
+        if (display != null) {
+            return display;
+        } else {
+            return true;
+        }
+    }
+
     public String getProtocol() {
         String p = protocol.trim();
         // Deal with ICMP(protocol number 1) specially because it need to be paired with
icmp type and code

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1e300b0d/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkACLListCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkACLListCmd.java
b/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkACLListCmd.java
index 07156cf..9aa0bab 100644
--- a/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkACLListCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkACLListCmd.java
@@ -77,8 +77,13 @@ public class CreateNetworkACLListCmd extends BaseAsyncCreateCmd {
         return vpcId;
     }
 
-    public Boolean getDisplay() {
-        return display;
+    @Override
+    public boolean isDisplay() {
+        if (display != null) {
+            return display;
+        } else {
+            return true;
+        }
     }
 
     // ///////////////////////////////////////////////////
@@ -92,7 +97,7 @@ public class CreateNetworkACLListCmd extends BaseAsyncCreateCmd {
 
     @Override
     public void create() {
-        NetworkACL result = _networkACLService.createNetworkACL(getName(), getDescription(),
getVpcId(), getDisplay());
+        NetworkACL result = _networkACLService.createNetworkACL(getName(), getDescription(),
getVpcId(), isDisplay());
         setEntityId(result.getId());
         setEntityUuid(result.getUuid());
     }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1e300b0d/api/src/org/apache/cloudstack/api/command/user/network/UpdateNetworkACLItemCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/network/UpdateNetworkACLItemCmd.java
b/api/src/org/apache/cloudstack/api/command/user/network/UpdateNetworkACLItemCmd.java
index eb095df..59ae05d 100644
--- a/api/src/org/apache/cloudstack/api/command/user/network/UpdateNetworkACLItemCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/network/UpdateNetworkACLItemCmd.java
@@ -88,8 +88,14 @@ public class UpdateNetworkACLItemCmd extends BaseAsyncCustomIdCmd {
     // ///////////////////////////////////////////////////
     // ///////////////// Accessors ///////////////////////
     // ///////////////////////////////////////////////////
-    public Boolean getDisplay() {
-        return display;
+
+    @Override
+    public boolean isDisplay() {
+        if (display != null) {
+            return display;
+        } else {
+            return true;
+        }
     }
 
     public Long getId() {
@@ -172,7 +178,7 @@ public class UpdateNetworkACLItemCmd extends BaseAsyncCustomIdCmd {
         CallContext.current().setEventDetails("Rule Id: " + getId());
         NetworkACLItem aclItem =
             _networkACLService.updateNetworkACLItem(getId(), getProtocol(), getSourceCidrList(),
getTrafficType(), getAction(), getNumber(), getSourcePortStart(),
-                getSourcePortEnd(), getIcmpCode(), getIcmpType(), this.getCustomId(), this.getDisplay());
+                getSourcePortEnd(), getIcmpCode(), getIcmpType(), this.getCustomId(), this.isDisplay());
         if (aclItem == null) {
             throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to update network
ACL Item");
         }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1e300b0d/api/src/org/apache/cloudstack/api/command/user/vpn/CreateRemoteAccessVpnCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/CreateRemoteAccessVpnCmd.java
b/api/src/org/apache/cloudstack/api/command/user/vpn/CreateRemoteAccessVpnCmd.java
index 2883b19..14b781d 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vpn/CreateRemoteAccessVpnCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vpn/CreateRemoteAccessVpnCmd.java
@@ -145,7 +145,7 @@ public class CreateRemoteAccessVpnCmd extends BaseAsyncCreateCmd {
     @Override
     public void create() {
         try {
-            RemoteAccessVpn vpn = _ravService.createRemoteAccessVpn(publicIpId, ipRange,
getOpenFirewall(), getDisplay());
+            RemoteAccessVpn vpn = _ravService.createRemoteAccessVpn(publicIpId, ipRange,
getOpenFirewall(), isDisplay());
             if (vpn != null) {
                 setEntityId(vpn.getServerAddressId());
                 // find uuid for server ip address
@@ -198,7 +198,11 @@ public class CreateRemoteAccessVpnCmd extends BaseAsyncCreateCmd {
         return ip;
     }
 
-    public Boolean getDisplay() {
-        return display;
+    @Override
+    public boolean isDisplay() {
+        if(display == null)
+            return true;
+        else
+            return display;
     }
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1e300b0d/api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnConnectionCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnConnectionCmd.java
b/api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnConnectionCmd.java
index 71245c3..6c08a42 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnConnectionCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnConnectionCmd.java
@@ -87,10 +87,20 @@ public class CreateVpnConnectionCmd extends BaseAsyncCreateCmd {
         return passive;
     }
 
+    @Deprecated
     public Boolean getDisplay() {
         return display;
     }
 
+    @Override
+    public boolean isDisplay() {
+        if (display != null) {
+            return display;
+        } else {
+            return true;
+        }
+    }
+
     /////////////////////////////////////////////////////
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1e300b0d/api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnGatewayCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnGatewayCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnGatewayCmd.java
index d5b5edb..fb933ba 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnGatewayCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnGatewayCmd.java
@@ -60,10 +60,20 @@ public class CreateVpnGatewayCmd extends BaseAsyncCmd {
         return vpcId;
     }
 
+    @Deprecated
     public Boolean getDisplay() {
         return display;
     }
 
+    @Override
+    public boolean isDisplay() {
+        if (display != null) {
+            return display;
+        } else {
+            return true;
+        }
+    }
+
     /////////////////////////////////////////////////////
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////


Mime
View raw message