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

nitinmeh · nitinmeh · commit 1e300b0d122a · 2014-05-09T10:13:33.000-07:00
diff --git a/api/src/com/cloud/network/IpAddress.java b/api/src/com/cloud/network/IpAddress.java
@@ -19,6 +19,7 @@
 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 @@
  * - 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 @@ enum Purpose {
 
     Long getNetworkId();
 
+    @Override
     boolean isDisplay();
 
 }
diff --git 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 @@ enum State {
 
     State getState();
 
+    @Override
     boolean isDisplay();
 }
diff --git a/api/src/com/cloud/network/Site2SiteVpnConnection.java b/api/src/com/cloud/network/Site2SiteVpnConnection.java
@@ -19,9 +19,10 @@
 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 @@ enum State {
 
     public boolean isPassive();
 
+    @Override
     boolean isDisplay();
 }
diff --git a/api/src/com/cloud/network/Site2SiteVpnGateway.java b/api/src/com/cloud/network/Site2SiteVpnGateway.java
@@ -19,16 +19,18 @@
 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();
 }
diff --git a/api/src/com/cloud/network/as/AutoScaleVmGroup.java b/api/src/com/cloud/network/as/AutoScaleVmGroup.java
@@ -20,9 +20,10 @@
 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();
 
 }
diff --git a/api/src/com/cloud/network/as/AutoScaleVmProfile.java b/api/src/com/cloud/network/as/AutoScaleVmProfile.java
@@ -20,14 +20,15 @@
 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;
 
 /**
  * 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();
 
 }
diff --git 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();
 
 }
diff --git a/api/src/com/cloud/network/rules/StickinessPolicy.java b/api/src/com/cloud/network/rules/StickinessPolicy.java
@@ -18,14 +18,15 @@
 
 import java.util.List;
 
+import org.apache.cloudstack.api.Displayable;
 import org.apache.cloudstack.api.Identity;
 import org.apache.cloudstack.api.InternalIdentity;
 
 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();
 
 }
diff --git 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();
 }
diff --git a/api/src/com/cloud/network/vpc/NetworkACLItem.java b/api/src/com/cloud/network/vpc/NetworkACLItem.java
@@ -18,9 +18,10 @@
 
 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 @@ enum Action {
      */
     TrafficType getTrafficType();
 
+    @Override
     boolean isDisplay();
 
 }
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
@@ -202,10 +202,19 @@ public Long getNetworkId() {
         }
     }
 
+    @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();
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
@@ -184,10 +184,19 @@ public ApiCommandJobType getInstanceType() {
         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);
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
@@ -131,10 +131,19 @@ public Long getTemplateId() {
         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;
     }
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
@@ -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;
     }
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
@@ -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;
     }
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
@@ -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 void create() {
         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) {
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
@@ -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
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
@@ -77,8 +77,13 @@ public Long getVpcId() {
         return vpcId;
     }
 
-    public Boolean getDisplay() {
-        return display;
+    @Override
+    public boolean isDisplay() {
+        if (display != null) {
+            return display;
+        } else {
+            return true;
+        }
     }
 
     // ///////////////////////////////////////////////////
@@ -92,7 +97,7 @@ public String getCommandName() {
 
     @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());
     }
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
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
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
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

Original file line number	Diff line number	Diff line change
`@@ -19,9 +19,10 @@`
`19`	`19`	`import java.util.Date;`
`20`	`20`
`21`	`21`	`import org.apache.cloudstack.acl.ControlledEntity;`
	`22`	`+import org.apache.cloudstack.api.Displayable;`
`22`	`23`	`import org.apache.cloudstack.api.InternalIdentity;`
`23`	`24`
`24`		`-public interface Site2SiteVpnConnection extends ControlledEntity, InternalIdentity {`
	`25`	`+public interface Site2SiteVpnConnection extends ControlledEntity, InternalIdentity, Displayable {`
`25`	`26`	`enum State {`
`26`	`27`	`Pending, Connected, Disconnected, Error,`
`27`	`28`	`}`
`@@ -43,5 +44,6 @@ enum State {`
`43`	`44`
`44`	`45`	`public boolean isPassive();`
`45`	`46`
	`47`	`+ @Override`
`46`	`48`	`boolean isDisplay();`
`47`	`49`	`}`