feuhaps
diff --git a/‎api/src/com/cloud/vm/VirtualMachine.java‎
Lines changed: 0 additions & 1 deletion b/‎api/src/com/cloud/vm/VirtualMachine.java‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎core/src/com/cloud/vm/DomainRouterVO.java‎
Lines changed: 76 additions & 80 deletions b/‎core/src/com/cloud/vm/DomainRouterVO.java‎
Lines changed: 76 additions & 80 deletions
@@ -293,5 +293,4 @@ public static boolean isSystemVM(VirtualMachine.Type vmtype) {
 
     public Map<String, String> getDetails();
 
-    boolean canPlugNics();
 }
@@ -36,45 +36,45 @@
 public class DomainRouterVO extends VMInstanceVO implements VirtualRouter {
     @Column(name="element_id")
     private long elementId;
-    
+
     @Column(name="public_ip_address")
     private String publicIpAddress;
-    
+
     @Column(name="public_mac_address")
     private String publicMacAddress;
-    
+
     @Column(name="public_netmask")
     private String publicNetmask;
 
     @Column(name="is_redundant_router")
     boolean isRedundantRouter;
-    
+
     @Column(name="priority")
     int priority;
-    
+
     @Column(name="is_priority_bumpup")
     boolean isPriorityBumpUp;
-    
+
     @Column(name="redundant_state")
     @Enumerated(EnumType.STRING)
     private RedundantState redundantState;
-    
+
     @Column(name="stop_pending")
     boolean stopPending;
-    
+
     @Column(name="role")
     @Enumerated(EnumType.STRING)
     private Role role = Role.VIRTUAL_ROUTER;
-    
+
     @Column(name="template_version")
     private String templateVersion;
-    
+
     @Column(name="scripts_version")
     private String scriptsVersion;
-    
+
     @Column(name="vpc_id")
     private Long vpcId;
-    
+
     public DomainRouterVO(long id,
             long serviceOfferingId,
             long elementId,
@@ -99,7 +99,7 @@ public DomainRouterVO(long id,
         this.stopPending = stopPending;
         this.vpcId = vpcId;
     }
-    
+
     public DomainRouterVO(long id,
             long serviceOfferingId,
             long elementId,
@@ -146,94 +146,94 @@ public void setPublicNetmask(String publicNetmask) {
     public long getDataCenterIdToDeployIn() {
         return dataCenterIdToDeployIn;
     }
-    
+
     public String getPublicNetmask() {
         return publicNetmask;
     }
-    
+
     public String getPublicMacAddress() {
         return publicMacAddress;
     }
-    
+
     protected DomainRouterVO() {
         super();
     }
-    
+
     @Override
     public String getPublicIpAddress() {
         return publicIpAddress;
     }
-    
-	@Override
-	public Role getRole() {
-		return role;
-	}
-
-	public void setRole(Role role) {
-		this.role = role;
-	}
-    
-	@Override
-	public boolean getIsRedundantRouter() {
-	    return this.isRedundantRouter;
- 	}
-
-	public void setIsRedundantRouter(boolean isRedundantRouter) {
-	    this.isRedundantRouter = isRedundantRouter;
-	}
-
-	@Override
-	public long getServiceOfferingId() {
-	    return serviceOfferingId;
-	}
-
-	public int getPriority() {
-	    return this.priority;
-	}
-	
-	public void setPriority(int priority) {
-	    this.priority = priority;
-	}
-
-	@Override
-	public RedundantState getRedundantState() {
-	    return this.redundantState;
-	}
-	
-	public void setRedundantState(RedundantState redundantState) {
-	    this.redundantState = redundantState;
-	}
-    
-	public boolean getIsPriorityBumpUp() {
-	    return this.isPriorityBumpUp;
- 	}
-
-	public void setIsPriorityBumpUp(boolean isPriorityBumpUp) {
-	    this.isPriorityBumpUp = isPriorityBumpUp;
-	}
 
     @Override
-	public boolean isStopPending() {
-	    return this.stopPending;
- 	}
+    public Role getRole() {
+        return role;
+    }
+
+    public void setRole(Role role) {
+        this.role = role;
+    }
+
+    @Override
+    public boolean getIsRedundantRouter() {
+        return this.isRedundantRouter;
+    }
+
+    public void setIsRedundantRouter(boolean isRedundantRouter) {
+        this.isRedundantRouter = isRedundantRouter;
+    }
 
     @Override
-	public void setStopPending(boolean stopPending) {
-	    this.stopPending = stopPending;
-	}
-    
+    public long getServiceOfferingId() {
+        return serviceOfferingId;
+    }
+
+    public int getPriority() {
+        return this.priority;
+    }
+
+    public void setPriority(int priority) {
+        this.priority = priority;
+    }
+
+    @Override
+    public RedundantState getRedundantState() {
+        return this.redundantState;
+    }
+
+    public void setRedundantState(RedundantState redundantState) {
+        this.redundantState = redundantState;
+    }
+
+    public boolean getIsPriorityBumpUp() {
+        return this.isPriorityBumpUp;
+    }
+
+    public void setIsPriorityBumpUp(boolean isPriorityBumpUp) {
+        this.isPriorityBumpUp = isPriorityBumpUp;
+    }
+
+    @Override
+    public boolean isStopPending() {
+        return this.stopPending;
+    }
+
+    @Override
+    public void setStopPending(boolean stopPending) {
+        this.stopPending = stopPending;
+    }
+
     public String getTemplateVersion() {
         return this.templateVersion;
     }
-    
+
     public void setTemplateVersion(String templateVersion) {
         this.templateVersion = templateVersion;
     }
-    
+
     public String getScriptsVersion() {
         return this.scriptsVersion;
     }
-    
+
     public void setScriptsVersion(String scriptsVersion) {
         this.scriptsVersion = scriptsVersion;
     }
@@ -242,9 +242,5 @@ public void setScriptsVersion(String scriptsVersion) {
     public Long getVpcId() {
         return vpcId;
     }
-    
-    @Override
-    public boolean canPlugNics() {
-        return true;
-    }
+
 }
Original file line number	Diff line number	Diff line change
`@@ -293,5 +293,4 @@ public static boolean isSystemVM(VirtualMachine.Type vmtype) {`
`293`	`293`
`294`	`294`	`public Map<String, String> getDetails();`
`295`	`295`
`296`		`- boolean canPlugNics();`
`297`	`296`	`}`