From 789912de6a099ba8bc079e465742751bb74d721d Mon Sep 17 00:00:00 2001 From: alena Date: Fri, 7 Jan 2011 10:47:45 -0800 Subject: [PATCH] Removed guestIpType parameter from listNetwork offerings command --- .../com/cloud/api/commands/ListNetworkOfferingsCmd.java | 9 +-------- .../cloud/configuration/ConfigurationManagerImpl.java | 4 ---- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/api/src/com/cloud/api/commands/ListNetworkOfferingsCmd.java b/api/src/com/cloud/api/commands/ListNetworkOfferingsCmd.java index 1864b4e06b9..64c726bd64f 100644 --- a/api/src/com/cloud/api/commands/ListNetworkOfferingsCmd.java +++ b/api/src/com/cloud/api/commands/ListNetworkOfferingsCmd.java @@ -49,9 +49,6 @@ public class ListNetworkOfferingsCmd extends BaseListCmd { @Parameter(name=ApiConstants.DISPLAY_TEXT, type=CommandType.STRING, description="list network offerings by display text") private String displayText; - @Parameter(name=ApiConstants.TYPE, type=CommandType.STRING, description="list by type of the network") - private String type; - @Parameter(name=ApiConstants.TRAFFIC_TYPE, type=CommandType.STRING, description="list by traffic type") private String trafficType; @@ -78,11 +75,7 @@ public class ListNetworkOfferingsCmd extends BaseListCmd { public String getDisplayText() { return displayText; } - - public String getType() { - return type; - } - + public String getTrafficType() { return trafficType; } diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java index c5ad0ff51ae..8edd2c78c9e 100755 --- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java +++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java @@ -2739,7 +2739,6 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura Object id = cmd.getId(); Object name = cmd.getNetworkOfferingName(); Object displayText = cmd.getDisplayText(); - Object type = cmd.getType(); Object trafficType = cmd.getTrafficType(); Object isDefault = cmd.getIsDefault(); Object specifyVlan = cmd.getSpecifyVlan(); @@ -2765,9 +2764,6 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura if (displayText != null) { sc.addAnd("displayText", SearchCriteria.Op.LIKE, "%" + displayText + "%"); } - if (type != null) { - sc.addAnd("guestIpType", SearchCriteria.Op.EQ, type); - } if (trafficType != null) { sc.addAnd("trafficType", SearchCriteria.Op.EQ, trafficType);