From 463835e7d7863da96e3454d9a7948968bcd7cbc1 Mon Sep 17 00:00:00 2001
From: Alex Huang <alex@cloud.com>
Date: Mon, 24 Jan 2011 17:43:28 -0800
Subject: [PATCH] removed unused domain in system vms

---
 core/src/com/cloud/vm/ConsoleProxyVO.java       | 12 ------------
 core/src/com/cloud/vm/SecondaryStorageVmVO.java | 13 -------------
 core/src/com/cloud/vm/SystemVm.java             |  1 -
 server/src/com/cloud/api/ApiResponseHelper.java |  1 -
 4 files changed, 27 deletions(-)

diff --git a/core/src/com/cloud/vm/ConsoleProxyVO.java b/core/src/com/cloud/vm/ConsoleProxyVO.java
index 4a3467a27cd..148ab090590 100644
--- a/core/src/com/cloud/vm/ConsoleProxyVO.java
+++ b/core/src/com/cloud/vm/ConsoleProxyVO.java
@@ -50,9 +50,6 @@ public class ConsoleProxyVO extends VMInstanceVO implements ConsoleProxy {
     @Column(name="public_netmask", nullable=false)
     private String publicNetmask;
     
-    @Column(name="domain", nullable=false)
-    private String domain;
-    
     @Column(name="ram_size", updatable=false, nullable=false)
     private int ramSize;
     
@@ -84,10 +81,6 @@ public class ConsoleProxyVO extends VMInstanceVO implements ConsoleProxy {
         super();
     }
 
-    public void setDomain(String domain) {
-    	this.domain = domain;
-    }
-    
     public void setPublicIpAddress(String publicIpAddress) {
     	this.publicIpAddress = publicIpAddress;
     }
@@ -131,11 +124,6 @@ public class ConsoleProxyVO extends VMInstanceVO implements ConsoleProxy {
 		return this.publicMacAddress;
 	}
     
-    @Override
-    public String getDomain() {
-    	return this.domain;
-    }
-	
     @Override
 	public int getRamSize() {
     	return this.ramSize;
diff --git a/core/src/com/cloud/vm/SecondaryStorageVmVO.java b/core/src/com/cloud/vm/SecondaryStorageVmVO.java
index 0087ffd3b21..fc66537a7b7 100644
--- a/core/src/com/cloud/vm/SecondaryStorageVmVO.java
+++ b/core/src/com/cloud/vm/SecondaryStorageVmVO.java
@@ -48,9 +48,6 @@ public class SecondaryStorageVmVO extends VMInstanceVO implements SecondaryStora
     @Column(name="public_netmask", nullable=false)
     private String publicNetmask;
     
-    @Column(name="domain", nullable=false)
-    private String domain;
-    
     @Column(name="guid", nullable=false)
     private String guid;
     
@@ -76,10 +73,6 @@ public class SecondaryStorageVmVO extends VMInstanceVO implements SecondaryStora
         super();
     }
 
-    public void setDomain(String domain) {
-    	this.domain = domain;
-    }
-    
     public void setPublicIpAddress(String publicIpAddress) {
     	this.publicIpAddress = publicIpAddress;
     }
@@ -115,12 +108,6 @@ public class SecondaryStorageVmVO extends VMInstanceVO implements SecondaryStora
 		return this.publicMacAddress;
 	}
     
-
-    @Override
-    public String getDomain() {
-    	return this.domain;
-    }
-	
     @Override
 	public int getRamSize() {
     	return this.ramSize;
diff --git a/core/src/com/cloud/vm/SystemVm.java b/core/src/com/cloud/vm/SystemVm.java
index 2a1d3b7c0dc..21d5027246e 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 getDomain();
     public String getPublicIpAddress();
     public String getPublicNetmask();
     public String getPublicMacAddress();
diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java
index ca7a5021538..68c0e281fa4 100755
--- a/server/src/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/com/cloud/api/ApiResponseHelper.java
@@ -1188,7 +1188,6 @@ public class ApiResponseHelper implements ResponseGenerator {
             vmResponse.setSystemVmType(vm.getType().toString().toLowerCase());
             vmResponse.setZoneId(vm.getDataCenterId());
 
-            vmResponse.setNetworkDomain(vm.getDomain());
             vmResponse.setName(vm.getName());
             vmResponse.setPodId(vm.getPodId());
             vmResponse.setTemplateId(vm.getTemplateId());