You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ah...@apache.org on 2013/12/12 22:01:15 UTC
[15/48] All Checkstyle problems corrected
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/ManagementServerMock.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/ManagementServerMock.java b/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/ManagementServerMock.java
index c449b8a..806dd21 100644
--- a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/ManagementServerMock.java
+++ b/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/ManagementServerMock.java
@@ -116,10 +116,10 @@ public class ManagementServerMock {
private DataCenterVO _zone;
private PhysicalNetwork _znet;
- private long _host_id = -1L;
+ private long _hostId = -1L;
// TODO: Use the name parameter to retrieve the @Parameter annotation.
- static void setParameter(BaseCmd cmd, String name, BaseCmd.CommandType field_type, Object value) {
+ static void setParameter(BaseCmd cmd, String name, BaseCmd.CommandType fieldType, Object value) {
Class<?> cls = cmd.getClass();
Field field;
try {
@@ -129,7 +129,7 @@ public class ManagementServerMock {
return;
}
field.setAccessible(true);
- switch (field_type) {
+ switch (fieldType) {
case STRING:
try {
field.set(cmd, value);
@@ -169,11 +169,11 @@ public class ManagementServerMock {
private void createHost() {
HostVO host =
- new HostVO(_host_id, "aa01", Type.BaremetalDhcp, "192.168.1.1", "255.255.255.0", null, null, null, null, null, null, null, null, null, null,
+ new HostVO(_hostId, "aa01", Type.BaremetalDhcp, "192.168.1.1", "255.255.255.0", null, null, null, null, null, null, null, null, null, null,
UUID.randomUUID().toString(), Status.Up, "1.0", null, null, _zone.getId(), null, 0, 0, "aa", 0, StoragePoolType.NetworkFilesystem);
host.setResourceState(ResourceState.Enabled);
_hostDao.persist(host);
- _host_id = host.getId();
+ _hostId = host.getId();
}
private void createPublicVlanIpRange() {
@@ -241,7 +241,7 @@ public class ManagementServerMock {
new UserVmVO(id, name, name, tmpl.getId(), HypervisorType.XenServer, tmpl.getGuestOSId(), false, false, _zone.getDomainId(), Account.ACCOUNT_ID_SYSTEM,
small.getId(), null, name, null);
vm.setState(com.cloud.vm.VirtualMachine.State.Running);
- vm.setHostId(_host_id);
+ vm.setHostId(_hostId);
vm.setDataCenterId(network.getDataCenterId());
_userVmDao.persist(vm);
@@ -256,7 +256,7 @@ public class ManagementServerMock {
}
private void deleteHost() {
- _hostDao.remove(_host_id);
+ _hostDao.remove(_hostId);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/NetworkProviderTest.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/NetworkProviderTest.java b/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/NetworkProviderTest.java
index 7c5e3c0..fff4e5a 100644
--- a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/NetworkProviderTest.java
+++ b/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/NetworkProviderTest.java
@@ -115,27 +115,27 @@ public class NetworkProviderTest extends TestCase {
private ManagementServerMock _server;
private ApiConnector _api;
- private static int _mysql_server_port;
- private static long _msId;
- private static Merovingian2 _lockMaster;
- public static boolean _initDone = false;
+ private static int s_mysqlSrverPort;
+ private static long s_msId;
+ private static Merovingian2 s_lockMaster;
+ public static boolean s_initDone = false;
@BeforeClass
public static void globalSetUp() throws Exception {
ApiConnectorFactory.setImplementation(ApiConnectorMock.class);
s_logger.info("mysql server is getting launched ");
- _mysql_server_port = TestDbSetup.init(null);
- s_logger.info("mysql server launched on port " + _mysql_server_port);
+ s_mysqlSrverPort = TestDbSetup.init(null);
+ s_logger.info("mysql server launched on port " + s_mysqlSrverPort);
- _msId = ManagementServerNode.getManagementServerId();
- _lockMaster = Merovingian2.createLockMaster(_msId);
+ s_msId = ManagementServerNode.getManagementServerId();
+ s_lockMaster = Merovingian2.createLockMaster(s_msId);
}
@AfterClass
public static void globalTearDown() throws Exception {
- _lockMaster.cleanupForServer(_msId);
+ s_lockMaster.cleanupForServer(s_msId);
JmxUtil.unregisterMBean("Locks", "Locks");
- _lockMaster = null;
+ s_lockMaster = null;
AbstractApplicationContext ctx = (AbstractApplicationContext)ComponentContext.getApplicationContext();
Map<String, ComponentLifecycle> lifecycleComponents = ctx.getBeansOfType(ComponentLifecycle.class);
@@ -144,8 +144,8 @@ public class NetworkProviderTest extends TestCase {
}
ctx.close();
- s_logger.info("destroying mysql server instance running at port <" + _mysql_server_port + ">");
- TestDbSetup.destroy(_mysql_server_port, null);
+ s_logger.info("destroying mysql server instance running at port <" + s_mysqlSrverPort + ">");
+ TestDbSetup.destroy(s_mysqlSrverPort, null);
}
@Override
@@ -162,8 +162,8 @@ public class NetworkProviderTest extends TestCase {
CallContext.register(user, system);
_server = ComponentContext.inject(new ManagementServerMock());
- _server.initialize(!_initDone);
- _initDone = false;
+ _server.initialize(!s_initDone);
+ s_initDone = false;
_api = _contrailMgr.getApiConnector();
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/PublicNetworkTest.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/PublicNetworkTest.java b/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/PublicNetworkTest.java
index 9901241..c85bc65 100644
--- a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/PublicNetworkTest.java
+++ b/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/PublicNetworkTest.java
@@ -67,10 +67,10 @@ public class PublicNetworkTest extends TestCase {
@Inject
public NetworkDao _networksDao;
- private static boolean _initDone = false;
- private static int _mysql_server_port;
- private static long _msId;
- private static Merovingian2 _lockMaster;
+ private static boolean s_initDone = false;
+ private static int s_mysqlServerPort;
+ private static long s_msId;
+ private static Merovingian2 s_lockMaster;
private ManagementServerMock _server;
private ApiConnector _spy;
@@ -78,17 +78,17 @@ public class PublicNetworkTest extends TestCase {
public static void globalSetUp() throws Exception {
ApiConnectorFactory.setImplementation(ApiConnectorMockito.class);
s_logger.info("mysql server is getting launched ");
- _mysql_server_port = TestDbSetup.init(null);
- s_logger.info("mysql server launched on port " + _mysql_server_port);
- _msId = ManagementServerNode.getManagementServerId();
- _lockMaster = Merovingian2.createLockMaster(_msId);
+ s_mysqlServerPort = TestDbSetup.init(null);
+ s_logger.info("mysql server launched on port " + s_mysqlServerPort);
+ s_msId = ManagementServerNode.getManagementServerId();
+ s_lockMaster = Merovingian2.createLockMaster(s_msId);
}
@AfterClass
public static void globalTearDown() throws Exception {
- _lockMaster.cleanupForServer(_msId);
+ s_lockMaster.cleanupForServer(s_msId);
JmxUtil.unregisterMBean("Locks", "Locks");
- _lockMaster = null;
+ s_lockMaster = null;
AbstractApplicationContext ctx = (AbstractApplicationContext)ComponentContext.getApplicationContext();
Map<String, ComponentLifecycle> lifecycleComponents = ctx.getBeansOfType(ComponentLifecycle.class);
@@ -97,8 +97,8 @@ public class PublicNetworkTest extends TestCase {
}
ctx.close();
- s_logger.info("destroying mysql server instance running at port <" + _mysql_server_port + ">");
- TestDbSetup.destroy(_mysql_server_port, null);
+ s_logger.info("destroying mysql server instance running at port <" + s_mysqlServerPort + ">");
+ TestDbSetup.destroy(s_mysqlServerPort, null);
}
@Override
@@ -112,8 +112,8 @@ public class PublicNetworkTest extends TestCase {
}
_server = ComponentContext.inject(new ManagementServerMock());
- _server.initialize(!_initDone);
- _initDone = false;
+ _server.initialize(!s_initDone);
+ s_initDone = false;
_spy = ((ApiConnectorMockito)_contrailMgr.getApiConnector()).getSpy();
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/plugins/network-elements/juniper-contrail/test/resources/commonContext.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/juniper-contrail/test/resources/commonContext.xml b/plugins/network-elements/juniper-contrail/test/resources/commonContext.xml
index c577513..eef908f 100644
--- a/plugins/network-elements/juniper-contrail/test/resources/commonContext.xml
+++ b/plugins/network-elements/juniper-contrail/test/resources/commonContext.xml
@@ -1,16 +1,15 @@
<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
license agreements. See the NOTICE file distributed with this work for additional
- information regarding copyright ownership. The ASF licenses this file to
- you under the Apache License, Version 2.0 (the "License"); you may not use
- this file except in compliance with the License. You may obtain a copy of
- the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
- by applicable law or agreed to in writing, software distributed under the
- License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
- OF ANY KIND, either express or implied. See the License for the specific
- language governing permissions and limitations under the License. -->
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
- xmlns:tx="http://www.springframework.org/schema/tx" xmlns:aop="http://www.springframework.org/schema/aop"
+ information regarding copyright ownership. The ASF licenses this file to you under
+ the Apache License, Version 2.0 (the "License"); you may not use this file except
+ in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing, software distributed under
+ the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+ OF ANY KIND, either express or implied. See the License for the specific language
+ governing permissions and limitations under the License. -->
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:context="http://www.springframework.org/schema/context" xmlns:tx="http://www.springframework.org/schema/tx"
+ xmlns:aop="http://www.springframework.org/schema/aop"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
http://www.springframework.org/schema/tx
@@ -21,128 +20,99 @@
http://www.springframework.org/schema/context/spring-context-3.0.xsd">
<context:annotation-config />
-<!--
- <context:component-scan base-package="org.apache.cloudstack, com.cloud" />
--->
- <!--
- @DB support
- -->
+ <!-- <context:component-scan base-package="org.apache.cloudstack, com.cloud" /> -->
+ <!-- @DB support -->
- <bean id="transactionContextBuilder" class="com.cloud.utils.db.TransactionContextBuilder" />
- <bean id="actionEventInterceptor" class="com.cloud.event.ActionEventInterceptor" />
- <bean id="contrailEventInterceptor" class="org.apache.cloudstack.network.contrail.management.EventUtils.EventInterceptor" />
+ <bean id="transactionContextBuilder" class="com.cloud.utils.db.TransactionContextBuilder" />
+ <bean id="actionEventInterceptor" class="com.cloud.event.ActionEventInterceptor" />
+ <bean id="contrailEventInterceptor"
+ class="org.apache.cloudstack.network.contrail.management.EventUtils.EventInterceptor" />
<bean id="instantiatePostProcessor" class="com.cloud.utils.component.ComponentInstantiationPostProcessor">
<property name="Interceptors">
<list>
<ref bean="transactionContextBuilder" />
<ref bean="actionEventInterceptor" />
- <ref bean="contrailEventInterceptor" />
+ <ref bean="contrailEventInterceptor" />
</list>
</property>
</bean>
- <bean id="eventBus" class = "org.apache.cloudstack.framework.messagebus.MessageBusBase" />
+ <bean id="eventBus" class="org.apache.cloudstack.framework.messagebus.MessageBusBase" />
<bean id="eventDaoImpl" class="com.cloud.event.dao.EventDaoImpl" />
<bean id="actionEventUtils" class="com.cloud.event.ActionEventUtils" />
<bean id="usageEventDaoImpl" class="com.cloud.event.dao.UsageEventDaoImpl" />
- <!--<bean id="eventUtils" class="com.cloud.event.EventUtils" />-->
+ <!--<bean id="eventUtils" class="com.cloud.event.EventUtils" /> -->
<bean id="accountDaoImpl" class="com.cloud.user.dao.AccountDaoImpl" />
<bean id="accountDetailsDaoImpl" class="com.cloud.user.AccountDetailsDaoImpl" />
<bean id="accountJoinDaoImpl" class="com.cloud.api.query.dao.AccountJoinDaoImpl" />
<bean id="accountVlanMapDaoImpl" class="com.cloud.dc.dao.AccountVlanMapDaoImpl" />
<bean id="launchPermissionDaoImpl" class="com.cloud.storage.dao.LaunchPermissionDaoImpl" />
- <bean id="primaryDataStoreDaoImpl" class="org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDaoImpl" />
+ <bean id="primaryDataStoreDaoImpl"
+ class="org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDaoImpl" />
<bean id="iPAddressDaoImpl" class="com.cloud.network.dao.IPAddressDaoImpl" />
<bean id="apiResponseHelper" class="com.cloud.api.ApiResponseHelper" />
<bean id="nicDaoImpl" class="com.cloud.vm.dao.NicDaoImpl" />
- <bean id="componentContext" class="com.cloud.utils.component.ComponentContext"/>
+ <bean id="componentContext" class="com.cloud.utils.component.ComponentContext" />
<bean id="IntegrationTestConfiguration"
- class="org.apache.cloudstack.network.contrail.management.IntegrationTestConfiguration"/>
+ class="org.apache.cloudstack.network.contrail.management.IntegrationTestConfiguration" />
- <bean id="HypervisorGuru"
- class="com.cloud.hypervisor.XenServerGuru"/>
+ <bean id="HypervisorGuru" class="com.cloud.hypervisor.XenServerGuru" />
<!-- Management traffic -->
- <bean id="PodBasedNetworkGuru"
- class="com.cloud.network.guru.PodBasedNetworkGuru"/>
+ <bean id="PodBasedNetworkGuru" class="com.cloud.network.guru.PodBasedNetworkGuru" />
- <bean id="ControlNetworkGuru"
- class="com.cloud.network.guru.ControlNetworkGuru"/>
+ <bean id="ControlNetworkGuru" class="com.cloud.network.guru.ControlNetworkGuru" />
- <bean id="PublicNetworkGuru"
- class="com.cloud.network.guru.PublicNetworkGuru"/>
+ <bean id="PublicNetworkGuru" class="com.cloud.network.guru.PublicNetworkGuru" />
- <bean id="StorageNetworkGuru"
- class="com.cloud.network.guru.StorageNetworkGuru"/>
+ <bean id="StorageNetworkGuru" class="com.cloud.network.guru.StorageNetworkGuru" />
- <bean id="DirectNetworkGuru"
- class="com.cloud.network.guru.DirectNetworkGuru"/>
+ <bean id="DirectNetworkGuru" class="com.cloud.network.guru.DirectNetworkGuru" />
- <bean id="VpcVirtualRouterElement"
- class="com.cloud.network.element.VpcVirtualRouterElement"/>
+ <bean id="VpcVirtualRouterElement" class="com.cloud.network.element.VpcVirtualRouterElement" />
- <bean id="VirtualRouterElement"
- class="com.cloud.network.element.VirtualRouterElement"/>
+ <bean id="VirtualRouterElement" class="com.cloud.network.element.VirtualRouterElement" />
- <!--
- <bean id="Ipv6AddressManager"
- class="com.cloud.network.Ipv6AddressManagerImpl"/>
- -->
+ <!-- <bean id="Ipv6AddressManager" class="com.cloud.network.Ipv6AddressManagerImpl"/> -->
- <bean id="com.cloud.network.security.SecurityGroupManager"
- class="com.cloud.network.security.SecurityGroupManagerImpl"/>
+ <bean id="com.cloud.network.security.SecurityGroupManager" class="com.cloud.network.security.SecurityGroupManagerImpl" />
- <bean id="SecurityGroupElement"
- class="com.cloud.network.element.SecurityGroupElement"/>
-
- <bean id="InternalLbVm" class="org.apache.cloudstack.network.element.InternalLoadBalancerElement">
- <property name="name" value="InternalLbVm"/>
- </bean>
- <!--
-
- <bean id="UserAuthenticator"
- class="com.cloud.server.auth.PlainTextUserAuthenticator"/>
- <bean id="ManagementServer"
- class="com.cloud.server.ManagementServerImpl"/>
+ <bean id="SecurityGroupElement" class="com.cloud.network.element.SecurityGroupElement" />
- <bean id="SecondaryStorageVmManager"
- class="com.cloud.storage.secondary.SecondaryStorageManagerImpl"/>
-
- <bean id="PodAllocator"
- class="com.cloud.agent.manager.allocator.impl.UserConcentratedAllocator"/>
- -->
- <bean id="com.cloud.vm.UserVmManager"
- class="com.cloud.vm.UserVmManagerImpl"/>
+ <bean id="InternalLbVm"
+ class="org.apache.cloudstack.network.element.InternalLoadBalancerElement">
+ <property name="name" value="InternalLbVm" />
+ </bean>
+ <!-- <bean id="UserAuthenticator" class="com.cloud.server.auth.PlainTextUserAuthenticator"/>
+ <bean id="ManagementServer" class="com.cloud.server.ManagementServerImpl"/> <bean
+ id="SecondaryStorageVmManager" class="com.cloud.storage.secondary.SecondaryStorageManagerImpl"/>
+ <bean id="PodAllocator" class="com.cloud.agent.manager.allocator.impl.UserConcentratedAllocator"/> -->
+ <bean id="com.cloud.vm.UserVmManager" class="com.cloud.vm.UserVmManagerImpl" />
- <bean id="com.cloud.vm.VirtualMachineManager"
- class="com.cloud.vm.VirtualMachineManagerImpl"/>
+ <bean id="com.cloud.vm.VirtualMachineManager" class="com.cloud.vm.VirtualMachineManagerImpl" />
- <!--
- <bean id="com.cloud.vm.dao.UserVmDao"
- class="com.cloud.vm.dao.UserVmDaoImpl"/>
- -->
+ <!-- <bean id="com.cloud.vm.dao.UserVmDao" class="com.cloud.vm.dao.UserVmDaoImpl"/> -->
<bean id="ContrailElement"
- class="org.apache.cloudstack.network.contrail.management.ContrailElementImpl"/>
+ class="org.apache.cloudstack.network.contrail.management.ContrailElementImpl" />
- <bean id="ContrailGuru"
- class="org.apache.cloudstack.network.contrail.management.ContrailGuru"/>
+ <bean id="ContrailGuru" class="org.apache.cloudstack.network.contrail.management.ContrailGuru" />
<bean id="networkElements" class="com.cloud.utils.component.AdapterList">
<property name="Adapters">
<list>
- <ref bean="ContrailElement"/>
- <ref bean="VirtualRouterElement"/>
- <ref bean="SecurityGroupElement"/>
- <ref bean="VpcVirtualRouterElement"/>
- <ref bean="InternalLbVm"/>
+ <ref bean="ContrailElement" />
+ <ref bean="VirtualRouterElement" />
+ <ref bean="SecurityGroupElement" />
+ <ref bean="VpcVirtualRouterElement" />
+ <ref bean="InternalLbVm" />
</list>
</property>
</bean>
@@ -150,11 +120,11 @@
<bean id="networkGurus" class="com.cloud.utils.component.AdapterList">
<property name="Adapters">
<list>
- <ref bean="ContrailGuru"/>
- <ref bean="PublicNetworkGuru"/>
- <ref bean="PodBasedNetworkGuru"/>
- <ref bean="ControlNetworkGuru"/>
- <ref bean="StorageNetworkGuru"/>
+ <ref bean="ContrailGuru" />
+ <ref bean="PublicNetworkGuru" />
+ <ref bean="PodBasedNetworkGuru" />
+ <ref bean="ControlNetworkGuru" />
+ <ref bean="StorageNetworkGuru" />
</list>
</property>
</bean>
@@ -164,7 +134,7 @@
<property name="NetworkElements" value="#{networkElements.Adapters}" />
</bean>
- <bean id="networkOrchestrator" class="org.apache.cloudstack.engine.orchestration.NetworkOrchestrator" >
+ <bean id="networkOrchestrator" class="org.apache.cloudstack.engine.orchestration.NetworkOrchestrator">
<property name="NetworkElements" value="#{networkElements.Adapters}" />
<property name="NetworkGurus" value="#{networkGurus.Adapters}" />
</bean>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/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 82f701b..cb31ea4 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
@@ -218,14 +218,13 @@ public class JuniperSRXExternalFirewallElement extends ExternalFirewallDeviceMan
return false;
}
- if (rules != null && rules.size() == 1 ) {
+ if (rules != null && rules.size() == 1) {
// for SRX no need to add default egress rule to DENY traffic
if (rules.get(0).getTrafficType() == FirewallRule.TrafficType.Egress && rules.get(0).getType() == FirewallRule.FirewallRuleType.System &&
- ! _networkManager.getNetworkEgressDefaultPolicy(config.getId()))
+ !_networkManager.getNetworkEgressDefaultPolicy(config.getId()))
return true;
}
-
return applyFirewallRules(config, rules);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java b/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java
index b828ab6..eaade01 100644
--- a/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java
+++ b/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java
@@ -104,7 +104,7 @@ public class JuniperSrxResource implements ServerResource {
private UsageFilter _usageFilterVlanOutput;
private UsageFilter _usageFilterIPInput;
private UsageFilter _usageFilterIPOutput;
- private final Logger s_logger = Logger.getLogger(JuniperSrxResource.class);
+ private static final Logger s_logger = Logger.getLogger(JuniperSrxResource.class);
private enum SrxXml {
LOGIN("login.xml"),
@@ -173,7 +173,7 @@ public class JuniperSrxResource implements ServerResource {
private final String scriptsDir = "scripts/network/juniper";
private final String xml;
- private final Logger s_logger = Logger.getLogger(JuniperSrxResource.class);
+ private static final Logger s_logger = Logger.getLogger(JuniperSrxResource.class);
private SrxXml(String filename) {
xml = getXml(filename);
@@ -854,9 +854,9 @@ public class JuniperSrxResource implements ServerResource {
addEgressSecurityPolicyAndApplications(SecurityPolicyType.SECURITYPOLICY_EGRESS, guestVlan, extractApplications(activeRulesForGuestNw),
extractCidrs(activeRulesForGuestNw), defaultEgressPolicy);
- /* Adding default policy rules are required because the order of rules is important.
- * Depending on the rules order the traffic accept/drop is performed
- */
+ /* Adding default policy rules are required because the order of rules is important.
+ * Depending on the rules order the traffic accept/drop is performed
+ */
removeEgressSecurityPolicyAndApplications(SecurityPolicyType.SECURITYPOLICY_EGRESS_DEFAULT, guestVlan, cidrs, defaultEgressPolicy);
addEgressSecurityPolicyAndApplications(SecurityPolicyType.SECURITYPOLICY_EGRESS_DEFAULT, guestVlan, applications, cidrs, defaultEgressPolicy);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/plugins/network-elements/netscaler/src/com/cloud/api/commands/AddNetscalerLoadBalancerCmd.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/netscaler/src/com/cloud/api/commands/AddNetscalerLoadBalancerCmd.java b/plugins/network-elements/netscaler/src/com/cloud/api/commands/AddNetscalerLoadBalancerCmd.java
index 1237e7f..b744fff 100644
--- a/plugins/network-elements/netscaler/src/com/cloud/api/commands/AddNetscalerLoadBalancerCmd.java
+++ b/plugins/network-elements/netscaler/src/com/cloud/api/commands/AddNetscalerLoadBalancerCmd.java
@@ -86,9 +86,9 @@ public class AddNetscalerLoadBalancerCmd extends BaseAsyncCmd {
private String gslbSitePrivateIp;
@Parameter(name = ApiConstants.EXCLUSIVE_GSLB_PROVIDER,
- type = CommandType.BOOLEAN,
- required = false,
- description = "true if NetScaler device being added is for providing GSLB service exclusively and can not be used for LB")
+ type = CommandType.BOOLEAN,
+ required = false,
+ description = "true if NetScaler device being added is for providing GSLB service exclusively and can not be used for LB")
private Boolean isExclusiveGslbProvider;
/////////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/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 a2bda90..5199f60 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
@@ -383,7 +383,7 @@ public class NetscalerElement extends ExternalLoadBalancerDeviceManagerImpl impl
if (cmd.isExclusiveGslbProvider() && !cmd.isGslbProvider()) {
throw new InvalidParameterValueException("NetScaler can be provisioned to be exclusive GSLB service provider" +
- " only if its being configured as GSLB service provider also.");
+ " only if its being configured as GSLB service provider also.");
}
ExternalLoadBalancerDeviceVO lbDeviceVO =
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java b/plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java
index e827298..54e5d50 100644
--- a/plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java
+++ b/plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java
@@ -16,7 +16,6 @@
// under the License.
package com.cloud.network.resource;
-import java.io.PrintWriter;
import java.io.StringWriter;
import java.security.cert.Certificate;
import java.util.ArrayList;
@@ -28,16 +27,9 @@ import java.util.Map;
import javax.naming.ConfigurationException;
-import com.citrix.netscaler.nitro.resource.config.ssl.sslcertkey;
-import com.citrix.netscaler.nitro.resource.config.ssl.sslcertkey_sslvserver_binding;
-import com.citrix.netscaler.nitro.resource.config.ssl.sslcertlink;
-import com.citrix.netscaler.nitro.resource.config.ssl.sslvserver_sslcertkey_binding;
-import com.cloud.network.lb.LoadBalancingRule.LbSslCert;
-import com.cloud.utils.security.CertificateHelper;
-import com.cloud.utils.ssh.SshHelper;
-import com.google.common.collect.Lists;
import org.apache.commons.io.output.ByteArrayOutputStream;
import org.apache.log4j.Logger;
+import org.bouncycastle.openssl.PEMWriter;
import com.citrix.netscaler.nitro.exception.nitro_exception;
import com.citrix.netscaler.nitro.resource.base.base_response;
@@ -73,6 +65,10 @@ import com.citrix.netscaler.nitro.resource.config.ns.nshardware;
import com.citrix.netscaler.nitro.resource.config.ns.nsip;
import com.citrix.netscaler.nitro.resource.config.ns.nstimer;
import com.citrix.netscaler.nitro.resource.config.ns.nstimer_autoscalepolicy_binding;
+import com.citrix.netscaler.nitro.resource.config.ssl.sslcertkey;
+import com.citrix.netscaler.nitro.resource.config.ssl.sslcertkey_sslvserver_binding;
+import com.citrix.netscaler.nitro.resource.config.ssl.sslcertlink;
+import com.citrix.netscaler.nitro.resource.config.ssl.sslvserver_sslcertkey_binding;
import com.citrix.netscaler.nitro.resource.stat.lb.lbvserver_stats;
import com.citrix.netscaler.nitro.service.nitro_service;
import com.citrix.netscaler.nitro.util.filtervalue;
@@ -80,6 +76,7 @@ import com.citrix.sdx.nitro.resource.config.device_profile;
import com.citrix.sdx.nitro.resource.config.mps;
import com.citrix.sdx.nitro.resource.config.ns;
import com.citrix.sdx.nitro.resource.config.xen_vpx_image;
+import com.google.common.collect.Lists;
import com.google.gson.Gson;
import org.apache.cloudstack.api.ApiConstants;
@@ -121,6 +118,7 @@ import com.cloud.agent.api.to.LoadBalancerTO.StickinessPolicyTO;
import com.cloud.agent.api.to.StaticNatRuleTO;
import com.cloud.host.Host;
import com.cloud.host.Host.Type;
+import com.cloud.network.lb.LoadBalancingRule.LbSslCert;
import com.cloud.network.rules.LbStickinessMethod.StickinessMethodType;
import com.cloud.resource.ServerResource;
import com.cloud.serializer.GsonHelper;
@@ -128,7 +126,8 @@ import com.cloud.utils.NumbersUtil;
import com.cloud.utils.Pair;
import com.cloud.utils.exception.ExecutionException;
import com.cloud.utils.net.NetUtils;
-import org.bouncycastle.openssl.PEMWriter;
+import com.cloud.utils.security.CertificateHelper;
+import com.cloud.utils.ssh.SshHelper;
class NitroError {
static final int NS_RESOURCE_EXISTS = 273;
@@ -683,17 +682,17 @@ public class NetscalerResource implements ServerResource {
String previousCertKeyName = null;
- if ( sslCert.getChain() != null ) {
+ if (sslCert.getChain() != null) {
List<Certificate> chainList = CertificateHelper.parseChain(sslCert.getChain());
// go from ROOT to intermediate CAs
- for ( Certificate intermediateCert : Lists.reverse(chainList)){
+ for (Certificate intermediateCert : Lists.reverse(chainList)) {
- String fingerPrint=CertificateHelper.generateFingerPrint(intermediateCert);
+ String fingerPrint = CertificateHelper.generateFingerPrint(intermediateCert);
String intermediateCertKeyName = generateSslCertKeyName(fingerPrint);
String intermediateCertFileName = intermediateCertKeyName + ".pem";
- if (! SSL.isSslCertKeyPresent(_netscalerService, intermediateCertKeyName)) {
- byte[] certData= intermediateCert.getEncoded();
+ if (!SSL.isSslCertKeyPresent(_netscalerService, intermediateCertKeyName)) {
+ byte[] certData = intermediateCert.getEncoded();
StringWriter textWriter = new StringWriter();
PEMWriter pemWriter = new PEMWriter(textWriter);
pemWriter.writeObject(intermediateCert);
@@ -703,7 +702,7 @@ public class NetscalerResource implements ServerResource {
SSL.createSslCertKey(_netscalerService, intermediateCertFileName, null, intermediateCertKeyName, null);
}
- if ( previousCertKeyName != null && ! SSL.certLinkExists(_netscalerService, intermediateCertKeyName, previousCertKeyName)){
+ if (previousCertKeyName != null && !SSL.certLinkExists(_netscalerService, intermediateCertKeyName, previousCertKeyName)) {
SSL.linkCerts(_netscalerService, intermediateCertKeyName, previousCertKeyName);
}
@@ -715,17 +714,17 @@ public class NetscalerResource implements ServerResource {
String keyFilename = generateSslKeyName(sslCert.getFingerprint()) + ".pem"; //netscaler uses ".pem" format for "bundle" files
String certKeyName = generateSslCertKeyName(sslCert.getFingerprint());
- ByteArrayOutputStream certDataStream = new ByteArrayOutputStream( );
+ ByteArrayOutputStream certDataStream = new ByteArrayOutputStream();
certDataStream.write(sslCert.getCert().getBytes());
- if (! SSL.isSslCertKeyPresent(_netscalerService, certKeyName)) {
+ if (!SSL.isSslCertKeyPresent(_netscalerService, certKeyName)) {
SSL.uploadCert(_ip, _username, _password, certFilename, certDataStream.toByteArray());
SSL.uploadKey(_ip, _username, _password, keyFilename, sslCert.getKey().getBytes());
SSL.createSslCertKey(_netscalerService, certFilename, keyFilename, certKeyName, sslCert.getPassword());
}
- if (previousCertKeyName != null && ! SSL.certLinkExists(_netscalerService, certKeyName, previousCertKeyName)){
+ if (previousCertKeyName != null && !SSL.certLinkExists(_netscalerService, certKeyName, previousCertKeyName)) {
SSL.linkCerts(_netscalerService, certKeyName, previousCertKeyName);
}
@@ -831,8 +830,8 @@ public class NetscalerResource implements ServerResource {
// unbind before deleting
if (nsVirtualServerExists(nsVirtualServerName) &&
- SSL.isSslCertKeyPresent(_netscalerService, certKeyName) &&
- SSL.isBoundToVserver(_netscalerService, certKeyName, nsVirtualServerName)) {
+ SSL.isSslCertKeyPresent(_netscalerService, certKeyName) &&
+ SSL.isBoundToVserver(_netscalerService, certKeyName, nsVirtualServerName)) {
SSL.unbindCertKeyFromVserver(_netscalerService, certKeyName, nsVirtualServerName);
}
@@ -843,27 +842,26 @@ public class NetscalerResource implements ServerResource {
SSL.deleteKeyFile(_ip, _username, _password, keyFilename);
}
-
/*
* Check and delete intermediate certs:
* we can delete an intermediate cert if no other
* cert references it as the athority
*/
- if ( sslCert.getChain() != null ) {
+ if (sslCert.getChain() != null) {
List<Certificate> chainList = CertificateHelper.parseChain(sslCert.getChain());
//go from intermediate CAs to ROOT
- for ( Certificate intermediateCert : chainList){
+ for (Certificate intermediateCert : chainList) {
- String fingerPrint=CertificateHelper.generateFingerPrint(intermediateCert);
+ String fingerPrint = CertificateHelper.generateFingerPrint(intermediateCert);
String intermediateCertKeyName = generateSslCertKeyName(fingerPrint);
String intermediateCertFileName = intermediateCertKeyName + ".pem";
if (SSL.isSslCertKeyPresent(_netscalerService, intermediateCertKeyName) &&
- ! SSL.isCaforCerts(_netscalerService, intermediateCertKeyName)) {
+ !SSL.isCaforCerts(_netscalerService, intermediateCertKeyName)) {
SSL.deleteSslCertKey(_netscalerService, intermediateCertKeyName);
SSL.deleteCertFile(_ip, _username, _password, intermediateCertFileName);
- }else {
+ } else {
break;// if this cert has another certificate as a child then stop at this point because we need the whole chain
}
@@ -1797,7 +1795,7 @@ public class NetscalerResource implements ServerResource {
return false;
}
- private static void deleteSslCertKey(nitro_service ns, String certKeyName) throws ExecutionException {
+ private static void deleteSslCertKey(nitro_service ns, String certKeyName) throws ExecutionException {
try {
sslcertkey certkey = new sslcertkey();
@@ -1813,7 +1811,7 @@ public class NetscalerResource implements ServerResource {
}
private static void deleteCertFile(String nsIp, String username, String password, String certFilename) throws Exception {
- SshHelper.sshExecute(nsIp,SSH_PORT,username,null,password,"shell rm " + SSL_CERT_PATH + certFilename);
+ SshHelper.sshExecute(nsIp, SSH_PORT, username, null, password, "shell rm " + SSL_CERT_PATH + certFilename);
}
private static void deleteKeyFile(String nsIp, String username, String password, String keyFilename) throws Exception {
@@ -1827,7 +1825,7 @@ public class NetscalerResource implements ServerResource {
certkey.set_certkey(certKeyName);
certkey.set_cert(SSL_CERT_PATH + certFilename);
- if ( keyFilename != null )
+ if (keyFilename != null)
certkey.set_key(SSL_CERT_PATH + keyFilename);
if (password != null) {
@@ -1896,8 +1894,8 @@ public class NetscalerResource implements ServerResource {
private static void uploadCert(String nsIp, String user, String password, String certFilename, byte[] certData) throws ExecutionException {
try {
- SshHelper.scpTo(nsIp,SSH_PORT,user,null,password, SSL_CERT_PATH, certData, certFilename, null);
- } catch (Exception e){
+ SshHelper.scpTo(nsIp, SSH_PORT, user, null, password, SSL_CERT_PATH, certData, certFilename, null);
+ } catch (Exception e) {
throw new ExecutionException("Failed to copy private key to device " + e.getMessage());
}
}
@@ -1912,7 +1910,7 @@ public class NetscalerResource implements ServerResource {
private static void enableSslFeature(nitro_service ns) throws ExecutionException {
try {
- base_response result = ns.enable_features(new String[]{"SSL"});
+ base_response result = ns.enable_features(new String[] {"SSL"});
if (result.errorcode != 0)
throw new ExecutionException("Unable to enable SSL on LB");
} catch (nitro_exception e) {
@@ -1944,7 +1942,7 @@ public class NetscalerResource implements ServerResource {
try {
// check if there is a link from userCertName to caCertName
- sslcertkey userCert = sslcertkey.get(ns,userCertName);
+ sslcertkey userCert = sslcertkey.get(ns, userCertName);
String nsCaCert = userCert.get_linkcertkeyname();
if (nsCaCert != null && nsCaCert.equals(caCertName))
@@ -1984,8 +1982,8 @@ public class NetscalerResource implements ServerResource {
public static boolean isCaforCerts(nitro_service ns, String caCertName) throws ExecutionException {
// check if this certificate serves as a CA for other certificates
try {
- sslcertlink[] childLinks = sslcertlink.get_filtered(ns,"linkcertkeyname:" + caCertName);
- if(childLinks != null && childLinks.length > 0){
+ sslcertlink[] childLinks = sslcertlink.get_filtered(ns, "linkcertkeyname:" + caCertName);
+ if (childLinks != null && childLinks.length > 0) {
return true;
}
@@ -2002,7 +2000,7 @@ public class NetscalerResource implements ServerResource {
try {
sslcertkey_sslvserver_binding[] cert_vs_binding = sslcertkey_sslvserver_binding.get_filtered(ns, certKeyName, "vservername:" + nsVirtualServerName);
- if(cert_vs_binding != null && cert_vs_binding.length > 0){
+ if (cert_vs_binding != null && cert_vs_binding.length > 0) {
return true;
}
@@ -2016,73 +2014,73 @@ public class NetscalerResource implements ServerResource {
}
}
- private void enableVPXInterfaces(String publicIf, String privateIf, ns ns_obj) {
+ private void enableVPXInterfaces(String publicIf, String privateIf, ns nsObj) {
// enable VPX to use 10 gigabit Ethernet interfaces if public/private interface
// on SDX is a 10Gig interface
if (publicIf.equals("10/1") || privateIf.equals("10/1")) {
- ns_obj.set_if_10_1(new Boolean(true));
+ nsObj.set_if_10_1(new Boolean(true));
}
if (publicIf.equals("10/2") || privateIf.equals("10/2")) {
- ns_obj.set_if_10_2(new Boolean(true));
+ nsObj.set_if_10_2(new Boolean(true));
}
if (publicIf.equals("10/3") || privateIf.equals("10/3")) {
- ns_obj.set_if_10_3(new Boolean(true));
+ nsObj.set_if_10_3(new Boolean(true));
}
if (publicIf.equals("10/4") || privateIf.equals("10/4")) {
- ns_obj.set_if_10_4(new Boolean(true));
+ nsObj.set_if_10_4(new Boolean(true));
}
if (publicIf.equals("10/5") || privateIf.equals("10/5")) {
- ns_obj.set_if_10_5(new Boolean(true));
+ nsObj.set_if_10_5(new Boolean(true));
}
if (publicIf.equals("10/6") || privateIf.equals("10/6")) {
- ns_obj.set_if_10_6(new Boolean(true));
+ nsObj.set_if_10_6(new Boolean(true));
}
if (publicIf.equals("10/7") || privateIf.equals("10/7")) {
- ns_obj.set_if_10_7(new Boolean(true));
+ nsObj.set_if_10_7(new Boolean(true));
}
if (publicIf.equals("10/8") || privateIf.equals("10/8")) {
- ns_obj.set_if_10_8(new Boolean(true));
+ nsObj.set_if_10_8(new Boolean(true));
}
// enable VPX to use 1 gigabit Ethernet interfaces if public/private interface
// on SDX is a 1Gig interface
if (publicIf.equals("1/1") || privateIf.equals("1/1")) {
- ns_obj.set_if_1_1(new Boolean(true));
+ nsObj.set_if_1_1(new Boolean(true));
}
if (publicIf.equals("1/2") || privateIf.equals("1/2")) {
- ns_obj.set_if_1_2(new Boolean(true));
+ nsObj.set_if_1_2(new Boolean(true));
}
if (publicIf.equals("1/3") || privateIf.equals("1/3")) {
- ns_obj.set_if_1_3(new Boolean(true));
+ nsObj.set_if_1_3(new Boolean(true));
}
if (publicIf.equals("1/4") || privateIf.equals("1/4")) {
- ns_obj.set_if_1_4(new Boolean(true));
+ nsObj.set_if_1_4(new Boolean(true));
}
if (publicIf.equals("1/5") || privateIf.equals("1/5")) {
- ns_obj.set_if_1_5(new Boolean(true));
+ nsObj.set_if_1_5(new Boolean(true));
}
if (publicIf.equals("1/6") || privateIf.equals("1/6")) {
- ns_obj.set_if_1_6(new Boolean(true));
+ nsObj.set_if_1_6(new Boolean(true));
}
if (publicIf.equals("1/7") || privateIf.equals("1/7")) {
- ns_obj.set_if_1_7(new Boolean(true));
+ nsObj.set_if_1_7(new Boolean(true));
}
if (publicIf.equals("1/8") || privateIf.equals("1/8")) {
- ns_obj.set_if_1_8(new Boolean(true));
+ nsObj.set_if_1_8(new Boolean(true));
}
}
@@ -3746,18 +3744,18 @@ public class NetscalerResource implements ServerResource {
private String generateSslCertName(String fingerPrint) {
// maximum length supported by NS is 31
// the first 20 characters of the SHA-1 checksum are the unique id
- String uniqueId = fingerPrint.replace(":","").substring(0,20);
+ String uniqueId = fingerPrint.replace(":", "").substring(0, 20);
return genObjectName("Cloud-Cert", uniqueId);
}
private String generateSslKeyName(String fingerPrint) {
- String uniqueId = fingerPrint.replace(":","").substring(0,20);
+ String uniqueId = fingerPrint.replace(":", "").substring(0, 20);
return genObjectName("Cloud-Key", uniqueId);
}
- private String generateSslCertKeyName(String fingerPrint){
- String uniqueId = fingerPrint.replace(":","").substring(0,20);
+ private String generateSslCertKeyName(String fingerPrint) {
+ String uniqueId = fingerPrint.replace(":", "").substring(0, 20);
return genObjectName("Cloud-Cert", uniqueId);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsCreateGreTunnelAnswer.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsCreateGreTunnelAnswer.java b/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsCreateGreTunnelAnswer.java
index 7913cc8..e9e3455 100644
--- a/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsCreateGreTunnelAnswer.java
+++ b/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsCreateGreTunnelAnswer.java
@@ -16,66 +16,64 @@
// under the License.
package com.cloud.agent.api;
-import com.cloud.agent.api.Answer;
-import com.cloud.agent.api.Command;
public class OvsCreateGreTunnelAnswer extends Answer {
- String hostIp;
- String remoteIp;
- String bridge;
- String key;
- long from;
- long to;
- int port;
+ String hostIp;
+ String remoteIp;
+ String bridge;
+ String key;
+ long from;
+ long to;
+ int port;
- public OvsCreateGreTunnelAnswer(Command cmd, boolean success, String details) {
- super(cmd, success, details);
- }
+ public OvsCreateGreTunnelAnswer(Command cmd, boolean success, String details) {
+ super(cmd, success, details);
+ }
- public OvsCreateGreTunnelAnswer(Command cmd, boolean success,
- String details, String hostIp, String bridge) {
- super(cmd, success, details);
- OvsCreateGreTunnelCommand c = (OvsCreateGreTunnelCommand) cmd;
- this.hostIp = hostIp;
- this.bridge = bridge;
- this.remoteIp = c.getRemoteIp();
- this.key = c.getKey();
- this.port = -1;
- this.from = c.getFrom();
- this.to = c.getTo();
- }
+ public OvsCreateGreTunnelAnswer(Command cmd, boolean success,
+ String details, String hostIp, String bridge) {
+ super(cmd, success, details);
+ OvsCreateGreTunnelCommand c = (OvsCreateGreTunnelCommand)cmd;
+ this.hostIp = hostIp;
+ this.bridge = bridge;
+ this.remoteIp = c.getRemoteIp();
+ this.key = c.getKey();
+ this.port = -1;
+ this.from = c.getFrom();
+ this.to = c.getTo();
+ }
- public OvsCreateGreTunnelAnswer(Command cmd, boolean success,
- String details, String hostIp, String bridge, int port) {
- this(cmd, success, details, hostIp, bridge);
- this.port = port;
- }
+ public OvsCreateGreTunnelAnswer(Command cmd, boolean success,
+ String details, String hostIp, String bridge, int port) {
+ this(cmd, success, details, hostIp, bridge);
+ this.port = port;
+ }
- public String getHostIp() {
- return hostIp;
- }
+ public String getHostIp() {
+ return hostIp;
+ }
- public String getRemoteIp() {
- return remoteIp;
- }
+ public String getRemoteIp() {
+ return remoteIp;
+ }
- public String getBridge() {
- return bridge;
- }
+ public String getBridge() {
+ return bridge;
+ }
- public String getKey() {
- return key;
- }
+ public String getKey() {
+ return key;
+ }
- public long getFrom() {
- return from;
- }
+ public long getFrom() {
+ return from;
+ }
- public long getTo() {
- return to;
- }
+ public long getTo() {
+ return to;
+ }
- public int getPort() {
- return port;
- }
+ public int getPort() {
+ return port;
+ }
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsCreateGreTunnelCommand.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsCreateGreTunnelCommand.java b/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsCreateGreTunnelCommand.java
index 588ff51..9a3d417 100644
--- a/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsCreateGreTunnelCommand.java
+++ b/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsCreateGreTunnelCommand.java
@@ -16,40 +16,39 @@
// under the License.
package com.cloud.agent.api;
-import com.cloud.agent.api.Command;
public class OvsCreateGreTunnelCommand extends Command {
- String remoteIp;
- String key;
- long from;
- long to;
-
- @Override
- public boolean executeInSequence() {
- return true;
- }
-
- public OvsCreateGreTunnelCommand(String remoteIp, String key, long from,
- long to) {
- this.remoteIp = remoteIp;
- this.key = key;
- this.from = from;
- this.to = to;
- }
-
- public String getRemoteIp() {
- return remoteIp;
- }
-
- public String getKey() {
- return key;
- }
-
- public long getFrom() {
- return from;
- }
-
- public long getTo() {
- return to;
- }
+ String remoteIp;
+ String key;
+ long from;
+ long to;
+
+ @Override
+ public boolean executeInSequence() {
+ return true;
+ }
+
+ public OvsCreateGreTunnelCommand(String remoteIp, String key, long from,
+ long to) {
+ this.remoteIp = remoteIp;
+ this.key = key;
+ this.from = from;
+ this.to = to;
+ }
+
+ public String getRemoteIp() {
+ return remoteIp;
+ }
+
+ public String getKey() {
+ return key;
+ }
+
+ public long getFrom() {
+ return from;
+ }
+
+ public long getTo() {
+ return to;
+ }
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsCreateTunnelAnswer.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsCreateTunnelAnswer.java b/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsCreateTunnelAnswer.java
index f921042..96acab7 100644
--- a/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsCreateTunnelAnswer.java
+++ b/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsCreateTunnelAnswer.java
@@ -16,70 +16,68 @@
// under the License.
package com.cloud.agent.api;
-import com.cloud.agent.api.Answer;
-import com.cloud.agent.api.Command;
public class OvsCreateTunnelAnswer extends Answer {
- Long from;
- Long to;
- long networkId;
- String inPortName;
+ Long from;
+ Long to;
+ long networkId;
+ String inPortName;
- // for debug info
- String fromIp;
- String toIp;
- int key;
- String bridge;
+ // for debug info
+ String fromIp;
+ String toIp;
+ int key;
+ String bridge;
- public OvsCreateTunnelAnswer(Command cmd, boolean success, String details,
- String bridge) {
- super(cmd, success, details);
- OvsCreateTunnelCommand c = (OvsCreateTunnelCommand) cmd;
- from = c.getFrom();
- to = c.getTo();
- networkId = c.getNetworkId();
- inPortName = "[]";
- fromIp = c.getFromIp();
- toIp = c.getRemoteIp();
- key = c.getKey();
- this.bridge = bridge;
- }
+ public OvsCreateTunnelAnswer(Command cmd, boolean success, String details,
+ String bridge) {
+ super(cmd, success, details);
+ OvsCreateTunnelCommand c = (OvsCreateTunnelCommand)cmd;
+ from = c.getFrom();
+ to = c.getTo();
+ networkId = c.getNetworkId();
+ inPortName = "[]";
+ fromIp = c.getFromIp();
+ toIp = c.getRemoteIp();
+ key = c.getKey();
+ this.bridge = bridge;
+ }
- public OvsCreateTunnelAnswer(Command cmd, boolean success, String details,
- String inPortName, String bridge) {
- this(cmd, success, details, bridge);
- this.inPortName = inPortName;
- }
+ public OvsCreateTunnelAnswer(Command cmd, boolean success, String details,
+ String inPortName, String bridge) {
+ this(cmd, success, details, bridge);
+ this.inPortName = inPortName;
+ }
- public Long getFrom() {
- return from;
- }
+ public Long getFrom() {
+ return from;
+ }
- public Long getTo() {
- return to;
- }
+ public Long getTo() {
+ return to;
+ }
- public long getNetworkId() {
- return networkId;
- }
+ public long getNetworkId() {
+ return networkId;
+ }
- public String getInPortName() {
- return inPortName;
- }
+ public String getInPortName() {
+ return inPortName;
+ }
- public String getFromIp() {
- return fromIp;
- }
+ public String getFromIp() {
+ return fromIp;
+ }
- public String getToIp() {
- return toIp;
- }
+ public String getToIp() {
+ return toIp;
+ }
- public int getKey() {
- return key;
- }
+ public int getKey() {
+ return key;
+ }
- public String getBridge() {
- return bridge;
- }
+ public String getBridge() {
+ return bridge;
+ }
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsCreateTunnelCommand.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsCreateTunnelCommand.java b/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsCreateTunnelCommand.java
index 1dc4d82..7f151fb 100644
--- a/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsCreateTunnelCommand.java
+++ b/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsCreateTunnelCommand.java
@@ -16,55 +16,54 @@
// under the License.
package com.cloud.agent.api;
-import com.cloud.agent.api.Command;
public class OvsCreateTunnelCommand extends Command {
- Integer key;
- String remoteIp;
- Long from;
- Long to;
- long networkId;
+ Integer key;
+ String remoteIp;
+ Long from;
+ Long to;
+ long networkId;
- // for debug info
- String fromIp;
+ // for debug info
+ String fromIp;
- @Override
- public boolean executeInSequence() {
- return true;
- }
+ @Override
+ public boolean executeInSequence() {
+ return true;
+ }
- public OvsCreateTunnelCommand(String remoteIp, Integer key, Long from,
- Long to, long networkId, String fromIp) {
- this.remoteIp = remoteIp;
- this.key = key;
- this.from = from;
- this.to = to;
- this.networkId = networkId;
- this.fromIp = fromIp;
- }
+ public OvsCreateTunnelCommand(String remoteIp, Integer key, Long from,
+ Long to, long networkId, String fromIp) {
+ this.remoteIp = remoteIp;
+ this.key = key;
+ this.from = from;
+ this.to = to;
+ this.networkId = networkId;
+ this.fromIp = fromIp;
+ }
- public Integer getKey() {
- return key;
- }
+ public Integer getKey() {
+ return key;
+ }
- public String getRemoteIp() {
- return remoteIp;
- }
+ public String getRemoteIp() {
+ return remoteIp;
+ }
- public Long getFrom() {
- return from;
- }
+ public Long getFrom() {
+ return from;
+ }
- public Long getTo() {
- return to;
- }
+ public Long getTo() {
+ return to;
+ }
- public long getNetworkId() {
- return networkId;
- }
+ public long getNetworkId() {
+ return networkId;
+ }
- public String getFromIp() {
- return fromIp;
- }
+ public String getFromIp() {
+ return fromIp;
+ }
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsDeleteFlowCommand.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsDeleteFlowCommand.java b/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsDeleteFlowCommand.java
index 3b5e1c2..4d2df9f 100644
--- a/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsDeleteFlowCommand.java
+++ b/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsDeleteFlowCommand.java
@@ -16,21 +16,20 @@
// under the License.
package com.cloud.agent.api;
-import com.cloud.agent.api.Command;
public class OvsDeleteFlowCommand extends Command {
- String vmName;
+ String vmName;
- @Override
- public boolean executeInSequence() {
- return true;
- }
+ @Override
+ public boolean executeInSequence() {
+ return true;
+ }
- public String getVmName() {
- return vmName;
- }
+ public String getVmName() {
+ return vmName;
+ }
- public OvsDeleteFlowCommand(String vmName) {
- this.vmName = vmName;
- }
+ public OvsDeleteFlowCommand(String vmName) {
+ this.vmName = vmName;
+ }
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsDestroyBridgeCommand.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsDestroyBridgeCommand.java b/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsDestroyBridgeCommand.java
index 21b89af..59b50be 100644
--- a/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsDestroyBridgeCommand.java
+++ b/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsDestroyBridgeCommand.java
@@ -17,28 +17,27 @@
package com.cloud.agent.api;
-import com.cloud.agent.api.Command;
public class OvsDestroyBridgeCommand extends Command {
- Long networkId;
- Integer key;
+ Long networkId;
+ Integer key;
- public OvsDestroyBridgeCommand(Long networkId, Integer key) {
- this.networkId = networkId;
- this.key = key;
- }
+ public OvsDestroyBridgeCommand(Long networkId, Integer key) {
+ this.networkId = networkId;
+ this.key = key;
+ }
- public Long getNetworkId() {
- return networkId;
- }
+ public Long getNetworkId() {
+ return networkId;
+ }
- public Integer getKey() {
- return key;
- }
+ public Integer getKey() {
+ return key;
+ }
- @Override
- public boolean executeInSequence() {
- return true;
- }
+ @Override
+ public boolean executeInSequence() {
+ return true;
+ }
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsDestroyTunnelCommand.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsDestroyTunnelCommand.java b/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsDestroyTunnelCommand.java
index d06acf5..4776a07 100644
--- a/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsDestroyTunnelCommand.java
+++ b/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsDestroyTunnelCommand.java
@@ -16,35 +16,34 @@
// under the License.
package com.cloud.agent.api;
-import com.cloud.agent.api.Command;
public class OvsDestroyTunnelCommand extends Command {
- Long networkId;
- Integer key;
- String inPortName;
-
- public OvsDestroyTunnelCommand(Long networkId, Integer key,
- String inPortName) {
- this.networkId = networkId;
- this.inPortName = inPortName;
- this.key = key;
- }
-
- public Long getNetworkId() {
- return networkId;
- }
-
- public String getInPortName() {
- return inPortName;
- }
-
- public Integer getKey() {
- return key;
- }
-
- @Override
- public boolean executeInSequence() {
- return true;
- }
+ Long networkId;
+ Integer key;
+ String inPortName;
+
+ public OvsDestroyTunnelCommand(Long networkId, Integer key,
+ String inPortName) {
+ this.networkId = networkId;
+ this.inPortName = inPortName;
+ this.key = key;
+ }
+
+ public Long getNetworkId() {
+ return networkId;
+ }
+
+ public String getInPortName() {
+ return inPortName;
+ }
+
+ public Integer getKey() {
+ return key;
+ }
+
+ @Override
+ public boolean executeInSequence() {
+ return true;
+ }
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsFetchInterfaceAnswer.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsFetchInterfaceAnswer.java b/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsFetchInterfaceAnswer.java
index 6c7deaa..237d21a 100644
--- a/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsFetchInterfaceAnswer.java
+++ b/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsFetchInterfaceAnswer.java
@@ -17,42 +17,40 @@
package com.cloud.agent.api;
-import com.cloud.agent.api.Answer;
-import com.cloud.agent.api.Command;
public class OvsFetchInterfaceAnswer extends Answer {
- String ip;
- String netmask;
- String mac;
- String label;
-
- public OvsFetchInterfaceAnswer(Command cmd, boolean success, String details) {
- super(cmd, success, details);
- this.label = ((OvsFetchInterfaceCommand) cmd).getLabel();
- }
-
- public OvsFetchInterfaceAnswer(Command cmd, boolean success,
- String details, String ip, String netmask, String mac) {
- super(cmd, success, details);
- this.ip = ip;
- this.netmask = netmask;
- this.mac = mac;
- this.label = ((OvsFetchInterfaceCommand) cmd).getLabel();
- }
-
- public String getIp() {
- return ip;
- }
-
- public String getNetmask() {
- return netmask;
- }
-
- public String getMac() {
- return mac;
- }
-
- public String getLabel() {
- return label;
- }
+ String ip;
+ String netmask;
+ String mac;
+ String label;
+
+ public OvsFetchInterfaceAnswer(Command cmd, boolean success, String details) {
+ super(cmd, success, details);
+ this.label = ((OvsFetchInterfaceCommand)cmd).getLabel();
+ }
+
+ public OvsFetchInterfaceAnswer(Command cmd, boolean success,
+ String details, String ip, String netmask, String mac) {
+ super(cmd, success, details);
+ this.ip = ip;
+ this.netmask = netmask;
+ this.mac = mac;
+ this.label = ((OvsFetchInterfaceCommand)cmd).getLabel();
+ }
+
+ public String getIp() {
+ return ip;
+ }
+
+ public String getNetmask() {
+ return netmask;
+ }
+
+ public String getMac() {
+ return mac;
+ }
+
+ public String getLabel() {
+ return label;
+ }
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsFetchInterfaceCommand.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsFetchInterfaceCommand.java b/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsFetchInterfaceCommand.java
index a305d5b..79a7e5c 100644
--- a/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsFetchInterfaceCommand.java
+++ b/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsFetchInterfaceCommand.java
@@ -17,22 +17,21 @@
package com.cloud.agent.api;
-import com.cloud.agent.api.Command;
public class OvsFetchInterfaceCommand extends Command {
- String label;
+ String label;
- @Override
- public boolean executeInSequence() {
- return true;
- }
+ @Override
+ public boolean executeInSequence() {
+ return true;
+ }
- public OvsFetchInterfaceCommand(String label) {
- this.label = label;
- }
+ public OvsFetchInterfaceCommand(String label) {
+ this.label = label;
+ }
- public String getLabel() {
- return label;
- }
+ public String getLabel() {
+ return label;
+ }
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsSetTagAndFlowAnswer.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsSetTagAndFlowAnswer.java b/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsSetTagAndFlowAnswer.java
index ee1fe42..be5be45 100644
--- a/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsSetTagAndFlowAnswer.java
+++ b/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsSetTagAndFlowAnswer.java
@@ -16,25 +16,23 @@
// under the License.
package com.cloud.agent.api;
-import com.cloud.agent.api.Answer;
-import com.cloud.agent.api.Command;
public class OvsSetTagAndFlowAnswer extends Answer {
- Long vmId;
- Long seqno;
+ Long vmId;
+ Long seqno;
- public OvsSetTagAndFlowAnswer(Command cmd, boolean success, String details) {
- super(cmd, success, details);
- OvsSetTagAndFlowCommand c = (OvsSetTagAndFlowCommand) cmd;
- this.vmId = c.getVmId();
- this.seqno = Long.parseLong(c.getSeqNo());
- }
+ public OvsSetTagAndFlowAnswer(Command cmd, boolean success, String details) {
+ super(cmd, success, details);
+ OvsSetTagAndFlowCommand c = (OvsSetTagAndFlowCommand)cmd;
+ this.vmId = c.getVmId();
+ this.seqno = Long.parseLong(c.getSeqNo());
+ }
- public Long getVmId() {
- return vmId;
- }
+ public Long getVmId() {
+ return vmId;
+ }
- public Long getSeqNo() {
- return seqno;
- }
+ public Long getSeqNo() {
+ return seqno;
+ }
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsSetTagAndFlowCommand.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsSetTagAndFlowCommand.java b/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsSetTagAndFlowCommand.java
index 28a936a..078528b 100644
--- a/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsSetTagAndFlowCommand.java
+++ b/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsSetTagAndFlowCommand.java
@@ -16,46 +16,45 @@
// under the License.
package com.cloud.agent.api;
-import com.cloud.agent.api.Command;
public class OvsSetTagAndFlowCommand extends Command {
- String vlans;
- String vmName;
- String seqno;
- String tag;
- Long vmId;
-
- @Override
- public boolean executeInSequence() {
- return true;
- }
-
- public String getSeqNo() {
- return seqno;
- }
-
- public String getVlans() {
- return vlans;
- }
-
- public String getVmName() {
- return vmName;
- }
-
- public Long getVmId() {
- return vmId;
- }
-
- public String getTag() {
- return tag;
- }
-
- public OvsSetTagAndFlowCommand(String vmName, String tag, String vlans,
- String seqno, Long vmId) {
- this.vmName = vmName;
- this.tag = tag;
- this.vlans = vlans;
- this.seqno = seqno;
- this.vmId = vmId;
- }
+ String vlans;
+ String vmName;
+ String seqno;
+ String tag;
+ Long vmId;
+
+ @Override
+ public boolean executeInSequence() {
+ return true;
+ }
+
+ public String getSeqNo() {
+ return seqno;
+ }
+
+ public String getVlans() {
+ return vlans;
+ }
+
+ public String getVmName() {
+ return vmName;
+ }
+
+ public Long getVmId() {
+ return vmId;
+ }
+
+ public String getTag() {
+ return tag;
+ }
+
+ public OvsSetTagAndFlowCommand(String vmName, String tag, String vlans,
+ String seqno, Long vmId) {
+ this.vmName = vmName;
+ this.tag = tag;
+ this.vlans = vlans;
+ this.seqno = seqno;
+ this.vmId = vmId;
+ }
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsSetupBridgeCommand.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsSetupBridgeCommand.java b/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsSetupBridgeCommand.java
index 6968a4c..e3390f3 100644
--- a/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsSetupBridgeCommand.java
+++ b/plugins/network-elements/ovs/src/com/cloud/agent/api/OvsSetupBridgeCommand.java
@@ -17,33 +17,32 @@
package com.cloud.agent.api;
-import com.cloud.agent.api.Command;
public class OvsSetupBridgeCommand extends Command {
- Integer key;
- Long hostId;
- Long networkId;
-
- @Override
- public boolean executeInSequence() {
- return true;
- }
-
- public OvsSetupBridgeCommand(Integer key, Long hostId, Long networkId) {
- this.key = key;
- this.hostId = hostId;
- this.networkId = networkId;
- }
-
- public Integer getKey() {
- return key;
- }
-
- public Long getHostId() {
- return hostId;
- }
-
- public Long getNetworkId() {
- return networkId;
- }
+ Integer key;
+ Long hostId;
+ Long networkId;
+
+ @Override
+ public boolean executeInSequence() {
+ return true;
+ }
+
+ public OvsSetupBridgeCommand(Integer key, Long hostId, Long networkId) {
+ this.key = key;
+ this.hostId = hostId;
+ this.networkId = networkId;
+ }
+
+ public Integer getKey() {
+ return key;
+ }
+
+ public Long getHostId() {
+ return hostId;
+ }
+
+ public Long getNetworkId() {
+ return networkId;
+ }
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/plugins/network-elements/ovs/src/com/cloud/agent/api/StartupOvsCommand.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/ovs/src/com/cloud/agent/api/StartupOvsCommand.java b/plugins/network-elements/ovs/src/com/cloud/agent/api/StartupOvsCommand.java
index 766aec2..1720402 100644
--- a/plugins/network-elements/ovs/src/com/cloud/agent/api/StartupOvsCommand.java
+++ b/plugins/network-elements/ovs/src/com/cloud/agent/api/StartupOvsCommand.java
@@ -16,12 +16,11 @@
// under the License.
package com.cloud.agent.api;
-import com.cloud.agent.api.StartupCommand;
import com.cloud.host.Host;
public class StartupOvsCommand extends StartupCommand {
- public StartupOvsCommand() {
- super(Host.Type.L2Networking);
- }
+ public StartupOvsCommand() {
+ super(Host.Type.L2Networking);
+ }
}