You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by hu...@apache.org on 2013/01/15 09:21:19 UTC
[10/26] git commit: PluggableService: Fix interface definition
PluggableService: Fix interface definition
Signed-off-by: Rohit Yadav <bh...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/bca2c928
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/bca2c928
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/bca2c928
Branch: refs/heads/cloud-agent-with-openvswitch
Commit: bca2c928e87ce81f54dccb918564714189b7d46e
Parents: 3ec985f
Author: Rohit Yadav <bh...@apache.org>
Authored: Mon Jan 14 18:59:01 2013 -0800
Committer: Rohit Yadav <bh...@apache.org>
Committed: Mon Jan 14 19:01:26 2013 -0800
----------------------------------------------------------------------
.../server/ManagementServerSimulatorImpl.java | 11 ++++++-----
.../network/element/CiscoNexusVSMElement.java | 11 ++++++++---
.../element/F5ExternalLoadBalancerElement.java | 15 ++++++++++++---
.../element/JuniperSRXExternalFirewallElement.java | 14 +++++++++++---
.../network/element/MidokuraMidonetElement.java | 9 ++-------
.../cloud/network/element/NetscalerElement.java | 12 +++++++++---
.../cloud/network/element/NiciraNvpElement.java | 10 +++++++---
.../network/element/VirtualRouterElement.java | 10 +++++++---
.../com/cloud/server/ManagementServerExtImpl.java | 6 +++---
.../src/com/cloud/server/ManagementServerImpl.java | 6 +++---
10 files changed, 68 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/bca2c928/plugins/hypervisors/simulator/src/com/cloud/server/ManagementServerSimulatorImpl.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/simulator/src/com/cloud/server/ManagementServerSimulatorImpl.java b/plugins/hypervisors/simulator/src/com/cloud/server/ManagementServerSimulatorImpl.java
index 44ab26a..c639a55 100644
--- a/plugins/hypervisors/simulator/src/com/cloud/server/ManagementServerSimulatorImpl.java
+++ b/plugins/hypervisors/simulator/src/com/cloud/server/ManagementServerSimulatorImpl.java
@@ -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;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/bca2c928/plugins/hypervisors/vmware/src/com/cloud/network/element/CiscoNexusVSMElement.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/src/com/cloud/network/element/CiscoNexusVSMElement.java b/plugins/hypervisors/vmware/src/com/cloud/network/element/CiscoNexusVSMElement.java
index 2cf8787..68388a6 100644
--- a/plugins/hypervisors/vmware/src/com/cloud/network/element/CiscoNexusVSMElement.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/network/element/CiscoNexusVSMElement.java
@@ -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;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/bca2c928/plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElement.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElement.java b/plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElement.java
index 438498f..b9739ec 100644
--- a/plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElement.java
+++ b/plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElement.java
@@ -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
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/bca2c928/plugins/network-elements/juniper-srx/src/com/cloud/network/element/JuniperSRXExternalFirewallElement.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/juniper-srx/src/com/cloud/network/element/JuniperSRXExternalFirewallElement.java b/plugins/network-elements/juniper-srx/src/com/cloud/network/element/JuniperSRXExternalFirewallElement.java
index 55722ae..6e9d32d 100644
--- a/plugins/network-elements/juniper-srx/src/com/cloud/network/element/JuniperSRXExternalFirewallElement.java
+++ b/plugins/network-elements/juniper-srx/src/com/cloud/network/element/JuniperSRXExternalFirewallElement.java
@@ -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
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/bca2c928/plugins/network-elements/midokura-midonet/src/com/cloud/network/element/MidokuraMidonetElement.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/midokura-midonet/src/com/cloud/network/element/MidokuraMidonetElement.java b/plugins/network-elements/midokura-midonet/src/com/cloud/network/element/MidokuraMidonetElement.java
index 5673466..a45c5c0 100644
--- a/plugins/network-elements/midokura-midonet/src/com/cloud/network/element/MidokuraMidonetElement.java
+++ b/plugins/network-elements/midokura-midonet/src/com/cloud/network/element/MidokuraMidonetElement.java
@@ -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;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/bca2c928/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java b/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java
index ac1619e..a178210 100644
--- a/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java
+++ b/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java
@@ -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
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/bca2c928/plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java b/plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java
index 22fab50..6bcaeee 100644
--- a/plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java
+++ b/plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java
@@ -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
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/bca2c928/server/src/com/cloud/network/element/VirtualRouterElement.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/element/VirtualRouterElement.java b/server/src/com/cloud/network/element/VirtualRouterElement.java
index 823b74f..02a239e 100755
--- a/server/src/com/cloud/network/element/VirtualRouterElement.java
+++ b/server/src/com/cloud/network/element/VirtualRouterElement.java
@@ -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
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/bca2c928/server/src/com/cloud/server/ManagementServerExtImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/server/ManagementServerExtImpl.java b/server/src/com/cloud/server/ManagementServerExtImpl.java
index 8a59d2f..c8c188b 100644
--- a/server/src/com/cloud/server/ManagementServerExtImpl.java
+++ b/server/src/com/cloud/server/ManagementServerExtImpl.java
@@ -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) {
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/bca2c928/server/src/com/cloud/server/ManagementServerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java
index 79ad759..bf10550 100755
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -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 {