Skip to content

Commit bca2c92

Browse files
yadvryadvr
committed
PluggableService: Fix interface definition
Signed-off-by: Rohit Yadav <[email protected]>
1 parent 3ec985f commit bca2c92

10 files changed

Lines changed: 68 additions & 36 deletions

File tree

‎plugins/hypervisors/simulator/src/com/cloud/server/ManagementServerSimulatorImpl.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,17 @@
1717
package com.cloud.server;
1818

1919

20+
import com.cloud.api.commands.ConfigureSimulator;
2021
import com.cloud.utils.PropertiesUtil;
2122

23+
import java.util.List;
2224
import java.util.Map;
2325

2426
public class ManagementServerSimulatorImpl extends ManagementServerExtImpl {
2527
@Override
26-
public Map<String, String> getProperties() {
27-
Map<String, String> apiNameRoleMaskMapping = super.getProperties();
28-
apiNameRoleMaskMapping.putAll(PropertiesUtil.processConfigFile(new String[]
29-
{"commands-simulator.properties"}));
30-
return apiNameRoleMaskMapping;
28+
public List<Class<?>> getCommands() {
29+
List<Class<?>> cmdList = super.getCommands();
30+
cmdList.add(ConfigureSimulator.class);
31+
return cmdList;
3132
}
3233
}

‎plugins/hypervisors/vmware/src/com/cloud/network/element/CiscoNexusVSMElement.java‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
package com.cloud.network.element;
1919

20+
import java.lang.Class;
2021
import java.lang.String;
2122
import java.util.List;
2223
import java.util.Map;
@@ -239,8 +240,12 @@ public CiscoNexusVSMResponse createCiscoNexusVSMDetailedResponse(CiscoNexusVSMDe
239240
}
240241

241242
@Override
242-
public Map<String, String> getProperties() {
243-
return PropertiesUtil.processConfigFile(new String[]
244-
{ "cisconexusvsm_commands.properties" });
243+
public List<Class<?>> getCommands() {
244+
List<Class<?>> cmdList = new ArrayList<Class<?>>();
245+
cmdList.add(ListCiscoNexusVSMsCmd.class);
246+
cmdList.add(EnableCiscoNexusVSMCmd.class);
247+
cmdList.add(DisableCiscoNexusVSMCmd.class);
248+
cmdList.add(DeleteCiscoNexusVSMCmd.class);
249+
return cmdList;
245250
}
246251
}

‎plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElement.java‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
// under the License.
1717
package com.cloud.network.element;
1818

19+
import java.lang.Class;
1920
import java.lang.String;
2021
import java.util.ArrayList;
2122
import java.util.HashMap;
@@ -262,9 +263,17 @@ public boolean canEnableIndividualServices() {
262263
}
263264

264265
@Override
265-
public Map<String, String> getProperties() {
266-
return PropertiesUtil.processConfigFile(new String[]
267-
{ "f5bigip_commands.properties" });
266+
public List<Class<?>> getCommands() {
267+
List<Class<?>> cmdList = new ArrayList<Class<?>>();
268+
cmdList.add(AddExternalLoadBalancerCmd.class);
269+
cmdList.add(AddF5LoadBalancerCmd.class);
270+
cmdList.add(ConfigureF5LoadBalancerCmd.class);
271+
cmdList.add(DeleteExternalLoadBalancerCmd.class);
272+
cmdList.add(DeleteF5LoadBalancerCmd.class);
273+
cmdList.add(ListExternalLoadBalancersCmd.class);
274+
cmdList.add(ListF5LoadBalancerNetworksCmd.class);
275+
cmdList.add(ListF5LoadBalancersCmd.class);
276+
return cmdList;
268277
}
269278

270279
@Override

‎plugins/network-elements/juniper-srx/src/com/cloud/network/element/JuniperSRXExternalFirewallElement.java‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -404,9 +404,17 @@ public ExternalFirewallResponse createExternalFirewallResponse(Host externalFire
404404
}
405405

406406
@Override
407-
public Map<String, String> getProperties() {
408-
return PropertiesUtil.processConfigFile(new String[]
409-
{ "junipersrx_commands.properties"});
407+
public List<Class<?>> getCommands() {
408+
List<Class<?>> cmdList = new ArrayList<Class<?>>();
409+
cmdList.add(AddExternalFirewallCmd.class);
410+
cmdList.add(AddSrxFirewallCmd.class);
411+
cmdList.add(ConfigureSrxFirewallCmd.class);
412+
cmdList.add(DeleteExternalFirewallCmd.class);
413+
cmdList.add(DeleteSrxFirewallCmd.class);
414+
cmdList.add(ListExternalFirewallsCmd.class);
415+
cmdList.add(ListSrxFirewallNetworksCmd.class);
416+
cmdList.add(ListSrxFirewallsCmd.class);
417+
return cmdList;
410418
}
411419

412420
@Override

‎plugins/network-elements/midokura-midonet/src/com/cloud/network/element/MidokuraMidonetElement.java‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,10 @@
3838
import org.apache.log4j.Logger;
3939

4040
import javax.ejb.Local;
41+
import java.lang.Class;
4142
import java.util.Map;
4243
import java.util.Set;
4344

44-
/**
45-
* User: tomoe
46-
* Date: 8/8/12
47-
* Time: 1:38 PM
48-
*/
49-
5045
@Local(value = NetworkElement.class)
5146
public class MidokuraMidonetElement extends AdapterBase implements ConnectivityProvider, PluggableService {
5247
private static final Logger s_logger = Logger.getLogger(MidokuraMidonetElement.class);
@@ -126,7 +121,7 @@ public boolean verifyServicesCombination(Set<Service> services) {
126121
}
127122

128123
@Override
129-
public String getPropertiesFile() {
124+
public List<Class<?>> getCommands() {
130125
// TODO: implement this.
131126
return null;
132127
}

‎plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
// under the License.
1717
package com.cloud.network.element;
1818

19+
import java.lang.Class;
1920
import java.net.URI;
2021
import java.util.ArrayList;
2122
import java.util.HashMap;
@@ -465,9 +466,14 @@ private ExternalLoadBalancerDeviceVO configureNetscalerLoadBalancer(long lbDevic
465466
}
466467

467468
@Override
468-
public Map<String, String> getProperties() {
469-
return PropertiesUtil.processConfigFile(new String[]
470-
{ "netscalerloadbalancer_commands.properties" });
469+
public List<Class<?>> getCommands() {
470+
List<Class<?>> cmdList = new ArrayList<Class<?>>();
471+
cmdList.add(AddNetscalerLoadBalancerCmd.class);
472+
cmdList.add(ConfigureNetscalerLoadBalancerCmd.class);
473+
cmdList.add(DeleteNetscalerLoadBalancerCmd.class);
474+
cmdList.add(ListNetscalerLoadBalancerNetworksCmd.class);
475+
cmdList.add(ListNetscalerLoadBalancersCmd.class);
476+
return cmdList;
471477
}
472478

473479
@Override

‎plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -541,9 +541,13 @@ private static Map<Service, Map<Capability, String>> setCapabilities() {
541541
}
542542

543543
@Override
544-
public Map<String, String> getProperties() {
545-
return PropertiesUtil.processConfigFile(new String[]
546-
{ "nicira-nvp_commands.properties" });
544+
public List<Class<?>> getCommands() {
545+
List<Class<?>> cmdList = new ArrayList<Class<?>>();
546+
cmdList.add(AddNiciraNvpDeviceCmd.class);
547+
cmdList.add(DeleteNiciraNvpDeviceCmd.class);
548+
cmdList.add(ListNiciraNvpDeviceNetworksCmd.class);
549+
cmdList.add(ListNiciraNvpDevicesCmd.class);
550+
return cmdList;
547551
}
548552

549553
@Override

‎server/src/com/cloud/network/element/VirtualRouterElement.java‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626

2727
import com.cloud.utils.PropertiesUtil;
2828
import org.apache.cloudstack.api.command.admin.router.ConfigureVirtualRouterElementCmd;
29+
import org.apache.cloudstack.api.command.admin.router.CreateVirtualRouterElementCmd;
2930
import org.apache.cloudstack.api.command.admin.router.ListVirtualRouterElementsCmd;
3031
import org.apache.log4j.Logger;
3132

@@ -681,9 +682,12 @@ public boolean saveUserData(Network network, NicProfile nic, VirtualMachineProfi
681682
}
682683

683684
@Override
684-
public Map<String, String> getProperties() {
685-
return PropertiesUtil.processConfigFile(new String[]
686-
{ "virtualrouter_commands.properties" });
685+
public List<Class<?>> getCommands() {
686+
List<Class<?>> cmdList = new ArrayList<Class<?>>();
687+
cmdList.add(CreateVirtualRouterElementCmd.class);
688+
cmdList.add(ConfigureVirtualRouterElementCmd.class);
689+
cmdList.add(ListVirtualRouterElementsCmd.class);
690+
return cmdList;
687691
}
688692

689693
@Override

‎server/src/com/cloud/server/ManagementServerExtImpl.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -207,9 +207,9 @@ public TimeZone getUsageTimezone() {
207207
}
208208

209209
@Override
210-
public Map<String, String> getProperties() {
211-
return PropertiesUtil.processConfigFile(new String[]
212-
{ "commands.properties", "commands-ext.properties" });
210+
public List<Class<?>> getCommands() {
211+
//TODO: Add api cmd classes
212+
return null;
213213
}
214214

215215
private Date computeAdjustedTime(Date initialDate, TimeZone targetTZ, boolean adjustToDayStart) {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2298,9 +2298,9 @@ public List<DiskOfferingVO> searchForDiskOfferings(ListDiskOfferingsCmd cmd) {
22982298
}
22992299

23002300
@Override
2301-
public Map<String, String> getProperties() {
2302-
return PropertiesUtil.processConfigFile(new String[]
2303-
{ "commands.properties" });
2301+
public List<Class<?>> getCommands() {
2302+
//TODO: Add cmd classes
2303+
return null;
23042304
}
23052305

23062306
protected class EventPurgeTask implements Runnable {

0 commit comments

Comments
 (0)