Skip to content

Commit 3dd7301

Browse files
author
Alex Huang
committed
removed unused gateway
1 parent 68464d6 commit 3dd7301

5 files changed

Lines changed: 0 additions & 54 deletions

File tree

api/src/com/cloud/network/router/VirtualRouter.java

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,6 @@ public enum Role {
4141

4242
public String getGuestZoneMacAddress();
4343

44-
/**
45-
* @return the gateway address for the router to use.
46-
*/
47-
public String getGateway();
48-
4944
/**
5045
* @return the ram size for this machine.
5146
*/
@@ -60,18 +55,6 @@ public enum Role {
6055

6156
String getDomain();
6257

63-
/**
64-
* @return account id that the domain router belongs to.
65-
*/
66-
@Override
67-
long getAccountId();
68-
69-
/**
70-
* @return domain id that the domain router belongs to.
71-
*/
72-
@Override
73-
long getDomainId();
74-
7558
Role getRole();
7659

7760
/**

core/src/com/cloud/vm/ConsoleProxyVO.java

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,6 @@
4141
@DiscriminatorValue(value="ConsoleProxy")
4242
public class ConsoleProxyVO extends VMInstanceVO implements ConsoleProxy {
4343

44-
@Column(name="gateway", nullable=false)
45-
private String gateway;
46-
4744
@Column(name="public_ip_address", nullable=false)
4845
private String publicIpAddress;
4946

@@ -87,10 +84,6 @@ protected ConsoleProxyVO() {
8784
super();
8885
}
8986

90-
public void setGateway(String gateway) {
91-
this.gateway = gateway;
92-
}
93-
9487
public void setDomain(String domain) {
9588
this.domain = domain;
9689
}
@@ -123,11 +116,6 @@ public void setSessionDetails(byte[] details) {
123116
this.sessionDetails = details;
124117
}
125118

126-
@Override
127-
public String getGateway() {
128-
return this.gateway;
129-
}
130-
131119
@Override
132120
public String getPublicIpAddress() {
133121
return this.publicIpAddress;

core/src/com/cloud/vm/DomainRouterVO.java

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,6 @@ public class DomainRouterVO extends VMInstanceVO implements VirtualRouter {
4141
@Column(name="ram_size", nullable=false)
4242
private int ramSize;
4343

44-
@Column(name="gateway")
45-
private String gateway;
46-
4744
@Column(name="public_ip_address")
4845
private String publicIpAddress;
4946

@@ -91,10 +88,6 @@ public DomainRouterVO(long id,
9188
this.domain = networkDomain;
9289
}
9390

94-
public void setGateway(String gateway) {
95-
this.gateway = gateway;
96-
}
97-
9891
public void setPublicIpAddress(String publicIpAddress) {
9992
this.publicIpAddress = publicIpAddress;
10093
}
@@ -167,11 +160,6 @@ public void setRamSize(int ramSize) {
167160
this.ramSize = ramSize;
168161
}
169162

170-
@Override
171-
public String getGateway() {
172-
return gateway;
173-
}
174-
175163
@Override
176164
public String getPublicIpAddress() {
177165
return publicIpAddress;

core/src/com/cloud/vm/SecondaryStorageVmVO.java

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,6 @@
3939
@DiscriminatorValue(value="SecondaryStorageVm")
4040
public class SecondaryStorageVmVO extends VMInstanceVO implements SecondaryStorageVm {
4141

42-
@Column(name="gateway", nullable=false)
43-
private String gateway;
44-
4542
@Column(name="public_ip_address", nullable=false)
4643
private String publicIpAddress;
4744

@@ -79,10 +76,6 @@ protected SecondaryStorageVmVO() {
7976
super();
8077
}
8178

82-
public void setGateway(String gateway) {
83-
this.gateway = gateway;
84-
}
85-
8679
public void setDomain(String domain) {
8780
this.domain = domain;
8881
}
@@ -107,11 +100,6 @@ public void setLastUpdateTime(Date time) {
107100
this.lastUpdateTime = time;
108101
}
109102

110-
@Override
111-
public String getGateway() {
112-
return this.gateway;
113-
}
114-
115103
@Override
116104
public String getPublicIpAddress() {
117105
return this.publicIpAddress;

core/src/com/cloud/vm/SystemVm.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import java.util.Date;
2121

2222
public interface SystemVm extends VirtualMachine {
23-
public String getGateway();
2423
public String getDomain();
2524
public String getPublicIpAddress();
2625
public String getPublicNetmask();

0 commit comments

Comments
 (0)