Skip to content

Commit d6232cb

Browse files
committed
Cannot list vlanipranges by keyword
Before change: cloudmonkey> list vlanipranges keyword=118 : Caught: com.mysql.jdbc.JDBC4PreparedStatement@18f36b6e: SELECT vlan.id, vlan.vlan_id, vlan.vlan_gateway, vlan.vlan_netmask, vlan.ip6_gateway, vlan.ip6_cidr, vlan.data_center_id, vlan.description, vlan.ip6_range, vlan.network_id, vlan.physical_network_id, vlan.vlan_type, vlan.uuid, vlan.removed, vlan.created FROM vlan WHERE ( OR vlan.description LIKE ** NOT SPECIFIED ** ) AND vlan.removed IS NULL ORDER BY vlan.id ASC LIMIT 0, 500 After change: cloudmonkey> list vlanipranges keyword='118' count = 1 vlaniprange: id = 0d80fd9c-cd6b-4f99-96c6-261420e75f58 account = system domain = ROOT domainid = 2044762d-c4a5-11e3-8379-005056ac4490 ......
1 parent f6db0a2 commit d6232cb

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

server/src/com/cloud/server/ManagementServerImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1597,9 +1597,9 @@ public Pair<List<? extends Vlan>, Integer> searchForVlans(final ListVlanIpRanges
15971597
final SearchCriteria<VlanVO> sc = sb.create();
15981598
if (keyword != null) {
15991599
final SearchCriteria<VlanVO> ssc = _vlanDao.createSearchCriteria();
1600-
ssc.addOr("vlanId", SearchCriteria.Op.LIKE, "%" + keyword + "%");
1600+
ssc.addOr("vlanTag", SearchCriteria.Op.LIKE, "%" + keyword + "%");
16011601
ssc.addOr("ipRange", SearchCriteria.Op.LIKE, "%" + keyword + "%");
1602-
sc.addAnd("vlanId", SearchCriteria.Op.SC, ssc);
1602+
sc.addAnd("vlanTag", SearchCriteria.Op.SC, ssc);
16031603
} else {
16041604
if (id != null) {
16051605
sc.setParameters("id", id);

0 commit comments

Comments
 (0)