diff --git a/server/src/com/cloud/vm/dao/DomainRouterDaoImpl.java b/server/src/com/cloud/vm/dao/DomainRouterDaoImpl.java index 66ba8b65f52..eb670cb3af1 100755 --- a/server/src/com/cloud/vm/dao/DomainRouterDaoImpl.java +++ b/server/src/com/cloud/vm/dao/DomainRouterDaoImpl.java @@ -183,7 +183,7 @@ public class DomainRouterDaoImpl extends GenericDaoBase im @Override public List findByNetwork(long networkId) { SearchCriteria sc = AllFieldsSearch.create(); - sc.setParameters("networkId", networkId); + sc.setJoinParameters("networkRouter", "networkId", networkId); return listBy(sc); } @@ -198,7 +198,7 @@ public class DomainRouterDaoImpl extends GenericDaoBase im @Override public List listActive(long networkId) { SearchCriteria sc = IdNetworkIdStatesSearch.create(); - sc.setParameters("networkId", networkId); + sc.setJoinParameters("networkRouter", "networkId", networkId); sc.setParameters("states", State.Running, State.Migrating, State.Stopping, State.Starting); return listBy(sc); } @@ -215,7 +215,7 @@ public class DomainRouterDaoImpl extends GenericDaoBase im @Override public List findByNetworkOutsideThePod(long networkId, long podId, State state, Role role) { SearchCriteria sc = OutsidePodSearch.create(); - sc.setParameters("networkId", networkId); + sc.setJoinParameters("networkRouter", "networkId", networkId); sc.setParameters("podId", podId); sc.setParameters("state", state); sc.setParameters("role", role); @@ -225,7 +225,7 @@ public class DomainRouterDaoImpl extends GenericDaoBase im @Override public List listByNetworkAndPodAndRole(long networkId, long podId, Role role) { SearchCriteria sc = AllFieldsSearch.create(); - sc.setParameters("networkId", networkId); + sc.setJoinParameters("networkRouter", "networkId", networkId); sc.setParameters("podId", podId); sc.setParameters("role", role); return listBy(sc); @@ -234,7 +234,7 @@ public class DomainRouterDaoImpl extends GenericDaoBase im @Override public List listByNetworkAndRole(long networkId, Role role) { SearchCriteria sc = AllFieldsSearch.create(); - sc.setParameters("networkId", networkId); + sc.setJoinParameters("networkRouter", "networkId", networkId); sc.setParameters("role", role); return listBy(sc); } diff --git a/setup/db/create-schema.sql b/setup/db/create-schema.sql index 60547e5f8f9..56d3e6155e2 100755 --- a/setup/db/create-schema.sql +++ b/setup/db/create-schema.sql @@ -1071,7 +1071,6 @@ CREATE TABLE `cloud`.`domain_router` ( `public_netmask` varchar(15) COMMENT 'netmask used for the domR', `guest_netmask` varchar(15) COMMENT 'netmask used for the guest network', `guest_ip_address` char(40) COMMENT ' ip address in the guest network', - `network_id` bigint unsigned NOT NULL COMMENT 'network configuration that this domain router belongs to', `is_redundant_router` int(1) unsigned NOT NULL COMMENT 'if in redundant router mode', `priority` int(4) unsigned COMMENT 'priority of router in the redundant router mode', `is_priority_bumpup` int(1) unsigned NOT NULL COMMENT 'if the priority has been bumped up', diff --git a/wscript b/wscript index 2d3f7a3d72e..9cd8d62d193 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ # the following two variables are used by the target "waf dist" # if you change 'em here, you need to change it also in cloud.spec, add a %changelog entry there, and add an entry in debian/changelog -VERSION = '3.0.3.2012-05-19T00:20:25Z' +VERSION = '3.0.3.2012-05-19T01:23:44Z' APPNAME = 'cloud' import shutil,os