diff --git a/api/src/com/cloud/network/router/VirtualRouter.java b/api/src/com/cloud/network/router/VirtualRouter.java index 4bffd3d195f..14cbf4e0cad 100755 --- a/api/src/com/cloud/network/router/VirtualRouter.java +++ b/api/src/com/cloud/network/router/VirtualRouter.java @@ -41,11 +41,6 @@ public interface VirtualRouter extends VirtualMachine { public String getGuestZoneMacAddress(); - /** - * @return the gateway address for the router to use. - */ - public String getGateway(); - /** * @return the ram size for this machine. */ @@ -60,18 +55,6 @@ public interface VirtualRouter extends VirtualMachine { String getDomain(); - /** - * @return account id that the domain router belongs to. - */ - @Override - long getAccountId(); - - /** - * @return domain id that the domain router belongs to. - */ - @Override - long getDomainId(); - Role getRole(); /** diff --git a/core/src/com/cloud/vm/ConsoleProxyVO.java b/core/src/com/cloud/vm/ConsoleProxyVO.java index bdff4e6eb25..4a3467a27cd 100644 --- a/core/src/com/cloud/vm/ConsoleProxyVO.java +++ b/core/src/com/cloud/vm/ConsoleProxyVO.java @@ -41,9 +41,6 @@ import com.cloud.hypervisor.Hypervisor.HypervisorType; @DiscriminatorValue(value="ConsoleProxy") public class ConsoleProxyVO extends VMInstanceVO implements ConsoleProxy { - @Column(name="gateway", nullable=false) - private String gateway; - @Column(name="public_ip_address", nullable=false) private String publicIpAddress; @@ -87,10 +84,6 @@ public class ConsoleProxyVO extends VMInstanceVO implements ConsoleProxy { super(); } - public void setGateway(String gateway) { - this.gateway = gateway; - } - public void setDomain(String domain) { this.domain = domain; } @@ -123,11 +116,6 @@ public class ConsoleProxyVO extends VMInstanceVO implements ConsoleProxy { this.sessionDetails = details; } - @Override - public String getGateway() { - return this.gateway; - } - @Override public String getPublicIpAddress() { return this.publicIpAddress; diff --git a/core/src/com/cloud/vm/DomainRouterVO.java b/core/src/com/cloud/vm/DomainRouterVO.java index 5ff1290f14d..fd6cd8a2d0c 100755 --- a/core/src/com/cloud/vm/DomainRouterVO.java +++ b/core/src/com/cloud/vm/DomainRouterVO.java @@ -41,9 +41,6 @@ public class DomainRouterVO extends VMInstanceVO implements VirtualRouter { @Column(name="ram_size", nullable=false) private int ramSize; - @Column(name="gateway") - private String gateway; - @Column(name="public_ip_address") private String publicIpAddress; @@ -91,10 +88,6 @@ public class DomainRouterVO extends VMInstanceVO implements VirtualRouter { this.domain = networkDomain; } - public void setGateway(String gateway) { - this.gateway = gateway; - } - public void setPublicIpAddress(String publicIpAddress) { this.publicIpAddress = publicIpAddress; } @@ -167,11 +160,6 @@ public class DomainRouterVO extends VMInstanceVO implements VirtualRouter { this.ramSize = ramSize; } - @Override - public String getGateway() { - return gateway; - } - @Override public String getPublicIpAddress() { return publicIpAddress; diff --git a/core/src/com/cloud/vm/SecondaryStorageVmVO.java b/core/src/com/cloud/vm/SecondaryStorageVmVO.java index dc45b221cb6..0087ffd3b21 100644 --- a/core/src/com/cloud/vm/SecondaryStorageVmVO.java +++ b/core/src/com/cloud/vm/SecondaryStorageVmVO.java @@ -39,9 +39,6 @@ import com.cloud.hypervisor.Hypervisor.HypervisorType; @DiscriminatorValue(value="SecondaryStorageVm") public class SecondaryStorageVmVO extends VMInstanceVO implements SecondaryStorageVm { - @Column(name="gateway", nullable=false) - private String gateway; - @Column(name="public_ip_address", nullable=false) private String publicIpAddress; @@ -79,10 +76,6 @@ public class SecondaryStorageVmVO extends VMInstanceVO implements SecondaryStora super(); } - public void setGateway(String gateway) { - this.gateway = gateway; - } - public void setDomain(String domain) { this.domain = domain; } @@ -107,11 +100,6 @@ public class SecondaryStorageVmVO extends VMInstanceVO implements SecondaryStora this.lastUpdateTime = time; } - @Override - public String getGateway() { - return this.gateway; - } - @Override public String getPublicIpAddress() { return this.publicIpAddress; diff --git a/core/src/com/cloud/vm/SystemVm.java b/core/src/com/cloud/vm/SystemVm.java index ce7a9b5093a..2a1d3b7c0dc 100644 --- a/core/src/com/cloud/vm/SystemVm.java +++ b/core/src/com/cloud/vm/SystemVm.java @@ -20,7 +20,6 @@ package com.cloud.vm; import java.util.Date; public interface SystemVm extends VirtualMachine { - public String getGateway(); public String getDomain(); public String getPublicIpAddress(); public String getPublicNetmask();