etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PluggableService: Fix interface definition 

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
This commit is contained in:
Rohit Yadav 2013-01-14 18:59:01 -08:00
parent 3ec985f46f
commit bca2c928e8
10 changed files with 68 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
plugins/hypervisors/simulator/src/com/cloud/server/ManagementServerSimulatorImpl.java
View File

@ -17,16 +17,17 @@
package com.cloud.server;
import com.cloud.api.commands.ConfigureSimulator;
import com.cloud.utils.PropertiesUtil;
import java.util.List;
import java.util.Map;
public class ManagementServerSimulatorImpl extends ManagementServerExtImpl {
@Override
public Map<String, String> getProperties() {
Map<String, String> apiNameRoleMaskMapping = super.getProperties();
apiNameRoleMaskMapping.putAll(PropertiesUtil.processConfigFile(new String[]
{"commands-simulator.properties"}));
return apiNameRoleMaskMapping;
public List<Class<?>> getCommands() {
List<Class<?>> cmdList = super.getCommands();
cmdList.add(ConfigureSimulator.class);
return cmdList;
}
}

11
plugins/hypervisors/vmware/src/com/cloud/network/element/CiscoNexusVSMElement.java
View File

@ -17,6 +17,7 @@
package com.cloud.network.element;
import java.lang.Class;
import java.lang.String;
import java.util.List;
import java.util.Map;
@ -239,8 +240,12 @@ public class CiscoNexusVSMElement extends CiscoNexusVSMDeviceManagerImpl impleme
}
@Override
public Map<String, String> getProperties() {
return PropertiesUtil.processConfigFile(new String[]
{ "cisconexusvsm_commands.properties" });
public List<Class<?>> getCommands() {
List<Class<?>> cmdList = new ArrayList<Class<?>>();
cmdList.add(ListCiscoNexusVSMsCmd.class);
cmdList.add(EnableCiscoNexusVSMCmd.class);
cmdList.add(DisableCiscoNexusVSMCmd.class);
cmdList.add(DeleteCiscoNexusVSMCmd.class);
return cmdList;
}
}

15
plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElement.java
View File

@ -16,6 +16,7 @@
// under the License.
package com.cloud.network.element;
import java.lang.Class;
import java.lang.String;
import java.util.ArrayList;
import java.util.HashMap;
@ -262,9 +263,17 @@ public class F5ExternalLoadBalancerElement extends ExternalLoadBalancerDeviceMan
}
@Override
public Map<String, String> getProperties() {
return PropertiesUtil.processConfigFile(new String[]
{ "f5bigip_commands.properties" });
public List<Class<?>> getCommands() {
List<Class<?>> cmdList = new ArrayList<Class<?>>();
cmdList.add(AddExternalLoadBalancerCmd.class);
cmdList.add(AddF5LoadBalancerCmd.class);
cmdList.add(ConfigureF5LoadBalancerCmd.class);
cmdList.add(DeleteExternalLoadBalancerCmd.class);
cmdList.add(DeleteF5LoadBalancerCmd.class);
cmdList.add(ListExternalLoadBalancersCmd.class);
cmdList.add(ListF5LoadBalancerNetworksCmd.class);
cmdList.add(ListF5LoadBalancersCmd.class);
return cmdList;
}
@Override

14
plugins/network-elements/juniper-srx/src/com/cloud/network/element/JuniperSRXExternalFirewallElement.java
View File

@ -404,9 +404,17 @@ public class JuniperSRXExternalFirewallElement extends ExternalFirewallDeviceMan
}
@Override
public Map<String, String> getProperties() {
return PropertiesUtil.processConfigFile(new String[]
{ "junipersrx_commands.properties"});
public List<Class<?>> getCommands() {
List<Class<?>> cmdList = new ArrayList<Class<?>>();
cmdList.add(AddExternalFirewallCmd.class);
cmdList.add(AddSrxFirewallCmd.class);
cmdList.add(ConfigureSrxFirewallCmd.class);
cmdList.add(DeleteExternalFirewallCmd.class);
cmdList.add(DeleteSrxFirewallCmd.class);
cmdList.add(ListExternalFirewallsCmd.class);
cmdList.add(ListSrxFirewallNetworksCmd.class);
cmdList.add(ListSrxFirewallsCmd.class);
return cmdList;
}
@Override

9
plugins/network-elements/midokura-midonet/src/com/cloud/network/element/MidokuraMidonetElement.java
View File

@ -38,15 +38,10 @@ import com.cloud.vm.VirtualMachineProfile;
import org.apache.log4j.Logger;
import javax.ejb.Local;
import java.lang.Class;
import java.util.Map;
import java.util.Set;
/**
* User: tomoe
* Date: 8/8/12
* Time: 1:38 PM
*/
@Local(value = NetworkElement.class)
public class MidokuraMidonetElement extends AdapterBase implements ConnectivityProvider, PluggableService {
private static final Logger s_logger = Logger.getLogger(MidokuraMidonetElement.class);
@ -126,7 +121,7 @@ public class MidokuraMidonetElement extends AdapterBase implements ConnectivityP
}
@Override
public String getPropertiesFile() {
public List<Class<?>> getCommands() {
// TODO: implement this.
return null;
}

12
plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java
View File

@ -16,6 +16,7 @@
// under the License.
package com.cloud.network.element;
import java.lang.Class;
import java.net.URI;
import java.util.ArrayList;
import java.util.HashMap;
@ -465,9 +466,14 @@ StaticNatServiceProvider {
}
@Override
public Map<String, String> getProperties() {
return PropertiesUtil.processConfigFile(new String[]
{ "netscalerloadbalancer_commands.properties" });
public List<Class<?>> getCommands() {
List<Class<?>> cmdList = new ArrayList<Class<?>>();
cmdList.add(AddNetscalerLoadBalancerCmd.class);
cmdList.add(ConfigureNetscalerLoadBalancerCmd.class);
cmdList.add(DeleteNetscalerLoadBalancerCmd.class);
cmdList.add(ListNetscalerLoadBalancerNetworksCmd.class);
cmdList.add(ListNetscalerLoadBalancersCmd.class);
return cmdList;
}
@Override

10
plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java
View File

@ -541,9 +541,13 @@ public class NiciraNvpElement extends AdapterBase implements
}
@Override
public Map<String, String> getProperties() {
return PropertiesUtil.processConfigFile(new String[]
{ "nicira-nvp_commands.properties" });
public List<Class<?>> getCommands() {
List<Class<?>> cmdList = new ArrayList<Class<?>>();
cmdList.add(AddNiciraNvpDeviceCmd.class);
cmdList.add(DeleteNiciraNvpDeviceCmd.class);
cmdList.add(ListNiciraNvpDeviceNetworksCmd.class);
cmdList.add(ListNiciraNvpDevicesCmd.class);
return cmdList;
}
@Override

10
server/src/com/cloud/network/element/VirtualRouterElement.java
View File

@ -26,6 +26,7 @@ import javax.ejb.Local;
import com.cloud.utils.PropertiesUtil;
import org.apache.cloudstack.api.command.admin.router.ConfigureVirtualRouterElementCmd;
import org.apache.cloudstack.api.command.admin.router.CreateVirtualRouterElementCmd;
import org.apache.cloudstack.api.command.admin.router.ListVirtualRouterElementsCmd;
import org.apache.log4j.Logger;
@ -681,9 +682,12 @@ public class VirtualRouterElement extends AdapterBase implements VirtualRouterEl
}
@Override
public Map<String, String> getProperties() {
return PropertiesUtil.processConfigFile(new String[]
{ "virtualrouter_commands.properties" });
public List<Class<?>> getCommands() {
List<Class<?>> cmdList = new ArrayList<Class<?>>();
cmdList.add(CreateVirtualRouterElementCmd.class);
cmdList.add(ConfigureVirtualRouterElementCmd.class);
cmdList.add(ListVirtualRouterElementsCmd.class);
return cmdList;
}
@Override

6
server/src/com/cloud/server/ManagementServerExtImpl.java
View File

@ -207,9 +207,9 @@ public class ManagementServerExtImpl extends ManagementServerImpl implements Man
}
@Override
public Map<String, String> getProperties() {
return PropertiesUtil.processConfigFile(new String[]
{ "commands.properties", "commands-ext.properties" });
public List<Class<?>> getCommands() {
//TODO: Add api cmd classes
return null;
}
private Date computeAdjustedTime(Date initialDate, TimeZone targetTZ, boolean adjustToDayStart) {

6
server/src/com/cloud/server/ManagementServerImpl.java
View File

@ -2298,9 +2298,9 @@ public class ManagementServerImpl implements ManagementServer {
}
@Override
public Map<String, String> getProperties() {
return PropertiesUtil.processConfigFile(new String[]
{ "commands.properties" });
public List<Class<?>> getCommands() {
//TODO: Add cmd classes
return null;
}
protected class EventPurgeTask implements Runnable {